diff --git a/qw_server/Makefile.in b/qw_server/Makefile.in
index c7be5ad..20c3ece 100644
--- a/qw_server/Makefile.in
+++ b/qw_server/Makefile.in
@@ -3,18 +3,21 @@
 # Quake general stuff
 #
 
-PROJECT_DIR  = @top_srcdir@
-SRC_DIR      = @srcdir@
+PROJECT_DIR	= @top_srcdir@
+PROJECT_ODIR	= ..
+SRC_DIR		= @srcdir@
+QW_COMMON_DIR	= $(PROJECT_DIR)/qw_common
+COMMON_DIR	= $(PROJECT_DIR)/common
+COMMON_ODIR	= $(PROJECT_ODIR)/common
+BIN_PREFIX	= qw-server
 
-DESTDIR      =
+DESTDIR		=
 
-prefix      = @prefix@
-bindir      = @bindir@
-mandir      = @mandir@
+prefix		= @prefix@
+bindir		= @bindir@
+mandir		= @mandir@
 
-COMMON_DIR=$(PROJECT_DIR)/common
-QW_COMMON_DIR= $(PROJECT_DIR)/qw_common
-BUILD_DIR = ../targets/qw_server
+BUILD_DIR	= $(PROJECT_ODIR)/targets/qw_server
 
 LDFLAGS = @LDFLAGS@ -lm
 LIBS = @LIBS@
@@ -71,7 +74,7 @@ QW_GENERAL_SRC = pmove.c pmovetst.c
 # Directory specific stuff
 #
 CFLAGS = @CFLAGS@ -DQUAKEWORLD -DSERVERONLY $(OPTFLAGS) $(DEFS) -I. \
-$(SRC_DIR_INC) -I$(QW_COMMON_DIR) -I$(COMMON_DIR)
+$(SRC_DIR_INC) -I$(QW_COMMON_DIR) -I$(COMMON_ODIR) -I$(COMMON_DIR)
 DEFS = @DEFS@
 
 SRVQUAKE = qw-server
diff --git a/uquake/Makefile.in b/uquake/Makefile.in
index 127b767..f48e05d 100644
--- a/uquake/Makefile.in
+++ b/uquake/Makefile.in
@@ -3,18 +3,20 @@
 # Quake general stuff
 #
 
-PROJECT_DIR = @top_srcdir@
-SRC_DIR     = @srcdir@
-BIN_PREFIX  = quake
+PROJECT_DIR	= @top_srcdir@
+PROJECT_ODIR	= ..
+SRC_DIR		= @srcdir@
+COMMON_DIR	= $(PROJECT_DIR)/common
+COMMON_ODIR	= $(PROJECT_ODIR)/common
+BIN_PREFIX	= quake
 
-DESTDIR     =
+DESTDIR		=
 
-prefix      = @prefix@
-bindir      = @bindir@
-mandir      = @mandir@
+prefix		= @prefix@
+bindir		= @bindir@
+mandir		= @mandir@
 
-COMMON_DIR=$(PROJECT_DIR)/common
-BUILD_DIR =../targets/uquake
+BUILD_DIR	= $(PROJECT_ODIR)/targets/uquake
 
 LDFLAGS = @LDFLAGS@ @SND_LIBS@ -lm
 LIBS = @LIBS@
@@ -192,7 +194,7 @@ CL_COMMON_SRC = $(MISC_SRC) $(CL_GUI_SRC) $(CL_SRC) \
 #
 DEFS         = @DEFS@
 CFLAGS       = @CFLAGS@ $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) \
--I$(COMMON_DIR) -I$(SRC_DIR)/include
+-I$(COMMON_ODIR) -I$(COMMON_DIR)
 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)