diff --git a/Makefile.common b/Makefile.common
index a4779635c5e..508c2ac8b07 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -21,7 +21,7 @@ OBJS =\
 	lua/ltm.o \
 	lua/lundump.o \
 	lua/lvm.o \
-	lua/lzio.o
+	lua/lzio.o \
 	mixer/mixer.o \
 	mixer/rate.o \
 	mixer/audiostream.o \
@@ -53,7 +53,7 @@ OBJS =\
 	textsplit.o \
 	timer.o \
 	vima.o \
-	walkplane.o \
+	walkplane.o
 
 DEPS = $(OBJS:.o=.d)
 
diff --git a/textobject.cpp b/textobject.cpp
index e4c111fb411..92a80e56ee6 100644
--- a/textobject.cpp
+++ b/textobject.cpp
@@ -19,7 +19,12 @@
 #include "textobject.h"
 #include "engine.h"
 #include "localize.h"
+
+#ifdef DIRECT3D_DRIVER
+#include "driver_d3d.h"
+#else
 #include "driver_gl.h"
+#endif
 
 TextObject::TextObject(const char *text, const int x, const int y, const Color& fgColor) :
 		fgColor_(fgColor), x_(x), y_(y) {