diff --git a/aegisub/src/command/subtitle.cpp b/aegisub/src/command/subtitle.cpp
index 33cce608e..064a67a85 100644
--- a/aegisub/src/command/subtitle.cpp
+++ b/aegisub/src/command/subtitle.cpp
@@ -36,8 +36,9 @@
 
 #include "../config.h"
 
-#include <wx/filename.h>
 #include <wx/filedlg.h>
+#include <wx/filename.h>
+#include <wx/msgdlg.h>
 #include <wx/choicdlg.h>
 
 #include <libaegisub/charset_conv.h>
diff --git a/aegisub/src/command/tool.cpp b/aegisub/src/command/tool.cpp
index f1edd6b69..8151bac05 100644
--- a/aegisub/src/command/tool.cpp
+++ b/aegisub/src/command/tool.cpp
@@ -36,6 +36,7 @@
 
 #include "../config.h"
 
+#include <wx/msgdlg.h>
 #include <wx/utils.h>
 
 #include "command.h"
diff --git a/aegisub/src/command/video.cpp b/aegisub/src/command/video.cpp
index d7509c5cf..e57262960 100644
--- a/aegisub/src/command/video.cpp
+++ b/aegisub/src/command/video.cpp
@@ -39,7 +39,10 @@
 #include "command.h"
 
 #include <wx/clipbrd.h>
+#include <wx/filedlg.h>
 #include <wx/filename.h>
+#include <wx/msgdlg.h>
+#include <wx/textdlg.h>
 
 #include "../ass_dialogue.h"
 #include "../ass_time.h"
diff --git a/aegisub/src/dialog_search_replace.cpp b/aegisub/src/dialog_search_replace.cpp
index 860b595cf..5751398ef 100644
--- a/aegisub/src/dialog_search_replace.cpp
+++ b/aegisub/src/dialog_search_replace.cpp
@@ -36,7 +36,11 @@
 
 #include <functional>
 
+#include <wx/button.h>
+#include <wx/msgdlg.h>
 #include <wx/regex.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
 #include <wx/string.h>
 
 #include "ass_dialogue.h"
diff --git a/aegisub/src/dialog_style_editor.cpp b/aegisub/src/dialog_style_editor.cpp
index 19c6b204c..c2c038552 100644
--- a/aegisub/src/dialog_style_editor.cpp
+++ b/aegisub/src/dialog_style_editor.cpp
@@ -37,9 +37,10 @@
 #include <algorithm>
 
 #include <wx/bmpbuttn.h>
-#include <wx/colordlg.h>
-#include <wx/fontdlg.h>
 #include <wx/fontenum.h>
+#include <wx/msgdlg.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
 
 #include "ass_dialogue.h"
 #include "ass_file.h"
diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp
index 6e4fc6c31..3150f06b1 100644
--- a/aegisub/src/frame_main.cpp
+++ b/aegisub/src/frame_main.cpp
@@ -39,6 +39,7 @@
 #include <wx/dnd.h>
 #include <wx/filename.h>
 #include <wx/image.h>
+#include <wx/msgdlg.h>
 #include <wx/statline.h>
 #include <wx/sysopt.h>
 #include <wx/tokenzr.h>
diff --git a/aegisub/src/subs_edit_box.cpp b/aegisub/src/subs_edit_box.cpp
index 6d9781e4c..3c9debfd6 100644
--- a/aegisub/src/subs_edit_box.cpp
+++ b/aegisub/src/subs_edit_box.cpp
@@ -36,14 +36,12 @@
 
 #include <functional>
 
+#include <wx/bmpbuttn.h>
 #include <wx/button.h>
 #include <wx/checkbox.h>
-#include <wx/colordlg.h>
 #include <wx/combobox.h>
-#include <wx/dcclient.h>
-#include <wx/dcmemory.h>
-#include <wx/fontdlg.h>
 #include <wx/radiobut.h>
+#include <wx/sizer.h>
 #include <wx/spinctrl.h>
 
 #include "subs_edit_box.h"
diff --git a/aegisub/src/subs_grid.h b/aegisub/src/subs_grid.h
index c92f3e7a4..5d34eca69 100644
--- a/aegisub/src/subs_grid.h
+++ b/aegisub/src/subs_grid.h
@@ -32,13 +32,10 @@
 /// @ingroup main_ui
 ///
 
-#include <vector>
-
-#include <wx/grid.h>
-#include <wx/wx.h>
-
 #include "base_grid.h"
 
+#include <vector>
+
 /// DOCME
 /// @class SubtitlesGrid
 /// @brief DOCME