Index: Apps/EOModelEditor/Inspectors/GNUmakefile
===================================================================
--- Apps/EOModelEditor/Inspectors/GNUmakefile	(revision 30842)
+++ Apps/EOModelEditor/Inspectors/GNUmakefile	(working copy)
@@ -27,7 +27,7 @@
 include $(GNUSTEP_MAKEFILES)/common.make
 SUBPROJECT_NAME=Inspectors
 
-ADDITIONAL_INCLUDE_DIRS+=-I../../
+ADDITIONAL_INCLUDE_DIRS+=-I../../../ -I../..
 
 Inspectors_NEEDS_GUI=yes
 Inspectors_HAS_RESOURCE_BUNDLE=yes
Index: Apps/EOModelEditor/GNUmakefile
===================================================================
--- Apps/EOModelEditor/GNUmakefile	(revision 30842)
+++ Apps/EOModelEditor/GNUmakefile	(working copy)
@@ -41,8 +41,8 @@
 ADDITIONAL_OBJC_LIBS += -lgnustep-baseadd
 endif
 
-ADDITIONAL_INCLUDE_DIRS+=-I../
-ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess ../EOControl ../EOInterface ../EOModeler
+ADDITIONAL_INCLUDE_DIRS+=-I../..
+ADDITIONAL_NATIVE_LIB_DIRS+=../../EOAccess ../../EOControl ../../EOInterface ../EOModeler
 ADDITIONAL_NATIVE_LIBS += EOAccess EOControl EOModeler Renaissance 
 
 $(APP_NAME)_RESOURCE_FILES =			\
Index: Apps/EOModeler/Makefile.preamble
===================================================================
--- Apps/EOModeler/Makefile.preamble	(revision 30842)
+++ Apps/EOModeler/Makefile.preamble	(working copy)
@@ -45,7 +45,7 @@
 ADDITIONAL_CFLAGS = $(TEST_CFLAGS) 
 
 # Additional include directories the compiler should search
-ADDITIONAL_INCLUDE_DIRS = -I../EOControl/$(GNUSTEP_TARGET_DIR) -I..
+ADDITIONAL_INCLUDE_DIRS = -I../../EOControl/$(GNUSTEP_TARGET_DIR) -I../..
 
 # Additional LDFLAGS to pass to the linker
 ADDITIONAL_LDFLAGS = $(TEST_LDFLAGS) 
Index: GDL2Palette/GNUmakefile
===================================================================
--- GDL2Palette/GNUmakefile	(revision 30842)
+++ GDL2Palette/GNUmakefile	(working copy)
@@ -32,7 +32,7 @@
 GDL2_PRINCIPAL_CLASS = GDL2Palette
 
 ADDITIONAL_INCLUDE_DIRS+=-I../
-ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess/ ../EOControl/ ../EOInterface ../EOModeler
+ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess/ ../EOControl/ ../EOInterface ../Apps/EOModeler
 ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl EOInterface EOModeler 
 
 GDL2_RESOURCE_FILES=		\