diff --git a/FL/Fl_Copy_Surface.H b/FL/Fl_Copy_Surface.H
index 734335e45..5bf679789 100644
--- a/FL/Fl_Copy_Surface.H
+++ b/FL/Fl_Copy_Surface.H
@@ -19,9 +19,7 @@
 #ifndef Fl_Copy_Surface_H
 #define Fl_Copy_Surface_H
 
-#include <FL/Fl_Paged_Device.H>
-#include <FL/Fl_Printer.H>
-#include <FL/x.H>
+#include <FL/Fl_Widget_Surface.H>
 
 /** Supports copying of graphical data to the clipboard.
  
diff --git a/FL/Fl_Image_Surface.H b/FL/Fl_Image_Surface.H
index 3a62fb081..20450be55 100644
--- a/FL/Fl_Image_Surface.H
+++ b/FL/Fl_Image_Surface.H
@@ -19,9 +19,10 @@
 #ifndef Fl_Image_Surface_H
 #define Fl_Image_Surface_H
 
-#include <FL/Fl_Copy_Surface.H>
+#include <FL/Fl_Widget_Surface.H>
 #include <FL/Fl_Image.H>
 #include <FL/Fl_Shared_Image.H>
+#include <FL/x.H>
 
 
 /** Directs all graphics requests to an Fl_Image.
diff --git a/src/Fl_Image_Surface.cxx b/src/Fl_Image_Surface.cxx
index f072187e7..5e3b881f1 100644
--- a/src/Fl_Image_Surface.cxx
+++ b/src/Fl_Image_Surface.cxx
@@ -19,6 +19,7 @@
 #include <FL/Fl_Image_Surface.H>
 #include <FL/Fl_Printer.H>
 #include <FL/Fl.H>
+#include <FL/x.H>
 
 #include "config_lib.h"
 #ifdef FL_CFG_GFX_QUARTZ
diff --git a/src/drivers/Xlib/Fl_Xlib_Copy_Surface.cxx b/src/drivers/Xlib/Fl_Xlib_Copy_Surface.cxx
index 77eb9ecd3..4d9baea83 100644
--- a/src/drivers/Xlib/Fl_Xlib_Copy_Surface.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Copy_Surface.cxx
@@ -18,6 +18,7 @@
 
 #include "Fl_Xlib_Copy_Surface.H"
 #include <FL/Fl.H>
+#include <FL/fl_draw.H>
 
 Fl_Copy_Surface::Helper::Helper(int w, int h) : Fl_Widget_Surface(NULL) {
   width = w;