diff --git a/ChangeLog b/ChangeLog
index a32a1e56e..5901ef103 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-18  Adam Fedor  <fedor@gnu.org>
+
+	* Model/GNUmakefile (ADDITIONAL_INCLUDE_DIRS): Don't include
+	../Headers on non-gnu targets.
+
 2003-08-17  Adam Fedor  <fedor@gnu.org>
 
 	* Source/NSTableView.m ([NSTableView -textDidBeginEditing:]): Fix leak
diff --git a/Model/GNUmakefile b/Model/GNUmakefile
index 9b8e74331..3532cba58 100644
--- a/Model/GNUmakefile
+++ b/Model/GNUmakefile
@@ -66,13 +66,13 @@ ADDITIONAL_CPPFLAGS += $(RUNTIME_DEFINE) $(GUI_DEFINE) $(BACKEND_DEFINE)
 ADDITIONAL_LIB_DIRS += -L$(GNUSTEP_OBJ_DIR) 
 ifeq ($(GUI_LIB), gnu)
   ADDITIONAL_LIB_DIRS += -L../Source/$(GNUSTEP_OBJ_DIR)
+  ADDITIONAL_INCLUDE_DIRS = -I../Headers/Additions -I../Headers
+else
+  ADDITIONAL_INCLUDE_DIRS = -I../Headers/Additions
 endif
 
 ADDITIONAL_OBJC_FLAGS += $(BACKEND_DEFINE)
 
-# Additional include directories the compiler should search
-ADDITIONAL_INCLUDE_DIRS = -I../Headers/Additions -I../Headers
-
 # What are the libraries this library depends upon. This is needed for some
 # systems where building a shared library requires to pass to the linker
 # all the libraries the target library depends upon.