diff --git a/Source/Functions.m b/Source/Functions.m
index 9e3a261c0..fdb36ba6e 100644
--- a/Source/Functions.m
+++ b/Source/Functions.m
@@ -36,6 +36,7 @@
 #include <AppKit/NSGraphics.h>
 #include <AppKit/NSColor.h>
 #include <AppKit/NSView.h>
+#include <AppKit/NSWindow.h>
 #include <AppKit/DPSOperators.h>
 
 char **NSArgv = NULL;
diff --git a/Source/NSEPSImageRep.m b/Source/NSEPSImageRep.m
index afd335bf3..7f1b29ca9 100644
--- a/Source/NSEPSImageRep.m
+++ b/Source/NSEPSImageRep.m
@@ -26,6 +26,7 @@
    */ 
 
 #include <Foundation/NSArray.h>
+#include <Foundation/NSCoder.h>
 #include <Foundation/NSData.h>
 #include <AppKit/NSPasteboard.h>
 #include <AppKit/NSEPSImageRep.h>
diff --git a/Source/NSFontManager.m b/Source/NSFontManager.m
index 55ac54211..2dbc04cb1 100644
--- a/Source/NSFontManager.m
+++ b/Source/NSFontManager.m
@@ -29,6 +29,8 @@
 #include <gnustep/gui/config.h>
 #include <Foundation/NSArray.h>
 #include <Foundation/NSSet.h>
+#include <Foundation/NSString.h>
+#include <Foundation/NSValue.h>
 #include <Foundation/NSDebug.h>
 #include <AppKit/NSFontManager.h>
 #include <AppKit/NSApplication.h>