diff --git a/Source/GSGuiPrivate.h b/Source/GSGuiPrivate.h index bbc6abeec..d41b0fa7c 100644 --- a/Source/GSGuiPrivate.h +++ b/Source/GSGuiPrivate.h @@ -31,6 +31,7 @@ #define _GNUstep_H_GSGuiPrivate #include +#include "GNUstepBase/preface.h" /* * Return the gnustep-gui bundle used to load gnustep-gui resources. diff --git a/Source/GSServicesManager.m b/Source/GSServicesManager.m index 509d8290e..b6f34d2ab 100644 --- a/Source/GSServicesManager.m +++ b/Source/GSServicesManager.m @@ -59,6 +59,7 @@ #include "AppKit/NSDocumentController.h" #include "GNUstepGUI/GSServicesManager.h" +#include "GSGuiPrivate.h" static GSServicesManager *manager = nil; diff --git a/Source/NSAnimation.m b/Source/NSAnimation.m index f5306d731..ef8d323a1 100644 --- a/Source/NSAnimation.m +++ b/Source/NSAnimation.m @@ -28,6 +28,7 @@ #import #import +#import #import #import #import diff --git a/Source/NSApplication.m b/Source/NSApplication.m index 15d520621..8c6f4905c 100644 --- a/Source/NSApplication.m +++ b/Source/NSApplication.m @@ -32,6 +32,7 @@ #include "config.h" #include +#include #include #include diff --git a/Source/NSBezierPath.m b/Source/NSBezierPath.m index a90f0ffa4..34bafb80a 100644 --- a/Source/NSBezierPath.m +++ b/Source/NSBezierPath.m @@ -28,13 +28,13 @@ Boston, MA 02110-1301, USA. */ -#include "AppKit/NSBezierPath.h" - #include "AppKit/NSAffineTransform.h" +#include "AppKit/NSBezierPath.h" #include "AppKit/NSFont.h" #include "AppKit/NSImage.h" #include "AppKit/PSOperators.h" #include "GNUstepGUI/GSFontInfo.h" +#include "GSGuiPrivate.h" #include diff --git a/Source/NSBitmapImageRep+GIF.m b/Source/NSBitmapImageRep+GIF.m index 863439236..0bedfacec 100644 --- a/Source/NSBitmapImageRep+GIF.m +++ b/Source/NSBitmapImageRep+GIF.m @@ -31,6 +31,7 @@ #include "config.h" #include "NSBitmapImageRep+GIF.h" +#include "GSGuiPrivate.h" #if HAVE_LIBUNGIF || HAVE_LIBGIF diff --git a/Source/NSBitmapImageRep+ICNS.m b/Source/NSBitmapImageRep+ICNS.m index 3af69263d..679562197 100644 --- a/Source/NSBitmapImageRep+ICNS.m +++ b/Source/NSBitmapImageRep+ICNS.m @@ -37,6 +37,7 @@ #include #include #include "AppKit/NSGraphics.h" +#include "GSGuiPrivate.h" #define ICNS_HEADER "icns" diff --git a/Source/NSBitmapImageRep+JPEG.m b/Source/NSBitmapImageRep+JPEG.m index 1ffc80ce1..7297cb049 100644 --- a/Source/NSBitmapImageRep+JPEG.m +++ b/Source/NSBitmapImageRep+JPEG.m @@ -36,6 +36,7 @@ #include #include #include "AppKit/NSGraphics.h" +#include "GSGuiPrivate.h" #include #if defined(__MINGW32__) diff --git a/Source/NSBrowserCell.m b/Source/NSBrowserCell.m index 529518b31..5eafa4364 100644 --- a/Source/NSBrowserCell.m +++ b/Source/NSBrowserCell.m @@ -39,6 +39,7 @@ #include "AppKit/NSGraphics.h" #include "AppKit/NSEvent.h" #include "AppKit/NSWindow.h" +#include "GSGuiPrivate.h" /* * Class variables diff --git a/Source/NSButtonCell.m b/Source/NSButtonCell.m index d6f5a2d70..2014f9156 100644 --- a/Source/NSButtonCell.m +++ b/Source/NSButtonCell.m @@ -54,6 +54,7 @@ #include "AppKit/NSWindow.h" #include "GNUstepGUI/GSTheme.h" #include "GNUstepGUI/GSNibLoading.h" +#include "GSGuiPrivate.h" #include diff --git a/Source/NSCell.m b/Source/NSCell.m index b3a86fd20..f7708d6ed 100644 --- a/Source/NSCell.m +++ b/Source/NSCell.m @@ -63,6 +63,7 @@ #import "AppKit/NSView.h" #import "AppKit/NSWindow.h" #include "GNUstepGUI/GSTheme.h" +#include "GSGuiPrivate.h" static Class colorClass; static Class cellClass; diff --git a/Source/NSClipView.m b/Source/NSClipView.m index 54cad221d..795caa198 100644 --- a/Source/NSClipView.m +++ b/Source/NSClipView.m @@ -40,6 +40,7 @@ #include "AppKit/PSOperators.h" #include +#include "GSGuiPrivate.h" #include diff --git a/Source/NSComboBoxCell.m b/Source/NSComboBoxCell.m index a99b8801a..6fce5dde6 100644 --- a/Source/NSComboBoxCell.m +++ b/Source/NSComboBoxCell.m @@ -53,6 +53,7 @@ #include "AppKit/NSTableView.h" #include "AppKit/NSTextView.h" #include "GNUstepGUI/GSTheme.h" +#include "GSGuiPrivate.h" static NSNotificationCenter *nc; static const BOOL ForceBrowser = NO; diff --git a/Source/NSImageCell.m b/Source/NSImageCell.m index 48444e5d7..6d3cc81e5 100644 --- a/Source/NSImageCell.m +++ b/Source/NSImageCell.m @@ -33,6 +33,7 @@ #include "AppKit/NSImageCell.h" #include "AppKit/NSImage.h" #include "GNUstepGUI/GSTheme.h" +#include "GSGuiPrivate.h" @implementation NSImageCell diff --git a/Source/NSMenuItemCell.m b/Source/NSMenuItemCell.m index 53f3c3ea6..129418236 100644 --- a/Source/NSMenuItemCell.m +++ b/Source/NSMenuItemCell.m @@ -46,6 +46,7 @@ #include "AppKit/NSMenuView.h" #include "AppKit/NSParagraphStyle.h" #include "GNUstepGUI/GSTheme.h" +#include "GSGuiPrivate.h" @implementation NSMenuItemCell diff --git a/Source/NSSplitView.m b/Source/NSSplitView.m index 67058b44c..4df3eb299 100644 --- a/Source/NSSplitView.m +++ b/Source/NSSplitView.m @@ -50,6 +50,7 @@ #include "AppKit/NSImage.h" #include "AppKit/NSSplitView.h" #include "AppKit/NSWindow.h" +#include "GSGuiPrivate.h" static NSNotificationCenter *nc = nil; diff --git a/Source/NSTableHeaderView.m b/Source/NSTableHeaderView.m index d28ff50df..fc8492ce9 100644 --- a/Source/NSTableHeaderView.m +++ b/Source/NSTableHeaderView.m @@ -43,6 +43,7 @@ #include "AppKit/NSColor.h" #include "AppKit/NSScrollView.h" #include "AppKit/NSGraphics.h" +#include "GSGuiPrivate.h" /* * Number of pixels in either direction that will be counted as a hit diff --git a/Source/NSTextBlock.m b/Source/NSTextBlock.m index 593705e1a..f8ff42b51 100644 --- a/Source/NSTextBlock.m +++ b/Source/NSTextBlock.m @@ -33,6 +33,7 @@ #import "AppKit/NSColor.h" #import "AppKit/NSGraphics.h" #import "AppKit/NSTextTable.h" +#include "GSGuiPrivate.h" @implementation NSTextBlock diff --git a/Source/NSTextContainer.m b/Source/NSTextContainer.m index ec8f8803c..292989e8a 100644 --- a/Source/NSTextContainer.m +++ b/Source/NSTextContainer.m @@ -35,6 +35,7 @@ #include "AppKit/NSTextStorage.h" #include "AppKit/NSTextView.h" #include "GNUstepGUI/GSLayoutManager.h" +#include "GSGuiPrivate.h" @interface NSTextContainer (TextViewObserver) - (void) _textViewFrameChanged: (NSNotification*)aNotification; diff --git a/Source/NSTextView.m b/Source/NSTextView.m index f6ed18677..46a26ee35 100644 --- a/Source/NSTextView.m +++ b/Source/NSTextView.m @@ -83,6 +83,7 @@ #import "AppKit/NSTextStorage.h" #import "AppKit/NSTextView.h" #import "AppKit/NSWindow.h" +#include "GSGuiPrivate.h" /* diff --git a/Source/NSView.m b/Source/NSView.m index 463926bf3..80cfae182 100644 --- a/Source/NSView.m +++ b/Source/NSView.m @@ -77,6 +77,7 @@ #include "GNUstepGUI/GSNibLoading.h" #include "GSToolTips.h" #include "GSBindingHelpers.h" +#include "GSGuiPrivate.h" /* * We need a fast array that can store objects without retain/release ... diff --git a/Source/NSWorkspace.m b/Source/NSWorkspace.m index 05a75f9be..ca9e0e4ab 100644 --- a/Source/NSWorkspace.m +++ b/Source/NSWorkspace.m @@ -72,6 +72,7 @@ #include "AppKit/NSScreen.h" #include "GNUstepGUI/GSServicesManager.h" #include "GNUstepGUI/GSDisplayServer.h" +#include "GSGuiPrivate.h" /* Informal protocol for method to ask an app to open a URL. */ diff --git a/Source/tiff.m b/Source/tiff.m index e55ffa5e5..683d0b507 100644 --- a/Source/tiff.m +++ b/Source/tiff.m @@ -64,6 +64,7 @@ #include #include #include +#include "GSGuiPrivate.h" #include #include diff --git a/Tools/make_services.m b/Tools/make_services.m index 77a20e480..f604273d3 100644 --- a/Tools/make_services.m +++ b/Tools/make_services.m @@ -26,19 +26,20 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import static void scanApplications(NSMutableDictionary *services, NSString *path); static void scanServices(NSMutableDictionary *services, NSString *path); diff --git a/Tools/set_show_service.m b/Tools/set_show_service.m index 5e51d43a6..7d2de3d35 100644 --- a/Tools/set_show_service.m +++ b/Tools/set_show_service.m @@ -28,12 +28,12 @@ */ -#include -#include -#include -#include -#include - +#include +#import +#import +#import +#import +#import "AppKit/NSApplication.h" int main(int argc, char** argv, char **env)