diff --git a/sc2/build/unix/build.config b/sc2/build/unix/build.config
index aaf65834c..9cea39fec 100644
--- a/sc2/build/unix/build.config
+++ b/sc2/build/unix/build.config
@@ -199,6 +199,7 @@ uqm_prepare_config()
 	CHOICE_graphics_OPTION_pure_ACTION='graphics_pure_action'
 	graphics_pure_action() {
 		CFLAGS="$CFLAGS -DGFXMODULE_SDL"
+		GFXMODULE_SDL=1
 		HAVE_OPENGL=0
 	}
 	CHOICE_graphics_OPTION_opengl_TITLE="Include OpenGL graphics support"
@@ -206,6 +207,7 @@ uqm_prepare_config()
 	CHOICE_graphics_OPTION_opengl_PRECOND="have_library opengl"
 	graphics_opengl_action() {
 		CFLAGS="$CFLAGS -DGFXMODULE_SDL -DHAVE_OPENGL"
+		GFXMODULE_SDL=1
 		HAVE_OPENGL=1
 		use_library opengl
 	}
@@ -435,7 +437,8 @@ uqm_process_config() {
 			PREPROC_OBJC MKDEP_OBJC COMPILE_OBJC \
 			MAKE ECHON SED DEBUG JOYSTICK NETPLAY \
 			OGGVORBIS SOUNDMODULE USE_INTERNAL_MIKMOD \
-			HAVE_OPENGL HAVE_GETOPT_LONG HAVE_REGEX_H_FLAG \
+			GFXMODULE_SDL HAVE_OPENGL \
+			HAVE_GETOPT_LONG HAVE_REGEX_H_FLAG \
 			USE_ZIP_IO USE_PLATFORM_ACCEL THREADLIB USE_WINSOCK \
 			INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \
 			REZ WINDRES $HAVE_SYMBOLS"
diff --git a/sc2/src/libs/graphics/Makeinfo b/sc2/src/libs/graphics/Makeinfo
index f654bb9c1..71fc08188 100644
--- a/sc2/src/libs/graphics/Makeinfo
+++ b/sc2/src/libs/graphics/Makeinfo
@@ -1,5 +1,10 @@
-uqm_SUBDIRS="sdl"
+uqm_SUBDIRS=
 uqm_CFILES="boxint.c clipline.c cmap.c context.c drawable.c filegfx.c
 		bbox.c dcqueue.c gfxload.c
 		font.c frame.c gfx_common.c intersec.c loaddisp.c
 		pixmap.c resgfx.c tfb_draw.c tfb_prim.c widgets.c"
+
+if [ -n "$uqm_GFXMODULE_SDL" ]; then
+	uqm_SUBDIRS="$uqm_SUBDIRS sdl"
+fi
+
diff --git a/sc2/src/libs/graphics/sdl/2xscalers.c b/sc2/src/libs/graphics/sdl/2xscalers.c
index 84a86ae38..a612d2c44 100644
--- a/sc2/src/libs/graphics/sdl/2xscalers.c
+++ b/sc2/src/libs/graphics/sdl/2xscalers.c
@@ -14,8 +14,6 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef GFXMODULE_SDL
-
 #include "libs/graphics/sdl/sdl_common.h"
 #include "types.h"
 #include "scalers.h"
@@ -260,4 +258,3 @@ SCALE_(BiAdaptFilter) (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r)
 	SCALE_(PlatDone) ();
 }
 
-#endif /* GFXMODULE_SDL */
diff --git a/sc2/src/libs/graphics/sdl/2xscalers_3dnow.c b/sc2/src/libs/graphics/sdl/2xscalers_3dnow.c
index 27c9cd341..da34e826e 100644
--- a/sc2/src/libs/graphics/sdl/2xscalers_3dnow.c
+++ b/sc2/src/libs/graphics/sdl/2xscalers_3dnow.c
@@ -14,8 +14,6 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef GFXMODULE_SDL
-
 #include "port.h"
 #include "libs/platform.h"
 
@@ -101,4 +99,4 @@ Scale_3DNow_PrepPlatform (const SDL_PixelFormat* fmt)
 #endif /* NO_IMPROVEMENT */
 
 #endif /* MMX_ASM */
-#endif /* GFXMODULE_SDL */
+
diff --git a/sc2/src/libs/graphics/sdl/2xscalers_mmx.c b/sc2/src/libs/graphics/sdl/2xscalers_mmx.c
index f454dece3..c321b1642 100644
--- a/sc2/src/libs/graphics/sdl/2xscalers_mmx.c
+++ b/sc2/src/libs/graphics/sdl/2xscalers_mmx.c
@@ -14,8 +14,6 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef GFXMODULE_SDL
-
 #include "port.h"
 #include "libs/platform.h"
 
@@ -135,4 +133,4 @@ Scale_MMX_PrepPlatform (const SDL_PixelFormat* fmt)
 
 
 #endif /* MMX_ASM */
-#endif /* GFXMODULE_SDL */
+
diff --git a/sc2/src/libs/graphics/sdl/2xscalers_sse.c b/sc2/src/libs/graphics/sdl/2xscalers_sse.c
index 8a9ca0951..a089744a8 100644
--- a/sc2/src/libs/graphics/sdl/2xscalers_sse.c
+++ b/sc2/src/libs/graphics/sdl/2xscalers_sse.c
@@ -14,8 +14,6 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef GFXMODULE_SDL
-
 #include "port.h"
 #include "libs/platform.h"
 
@@ -99,4 +97,4 @@ Scale_SSE_PrepPlatform (const SDL_PixelFormat* fmt)
 #endif
 
 #endif /* MMX_ASM */
-#endif /* GFXMODULE_SDL */
+
diff --git a/sc2/src/libs/graphics/sdl/biadv2x.c b/sc2/src/libs/graphics/sdl/biadv2x.c
index 2eb840b5f..b38cdf701 100644
--- a/sc2/src/libs/graphics/sdl/biadv2x.c
+++ b/sc2/src/libs/graphics/sdl/biadv2x.c
@@ -21,8 +21,6 @@
 //    When this file is built standalone is produces a plain C version
 //    Also #included by 2xscalers_mmx.c for an MMX version
 
-#ifdef GFXMODULE_SDL
-
 #include "libs/graphics/sdl/sdl_common.h"
 #include "types.h"
 #include "scalers.h"
@@ -532,4 +530,3 @@ SCALE_(BiAdaptAdvFilter) (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r)
 	SCALE_(PlatDone) ();
 }
 
-#endif /* GFXMODULE_SDL */
diff --git a/sc2/src/libs/graphics/sdl/bilinear2x.c b/sc2/src/libs/graphics/sdl/bilinear2x.c
index d3ee12585..a12eb9384 100644
--- a/sc2/src/libs/graphics/sdl/bilinear2x.c
+++ b/sc2/src/libs/graphics/sdl/bilinear2x.c
@@ -19,8 +19,6 @@
 //    When this file is built standalone is produces a plain C version
 //    Also #included by 2xscalers_mmx.c for an MMX version
 
-#ifdef GFXMODULE_SDL
-
 #include "libs/graphics/sdl/sdl_common.h"
 #include "types.h"
 #include "scalers.h"
@@ -112,4 +110,3 @@ SCALE_(BilinearFilter) (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r)
 	SCALE_(PlatDone) ();
 }
 
-#endif /* GFXMODULE_SDL */
diff --git a/sc2/src/libs/graphics/sdl/hq2x.c b/sc2/src/libs/graphics/sdl/hq2x.c
index 776851569..02dc8068c 100644
--- a/sc2/src/libs/graphics/sdl/hq2x.c
+++ b/sc2/src/libs/graphics/sdl/hq2x.c
@@ -27,8 +27,6 @@
 //    When this file is built standalone is produces a plain C version
 //    Also #included by 2xscalers_mmx.c for an MMX version
 
-#ifdef GFXMODULE_SDL
-
 #include "libs/graphics/sdl/sdl_common.h"
 #include "types.h"
 #include "scalers.h"
@@ -2888,4 +2886,3 @@ SCALE_(HqFilter) (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r)
 	SCALE_(PlatDone) ();
 }
 
-#endif /* GFXMODULE_SDL */
diff --git a/sc2/src/libs/graphics/sdl/nearest2x.c b/sc2/src/libs/graphics/sdl/nearest2x.c
index 37a0bde0e..42e681385 100644
--- a/sc2/src/libs/graphics/sdl/nearest2x.c
+++ b/sc2/src/libs/graphics/sdl/nearest2x.c
@@ -19,8 +19,6 @@
 //    When this file is built standalone is produces a plain C version
 //    Also #included by 2xscalers_mmx.c for an MMX version
 
-#ifdef GFXMODULE_SDL
-
 #include "libs/graphics/sdl/sdl_common.h"
 #include "types.h"
 #include "scalers.h"
@@ -207,4 +205,3 @@ SCALE_(Nearest) (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r)
 	SCALE_(PlatDone) ();
 }
 
-#endif /* GFXMODULE_SDL */
diff --git a/sc2/src/libs/graphics/sdl/opengl.c b/sc2/src/libs/graphics/sdl/opengl.c
index 3740d918f..686326407 100644
--- a/sc2/src/libs/graphics/sdl/opengl.c
+++ b/sc2/src/libs/graphics/sdl/opengl.c
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#if defined (GFXMODULE_SDL) && defined (HAVE_OPENGL)
+#ifdef HAVE_OPENGL
 
 #include "libs/graphics/sdl/opengl.h"
 #include "libs/graphics/bbox.h"
diff --git a/sc2/src/libs/graphics/sdl/primitives.c b/sc2/src/libs/graphics/sdl/primitives.c
index 17edb7da5..edebb419b 100644
--- a/sc2/src/libs/graphics/sdl/primitives.c
+++ b/sc2/src/libs/graphics/sdl/primitives.c
@@ -16,8 +16,6 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef GFXMODULE_SDL
-
 #include "port.h"
 #include "sdl_common.h"
 #include "primitives.h"
@@ -629,4 +627,3 @@ clip_blt_rects(SDL_Rect *src_r, SDL_Rect *dst_r, const SDL_Rect *clip_r)
 	return 1;
 }
 
-#endif
diff --git a/sc2/src/libs/graphics/sdl/pure.c b/sc2/src/libs/graphics/sdl/pure.c
index 6eadbaf4a..78fd62483 100644
--- a/sc2/src/libs/graphics/sdl/pure.c
+++ b/sc2/src/libs/graphics/sdl/pure.c
@@ -15,8 +15,6 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef GFXMODULE_SDL
-
 #include "pure.h"
 #include "libs/graphics/bbox.h"
 #include "scalers.h"
@@ -475,4 +473,3 @@ Scale_PerfTest (void)
 	SDL_UnlockSurface (SDL_Screen);
 }
 
-#endif
diff --git a/sc2/src/libs/graphics/sdl/rotozoom.c b/sc2/src/libs/graphics/sdl/rotozoom.c
index 449315029..f50f2ab36 100644
--- a/sc2/src/libs/graphics/sdl/rotozoom.c
+++ b/sc2/src/libs/graphics/sdl/rotozoom.c
@@ -9,8 +9,6 @@
 
 */
 
-#ifdef GFXMODULE_SDL
-
 #include <stdlib.h>
 #include <string.h>
 #include "libs/memlib.h"
@@ -1025,4 +1023,3 @@ SDL_Surface *zoomSurface(SDL_Surface * src, double zoomx, double zoomy, int smoo
     return (rz_dst);
 }
 
-#endif
diff --git a/sc2/src/libs/graphics/sdl/scalers.c b/sc2/src/libs/graphics/sdl/scalers.c
index e3ca6ebe1..f903478a6 100644
--- a/sc2/src/libs/graphics/sdl/scalers.c
+++ b/sc2/src/libs/graphics/sdl/scalers.c
@@ -14,8 +14,6 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef GFXMODULE_SDL
-
 #include "types.h"
 #include "libs/graphics/sdl/sdl_common.h"
 #include "libs/platform.h"
@@ -286,4 +284,3 @@ Scale_PrepPlatform (int flags, const SDL_PixelFormat* fmt)
 	return fdef->func;
 }
 
-#endif
diff --git a/sc2/src/libs/graphics/sdl/sdl_common.c b/sc2/src/libs/graphics/sdl/sdl_common.c
index 4b933b288..461a64831 100644
--- a/sc2/src/libs/graphics/sdl/sdl_common.c
+++ b/sc2/src/libs/graphics/sdl/sdl_common.c
@@ -16,8 +16,6 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifdef GFXMODULE_SDL
-
 #include "sdl_common.h"
 #include "opengl.h"
 #include "pure.h"
@@ -607,5 +605,3 @@ TFB_SetGamma (float gamma)
 	}
 }
 
-#endif
-
diff --git a/sc2/src/libs/graphics/sdl/triscan2x.c b/sc2/src/libs/graphics/sdl/triscan2x.c
index 001ad1128..830dc7c71 100644
--- a/sc2/src/libs/graphics/sdl/triscan2x.c
+++ b/sc2/src/libs/graphics/sdl/triscan2x.c
@@ -20,8 +20,6 @@
 //    When this file is built standalone is produces a plain C version
 //    Also #included by 2xscalers_mmx.c for an MMX version
 
-#ifdef GFXMODULE_SDL
-
 #include "libs/graphics/sdl/sdl_common.h"
 #include "types.h"
 #include "scalers.h"
@@ -155,4 +153,3 @@ SCALE_(TriScanFilter) (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r)
 	SCALE_(PlatDone) ();
 }
 
-#endif /* GFXMODULE_SDL */