diff --git a/FL/Fl_Image_Surface.H b/FL/Fl_Image_Surface.H
index 1e595b50d..227a05b6a 100644
--- a/FL/Fl_Image_Surface.H
+++ b/FL/Fl_Image_Surface.H
@@ -22,7 +22,7 @@
 #include <FL/Fl_Widget_Surface.H>
 #include <FL/Fl_Image.H>
 #include <FL/Fl_Shared_Image.H>
-#include <FL/x.H> // for Fl_Offscreen
+#include <FL/Fl_Graphics_Driver.H> // for Fl_Offscreen
 
 
 /** 
diff --git a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx
index 0914eda90..3f087351b 100644
--- a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx
@@ -19,6 +19,7 @@
 #include "../../config_lib.h"
 
 #ifdef FL_CFG_GFX_QUARTZ
+#include <FL/x.H>
 #include <FL/fl_draw.H>
 #include <FL/Fl_Image_Surface.H>
 #include "Fl_Quartz_Graphics_Driver.H"