Clean #include directives used by x.H, mac.H, win32.H

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11671 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

3 files changed, 6 insertions, 12 deletions

diff --git a/FL/mac.H b/FL/mac.H
index 8b65b252d..35cedae22 100644
--- a/FL/mac.H
+++ b/FL/mac.H
@@ -32,7 +32,6 @@ typedef FLWindow *Window;
 typedef class FLWindow *Window; // pointer to the FLWindow objective-c class
 #endif // __OBJC__
 
-#include <FL/Fl_System_Driver.H>
 #include <FL/Fl_Widget.H> // for Fl_Callback
 
 #if (defined(FL_LIBRARY) || defined(FL_INTERNALS)) // this part must be compiled when building the FLTK libraries
@@ -85,8 +84,6 @@ struct flCocoaRegion {
   CGRect *rects;
 }; // a region is the union of a series of rectangles
 
-#  include <FL/Fl_Window.H>
-
 #ifndef CGFLOAT_DEFINED //appears with 10.5 in CGBase.h
 #if defined(__LP64__) && __LP64__
 typedef double CGFloat;
@@ -97,7 +94,6 @@ typedef float CGFloat;
 
 #endif // FL_LIBRARY || FL_INTERNALS
 
-
 extern CGContextRef fl_gc;
 
 #endif // FL_DOXYGEN
diff --git a/FL/win32.H b/FL/win32.H
index b27eafc54..1983cc0cf 100644
--- a/FL/win32.H
+++ b/FL/win32.H
@@ -28,9 +28,6 @@
 #include <windows.h>
 typedef HWND Window;
 
-#include <FL/Fl_Device.H>
-#include <FL/Fl_Window.H>
-
 // this part is included only when compiling the FLTK library or if requested explicitly
 #if defined(FL_LIBRARY) || defined(FL_INTERNALS) 
 
@@ -53,7 +50,6 @@ extern FL_EXPORT void fl_save_dc( HWND w, HDC dc);
 
 #endif // FL_LIBRARY || FL_INTERNALS
 
-
 // most recent fl_color() or fl_rgbcolor() points at one of these:
 extern FL_EXPORT struct Fl_XMap {
   COLORREF rgb;	// this should be the type the RGB() macro returns
diff --git a/FL/x.H b/FL/x.H
index e3919cc5b..005c1fc7e 100644
--- a/FL/x.H
+++ b/FL/x.H
@@ -24,8 +24,9 @@
 #if !defined(Fl_X_H) && !defined(FL_DOXYGEN) 
 #  define Fl_X_H
 
-#  include "Enumerations.H"
-#  include <FL/Fl_Device.H>
+#   include <FL/Fl_Export.H>
+#   include <FL/platform_types.h>
+class Fl_Window;
 
 #  ifdef WIN32
 #    include "win32.H"
@@ -38,6 +39,8 @@
 #    pragma message "FL_PORTING: write a header file based on this file, win32.H, or mac.H to define the FLTK core internals"
 #    include "porting.H"
 #  else // X11
+#   include <FL/fl_types.h>
+#   include <FL/Enumerations.H>
 #    ifndef USE_X11
 #      define USE_X11 1
 #    endif
@@ -50,7 +53,6 @@
 #      pragma reset woff 3322
 #    endif
 #    include <X11/Xatom.h>
-#    include "Fl_Window.H"
 
 FL_EXPORT void fl_open_display(Display*);
 
@@ -60,7 +62,6 @@ extern FL_EXPORT int fl_screen;
 extern FL_EXPORT XVisualInfo *fl_visual;
 extern FL_EXPORT Colormap fl_colormap;
 
-
 // drawing functions:
 extern FL_EXPORT GC fl_gc;
 FL_EXPORT ulong fl_xpixel(Fl_Color i);
@@ -114,6 +115,7 @@ extern FL_EXPORT int fl_background_pixel;  // hack into Fl_X::make_xid()
 // cross-platform declarations
 //
 #if defined(FL_LIBRARY) || defined(FL_INTERNALS)
+#  include <FL/Fl_Window.H>
 
 class FL_EXPORT Fl_X {
 public: