diff --git a/gerbview/files.cpp b/gerbview/files.cpp
index 216f3081aa..ef86fe3673 100644
--- a/gerbview/files.cpp
+++ b/gerbview/files.cpp
@@ -22,6 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <wx/filedlg.h>
 #include <wx/wfstream.h>
 #include <wx/zipstrm.h>
 #include <reporter.h>
diff --git a/gerbview/widgets/gerbview_layer_widget.cpp b/gerbview/widgets/gerbview_layer_widget.cpp
index 93695643f6..277280d7db 100644
--- a/gerbview/widgets/gerbview_layer_widget.cpp
+++ b/gerbview/widgets/gerbview_layer_widget.cpp
@@ -23,6 +23,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <wx/checkbox.h>
+#include <wx/filedlg.h>
 #include <bitmaps.h>
 #include <menus_helpers.h>
 #include <gerbview.h>
diff --git a/gerbview/widgets/layer_widget.cpp b/gerbview/widgets/layer_widget.cpp
index e671b95b86..f2e5f45633 100644
--- a/gerbview/widgets/layer_widget.cpp
+++ b/gerbview/widgets/layer_widget.cpp
@@ -40,6 +40,7 @@
 #include <menus_helpers.h>
 #include <widgets/indicator_icon.h>
 #include <widgets/wx_ellipsized_static_text.h>
+#include <wx/checkbox.h>
 
 #include <algorithm>
 
diff --git a/gerbview/widgets/layer_widget.h b/gerbview/widgets/layer_widget.h
index 658dbd684f..92ebd6c4d1 100644
--- a/gerbview/widgets/layer_widget.h
+++ b/gerbview/widgets/layer_widget.h
@@ -26,7 +26,6 @@
 #define LAYERWIDGET_H_
 
 #include <wx/intl.h>
-#include <wx/wx.h>
 #include <wx/statbmp.h>
 #include <wx/string.h>
 #include <wx/aui/auibook.h>