diff --git a/aegisub/src/auto4_lua.cpp b/aegisub/src/auto4_lua.cpp
index cec39ecb3..c6badb177 100644
--- a/aegisub/src/auto4_lua.cpp
+++ b/aegisub/src/auto4_lua.cpp
@@ -46,6 +46,7 @@
 
 #include <algorithm>
 
+#include <wx/clipbrd.h>
 #include <wx/filefn.h>
 #include <wx/filename.h>
 #include <wx/log.h>
diff --git a/aegisub/src/auto4_lua_progresssink.cpp b/aegisub/src/auto4_lua_progresssink.cpp
index fc9d00152..c3c38e5f2 100644
--- a/aegisub/src/auto4_lua_progresssink.cpp
+++ b/aegisub/src/auto4_lua_progresssink.cpp
@@ -40,6 +40,10 @@
 
 #include "auto4_lua.h"
 
+#ifndef AGI_PRE
+#include <wx/filedlg.h>
+#endif
+
 #ifdef __WINDOWS__
 #include "../../contrib/lua51/src/lua.h"
 #include "../../contrib/lua51/src/lauxlib.h"
diff --git a/aegisub/src/dialog_fonts_collector.cpp b/aegisub/src/dialog_fonts_collector.cpp
index d1daeba61..b35e1e3be 100644
--- a/aegisub/src/dialog_fonts_collector.cpp
+++ b/aegisub/src/dialog_fonts_collector.cpp
@@ -365,7 +365,7 @@ void DialogFontsCollector::OnAddText(wxThreadEvent &event) {
 }
 
 void DialogFontsCollector::OnCollectionComplete(wxThreadEvent &) {
-	EnableCloseButton();
+	EnableCloseButton(true);
 	start_btn->Enable();
 	close_btn->Enable();
 	collection_mode->Enable();