diff --git a/dgl/ImageWidgets.hpp b/dgl/ImageWidgets.hpp
index aa85fe6f..bf42ad3e 100644
--- a/dgl/ImageWidgets.hpp
+++ b/dgl/ImageWidgets.hpp
@@ -17,7 +17,7 @@
 #ifndef DGL_IMAGE_WIDGETS_HPP_INCLUDED
 #define DGL_IMAGE_WIDGETS_HPP_INCLUDED
 
-#include "OpenGL.hpp"
+#include "Image.hpp"
 
 START_NAMESPACE_DGL
 
diff --git a/dgl/src/Cairo.cpp b/dgl/src/Cairo.cpp
index c505099f..91107b57 100644
--- a/dgl/src/Cairo.cpp
+++ b/dgl/src/Cairo.cpp
@@ -25,6 +25,9 @@
 #include "WidgetPrivateData.hpp"
 #include "WindowPrivateData.hpp"
 
+// templated classes
+#include "ImageBaseWidgets.cpp"
+
 START_NAMESPACE_DGL
 
 // -----------------------------------------------------------------------
@@ -799,10 +802,3 @@ const GraphicsContext& Window::PrivateData::getGraphicsContext() const noexcept
 // -----------------------------------------------------------------------
 
 END_NAMESPACE_DGL
-
-// -----------------------------------------------------------------------
-// templated classes
-
-#include "ImageBaseWidgets.cpp"
-
-// -----------------------------------------------------------------------
diff --git a/dgl/src/OpenGL.cpp b/dgl/src/OpenGL.cpp
index 5af0588a..dbd8428e 100644
--- a/dgl/src/OpenGL.cpp
+++ b/dgl/src/OpenGL.cpp
@@ -24,6 +24,9 @@
 #include "WidgetPrivateData.hpp"
 #include "WindowPrivateData.hpp"
 
+// templated classes
+#include "ImageBaseWidgets.cpp"
+
 START_NAMESPACE_DGL
 
 // -----------------------------------------------------------------------
@@ -652,10 +655,3 @@ const GraphicsContext& Window::PrivateData::getGraphicsContext() const noexcept
 // -----------------------------------------------------------------------
 
 END_NAMESPACE_DGL
-
-// -----------------------------------------------------------------------
-// templated classes
-
-#include "ImageBaseWidgets.cpp"
-
-// -----------------------------------------------------------------------