diff --git a/src/BatchCommandDialog.h b/src/BatchCommandDialog.h
index f8664ccac..0f58c1408 100644
--- a/src/BatchCommandDialog.h
+++ b/src/BatchCommandDialog.h
@@ -14,8 +14,6 @@
 
 #include <wx/defs.h>
 
-#include  <wx/checklst.h>
-
 #include "BatchCommands.h"
 
 class wxWindow;
diff --git a/src/BatchProcessDialog.h b/src/BatchProcessDialog.h
index 04763e4aa..735368d95 100644
--- a/src/BatchProcessDialog.h
+++ b/src/BatchProcessDialog.h
@@ -14,8 +14,6 @@
 
 #include <wx/defs.h>
 
-#include  <wx/checklst.h>
-
 #include "BatchCommands.h"
 
 class wxWindow;
diff --git a/src/FileIO.h b/src/FileIO.h
index 404638aa3..c0d1bff73 100644
--- a/src/FileIO.h
+++ b/src/FileIO.h
@@ -13,7 +13,10 @@
 
 #include "MemoryX.h"
 #include <wx/object.h>
-#include <wx/wfstream.h>
+
+class wxInputStream;
+class wxOutputStream;
+class wxFFileOutputStream;
 
 class FileIO
 {
diff --git a/src/commands/CommandMisc.h b/src/commands/CommandMisc.h
index 3a926fb54..28e5a48f4 100644
--- a/src/commands/CommandMisc.h
+++ b/src/commands/CommandMisc.h
@@ -17,8 +17,9 @@
 #define __COMMANDMISC__
 
 #include <map>
-#include <wx/variant.h>
 #include "Validators.h"
+
+class wxVariant;
 class OldStyleCommandType;
 
 // Map from parameter name to the value of the parameter
diff --git a/src/commands/Validators.h b/src/commands/Validators.h
index 2309ac2d1..3c4cbf063 100644
--- a/src/commands/Validators.h
+++ b/src/commands/Validators.h
@@ -47,6 +47,8 @@ class wxArrayString;
 
 #include "../MemoryX.h"
 
+#include <wx/variant.h> // member variable
+
 class Validator /* not final */
 {
 private:
diff --git a/src/widgets/ImageRoll.h b/src/widgets/ImageRoll.h
index f36a264ea..841ae4c59 100644
--- a/src/widgets/ImageRoll.h
+++ b/src/widgets/ImageRoll.h
@@ -15,7 +15,6 @@
 #include <vector>
 #include <wx/dc.h> // for enum wxRasterOperationMode
 #include <wx/defs.h>
-#include <wx/version.h>
 #include "wxPanelWrapper.h"
 
 #if !wxCHECK_VERSION(3,0,0)
diff --git a/src/widgets/Ruler.h b/src/widgets/Ruler.h
index 382721120..17b3c9f5c 100644
--- a/src/widgets/Ruler.h
+++ b/src/widgets/Ruler.h
@@ -15,7 +15,6 @@
 
 #include <wx/colour.h> // member variable
 #include <wx/pen.h> // member variable
-#include <wx/types.h>
 
 class wxArrayString;
 class wxDC;