diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e6e523d23..3d89be21f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1000,7 +1000,6 @@ set (PCH_SOURCES
 	gamedata/textures/animations.cpp
 	gamedata/textures/anim_switches.cpp
 	gamedata/textures/buildloader.cpp
-	gamedata/fonts/v_text.cpp	
 	gamedata/p_xlat.cpp
 	gamedata/xlat/parse_xlat.cpp
 	gamedata/xlat/parsecontext.cpp
@@ -1064,6 +1063,7 @@ set (PCH_SOURCES
 	common/fonts/font.cpp
 	common/fonts/hexfont.cpp
 	common/fonts/v_font.cpp
+	common/fonts/v_text.cpp	
 	common/textures/hw_ihwtexture.cpp
 	common/textures/hw_material.cpp
 	common/textures/bitmap.cpp
diff --git a/src/gamedata/fonts/v_text.cpp b/src/common/fonts/v_text.cpp
similarity index 99%
rename from src/gamedata/fonts/v_text.cpp
rename to src/common/fonts/v_text.cpp
index 437e56450..375e2d67b 100644
--- a/src/gamedata/fonts/v_text.cpp
+++ b/src/common/fonts/v_text.cpp
@@ -38,10 +38,9 @@
 #include <wctype.h>
 
 #include "v_text.h"
+#include "v_font.h"
 #include "utf8.h"
 
-
-#include "v_video.h"
 #include "filesystem.h"
 
 #include "gstrings.h"
diff --git a/src/gamedata/fonts/v_text.h b/src/common/fonts/v_text.h
similarity index 100%
rename from src/gamedata/fonts/v_text.h
rename to src/common/fonts/v_text.h
diff --git a/src/rendering/polyrenderer/backend/poly_framebuffer.cpp b/src/rendering/polyrenderer/backend/poly_framebuffer.cpp
index d7ceb41ad..413106144 100644
--- a/src/rendering/polyrenderer/backend/poly_framebuffer.cpp
+++ b/src/rendering/polyrenderer/backend/poly_framebuffer.cpp
@@ -27,7 +27,7 @@
 #include "actor.h"
 #include "i_time.h"
 #include "g_game.h"
-#include "gamedata/fonts/v_text.h"
+#include "v_text.h"
 
 #include "rendering/i_video.h"