diff --git a/configure.in b/configure.in
index 447e790..55418f5 100644
--- a/configure.in
+++ b/configure.in
@@ -59,7 +59,9 @@ AC_CHECK_FUNCS([bzero floor getcwd gethostbyname getmntent getpagesize gettimeof
 
 AC_CONFIG_FILES([Makefile
 				 src/Makefile
-				 game/Makefile])
+				 game/Makefile
+				 game/baseq2/Makefile
+				 game/ctf/Makefile])
 #				 ref_gl/Makefile
 #				 ref_soft/Makefile])
 AC_OUTPUT
diff --git a/game/baseq2/Makefile.am b/game/baseq2/Makefile.am
index da9fb96..0b9caab 100644
--- a/game/baseq2/Makefile.am
+++ b/game/baseq2/Makefile.am
@@ -53,5 +53,5 @@ game_so_SOURCES = g_ai.c \
 			m_flash.c
 
 AM_CFLAGS = -fPIC
-AM_CPPFLAGS = -I../src
+AM_CPPFLAGS = -I../../src -I..
 LDFLAGS = -shared
diff --git a/game/ctf/.gitignore b/game/ctf/.gitignore
new file mode 100644
index 0000000..e9407c9
--- /dev/null
+++ b/game/ctf/.gitignore
@@ -0,0 +1,4 @@
+Makefile
+Makefile.in
+.libs
+.deps
diff --git a/game/ctf/Makefile.am b/game/ctf/Makefile.am
new file mode 100644
index 0000000..2dfdf5c
--- /dev/null
+++ b/game/ctf/Makefile.am
@@ -0,0 +1,3 @@
+# $Id$
+
+
diff --git a/game/baseq2/game.h b/game/game.h
similarity index 100%
rename from game/baseq2/game.h
rename to game/game.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 4540001..cbaa886 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,4 +26,4 @@ quake2_SOURCES = main.c q_sh.c vid_menu.c vid_so.c glob.c net_udp.c \
 				#snd_mixa.S
 				
 AM_CFLAGS = -Wall -Werror -pipe
-AM_CPPFLAGS = -DLINUX_VERSION="\"$(VERSION)\"" -Dstricmp=strcasecmp
+AM_CPPFLAGS = -DLINUX_VERSION="\"$(VERSION)\"" -Dstricmp=strcasecmp -I../game
diff --git a/src/main.c b/src/main.c
index 375accc..8ec0085 100644
--- a/src/main.c
+++ b/src/main.c
@@ -62,7 +62,7 @@
 #endif
 
 #include "qcommon.h"
-#include "../game/game.h"
+#include "game.h"
 #include "rw.h"
 
 cvar_t *nostdout;