diff --git a/ChangeLog b/ChangeLog
index 22a17d5c9..2f87d9278 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2010-03-25 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Headers/AppKit/NSController.h
+	* Headers/AppKit/NSGlyphGenerator.h
+	* Headers/AppKit/NSGradient.h
+	* Headers/AppKit/NSGraphicsContext.h
+	* Headers/AppKit/NSPopUpButton.h
+	* Headers/AppKit/NSShadow.h
+	* Source/NSPopUpButtonCell.m
+	* Source/NSGlyphGenerator.m
+	* Source/NSPopUpButton.m
+	* Source/NSMenu.m
+	* Source/NSGradient.m
+	* Source/GSHorizontalTypesetter.m
+	* Source/NSTextView.m
+	* Source/NSShadow.m
+	* Source/NSPrintPanel.m
+	* Source/NSSpellChecker.m
+	* Source/NSDocument.m: Yet another bit of #include -> #import
+	replacement. Replace includes of Foundation.h.
+
 2010-03-24 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/AppKit/NSColorList.h
diff --git a/Headers/AppKit/NSController.h b/Headers/AppKit/NSController.h
index 288b07500..97ae27584 100644
--- a/Headers/AppKit/NSController.h
+++ b/Headers/AppKit/NSController.h
@@ -28,7 +28,7 @@
 #ifndef _GNUstep_H_NSController
 #define _GNUstep_H_NSController
 
-#include <Foundation/NSObject.h>
+#import <Foundation/NSObject.h>
 
 #if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
 
diff --git a/Headers/AppKit/NSGlyphGenerator.h b/Headers/AppKit/NSGlyphGenerator.h
index 6d925d3f3..c8972db64 100644
--- a/Headers/AppKit/NSGlyphGenerator.h
+++ b/Headers/AppKit/NSGlyphGenerator.h
@@ -31,10 +31,12 @@
 #define _GNUstep_H_NSGlyphGenerator
 #import <GNUstepBase/GSVersionMacros.h>
 
-#import <Foundation/Foundation.h>
+#import <Foundation/NSObject.h>
 // define NSGlyph
 #import <AppKit/NSFont.h>
 
+@class NSAttributedString;
+
 #if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
 
 enum
diff --git a/Headers/AppKit/NSGradient.h b/Headers/AppKit/NSGradient.h
index c47a5035c..3dc1df861 100644
--- a/Headers/AppKit/NSGradient.h
+++ b/Headers/AppKit/NSGradient.h
@@ -32,7 +32,13 @@
 #import <GNUstepBase/GSVersionMacros.h>
 
 #if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST)
-#import <Foundation/Foundation.h>
+#import <Foundation/NSGeometry.h>
+#import <Foundation/NSObject.h>
+
+@class NSArray;
+@class NSBezierPath;
+@class NSColor;
+@class NSColorSpace;
 
 typedef NSUInteger NSGradientDrawingOptions;
 
@@ -41,10 +47,6 @@ enum {
   NSGradientDrawsAfterEndingLocation = 2
 };
 
-@class NSBezierPath;
-@class NSColor;
-@class NSColorSpace;
-
 @interface NSGradient : NSObject <NSCopying, NSCoding>
 {
   NSColorSpace *_colorSpace;
diff --git a/Headers/AppKit/NSGraphicsContext.h b/Headers/AppKit/NSGraphicsContext.h
index f971cd2e3..65ccbcb4d 100644
--- a/Headers/AppKit/NSGraphicsContext.h
+++ b/Headers/AppKit/NSGraphicsContext.h
@@ -32,10 +32,10 @@
 #define _NSGraphicsContext_h_INCLUDE
 #import <GNUstepBase/GSVersionMacros.h>
 
-#include <Foundation/NSObject.h>
-#include <Foundation/NSMapTable.h>
+#import <Foundation/NSObject.h>
+#import <Foundation/NSMapTable.h>
 
-#include <AppKit/AppKitDefines.h>
+#import <AppKit/AppKitDefines.h>
 
 @class NSDate;
 @class NSDictionary;
@@ -125,7 +125,7 @@ typedef enum _GSTextDrawingMode
 } GSTextDrawingMode;
 
 // We have to load this after the NSCompositingOperation are defined!!!
-#include <GNUstepGUI/GSMethodTable.h>
+#import <GNUstepGUI/GSMethodTable.h>
 
 /*
  * Window ordering
diff --git a/Headers/AppKit/NSPopUpButton.h b/Headers/AppKit/NSPopUpButton.h
index 81061d8d1..5ee57c42e 100644
--- a/Headers/AppKit/NSPopUpButton.h
+++ b/Headers/AppKit/NSPopUpButton.h
@@ -32,10 +32,11 @@
 #ifndef _GNUstep_H_NSPopUpButton
 #define _GNUstep_H_NSPopUpButton
 
-#include <Foundation/Foundation.h>
+#import <Foundation/NSGeometry.h>
 
-#include <AppKit/NSButton.h>
-#include <AppKit/NSMenuItem.h>
+#import <AppKit/AppKitDefines.h>
+#import <AppKit/NSButton.h>
+#import <AppKit/NSMenuItem.h>
 
 @class NSString;
 @class NSArray;
diff --git a/Headers/AppKit/NSShadow.h b/Headers/AppKit/NSShadow.h
index bbff531f8..5972d8534 100644
--- a/Headers/AppKit/NSShadow.h
+++ b/Headers/AppKit/NSShadow.h
@@ -32,7 +32,8 @@
 #import <GNUstepBase/GSVersionMacros.h>
 
 #if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
-#import <Foundation/Foundation.h>
+#import <Foundation/NSGeometry.h>
+#import <Foundation/NSObject.h>
 
 @class NSColor;
 
diff --git a/Source/GSHorizontalTypesetter.m b/Source/GSHorizontalTypesetter.m
index 733798d6c..7e79400b6 100644
--- a/Source/GSHorizontalTypesetter.m
+++ b/Source/GSHorizontalTypesetter.m
@@ -25,22 +25,23 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "GNUstepGUI/GSHorizontalTypesetter.h"
 
 #include <math.h>
 
-#include <Foundation/NSDebug.h>
-#include <Foundation/NSException.h>
-#include <Foundation/NSGeometry.h>
-#include <Foundation/NSLock.h>
-#include <Foundation/NSValue.h>
+#import <Foundation/NSDebug.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSGeometry.h>
+#import <Foundation/NSLock.h>
+#import <Foundation/NSThread.h>
+#import <Foundation/NSValue.h>
 
-#include "AppKit/NSAttributedString.h"
-#include "AppKit/NSParagraphStyle.h"
-#include "AppKit/NSTextAttachment.h"
-#include "AppKit/NSTextContainer.h"
-#include "AppKit/NSTextStorage.h"
-#include "GNUstepGUI/GSLayoutManager.h"
+#import "AppKit/NSAttributedString.h"
+#import "AppKit/NSParagraphStyle.h"
+#import "AppKit/NSTextAttachment.h"
+#import "AppKit/NSTextContainer.h"
+#import "AppKit/NSTextStorage.h"
+#import "GNUstepGUI/GSLayoutManager.h"
+#import "GNUstepGUI/GSHorizontalTypesetter.h"
 
 
 
diff --git a/Source/NSDocument.m b/Source/NSDocument.m
index 38d3fc7ac..363462da5 100644
--- a/Source/NSDocument.m
+++ b/Source/NSDocument.m
@@ -28,19 +28,25 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <Foundation/NSData.h>
-#include "AppKit/NSBox.h"
-#include "AppKit/NSDocument.h"
-#include "AppKit/NSFileWrapper.h"
-#include "AppKit/NSSavePanel.h"
-#include "AppKit/NSPageLayout.h"
-#include "AppKit/NSPrintInfo.h"
-#include "AppKit/NSPrintOperation.h"
-#include "AppKit/NSPopUpButton.h"
-#include "AppKit/NSView.h"
-#include "NSDocumentFrameworkPrivate.h"
+#import <Foundation/NSData.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSFileManager.h>
+#import <Foundation/NSNotification.h>
+#import <Foundation/NSProcessInfo.h>
+#import <Foundation/NSUndoManager.h>
+#import <Foundation/NSURL.h>
+#import "AppKit/NSBox.h"
+#import "AppKit/NSDocument.h"
+#import "AppKit/NSFileWrapper.h"
+#import "AppKit/NSSavePanel.h"
+#import "AppKit/NSPageLayout.h"
+#import "AppKit/NSPopUpButton.h"
+#import "AppKit/NSPrintInfo.h"
+#import "AppKit/NSPrintOperation.h"
+#import "AppKit/NSView.h"
+#import "NSDocumentFrameworkPrivate.h"
 
-#include "GSGuiPrivate.h"
+#import "GSGuiPrivate.h"
 
 @implementation NSDocument
 
diff --git a/Source/NSGlyphGenerator.m b/Source/NSGlyphGenerator.m
index c22f63850..c5a218715 100644
--- a/Source/NSGlyphGenerator.m
+++ b/Source/NSGlyphGenerator.m
@@ -25,15 +25,18 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <Foundation/NSDictionary.h>
-#include <GNUstepBase/Unicode.h>
+#import <Foundation/NSCharacterSet.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSValue.h>
+#import <GNUstepBase/Unicode.h>
 
-#include "AppKit/NSAttributedString.h"
-#include "AppKit/NSFont.h"
-#include "AppKit/NSGlyphGenerator.h"
+#import "AppKit/NSAttributedString.h"
+#import "AppKit/NSFont.h"
+#import "AppKit/NSGlyphGenerator.h"
 /* just for NSAttachmentCharacter */
-#include "AppKit/NSTextAttachment.h"
-#include "GNUstepGUI/GSFontInfo.h"
+#import "AppKit/NSTextAttachment.h"
+#import "GNUstepGUI/GSFontInfo.h"
 
 static NSGlyphGenerator* instance;
 
diff --git a/Source/NSGradient.m b/Source/NSGradient.m
index 0ade41202..983b4baf3 100644
--- a/Source/NSGradient.m
+++ b/Source/NSGradient.m
@@ -29,7 +29,7 @@
    Boston, MA 02110-1301, USA.
 */ 
 
-#import <Foundation/NSGeometry.h>
+#import <Foundation/NSException.h>
 #import "AppKit/NSBezierPath.h"
 #import "AppKit/NSColor.h"
 #import "AppKit/NSColorSpace.h"
diff --git a/Source/NSMenu.m b/Source/NSMenu.m
index ee6bbd51c..41e12a48e 100644
--- a/Source/NSMenu.m
+++ b/Source/NSMenu.m
@@ -33,31 +33,36 @@
    Boston, MA 02110-1301, USA.
 */ 
 
-#include "config.h"
-#include <Foundation/NSCoder.h>
-#include <Foundation/NSArray.h>
-#include <Foundation/NSException.h>
-#include <Foundation/NSProcessInfo.h>
-#include <Foundation/NSString.h>
-#include <Foundation/NSNotification.h>
+#import "config.h"
+#import <Foundation/NSCoder.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDebug.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSProcessInfo.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSNotification.h>
+#import <Foundation/NSNotificationQueue.h>
+#import <Foundation/NSRunLoop.h>
+#import <Foundation/NSUserDefaults.h>
+#import <Foundation/NSValue.h>
 
-#include "AppKit/NSMatrix.h"
-#include "AppKit/NSApplication.h"
-#include "AppKit/NSWindow.h"
-#include "AppKit/NSEvent.h"
-#include "AppKit/NSFont.h"
-#include "AppKit/NSImage.h"
-#include "AppKit/NSMenu.h"
-#include "AppKit/NSMenuItem.h"
-#include "AppKit/NSMenuView.h"
-#include "AppKit/NSPanel.h"
-#include "AppKit/NSPopUpButton.h"
-#include "AppKit/NSPopUpButtonCell.h"
-#include "AppKit/NSScreen.h"
-#include "AppKit/NSAttributedString.h"
+#import "AppKit/NSMatrix.h"
+#import "AppKit/NSApplication.h"
+#import "AppKit/NSWindow.h"
+#import "AppKit/NSEvent.h"
+#import "AppKit/NSFont.h"
+#import "AppKit/NSImage.h"
+#import "AppKit/NSMenu.h"
+#import "AppKit/NSMenuItem.h"
+#import "AppKit/NSMenuView.h"
+#import "AppKit/NSPanel.h"
+#import "AppKit/NSPopUpButton.h"
+#import "AppKit/NSPopUpButtonCell.h"
+#import "AppKit/NSScreen.h"
+#import "AppKit/NSAttributedString.h"
 
-#include "GSGuiPrivate.h"
-#include "GNUstepGUI/GSTheme.h"
+#import "GSGuiPrivate.h"
+#import "GNUstepGUI/GSTheme.h"
 
 /*
   Drawing related:
diff --git a/Source/NSPopUpButton.m b/Source/NSPopUpButton.m
index 098c8e084..9c7ffe1c7 100644
--- a/Source/NSPopUpButton.m
+++ b/Source/NSPopUpButton.m
@@ -28,16 +28,17 @@
    Boston, MA 02110-1301, USA.
 */ 
 
-#include <Foundation/Foundation.h>
-#include <Foundation/NSKeyValueObserving.h>
-#include "AppKit/NSApplication.h"
-#include "AppKit/NSEvent.h"
-#include "AppKit/NSKeyValueBinding.h"
-#include "AppKit/NSPopUpButton.h"
-#include "AppKit/NSPopUpButtonCell.h"
-#include "AppKit/NSMenu.h"
-#include "AppKit/NSMenuItem.h"
-#include "AppKit/NSMenuView.h"
+#import <Foundation/NSKeyValueCoding.h>
+#import <Foundation/NSKeyValueObserving.h>
+#import <Foundation/NSValue.h>
+#import "AppKit/NSApplication.h"
+#import "AppKit/NSEvent.h"
+#import "AppKit/NSKeyValueBinding.h"
+#import "AppKit/NSPopUpButton.h"
+#import "AppKit/NSPopUpButtonCell.h"
+#import "AppKit/NSMenu.h"
+#import "AppKit/NSMenuItem.h"
+#import "AppKit/NSMenuView.h"
 
 /*
  * class variables
diff --git a/Source/NSPopUpButtonCell.m b/Source/NSPopUpButtonCell.m
index a94a085cf..cd945c0d2 100644
--- a/Source/NSPopUpButtonCell.m
+++ b/Source/NSPopUpButtonCell.m
@@ -26,17 +26,18 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "config.h"
-#include "AppKit/NSApplication.h"
-#include "AppKit/NSEvent.h"
-#include "AppKit/NSGraphics.h"
-#include "AppKit/NSImage.h"
-#include "AppKit/NSMenu.h"
-#include "AppKit/NSMenuView.h"
-#include "AppKit/NSPopUpButton.h"
-#include "AppKit/NSPopUpButtonCell.h"
-#include "AppKit/NSWindow.h"
-#include "GNUstepGUI/GSTheme.h"
+#import "config.h"
+#import <Foundation/NSValue.h>
+#import "AppKit/NSApplication.h"
+#import "AppKit/NSEvent.h"
+#import "AppKit/NSGraphics.h"
+#import "AppKit/NSImage.h"
+#import "AppKit/NSMenu.h"
+#import "AppKit/NSMenuView.h"
+#import "AppKit/NSPopUpButton.h"
+#import "AppKit/NSPopUpButtonCell.h"
+#import "AppKit/NSWindow.h"
+#import "GNUstepGUI/GSTheme.h"
 
 /* The image to use in a specific popupbutton depends on type and
  * preferred edge; that is, _pbc_image[0] if it is a
diff --git a/Source/NSPrintPanel.m b/Source/NSPrintPanel.m
index f1ee10a46..9f5b2fb9e 100644
--- a/Source/NSPrintPanel.m
+++ b/Source/NSPrintPanel.m
@@ -29,23 +29,24 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "config.h"
-#include <Foundation/NSArray.h>
-#include <Foundation/NSBundle.h>
-#include <Foundation/NSDictionary.h>
-#include <Foundation/NSValue.h>
-#include "AppKit/NSApplication.h"
-#include "AppKit/NSForm.h"
-#include "AppKit/NSNibLoading.h"
-#include "AppKit/NSPrinter.h"
-#include "AppKit/NSPrintPanel.h"
-#include "AppKit/NSPrintInfo.h"
-#include "AppKit/NSPrintOperation.h"
-#include "AppKit/NSPopUpButton.h"
-#include "AppKit/NSSavePanel.h"
-#include "AppKit/NSView.h"
-#include "GSGuiPrivate.h"
-#include "GNUstepGUI/GSPrinting.h"
+#import "config.h"
+#import <Foundation/NSArray.h>
+#import <Foundation/NSBundle.h>
+#import <Foundation/NSDebug.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSValue.h>
+#import "AppKit/NSApplication.h"
+#import "AppKit/NSForm.h"
+#import "AppKit/NSNibLoading.h"
+#import "AppKit/NSPrinter.h"
+#import "AppKit/NSPrintPanel.h"
+#import "AppKit/NSPrintInfo.h"
+#import "AppKit/NSPrintOperation.h"
+#import "AppKit/NSPopUpButton.h"
+#import "AppKit/NSSavePanel.h"
+#import "AppKit/NSView.h"
+#import "GSGuiPrivate.h"
+#import "GNUstepGUI/GSPrinting.h"
 
 static NSPrintPanel *shared_instance;
 
diff --git a/Source/NSShadow.m b/Source/NSShadow.m
index 28fc06c90..5cb52be92 100644
--- a/Source/NSShadow.m
+++ b/Source/NSShadow.m
@@ -27,6 +27,7 @@
    Boston, MA 02110-1301, USA.
 */
 
+#import <Foundation/NSString.h>
 #import "AppKit/NSShadow.h"
 #import "AppKit/NSColor.h"
 
diff --git a/Source/NSSpellChecker.m b/Source/NSSpellChecker.m
index f8bdfad0f..174c88cd7 100644
--- a/Source/NSSpellChecker.m
+++ b/Source/NSSpellChecker.m
@@ -32,12 +32,17 @@
 
 #include "config.h"
 #import <Foundation/NSArray.h>
-#import <Foundation/NSSet.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSProxy.h>
 #import <Foundation/NSBundle.h>
+#import <Foundation/NSConnection.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSDistantObject.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSNotification.h>
+#import <Foundation/NSProxy.h>
+#import <Foundation/NSSet.h>
 #import <Foundation/NSSpellServer.h>
+#import <Foundation/NSUserDefaults.h>
 #import <Foundation/NSValue.h>
 #import "AppKit/NSNibLoading.h"
 #import "AppKit/NSEvent.h"
diff --git a/Source/NSTextView.m b/Source/NSTextView.m
index eca9dae08..80e818cda 100644
--- a/Source/NSTextView.m
+++ b/Source/NSTextView.m
@@ -45,10 +45,12 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "config.h"
+#import "config.h"
 #import <Foundation/NSArchiver.h>
 #import <Foundation/NSArray.h>
+#import <Foundation/NSCharacterSet.h>
 #import <Foundation/NSCoder.h>
+#import <Foundation/NSData.h>
 #import <Foundation/NSDebug.h>
 #import <Foundation/NSEnumerator.h>
 #import <Foundation/NSException.h>
@@ -83,7 +85,7 @@
 #import "AppKit/NSTextStorage.h"
 #import "AppKit/NSTextView.h"
 #import "AppKit/NSWindow.h"
-#include "GSGuiPrivate.h"
+#import "GSGuiPrivate.h"
 
 
 /*