diff --git a/ChangeLog b/ChangeLog
index c2fe479ab..4aaa22317 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-04 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Headers/AppKit/AppKit.h,
+	* Headers/AppKit/NSAlert.h,
+	* Headers/AppKit/NSActionCell.h,
+	* Headers/AppKit/NSCell.h,
+	* Source/NSAlert.m,
+	* Source/NSAffineTransform.m,
+	* Source/NSCell.m: Clean up includes.
+	* Source/NSActionCell.m: Add method integerValue.
+
 2010-02-27 23:32-EST Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Headers/Additions/GNUstepGUI/GSTheme.h: Add category to allow
diff --git a/Headers/AppKit/AppKit.h b/Headers/AppKit/AppKit.h
index f7ad9eabc..d40826c47 100644
--- a/Headers/AppKit/AppKit.h
+++ b/Headers/AppKit/AppKit.h
@@ -32,155 +32,155 @@
 #import <GNUstepBase/GSVersionMacros.h>
 
 /* Define library version */
-#include <GNUstepGUI/GSVersion.h>
+#import <GNUstepGUI/GSVersion.h>
 
 //
 // Foundation
 //
-#include <Foundation/Foundation.h>
+#import <Foundation/Foundation.h>
 
 //
 // GNUstep GUI Library functions
 //
-#include <AppKit/NSGraphics.h>
+#import <AppKit/NSGraphics.h>
 
-#include <AppKit/NSActionCell.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSAttributedString.h>
-#include <AppKit/NSBitmapImageRep.h>
-#include <AppKit/NSBox.h>
-#include <AppKit/NSBrowser.h>
-#include <AppKit/NSBrowserCell.h>
-#include <AppKit/NSButton.h>
-#include <AppKit/NSButtonCell.h>
-#include <AppKit/NSCachedImageRep.h>
-#include <AppKit/NSCell.h>
-#include <AppKit/NSClipView.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSColorList.h>
-#include <AppKit/NSColorPanel.h>
-#include <AppKit/NSColorPicker.h>
-#include <AppKit/NSColorPicking.h>
-#include <AppKit/NSColorWell.h>
-#include <AppKit/NSControl.h>
-#include <AppKit/NSCursor.h>
-#include <AppKit/NSCustomImageRep.h>
-#include <AppKit/NSDataLink.h>
-#include <AppKit/NSDataLinkManager.h>
-#include <AppKit/NSDataLinkPanel.h>
-#include <AppKit/NSDragging.h>
-#include <AppKit/NSEPSImageRep.h>
-#include <AppKit/NSEvent.h>
-#include <AppKit/NSFont.h>
-#include <AppKit/NSFontManager.h>
-#include <AppKit/NSFontPanel.h>
-#include <AppKit/NSForm.h>
-#include <AppKit/NSFormCell.h>
-#include <AppKit/NSHelpPanel.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSImageCell.h>
-#include <AppKit/NSImageRep.h>
-#include <AppKit/NSImageView.h>
-#include <AppKit/NSMatrix.h>
-#include <AppKit/NSMenu.h>
-#include <AppKit/NSMenuItem.h>
-#include <AppKit/NSMenuItemCell.h>
-#include <AppKit/NSMenuView.h>
-#include <AppKit/NSNibLoading.h>
-#include <AppKit/NSOpenPanel.h>
-#include <AppKit/NSPageLayout.h>
-#include <AppKit/NSPanel.h>
-#include <AppKit/NSPasteboard.h>
-#include <AppKit/NSPopUpButton.h>
-#include <AppKit/NSPopUpButtonCell.h>
-#include <AppKit/NSPrinter.h>
-#include <AppKit/NSPrintInfo.h>
-#include <AppKit/NSPrintOperation.h>
-#include <AppKit/NSPrintPanel.h>
-#include <AppKit/NSResponder.h>
-#include <AppKit/NSSavePanel.h>
-#include <AppKit/NSScreen.h>
-#include <AppKit/NSScroller.h>
-#include <AppKit/NSScrollView.h>
-#include <AppKit/NSSelection.h>
-#include <AppKit/NSSlider.h>
-#include <AppKit/NSSliderCell.h>
-#include <AppKit/NSSpellChecker.h>
-#include <AppKit/NSSpellProtocol.h>
-#include <AppKit/NSSplitView.h>
-#include <AppKit/NSStringDrawing.h>
-#include <AppKit/NSText.h>
-#include <AppKit/NSTextField.h>
-#include <AppKit/NSTextFieldCell.h>
-#include <AppKit/NSView.h>
-#include <AppKit/NSWindow.h>
-#include <AppKit/NSWorkspace.h>
+#import <AppKit/NSActionCell.h>
+#import <AppKit/NSApplication.h>
+#import <AppKit/NSAttributedString.h>
+#import <AppKit/NSBitmapImageRep.h>
+#import <AppKit/NSBox.h>
+#import <AppKit/NSBrowser.h>
+#import <AppKit/NSBrowserCell.h>
+#import <AppKit/NSButton.h>
+#import <AppKit/NSButtonCell.h>
+#import <AppKit/NSCachedImageRep.h>
+#import <AppKit/NSCell.h>
+#import <AppKit/NSClipView.h>
+#import <AppKit/NSColor.h>
+#import <AppKit/NSColorList.h>
+#import <AppKit/NSColorPanel.h>
+#import <AppKit/NSColorPicker.h>
+#import <AppKit/NSColorPicking.h>
+#import <AppKit/NSColorWell.h>
+#import <AppKit/NSControl.h>
+#import <AppKit/NSCursor.h>
+#import <AppKit/NSCustomImageRep.h>
+#import <AppKit/NSDataLink.h>
+#import <AppKit/NSDataLinkManager.h>
+#import <AppKit/NSDataLinkPanel.h>
+#import <AppKit/NSDragging.h>
+#import <AppKit/NSEPSImageRep.h>
+#import <AppKit/NSEvent.h>
+#import <AppKit/NSFont.h>
+#import <AppKit/NSFontManager.h>
+#import <AppKit/NSFontPanel.h>
+#import <AppKit/NSForm.h>
+#import <AppKit/NSFormCell.h>
+#import <AppKit/NSHelpPanel.h>
+#import <AppKit/NSImage.h>
+#import <AppKit/NSImageCell.h>
+#import <AppKit/NSImageRep.h>
+#import <AppKit/NSImageView.h>
+#import <AppKit/NSMatrix.h>
+#import <AppKit/NSMenu.h>
+#import <AppKit/NSMenuItem.h>
+#import <AppKit/NSMenuItemCell.h>
+#import <AppKit/NSMenuView.h>
+#import <AppKit/NSNibLoading.h>
+#import <AppKit/NSOpenPanel.h>
+#import <AppKit/NSPageLayout.h>
+#import <AppKit/NSPanel.h>
+#import <AppKit/NSPasteboard.h>
+#import <AppKit/NSPopUpButton.h>
+#import <AppKit/NSPopUpButtonCell.h>
+#import <AppKit/NSPrinter.h>
+#import <AppKit/NSPrintInfo.h>
+#import <AppKit/NSPrintOperation.h>
+#import <AppKit/NSPrintPanel.h>
+#import <AppKit/NSResponder.h>
+#import <AppKit/NSSavePanel.h>
+#import <AppKit/NSScreen.h>
+#import <AppKit/NSScroller.h>
+#import <AppKit/NSScrollView.h>
+#import <AppKit/NSSelection.h>
+#import <AppKit/NSSlider.h>
+#import <AppKit/NSSliderCell.h>
+#import <AppKit/NSSpellChecker.h>
+#import <AppKit/NSSpellProtocol.h>
+#import <AppKit/NSSplitView.h>
+#import <AppKit/NSStringDrawing.h>
+#import <AppKit/NSText.h>
+#import <AppKit/NSTextField.h>
+#import <AppKit/NSTextFieldCell.h>
+#import <AppKit/NSView.h>
+#import <AppKit/NSWindow.h>
+#import <AppKit/NSWorkspace.h>
 
 #if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
-#include <AppKit/NSAlert.h>
-#include <AppKit/NSAnimation.h>
-#include <AppKit/NSAffineTransform.h>
-#include <AppKit/NSArrayController.h>
-#include <AppKit/NSBezierPath.h>
-#include <AppKit/NSComboBox.h>
-#include <AppKit/NSComboBoxCell.h>
-#include <AppKit/NSController.h>
-#include <AppKit/NSDocument.h>
-#include <AppKit/NSDocumentController.h>
-#include <AppKit/NSDrawer.h>
-#include <AppKit/NSFileWrapper.h>
-#include <AppKit/NSFontDescriptor.h>
-#include <AppKit/NSGradient.h>
-#include <AppKit/NSGraphicsContext.h>
-#include <AppKit/NSHelpManager.h>
-#include <AppKit/NSInputManager.h>
-#include <AppKit/NSInputServer.h>
-#include <AppKit/NSInterfaceStyle.h>
-#include <AppKit/NSKeyValueBinding.h>
-#include <AppKit/NSLayoutManager.h>
-#include <AppKit/NSLevelIndicator.h>
-#include <AppKit/NSLevelIndicatorCell.h>
-#include <AppKit/NSMovie.h>
-#include <AppKit/NSMovieView.h>
-#include <AppKit/NSNib.h>
-#include <AppKit/NSNibDeclarations.h>
-#include <AppKit/NSObjectController.h>
-#include <AppKit/NSOpenGL.h>
-#include <AppKit/NSOpenGLView.h>
-#include <AppKit/NSOutlineView.h>
-#include <AppKit/NSParagraphStyle.h>
-#include <AppKit/NSProgressIndicator.h>
-#include <AppKit/NSRulerMarker.h>
-#include <AppKit/NSRulerView.h>
-#include <AppKit/NSSearchField.h>
-#include <AppKit/NSSearchFieldCell.h>
-#include <AppKit/NSSecureTextField.h>
-#include <AppKit/NSSegmentedCell.h>
-#include <AppKit/NSSegmentedControl.h>
-#include <AppKit/NSShadow.h>
-#include <AppKit/NSSound.h>
-#include <AppKit/NSSpeechSynthesizer.h>
-#include <AppKit/NSStepper.h>
-#include <AppKit/NSStepperCell.h>
-#include <AppKit/NSTableColumn.h>
-#include <AppKit/NSTableHeaderCell.h>
-#include <AppKit/NSTableHeaderView.h>
-#include <AppKit/NSTableView.h>
-#include <AppKit/NSTabView.h>
-#include <AppKit/NSTabViewItem.h>
-#include <AppKit/NSTextAttachment.h>
-#include <AppKit/NSTextContainer.h>
-#include <AppKit/NSTextList.h>
-#include <AppKit/NSTextStorage.h>
-#include <AppKit/NSTextTable.h>
-#include <AppKit/NSTextView.h>
-#include <AppKit/NSToolbar.h>
-#include <AppKit/NSToolbarItem.h>
-#include <AppKit/NSUserDefaultsController.h>
-#include <AppKit/NSUserInterfaceValidation.h>
-#include <AppKit/NSWindowController.h>
+#import <AppKit/NSAlert.h>
+#import <AppKit/NSAnimation.h>
+#import <AppKit/NSAffineTransform.h>
+#import <AppKit/NSArrayController.h>
+#import <AppKit/NSBezierPath.h>
+#import <AppKit/NSComboBox.h>
+#import <AppKit/NSComboBoxCell.h>
+#import <AppKit/NSController.h>
+#import <AppKit/NSDocument.h>
+#import <AppKit/NSDocumentController.h>
+#import <AppKit/NSDrawer.h>
+#import <AppKit/NSFileWrapper.h>
+#import <AppKit/NSFontDescriptor.h>
+#import <AppKit/NSGradient.h>
+#import <AppKit/NSGraphicsContext.h>
+#import <AppKit/NSHelpManager.h>
+#import <AppKit/NSInputManager.h>
+#import <AppKit/NSInputServer.h>
+#import <AppKit/NSInterfaceStyle.h>
+#import <AppKit/NSKeyValueBinding.h>
+#import <AppKit/NSLayoutManager.h>
+#import <AppKit/NSLevelIndicator.h>
+#import <AppKit/NSLevelIndicatorCell.h>
+#import <AppKit/NSMovie.h>
+#import <AppKit/NSMovieView.h>
+#import <AppKit/NSNib.h>
+#import <AppKit/NSNibDeclarations.h>
+#import <AppKit/NSObjectController.h>
+#import <AppKit/NSOpenGL.h>
+#import <AppKit/NSOpenGLView.h>
+#import <AppKit/NSOutlineView.h>
+#import <AppKit/NSParagraphStyle.h>
+#import <AppKit/NSProgressIndicator.h>
+#import <AppKit/NSRulerMarker.h>
+#import <AppKit/NSRulerView.h>
+#import <AppKit/NSSearchField.h>
+#import <AppKit/NSSearchFieldCell.h>
+#import <AppKit/NSSecureTextField.h>
+#import <AppKit/NSSegmentedCell.h>
+#import <AppKit/NSSegmentedControl.h>
+#import <AppKit/NSShadow.h>
+#import <AppKit/NSSound.h>
+#import <AppKit/NSSpeechSynthesizer.h>
+#import <AppKit/NSStepper.h>
+#import <AppKit/NSStepperCell.h>
+#import <AppKit/NSTableColumn.h>
+#import <AppKit/NSTableHeaderCell.h>
+#import <AppKit/NSTableHeaderView.h>
+#import <AppKit/NSTableView.h>
+#import <AppKit/NSTabView.h>
+#import <AppKit/NSTabViewItem.h>
+#import <AppKit/NSTextAttachment.h>
+#import <AppKit/NSTextContainer.h>
+#import <AppKit/NSTextList.h>
+#import <AppKit/NSTextStorage.h>
+#import <AppKit/NSTextTable.h>
+#import <AppKit/NSTextView.h>
+#import <AppKit/NSToolbar.h>
+#import <AppKit/NSToolbarItem.h>
+#import <AppKit/NSUserDefaultsController.h>
+#import <AppKit/NSUserInterfaceValidation.h>
+#import <AppKit/NSWindowController.h>
 #endif
 
-#include <AppKit/PSOperators.h>
+#import <AppKit/PSOperators.h>
 
 #endif /* _GNUstep_H_AppKit */
diff --git a/Headers/AppKit/NSActionCell.h b/Headers/AppKit/NSActionCell.h
index 825b5f412..1b7726ecb 100644
--- a/Headers/AppKit/NSActionCell.h
+++ b/Headers/AppKit/NSActionCell.h
@@ -31,7 +31,7 @@
 #define _GNUstep_H_NSActionCell
 #import <GNUstepBase/GSVersionMacros.h>
 
-#include <AppKit/NSCell.h>
+#import <AppKit/NSCell.h>
 
 @interface NSActionCell : NSCell
 {
diff --git a/Headers/AppKit/NSAlert.h b/Headers/AppKit/NSAlert.h
index 4d8740edd..794d4f2f7 100644
--- a/Headers/AppKit/NSAlert.h
+++ b/Headers/AppKit/NSAlert.h
@@ -30,7 +30,7 @@
 #define _GNUstep_H_NSAlert
 #import <GNUstepBase/GSVersionMacros.h>
 
-#include <Foundation/NSObject.h>
+#import <Foundation/NSObject.h>
 
 @class NSArray;
 @class NSError;
diff --git a/Headers/AppKit/NSCell.h b/Headers/AppKit/NSCell.h
index 4cc99a385..ff55f7629 100644
--- a/Headers/AppKit/NSCell.h
+++ b/Headers/AppKit/NSCell.h
@@ -31,17 +31,16 @@
 #define _GNUstep_H_NSCell
 #import <GNUstepBase/GSVersionMacros.h>
 
-#include <Foundation/NSCoder.h>
-#include <Foundation/NSGeometry.h>
+#import <Foundation/NSGeometry.h>
 
 // For tint
-#include <AppKit/NSColor.h>
+#import <AppKit/NSColor.h>
 // for NSWritingDirection
-#include <AppKit/NSParagraphStyle.h>
+#import <AppKit/NSParagraphStyle.h>
 // For text alignment
-#include <AppKit/NSText.h>
+#import <AppKit/NSText.h>
 // for NSFocusRingType
-#include <AppKit/NSView.h>
+#import <AppKit/NSView.h>
 
 @class NSString;
 @class NSMutableDictionary;
diff --git a/Source/NSActionCell.m b/Source/NSActionCell.m
index e1b3f1c6a..2cb73d3d9 100644
--- a/Source/NSActionCell.m
+++ b/Source/NSActionCell.m
@@ -26,8 +26,9 @@
    Boston, MA 02110-1301, USA.
 */ 
 
-#include "config.h"
+#import "config.h"
 #import <Foundation/NSCoder.h>
+
 #import "AppKit/NSActionCell.h"
 #import "AppKit/NSControl.h"
 
@@ -208,6 +209,17 @@ static Class controlClass;
   return [super intValue];
 }
 
+/**
+ * Retrieve the value of the receiver as an NSInteger.
+ */
+- (NSInteger) integerValue
+{
+  if (_cell.in_editing && _control_view)
+    if ([_control_view isKindOfClass: controlClass])
+      [(NSControl *)_control_view validateEditing];
+  return [super integerValue];
+}
+
 /**
  * Set the value of the receiver from anObject.
  */
diff --git a/Source/NSAffineTransform.m b/Source/NSAffineTransform.m
index f3963f74b..fb75fb635 100644
--- a/Source/NSAffineTransform.m
+++ b/Source/NSAffineTransform.m
@@ -30,7 +30,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "config.h"
+#import "config.h"
 #include <math.h>
 
 #import <Foundation/NSArray.h>
diff --git a/Source/NSAlert.m b/Source/NSAlert.m
index 2b4a7c85f..04477e9d2 100644
--- a/Source/NSAlert.m
+++ b/Source/NSAlert.m
@@ -34,28 +34,36 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "config.h"
+#import "config.h"
 
-#include <Foundation/NSDebug.h>
-#include <Foundation/NSBundle.h>
-#include <Foundation/NSError.h>
-#include <Foundation/NSString.h>
-#include "AppKit/NSAlert.h"
-#include "AppKit/NSApplication.h"
-#include "AppKit/NSBox.h"
-#include "AppKit/NSButton.h"
-#include "AppKit/NSFont.h"
-#include "AppKit/NSHelpManager.h"
-#include "AppKit/NSImage.h"
-#include "AppKit/NSMatrix.h"
-#include "AppKit/NSPanel.h"
-#include "AppKit/NSScreen.h"
-#include "AppKit/NSScrollView.h"
+#import <Foundation/NSDebug.h>
+#import <Foundation/NSBundle.h>
+#import <Foundation/NSError.h>
+#import <Foundation/NSNotification.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSThread.h>
+#import "AppKit/NSAlert.h"
+#import "AppKit/NSApplication.h"
+#import "AppKit/NSAttributedString.h"
+#import "AppKit/NSBox.h"
+#import "AppKit/NSBrowser.h"
+#import "AppKit/NSBrowserCell.h"
+#import "AppKit/NSButton.h"
+#import "AppKit/NSEvent.h"
+#import "AppKit/NSFont.h"
+#import "AppKit/NSHelpManager.h"
+#import "AppKit/NSImage.h"
+#import "AppKit/NSMatrix.h"
+#import "AppKit/NSPanel.h"
+#import "AppKit/NSScreen.h"
+#import "AppKit/NSScroller.h"
+#import "AppKit/NSScrollView.h"
+#import "AppKit/NSTextField.h"
+#import "AppKit/NSTextView.h"
 
-#include "GNUstepGUI/IMLoading.h"
-#include "GNUstepGUI/GMAppKit.h"
-#include "GNUstepGUI/GMArchiver.h"
-#include "GSGuiPrivate.h"
+#import "GNUstepGUI/GMAppKit.h"
+#import "GNUstepGUI/GMArchiver.h"
+#import "GSGuiPrivate.h"
 
 extern NSThread *GSAppKitThread;
 
diff --git a/Source/NSCell.m b/Source/NSCell.m
index f7708d6ed..930fd952f 100644
--- a/Source/NSCell.m
+++ b/Source/NSCell.m
@@ -32,17 +32,17 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "config.h"
-#import <Foundation/NSString.h>
-#import <Foundation/NSGeometry.h>
+#import "config.h"
+#import <Foundation/NSCoder.h>
+#import <Foundation/NSDebug.h>
 #import <Foundation/NSException.h>
+#import <Foundation/NSFormatter.h>
 #import <Foundation/NSValue.h>
 #import <Foundation/NSNotification.h>
 #import <Foundation/NSNumberFormatter.h>
-#import <Foundation/NSDebug.h>
-#import <Foundation/NSFormatter.h>
 #import <Foundation/NSRunLoop.h>
-#include <GNUstepBase/GSCategories.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSGeometry.h>
 
 #import "AppKit/AppKitExceptions.h"
 #import "AppKit/NSAttributedString.h"
@@ -62,8 +62,8 @@
 #import "AppKit/NSTextContainer.h"
 #import "AppKit/NSView.h"
 #import "AppKit/NSWindow.h"
-#include "GNUstepGUI/GSTheme.h"
-#include "GSGuiPrivate.h"
+#import "GNUstepGUI/GSTheme.h"
+#import "GSGuiPrivate.h"
 
 static Class colorClass;
 static Class cellClass;