diff --git a/sc2/src/libs/graphics/Makeinfo b/sc2/src/libs/graphics/Makeinfo
index 7d7e5d438..6a4eb8040 100644
--- a/sc2/src/libs/graphics/Makeinfo
+++ b/sc2/src/libs/graphics/Makeinfo
@@ -1,4 +1,5 @@
 uqm_SUBDIRS="sdl"
 uqm_CFILES="boxint.c clipline.c cmap.c context.c drawable.c filegfx.c
+		dcqueue.c
 		font.c frame.c gfx_common.c intersec.c loaddisp.c
 		pixmap.c resgfx.c tfb_draw.c tfb_prim.c widgets.c"
diff --git a/sc2/src/libs/graphics/sdl/dcqueue.c b/sc2/src/libs/graphics/dcqueue.c
similarity index 97%
rename from sc2/src/libs/graphics/sdl/dcqueue.c
rename to sc2/src/libs/graphics/dcqueue.c
index a9568fbb0..28cfe8c1f 100644
--- a/sc2/src/libs/graphics/sdl/dcqueue.c
+++ b/sc2/src/libs/graphics/dcqueue.c
@@ -1,5 +1,3 @@
-//Copyright Paul Reiche, Fred Ford. 1992-2002
-
 /*
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,14 +14,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef GFXMODULE_SDL
-
 #include "port.h"
-#include "sdl_common.h"
 #include "libs/threadlib.h"
-#include SDL_INCLUDE(SDL_thread.h)
 #include "libs/graphics/drawcmd.h"
-#include "libs/graphics/sdl/dcqueue.h"
+#include "libs/graphics/drawable.h"
+#include "libs/graphics/context.h"
+#include "libs/graphics/dcqueue.h"
 #include "libs/log.h"
 #include "libs/misc.h"
 		// for TFB_DEBUG_HALT
@@ -252,6 +248,3 @@ TFB_EnqueueDrawCommand (TFB_DrawCommand* DrawCommand)
 	TFB_DrawCommandQueue_Push (DrawCommand);
 }
 
-#endif
-
-
diff --git a/sc2/src/libs/graphics/sdl/dcqueue.h b/sc2/src/libs/graphics/dcqueue.h
similarity index 97%
rename from sc2/src/libs/graphics/sdl/dcqueue.h
rename to sc2/src/libs/graphics/dcqueue.h
index 1e98a6af5..deed68534 100644
--- a/sc2/src/libs/graphics/sdl/dcqueue.h
+++ b/sc2/src/libs/graphics/dcqueue.h
@@ -1,5 +1,3 @@
-//Copyright Paul Reiche, Fred Ford. 1992-2002
-
 /*
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/sc2/src/libs/graphics/sdl/Makeinfo b/sc2/src/libs/graphics/sdl/Makeinfo
index 7efc05402..dccc0447a 100644
--- a/sc2/src/libs/graphics/sdl/Makeinfo
+++ b/sc2/src/libs/graphics/sdl/Makeinfo
@@ -1,4 +1,4 @@
-uqm_CFILES="3do_blt.c 3do_funcs.c 3do_getbody.c dcqueue.c opengl.c
+uqm_CFILES="3do_blt.c 3do_funcs.c 3do_getbody.c opengl.c
 		palette.c
 		primitives.c pure.c sdl_common.c
 		scalers.c 2xscalers.c
diff --git a/sc2/src/libs/graphics/sdl/sdl_common.c b/sc2/src/libs/graphics/sdl/sdl_common.c
index 087c1261f..ec63ade34 100644
--- a/sc2/src/libs/graphics/sdl/sdl_common.c
+++ b/sc2/src/libs/graphics/sdl/sdl_common.c
@@ -22,10 +22,10 @@
 #include "opengl.h"
 #include "pure.h"
 #include "primitives.h"
-#include "dcqueue.h"
 #include "options.h"
 #include "uqmversion.h"
 #include "libs/graphics/drawcmd.h"
+#include "libs/graphics/dcqueue.h"
 #include "libs/graphics/cmap.h"
 #include "libs/input/sdl/input.h"
 		// for ProcessInputEvent()