diff --git a/Model/GNUmakefile b/Model/GNUmakefile
index 917f7431e..3b414bc87 100644
--- a/Model/GNUmakefile
+++ b/Model/GNUmakefile
@@ -73,7 +73,7 @@ endif
 ADDITIONAL_OBJC_FLAGS += $(BACKEND_DEFINE)
 
 # Additional include directories the compiler should search
-ADDITIONAL_INCLUDE_DIRS = -I../Headers -I../Headers/gnustep
+ADDITIONAL_INCLUDE_DIRS = -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
diff --git a/Model/IMCustomObject.m b/Model/IMCustomObject.m
index 1c7266ef7..d4756e42a 100644
--- a/Model/IMCustomObject.m
+++ b/Model/IMCustomObject.m
@@ -24,8 +24,8 @@
 */
 
 #include <Foundation/NSObjCRuntime.h>
-#include <AppKit/GMArchiver.h>
-#include "AppKit/IMCustomObject.h"
+#include "gnustep/gui/GMArchiver.h"
+#include "gnustep/gui/IMCustomObject.h"
 
 @implementation NSObject(ModelUnarchiving)
 
diff --git a/Model/Translator.m b/Model/Translator.m
index ee1d91e9d..e696d48e0 100644
--- a/Model/Translator.m
+++ b/Model/Translator.m
@@ -32,8 +32,8 @@
 
 #import <Foundation/NSNotification.h>
 #import <AppKit/AppKit.h>
-#import <AppKit/GMArchiver.h>
-#import "AppKit/IMLoading.h"
+#import "gnustep/gui/GMArchiver.h"
+#import "gnustep/gui/IMLoading.h"
 #import "IBClasses.h"
 #import "Translator.h"
 
diff --git a/Model/nib2gmodel.m b/Model/nib2gmodel.m
index 11ab4778d..cb2521f7f 100644
--- a/Model/nib2gmodel.m
+++ b/Model/nib2gmodel.m
@@ -42,7 +42,7 @@ int main ()
     printf ("Convert nib files to GNU model files.\n");
     printf ("usage: %s nib-file gmodel-file\n",
 	    [[processInfo processName] cString]);
-    exit (1);
+    return (1);
   }
 
   translator = [[Translator new] autorelease];