diff --git a/common/common_quakedef.h b/common/common_quakedef.h
index aa92b6a..c4e6642 100644
--- a/common/common_quakedef.h
+++ b/common/common_quakedef.h
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define	QUAKE_GAME			// as opposed to utilities
 
-#include <config/config.h>
+#include <config.h>                     // generated from config.h.in
 
 #include <math.h>
 #include <string.h>
diff --git a/common/config/config.h.in b/common/config.h.in
similarity index 100%
rename from common/config/config.h.in
rename to common/config.h.in
diff --git a/configure.in b/configure.in
index f02c2ba..3b9e189 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(common/crc.h)
+AC_CONFIG_HEADER(common/config.h)
 AC_CANONICAL_SYSTEM
 AC_LANG_C
 
@@ -132,7 +133,6 @@ if test "x$HAS_OGL_INC" != x; then
 	    AC_DEFINE(HAVE_GL_COLOR_INDEX8_EXT, 1)
 	else
 	    AC_MSG_RESULT(no)
-	    AC_MSG_ERROR(Error, HAVE_GL_COLOR_INDEX8_EXT not found.)
 	fi
 
 	AC_MSG_CHECKING(for GLAPIENTRY)
@@ -155,7 +155,6 @@ if test "x$HAS_OGL_INC" != x; then
 		AC_DEFINE(GLAPIENTRY_IS_APIENTRY, 1)
 	    else
 		AC_MSG_RESULT(no)
-		AC_MSG_ERROR(Error, neither GLAPIENTRY nor APIENTRY are defined)
 	    fi
 	fi
 
@@ -392,6 +391,5 @@ AC_PATH_XTRA
 #
 # Output files
 #
-AC_CONFIG_HEADER(common/config/config.h)
 AC_OUTPUT(qw_client/Makefile qw_server/Makefile uquake/Makefile Makefile)
 
diff --git a/qw_client/Makefile.in b/qw_client/Makefile.in
index 5fb9844..3939d8b 100644
--- a/qw_client/Makefile.in
+++ b/qw_client/Makefile.in
@@ -9,7 +9,7 @@ QW_COMMON_DIR= $(PROJECT_DIR)/qw_common
 COMMON_DIR=$(PROJECT_DIR)/common
 BIN_PREFIX   = qw-client
 
-BUILD_DIR = $(PROJECT_DIR)/targets/qw_client
+BUILD_DIR = ../targets/qw_client
 
 LDFLAGS = @LDFLAGS@ @SND_LIBS@
 LIBS = @LIBS@
@@ -186,7 +186,8 @@ CL_COMMON_SRC = $(MISC_SRC) $(CL_GUI_SRC) $(CL_SRC) \
 # Directory specific stuff
 #
 DEFS = @DEFS@ @STRICMP_DEF@
-CFLAGS = -Wall -DQUAKEWORLD $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) -I$(QW_COMMON_DIR) -I$(COMMON_DIR)
+CFLAGS = -Wall -DQUAKEWORLD $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) \
+-I$(QW_COMMON_DIR) -I$(COMMON_DIR) -I../common
 ALL_X11_SRC  = $(GENERAL_SRC) $(SW_REND_SRC) $(QW_X11_VID_SRC) model.c
 ALL_GL_SRC   = $(GENERAL_SRC) $(GL_REND_SRC) $(GL_VID_SRC) $(QW_GL_REND_SRC) 
 ALL_TDFX_SRC = $(GENERAL_SRC) $(GL_REND_SRC) $(TDFX_VID_SRC) $(QW_GL_REND_SRC) 
diff --git a/qw_server/Makefile.in b/qw_server/Makefile.in
index c7849c0..f85c0c8 100644
--- a/qw_server/Makefile.in
+++ b/qw_server/Makefile.in
@@ -8,7 +8,7 @@ SRC_DIR      = @srcdir@
 
 COMMON_DIR=$(PROJECT_DIR)/common
 QW_COMMON_DIR= $(PROJECT_DIR)/qw_common
-BUILD_DIR = $(PROJECT_DIR)/targets/qw_server
+BUILD_DIR = ../targets/qw_server
 
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -64,7 +64,8 @@ QW_GENERAL_SRC = pmove.c pmovetst.c
 #
 # Directory specific stuff
 #
-CFLAGS = -DQUAKEWORLD -DSERVERONLY $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) -I$(QW_COMMON_DIR) -I$(COMMON_DIR)
+CFLAGS = -DQUAKEWORLD -DSERVERONLY $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) \
+-I$(QW_COMMON_DIR) -I$(COMMON_DIR) -I../common
 DEFS = @DEFS@ @STRICMP_DEF@
 
 SRVQUAKE = qw-server
diff --git a/uquake/Makefile.in b/uquake/Makefile.in
index d4b819b..1ff58ae 100644
--- a/uquake/Makefile.in
+++ b/uquake/Makefile.in
@@ -8,7 +8,7 @@ SRC_DIR     = @srcdir@
 BIN_PREFIX  = quake
 
 COMMON_DIR=$(PROJECT_DIR)/common
-BUILD_DIR = $(PROJECT_DIR)/targets/uquake
+BUILD_DIR =../targets/uquake
 
 LDFLAGS = @LDFLAGS@ @SND_LIBS@
 LIBS = @LIBS@
@@ -174,7 +174,8 @@ CL_COMMON_SRC = $(MISC_SRC) $(CL_GUI_SRC) $(CL_SRC) \
 # Directory specific stuff
 #
 DEFS         = @DEFS@
-CFLAGS       = $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) -I$(COMMON_DIR) -I$(SRC_DIR)/include
+CFLAGS       = $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) -I$(COMMON_DIR) \
+-I../common -I$(SRC_DIR)/include
 ALL_X11_SRC  = $(GENERAL_SRC) $(SW_REND_SRC) $(X11_VID_SRC) model.c
 ALL_GL_SRC   = $(GENERAL_SRC) $(GL_REND_SRC) $(GL_VID_SRC)
 ALL_TDFX_SRC = $(GENERAL_SRC) $(GL_REND_SRC) $(TDFX_VID_SRC)