7 files changed, 10 insertions, 3 deletions
diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx
index 0646d5912..c41960886 100644
--- a/src/Fl_Window.cxx
+++ b/src/Fl_Window.cxx
@@ -22,6 +22,7 @@
 // equivalent (but totally different) crap for MSWindows is in Fl_win32.cxx
 #include <config.h>
 #include <FL/Fl.H>
+#include <FL/x.H>
 #include <FL/Fl_Window_Driver.H>
 #include <FL/Fl_RGB_Image.H>
 #include <FL/Fl_Window.H>
diff --git a/src/Fl_Window_iconize.cxx b/src/Fl_Window_iconize.cxx
index bd5b7e93a..93b4fd127 100644
--- a/src/Fl_Window_iconize.cxx
+++ b/src/Fl_Window_iconize.cxx
@@ -16,6 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
+#include <FL/x.H>
 #include <FL/Fl_Window_Driver.H>
 
 extern char fl_show_iconic; // in Fl_x.cxx
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H
index 12dbead09..63b0524ac 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H
+++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H
@@ -26,7 +26,7 @@
 #define FL_COCOA_SCREEN_DRIVER_H
 
 #include <FL/Fl_Screen_Driver.H>
-
+#include <FL/x.H> // for XRectangle
 
 /*
  Move everything here that manages the native screen interface.
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
index 8da0ab610..2d2d6675b 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
+++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
@@ -18,7 +18,7 @@
 
 
 #include "../../config_lib.h"
-#include "Fl_Cocoa_Screen_Driver.h"
+#include "Fl_Cocoa_Screen_Driver.H"
 #include <FL/Fl.H>
 #include <FL/x.H>
 #include <FL/Fl_Graphics_Driver.H>
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H
index 26061655c..1bbcb00ee 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H
+++ b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H
@@ -26,7 +26,7 @@
 #define FL_WINAPI_SCREEN_DRIVER_H
 
 #include <FL/Fl_Screen_Driver.H>
-
+#include <windows.h>
 
 class Fl_Window;
 
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
index f1b086566..01f5225bd 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
+++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
@@ -19,6 +19,10 @@
 
 #include "../../config_lib.h"
 #include <FL/Fl.H>
+#include <FL/Fl_Image.H>
+#include <FL/Fl_Bitmap.H>
+#include <FL/Fl_Window.H>
+#include <FL/x.H>
 #include "Fl_WinAPI_Window_Driver.H"
 #include <windows.h>
 
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.H b/src/drivers/X11/Fl_X11_Window_Driver.H
index 2d42b4410..3e4a80880 100644
--- a/src/drivers/X11/Fl_X11_Window_Driver.H
+++ b/src/drivers/X11/Fl_X11_Window_Driver.H
@@ -26,6 +26,7 @@
 #define FL_X11_WINDOW_DRIVER_H
 
 #include <FL/Fl_Window_Driver.H>
+class Fl_Bitmap;
 
 /*
  Move everything here that manages the native window interface.