diff --git a/aegisub/src/charset_conv.h b/aegisub/src/charset_conv.h
index 7baa85f27..6ef22a164 100644
--- a/aegisub/src/charset_conv.h
+++ b/aegisub/src/charset_conv.h
@@ -40,7 +40,6 @@
 #include <wx/thread.h>
 #endif
 
-#include "aegisub_endian.h"
 #include <libaegisub/charset_conv.h>
 
 /// @class AegisubCSConv
@@ -60,9 +59,7 @@ private:
 	AegisubCSConv& operator=(const AegisubCSConv&);
 	wxString localCharset;
 
-#if wxUSE_THREADS
 	mutable wxMutex iconvMutex;
-#endif
 
 	// ToWChar and FromWChar are const in wxMBConv, but iconv can't be used
 	// immutably
diff --git a/aegisub/src/export_fixstyle.cpp b/aegisub/src/export_fixstyle.cpp
index cc1bf5f6e..d29c7bff1 100644
--- a/aegisub/src/export_fixstyle.cpp
+++ b/aegisub/src/export_fixstyle.cpp
@@ -44,7 +44,6 @@
 #include "export_fixstyle.h"
 #include "ass_file.h"
 #include "ass_dialogue.h"
-#include "ass_style.h"
 
 AssFixStylesFilter::AssFixStylesFilter()
 : AssExportFilter(_("Fix Styles"), _("Fixes styles by replacing any style that isn't available on file with Default."), -5000, true)
diff --git a/aegisub/src/export_fixstyle.h b/aegisub/src/export_fixstyle.h
index 5994331a6..3b9698c08 100644
--- a/aegisub/src/export_fixstyle.h
+++ b/aegisub/src/export_fixstyle.h
@@ -36,12 +36,8 @@
 
 #include "ass_export_filter.h"
 
-
-/// DOCME
 /// @class AssFixStylesFilter
 /// @brief Fixes styles by replacing any style that isn't available on file with Default
-///
-/// DOCME
 class AssFixStylesFilter : public AssExportFilter {
 public:
 	void ProcessSubs(AssFile *subs, wxWindow *);