diff --git a/aegisub/src/aegisub_endian.h b/aegisub/src/aegisub_endian.h
index bc9087be2..8e2f194d2 100644
--- a/aegisub/src/aegisub_endian.h
+++ b/aegisub/src/aegisub_endian.h
@@ -33,13 +33,6 @@
 /// @ingroup utility
 ///
 
-#pragma once
-
-#ifndef _AEGISUB_ENDIAN_H
-
-/// DOCME
-#define _AEGISUB_ENDIAN_H
-
 
 // Sanity check
 
@@ -468,6 +461,3 @@ namespace Endian {
 
 };
 
-#endif
-
-
diff --git a/aegisub/src/ass_attachment.cpp b/aegisub/src/ass_attachment.cpp
index e8b74f768..74d5ba1fa 100644
--- a/aegisub/src/ass_attachment.cpp
+++ b/aegisub/src/ass_attachment.cpp
@@ -39,8 +39,11 @@
 // Includes
 #include "config.h"
 
-#include <wx/wfstream.h>
+#ifndef WX_PRE
 #include <wx/filename.h>
+#include <wx/wfstream.h>
+#endif
+
 #include "ass_attachment.h"
 
 
diff --git a/aegisub/src/ass_attachment.h b/aegisub/src/ass_attachment.h
index 0a17d37a9..7c76c3bae 100644
--- a/aegisub/src/ass_attachment.h
+++ b/aegisub/src/ass_attachment.h
@@ -35,9 +35,6 @@
 ///
 
 
-#pragma once
-
-
 ///////////
 // Headers
 #include "ass_entry.h"
@@ -104,5 +101,3 @@ public:
 	AssAttachment(wxString name);
 	~AssAttachment();
 };
-
-
diff --git a/aegisub/src/ass_dialogue.cpp b/aegisub/src/ass_dialogue.cpp
index 696a94e9d..1f5ef6845 100644
--- a/aegisub/src/ass_dialogue.cpp
+++ b/aegisub/src/ass_dialogue.cpp
@@ -39,9 +39,12 @@
 // Includes
 #include "config.h"
 
-#include <fstream>
-#include <wx/tokenzr.h>
+#ifndef WX_PRE
 #include <wx/regex.h>
+#include <wx/tokenzr.h>
+#endif
+
+#include <fstream>
 #include "ass_dialogue.h"
 #include "ass_override.h"
 #include "vfr.h"
diff --git a/aegisub/src/ass_dialogue.h b/aegisub/src/ass_dialogue.h
index 9595c2635..ba68cc643 100644
--- a/aegisub/src/ass_dialogue.h
+++ b/aegisub/src/ass_dialogue.h
@@ -35,9 +35,6 @@
 ///
 
 
-#pragma once
-
-
 ////////////
 // Includes
 #include <vector>
@@ -294,5 +291,3 @@ public:
 	AssDialogue(wxString data,int version=1);
 	~AssDialogue();
 };
-
-
diff --git a/aegisub/src/audio_display.cpp b/aegisub/src/audio_display.cpp
index b57eddaed..496e7e5f5 100644
--- a/aegisub/src/audio_display.cpp
+++ b/aegisub/src/audio_display.cpp
@@ -45,7 +45,7 @@
 #include <vector>
 #include "audio_display.h"
 #include "audio_provider_stream.h"
-#include "ass_dialogue.h"
+//#include "ass_dialogue.h"
 #include "subs_grid.h"
 #include "ass_file.h"
 #include "subs_edit_box.h"
diff --git a/aegisub/src/audio_karaoke.cpp b/aegisub/src/audio_karaoke.cpp
index 1750dd8b1..62cd795c2 100644
--- a/aegisub/src/audio_karaoke.cpp
+++ b/aegisub/src/audio_karaoke.cpp
@@ -42,7 +42,6 @@
 #include "audio_karaoke.h"
 #include "audio_display.h"
 #include "audio_box.h"
-#include "ass_dialogue.h"
 #include "ass_override.h"
 #include <wx/tokenzr.h>
 #include <wx/menu.h>
diff --git a/aegisub/src/dialog_kara_timing_copy.cpp b/aegisub/src/dialog_kara_timing_copy.cpp
index 2ff0b1b0d..118f00979 100644
--- a/aegisub/src/dialog_kara_timing_copy.cpp
+++ b/aegisub/src/dialog_kara_timing_copy.cpp
@@ -44,7 +44,6 @@
 #include <deque>
 #include "dialog_kara_timing_copy.h"
 #include "ass_file.h"
-#include "ass_dialogue.h"
 #include "ass_style.h"
 #include "ass_override.h"
 #include "subs_grid.h"
diff --git a/aegisub/src/stdwx.h b/aegisub/src/stdwx.h
index f4d3ff299..acdb6ff3b 100644
--- a/aegisub/src/stdwx.h
+++ b/aegisub/src/stdwx.h
@@ -77,6 +77,7 @@
 #include <wx/event.h>
 #include <wx/stc/stc.h>
 #include <wx/string.h>
+#include <wx/regex.h>
 #ifdef HAVE_APPLE_OPENGL_FRAMEWORK
 #include <OpenGL/GL.h>
 #include <OpenGL/glu.h>
diff --git a/aegisub/src/subs_grid.cpp b/aegisub/src/subs_grid.cpp
index 50e115224..f049c7b01 100644
--- a/aegisub/src/subs_grid.cpp
+++ b/aegisub/src/subs_grid.cpp
@@ -45,7 +45,6 @@
 #include <wx/filename.h>
 #include "subs_grid.h"
 #include "ass_file.h"
-#include "ass_dialogue.h"
 #include "ass_style.h"
 #include "video_display.h"
 #include "video_context.h"
diff --git a/aegisub/src/text_file_writer.cpp b/aegisub/src/text_file_writer.cpp
index 7fe425f44..d0985b5d1 100644
--- a/aegisub/src/text_file_writer.cpp
+++ b/aegisub/src/text_file_writer.cpp
@@ -39,7 +39,6 @@
 #include <fstream>
 #include "text_file_writer.h"
 #include "options.h"
-#include "aegisub_endian.h"
 #include "charset_conv.h"