diff --git a/gui/consolefont.cpp b/graphics/consolefont.cpp
similarity index 99%
rename from gui/consolefont.cpp
rename to graphics/consolefont.cpp
index edbff22aa36..c9184e4b2e0 100644
--- a/gui/consolefont.cpp
+++ b/graphics/consolefont.cpp
@@ -16,9 +16,7 @@
    Copyright 1991, 1998 The Open Group
 */
 
-namespace GUI {
-
-using namespace Graphics;
+namespace Graphics {
 
 /* Font character bitmap data. */
 static const bitmap_t _font_bits[] = {
@@ -4781,4 +4779,4 @@ static const FontDesc desc = {
 
 extern const NewFont g_consolefont(desc);
 
-} // End of namespace GUI
+} // End of namespace Graphics
diff --git a/graphics/fontman.cpp b/graphics/fontman.cpp
index cc7675fd96a..e0ca9e59978 100644
--- a/graphics/fontman.cpp
+++ b/graphics/fontman.cpp
@@ -21,10 +21,6 @@
 #include "graphics/fontman.h"
 //#include "gui/consolefont.h"
 
-namespace GUI {
-	extern const Graphics::NewFont g_consolefont;
-}
-
 DECLARE_SINGLETON(Graphics::FontManager);
 
 namespace Graphics {
@@ -32,6 +28,7 @@ namespace Graphics {
 const ScummFont g_scummfont;
 extern const NewFont g_sysfont;
 extern const NewFont g_sysfont_big;
+extern const NewFont g_consolefont;
 
 
 FontManager::FontManager() {
@@ -45,7 +42,7 @@ const Font *FontManager::getFontByUsage(FontUsage usage) const {
 	case kOSDFont:
 		return &g_scummfont;
 	case kConsoleFont:
-		return &GUI::g_consolefont;
+		return &g_consolefont;
 	case kGUIFont:
 		return &g_sysfont;
 	case kBigGUIFont:
diff --git a/graphics/module.mk b/graphics/module.mk
index 0488ead3a6a..83d650b3064 100644
--- a/graphics/module.mk
+++ b/graphics/module.mk
@@ -2,11 +2,12 @@ MODULE := graphics
 
 MODULE_OBJS := \
 	graphics/animation.o \
-	graphics/scummfont.o \
+	graphics/consolefont.o \
 	graphics/font.o \
 	graphics/fontman.o \
 	graphics/newfont.o \
 	graphics/newfont_big.o \
+	graphics/scummfont.o \
 	graphics/surface.o
 
 MODULE_DIRS += \
diff --git a/gui/console.cpp b/gui/console.cpp
index b9d2374c923..2e1e67d4911 100644
--- a/gui/console.cpp
+++ b/gui/console.cpp
@@ -29,9 +29,12 @@
 
 #include "graphics/font.h"
 
-namespace GUI {
+namespace Graphics {
+extern const NewFont g_consolefont;
+}
+using Graphics::g_consolefont;
 
-extern const Graphics::NewFont g_consolefont;
+namespace GUI {
 
 #define kConsoleCharWidth	(g_consolefont.getMaxCharWidth())
 #define kConsoleLineHeight	(g_consolefont.getFontHeight() + 2)
diff --git a/gui/module.mk b/gui/module.mk
index bda7f5fa8fc..e3b2af7727b 100644
--- a/gui/module.mk
+++ b/gui/module.mk
@@ -5,7 +5,6 @@ MODULE_OBJS := \
 	gui/browser.o \
 	gui/chooser.o \
 	gui/console.o \
-	gui/consolefont.o \
 	gui/dialog.o \
 	gui/editable.o \
 	gui/EditTextWidget.o \