diff --git a/Source/GSComboSupport.m b/Source/GSComboSupport.m
index ce3ca24c8..269a79798 100644
--- a/Source/GSComboSupport.m
+++ b/Source/GSComboSupport.m
@@ -26,6 +26,9 @@
 
 #include <Foundation/NSString.h>
 #include <Foundation/NSArray.h>
+#include <Foundation/NSRunLoop.h>
+#include <Foundation/NSException.h>
+#include <Foundation/NSAutoreleasePool.h>
 #include <AppKit/NSApplication.h>
 #include <AppKit/NSBox.h>
 #include <AppKit/NSBrowser.h>
diff --git a/Source/GSInfoPanel.m b/Source/GSInfoPanel.m
index 91fea767c..be2a3f6b6 100644
--- a/Source/GSInfoPanel.m
+++ b/Source/GSInfoPanel.m
@@ -34,6 +34,7 @@
 #include <Foundation/NSBundle.h>
 #include <Foundation/NSDictionary.h>
 #include <Foundation/NSString.h>
+#include <Foundation/NSProcessInfo.h>
 
 static id 
 _value_from_info_plist_for_key (NSString *key)
diff --git a/Source/GSServicesManager.m b/Source/GSServicesManager.m
index 8d6d8e745..d1abe4930 100644
--- a/Source/GSServicesManager.m
+++ b/Source/GSServicesManager.m
@@ -46,6 +46,7 @@
 #include <Foundation/NSPortNameServer.h>
 #include <Foundation/NSTask.h>
 #include <Foundation/NSObjCRuntime.h>
+#include <Foundation/NSInvocation.h>
 
 #include <AppKit/NSApplication.h>
 #include <AppKit/NSPasteboard.h>
diff --git a/Source/NSApplication.m b/Source/NSApplication.m
index 3a489298b..ec8fd0829 100644
--- a/Source/NSApplication.m
+++ b/Source/NSApplication.m
@@ -57,6 +57,7 @@
 #include <AppKit/NSPopUpButton.h>
 #include <AppKit/NSPasteboard.h>
 #include <AppKit/NSColorPanel.h>
+#include <AppKit/NSFontManager.h>
 #include <AppKit/NSPanel.h>
 #include <AppKit/NSEvent.h>
 #include <AppKit/NSImage.h>
diff --git a/Source/NSBox.m b/Source/NSBox.m
index 586881c87..715dd3f0b 100644
--- a/Source/NSBox.m
+++ b/Source/NSBox.m
@@ -27,6 +27,7 @@
 
 #include <gnustep/gui/config.h>
 #include <Foundation/NSArray.h>
+#include <Foundation/NSDebug.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSString.h>
 
diff --git a/Source/NSBrowser.m b/Source/NSBrowser.m
index eea87093e..b217d4f88 100644
--- a/Source/NSBrowser.m
+++ b/Source/NSBrowser.m
@@ -34,6 +34,7 @@
 #include <math.h>                  // (float)rintf(float x)
 #include <gnustep/gui/config.h>
 #include <Foundation/NSArray.h>
+#include <Foundation/NSDebug.h>
 #include <Foundation/NSException.h>
 #include <AppKit/NSBrowser.h>
 #include <AppKit/NSBrowserCell.h>
diff --git a/Source/NSBrowserCell.m b/Source/NSBrowserCell.m
index a3fcadbfb..69aaa6e4c 100644
--- a/Source/NSBrowserCell.m
+++ b/Source/NSBrowserCell.m
@@ -29,6 +29,8 @@
 
 #include <gnustep/gui/config.h>
 
+#include <Foundation/NSUserDefaults.h>
+
 #include <AppKit/NSBrowserCell.h>
 #include <AppKit/NSColor.h>
 #include <AppKit/NSFont.h>
diff --git a/Source/NSBundleAdditions.m b/Source/NSBundleAdditions.m
index 0febd47ba..65d8d4cf8 100644
--- a/Source/NSBundleAdditions.m
+++ b/Source/NSBundleAdditions.m
@@ -34,9 +34,12 @@
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSDictionary.h>
+#include <Foundation/NSDebug.h>
 #include <Foundation/NSEnumerator.h>
+#include <Foundation/NSException.h>
 #include <Foundation/NSInvocation.h>
 #include <Foundation/NSObjCRuntime.h>
+#include <Foundation/NSPathUtilities.h>
 #include <Foundation/NSFileManager.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSUserDefaults.h>
diff --git a/Source/NSButtonCell.m b/Source/NSButtonCell.m
index 5b182ab24..042543866 100644
--- a/Source/NSButtonCell.m
+++ b/Source/NSButtonCell.m
@@ -35,6 +35,7 @@
 #include <Foundation/NSArray.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSException.h>
+#include <Foundation/NSDebug.h>
 
 #include <AppKit/AppKitExceptions.h>
 #include <AppKit/NSButtonCell.h>
diff --git a/Source/NSCell.m b/Source/NSCell.m
index 8aa6c18ed..cb7a54b82 100644
--- a/Source/NSCell.m
+++ b/Source/NSCell.m
@@ -52,6 +52,7 @@
 #include <AppKit/NSParagraphStyle.h>
 #include <AppKit/NSMenu.h>
 #include <AppKit/PSOperators.h>
+#include <AppKit/NSAttributedString.h>
 
 static Class	colorClass;
 static Class	cellClass;
diff --git a/Source/NSColorPanel.m b/Source/NSColorPanel.m
index 270a6a0d5..bc14ff084 100644
--- a/Source/NSColorPanel.m
+++ b/Source/NSColorPanel.m
@@ -30,6 +30,7 @@
 #include <Foundation/NSEnumerator.h>
 #include <Foundation/NSFileManager.h>
 #include <Foundation/NSLock.h>
+#include <Foundation/NSNotification.h>
 #include <Foundation/NSPathUtilities.h>
 #include <AppKit/NSButtonCell.h>
 #include <AppKit/NSColor.h>
@@ -37,6 +38,7 @@
 #include <AppKit/NSColorPicker.h>
 #include <AppKit/NSColorPicking.h>
 #include <AppKit/NSColorWell.h>
+#include <AppKit/NSImage.h>
 #include <AppKit/NSPasteboard.h>
 #include <AppKit/NSWindow.h>
 #include <AppKit/NSApplication.h>
diff --git a/Source/NSColorPicker.m b/Source/NSColorPicker.m
index 1ae6c4d53..be4a13055 100644
--- a/Source/NSColorPicker.m
+++ b/Source/NSColorPicker.m
@@ -28,6 +28,7 @@
 */ 
 
 #include <gnustep/gui/config.h>
+#include <Foundation/NSBundle.h>
 #include <AppKit/NSButtonCell.h>
 #include <AppKit/NSColorPicker.h>
 
diff --git a/Source/NSColorWell.m b/Source/NSColorWell.m
index ba74578a9..7e3c11f97 100644
--- a/Source/NSColorWell.m
+++ b/Source/NSColorWell.m
@@ -37,6 +37,7 @@
 #include <AppKit/NSGraphics.h>
 #include <AppKit/NSPasteboard.h>
 #include <AppKit/NSWindow.h>
+#include <Foundation/NSDebug.h>
 #include <Foundation/NSNotification.h>
 
 static NSString *GSColorWellDidBecomeExclusiveNotification =
diff --git a/Source/NSComboBoxCell.m b/Source/NSComboBoxCell.m
index bebd7feb5..be09f00b2 100644
--- a/Source/NSComboBoxCell.m
+++ b/Source/NSComboBoxCell.m
@@ -31,6 +31,7 @@
 #include <AppKit/NSComboBox.h>
 #include <AppKit/NSComboBoxCell.h>
 #include <AppKit/NSGraphicsContext.h>
+#include <AppKit/NSImage.h>
 #include <AppKit/NSScreen.h>
 
 #include "GSComboSupport.h"
diff --git a/Source/NSControl.m b/Source/NSControl.m
index b7abc1833..3f7990c86 100644
--- a/Source/NSControl.m
+++ b/Source/NSControl.m
@@ -29,6 +29,7 @@
 
 #include <gnustep/gui/config.h>
 
+#include <Foundation/NSDebug.h>
 #include <Foundation/NSException.h>
 #include <AppKit/NSControl.h>
 #include <AppKit/NSColor.h>
diff --git a/Source/NSFontPanel.m b/Source/NSFontPanel.m
index fb2850827..349e624c1 100644
--- a/Source/NSFontPanel.m
+++ b/Source/NSFontPanel.m
@@ -28,6 +28,8 @@
 */ 
 
 #include <gnustep/gui/config.h>
+#include <Foundation/NSDebug.h>
+#include <Foundation/NSValue.h>
 #include <AppKit/NSDragging.h>
 #include <AppKit/NSFont.h>
 #include <AppKit/NSFontPanel.h>
diff --git a/Source/NSLayoutManager.m b/Source/NSLayoutManager.m
index cd6ca9ee4..bf127fc90 100644
--- a/Source/NSLayoutManager.m
+++ b/Source/NSLayoutManager.m
@@ -32,6 +32,7 @@
 #include <AppKit/NSParagraphStyle.h>
 #include "GSSimpleLayoutManager.h"
 
+#include <AppKit/NSImage.h>
 #include <AppKit/NSWindow.h>
 #include <Foundation/NSException.h>
 
diff --git a/Source/NSMenu.m b/Source/NSMenu.m
index 1dc061192..83b309eba 100644
--- a/Source/NSMenu.m
+++ b/Source/NSMenu.m
@@ -52,6 +52,7 @@
 #include <AppKit/NSPopUpButton.h>
 #include <AppKit/NSPopUpButtonCell.h>
 #include <AppKit/NSScreen.h>
+#include <AppKit/NSAttributedString.h>
 
 /* A menu's title is an instance of this class */
 @interface NSMenuWindowTitleView : NSView
diff --git a/Source/NSMenuItem.m b/Source/NSMenuItem.m
index b3a3b30c4..97a2f126f 100644
--- a/Source/NSMenuItem.m
+++ b/Source/NSMenuItem.m
@@ -30,6 +30,7 @@
 #include <gnustep/gui/config.h>
 #include <Foundation/NSUserDefaults.h>
 #include <Foundation/NSDictionary.h>
+#include <Foundation/NSDebug.h>
 #include <Foundation/NSException.h>
 #include <AppKit/NSMenuItem.h>
 #include <AppKit/NSMenu.h>
diff --git a/Source/NSMenuView.m b/Source/NSMenuView.m
index b5c76532a..ef105631c 100644
--- a/Source/NSMenuView.m
+++ b/Source/NSMenuView.m
@@ -27,6 +27,9 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 
 
+
+#include <Foundation/NSThread.h>
+
 #include <AppKit/NSApplication.h>
 #include <AppKit/NSEvent.h>
 #include <AppKit/NSFont.h>
diff --git a/Source/NSOpenPanel.m b/Source/NSOpenPanel.m
index 7ae305ffc..a670fc7ff 100644
--- a/Source/NSOpenPanel.m
+++ b/Source/NSOpenPanel.m
@@ -42,6 +42,9 @@
 #include <Foundation/NSString.h>
 #include <Foundation/NSArray.h>
 #include <Foundation/NSException.h>
+#include <Foundation/NSFileManager.h>
+#include <Foundation/NSNotification.h>
+#include <Foundation/NSURL.h>
 #include <AppKit/GMArchiver.h>
 #include <AppKit/IMLoading.h>
 #include <AppKit/NSApplication.h>
diff --git a/Source/NSOutlineView.m b/Source/NSOutlineView.m
index faca479e0..778e9b085 100644
--- a/Source/NSOutlineView.m
+++ b/Source/NSOutlineView.m
@@ -25,25 +25,31 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 
 
-#import <AppKit/NSOutlineView.h>
-#import <Foundation/NSNotification.h>
-#import <AppKit/NSApplication.h>
-#import <AppKit/NSCell.h>
-#import <AppKit/NSFont.h>
-#import <AppKit/NSClipView.h>
-#import <AppKit/NSColor.h>
-#import <AppKit/NSEvent.h>
-#import <AppKit/NSGraphics.h>
-#import <AppKit/NSScroller.h>
-#import <AppKit/NSTableColumn.h>
-#import <AppKit/NSTableHeaderView.h>
-#import <AppKit/NSText.h>
-#import <AppKit/NSTextFieldCell.h>
-#import <AppKit/NSWindow.h>
-#import <AppKit/PSOperators.h>
-#import <AppKit/NSCachedImageRep.h>
-#import <Foundation/NSArray.h>
-#import <Foundation/NSMapTable.h>
+#include <AppKit/NSOutlineView.h>
+#include <Foundation/NSNotification.h>
+#include <Foundation/NSNull.h>
+#include <Foundation/NSValue.h>
+#include <Foundation/NSException.h>
+#include <Foundation/NSUserDefaults.h>
+#include <Foundation/NSArray.h>
+#include <Foundation/NSMapTable.h>
+#include <AppKit/NSApplication.h>
+#include <AppKit/NSCell.h>
+#include <AppKit/NSFont.h>
+#include <AppKit/NSClipView.h>
+#include <AppKit/NSColor.h>
+#include <AppKit/NSEvent.h>
+#include <AppKit/NSGraphics.h>
+#include <AppKit/NSScroller.h>
+#include <AppKit/NSImage.h>
+#include <AppKit/NSTableColumn.h>
+#include <AppKit/NSTableHeaderView.h>
+#include <AppKit/NSText.h>
+#include <AppKit/NSTextFieldCell.h>
+#include <AppKit/NSWindow.h>
+#include <AppKit/PSOperators.h>
+#include <AppKit/NSCachedImageRep.h>
+
 
 static NSNotificationCenter *nc = nil;
 static const int current_version = 1;
diff --git a/Source/NSProgressIndicator.m b/Source/NSProgressIndicator.m
index 88ff591dd..83489ca22 100644
--- a/Source/NSProgressIndicator.m
+++ b/Source/NSProgressIndicator.m
@@ -23,6 +23,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include <Foundation/NSTimer.h>
 #include <AppKit/NSProgressIndicator.h>
 #include <AppKit/NSGraphics.h>
 #include <AppKit/NSWindow.h>
diff --git a/Source/NSSavePanel.m b/Source/NSSavePanel.m
index b821b7eef..bfab3d97b 100644
--- a/Source/NSSavePanel.m
+++ b/Source/NSSavePanel.m
@@ -47,6 +47,10 @@
 #include <AppKit/NSWorkspace.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSFileManager.h>
+#include <Foundation/NSUserDefaults.h>
+#include <Foundation/NSURL.h>
+#include <Foundation/NSAutoreleasePool.h>
+#include <Foundation/NSNotification.h>
 #include <Foundation/NSPathUtilities.h>
 
 #define _SAVE_PANEL_X_PAD	5
diff --git a/Source/NSScrollView.m b/Source/NSScrollView.m
index 8f2c52f27..5d9359d10 100644
--- a/Source/NSScrollView.m
+++ b/Source/NSScrollView.m
@@ -28,6 +28,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
 */
 
+#include <Foundation/NSDebug.h>
 #include <Foundation/NSException.h>
 #include <AppKit/NSScroller.h>
 #include <AppKit/NSColor.h>
diff --git a/Source/NSScroller.m b/Source/NSScroller.m
index 2d893c6e6..7c1f19f00 100644
--- a/Source/NSScroller.m
+++ b/Source/NSScroller.m
@@ -31,6 +31,7 @@
 
 #include <Foundation/NSDate.h>
 #include <Foundation/NSRunLoop.h>
+#include <Foundation/NSDebug.h>
 
 #include <AppKit/NSScroller.h>
 #include <AppKit/NSScrollView.h>
diff --git a/Source/NSSpellChecker.m b/Source/NSSpellChecker.m
index 4dcdbefa2..68b6c56e5 100644
--- a/Source/NSSpellChecker.m
+++ b/Source/NSSpellChecker.m
@@ -38,6 +38,7 @@
 #include <Foundation/NSUtilities.h>
 #include <Foundation/NSValue.h>
 #include <AppKit/NSNibLoading.h>
+#include <AppKit/NSImage.h>
 #include <AppKit/NSSpellChecker.h>
 #include <AppKit/NSSpellServer.h>
 #include <AppKit/GSServicesManager.h>
diff --git a/Source/NSStepper.m b/Source/NSStepper.m
index cacc7bfba..9db022202 100644
--- a/Source/NSStepper.m
+++ b/Source/NSStepper.m
@@ -25,6 +25,7 @@
 
 #include <gnustep/gui/config.h>
 
+#include <Foundation/NSDebug.h>
 #include <Foundation/NSException.h>
 #include <AppKit/NSStepper.h>
 #include <AppKit/NSControl.h>
diff --git a/Source/NSTableColumn.m b/Source/NSTableColumn.m
index da9ab0568..3be4ec6c5 100644
--- a/Source/NSTableColumn.m
+++ b/Source/NSTableColumn.m
@@ -25,6 +25,7 @@
 */
 
 #include <Foundation/NSNotification.h>
+#include <Foundation/NSValue.h>
 #include <AppKit/NSTableHeaderCell.h>
 #include <AppKit/NSTableColumn.h>
 #include <AppKit/NSTableView.h>
diff --git a/Source/NSTableHeaderView.m b/Source/NSTableHeaderView.m
index 0933b38f6..79d74d874 100644
--- a/Source/NSTableHeaderView.m
+++ b/Source/NSTableHeaderView.m
@@ -29,6 +29,8 @@
 */
 
 #include <Foundation/NSArray.h>
+#include <Foundation/NSDebug.h>
+#include <Foundation/NSRunLoop.h>
 #include <AppKit/NSTableHeaderCell.h>
 #include <AppKit/NSTableHeaderView.h>
 #include <AppKit/NSTableColumn.h>
diff --git a/Source/NSTableView.m b/Source/NSTableView.m
index bfe1e5f17..f08a654f1 100644
--- a/Source/NSTableView.m
+++ b/Source/NSTableView.m
@@ -26,12 +26,20 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 
 
+#include <Foundation/NSException.h>
+#include <Foundation/NSFormatter.h>
+#include <Foundation/NSNotification.h>
+#include <Foundation/NSSet.h>
+#include <Foundation/NSUserDefaults.h>
+#include <Foundation/NSValue.h>
+
 #include <AppKit/NSTableView.h>
 #include <AppKit/NSApplication.h>
 #include <AppKit/NSCell.h>
 #include <AppKit/NSClipView.h>
 #include <AppKit/NSColor.h>
 #include <AppKit/NSEvent.h>
+#include <AppKit/NSImage.h>
 #include <AppKit/NSGraphics.h>
 #include <AppKit/NSScroller.h>
 #include <AppKit/NSTableColumn.h>
diff --git a/Source/NSText.m b/Source/NSText.m
index cf062a1db..f8381bbd0 100644
--- a/Source/NSText.m
+++ b/Source/NSText.m
@@ -54,6 +54,7 @@
 #include <AppKit/NSSpellChecker.h>
 #include <AppKit/NSScrollView.h>
 #include <AppKit/NSPanel.h>
+#include <AppKit/NSAttributedString.h>
 
 #include <AppKit/NSDragging.h>
 #include <AppKit/NSTextStorage.h>
diff --git a/Source/NSTextField.m b/Source/NSTextField.m
index aa226904a..f3af07c64 100644
--- a/Source/NSTextField.m
+++ b/Source/NSTextField.m
@@ -34,6 +34,7 @@
 #include <Foundation/NSFormatter.h>
 #include <Foundation/NSNotification.h>
 #include <Foundation/NSString.h>
+#include <Foundation/NSValue.h>
 
 #include <AppKit/NSApplication.h>
 #include <AppKit/NSCursor.h>
diff --git a/Source/NSTextFieldCell.m b/Source/NSTextFieldCell.m
index e61a6cd37..35cf4f58e 100644
--- a/Source/NSTextFieldCell.m
+++ b/Source/NSTextFieldCell.m
@@ -28,6 +28,7 @@
 */ 
 
 #include <gnustep/gui/config.h>
+#include <Foundation/NSNotification.h>
 #include <AppKit/NSColor.h>
 #include <AppKit/NSFont.h>
 #include <AppKit/NSGraphics.h>
diff --git a/Source/NSTextView.m b/Source/NSTextView.m
index 719f8affe..c8c851650 100644
--- a/Source/NSTextView.m
+++ b/Source/NSTextView.m
@@ -59,6 +59,7 @@
 #include <AppKit/NSLayoutManager.h>
 #include <AppKit/NSTextStorage.h>
 #include <AppKit/NSColorPanel.h>
+#include <AppKit/NSAttributedString.h>
 
 #define HUGE 1e7
 
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 605e90017..228e4215a 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -32,6 +32,10 @@
 
 #include <gnustep/gui/config.h>
 
+#include <Foundation/NSDebug.h>
+#include <Foundation/NSRunLoop.h>
+#include <Foundation/NSScanner.h>
+#include <Foundation/NSAutoreleasePool.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSArray.h>