diff --git a/src/agi_pre.h b/src/agi_pre.h
index b2519bab2..89e2827ba 100644
--- a/src/agi_pre.h
+++ b/src/agi_pre.h
@@ -49,17 +49,46 @@
 // Ensure we get a consistent SDK with VS2012 + Win8 SDK
 #define _USING_V110_SDK71_ 1
 
-#include "../libaegisub/lagi_pre.h"
+#ifndef _WIN32
+#include "../acconf.h"
+#endif
 
-// General headers
+#define WIN32_LEAN_AND_MEAN
+
+// Common C
+#include <cassert>
+#include <cerrno>
+#include <cfloat>
+#include <climits>
+#include <cmath>
+#include <cstdint>
+#include <ctime>
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4996)
+#endif
+
+// Common C++
+#include <algorithm>
 #include <array>
-#include <inttypes.h>
-#include <list>
+#include <functional>
+#include <iterator>
 #include <limits>
+#include <list>
+#include <map>
+#include <memory>
 #include <set>
-#include <typeinfo>
+#include <string>
 #include <type_traits>
+#include <typeinfo>
 #include <utility>
+#include <unordered_map>
+#include <vector>
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 #ifdef _WIN32
 #include <objbase.h>
@@ -68,100 +97,110 @@
 #include <sys/param.h>
 #endif
 
+// Boost
 #include <boost/container/list.hpp>
 #include <boost/flyweight.hpp>
 #include <boost/range/adaptor/filtered.hpp>
-#include <boost/range/adaptor/indirected.hpp>
-#include <boost/range/adaptor/reversed.hpp>
+#include <boost/range/adaptor/transformed.hpp>
+#include <boost/range/algorithm.hpp>
+#include <boost/range/irange.hpp>
+#include <boost/regex.hpp>
+#define BOOST_NO_SCOPED_ENUMS
+#include <boost/filesystem/path.hpp>
+#undef BOOST_NO_SCOPED_ENUMS
+#include <boost/interprocess/streams/bufferstream.hpp>
 
 // wxWidgets headers
-#include <wx/wxprec.h> // Leave this first.
+#include <wx/defs.h> // Leave this first.
 
 #include <wx/accel.h>
 #include <wx/app.h>
 #include <wx/arrstr.h>
 #include <wx/bitmap.h>
 #include <wx/bmpbuttn.h>
+#include <wx/brush.h>
 #include <wx/button.h>
 #include <wx/checkbox.h>
 #include <wx/checklst.h>
 #include <wx/choicdlg.h>
 #include <wx/choice.h>
-#include <wx/choicebk.h>
 #include <wx/clipbrd.h>
 #include <wx/colour.h>
 #include <wx/combobox.h>
-#include <wx/config.h>
+#include <wx/containr.h>
 #include <wx/control.h>
+#include <wx/ctrlsub.h>
+#include <wx/cursor.h>
 #include <wx/dataobj.h>
-#include <wx/dataview.h>
 #include <wx/dc.h>
 #include <wx/dcbuffer.h>
 #include <wx/dcclient.h>
 #include <wx/dcmemory.h>
-#include <wx/dcscreen.h>
+#include <wx/dcprint.h>
 #include <wx/dialog.h>
-#include <wx/dir.h>
 #include <wx/dirdlg.h>
-#include <wx/display.h>
 #include <wx/dnd.h>
+#include <wx/dynarray.h>
 #include <wx/event.h>
 #include <wx/file.h>
 #include <wx/filedlg.h>
 #include <wx/filefn.h>
 #include <wx/filename.h>
 #include <wx/font.h>
-#include <wx/fontdlg.h>
 #include <wx/frame.h>
-#include <wx/gauge.h>
-#include <wx/gbsizer.h>
 #include <wx/gdicmn.h>
+#include <wx/gdiobj.h>
 #include <wx/glcanvas.h>
+#include <wx/hash.h>
+#include <wx/hashmap.h>
 #include <wx/icon.h>
 #include <wx/image.h>
 #include <wx/intl.h>
+#include <wx/layout.h>
+#include <wx/list.h>
 #include <wx/listbox.h>
 #include <wx/listctrl.h>
 #include <wx/log.h>
+#include <wx/math.h>
+#include <wx/memory.h>
 #include <wx/menu.h>
 #include <wx/menuitem.h>
+#include <wx/module.h>
 #include <wx/msgdlg.h>
+#include <wx/object.h>
+#include <wx/palette.h>
 #include <wx/panel.h>
+#include <wx/pen.h>
 #include <wx/power.h>
 #include <wx/radiobox.h>
 #include <wx/radiobut.h>
-#include <wx/rawbmp.h>
+#include <wx/region.h>
 #include <wx/sashwin.h>
-#include <wx/scrolbar.h>
+#include <wx/scrolwin.h>
 #include <wx/settings.h>
 #include <wx/sizer.h>
-#include <wx/slider.h>
 #include <wx/spinctrl.h>
-#include <wx/stackwalk.h>
-#include <wx/statbmp.h>
 #include <wx/statbox.h>
 #include <wx/statline.h>
 #include <wx/stattext.h>
+#include <wx/statusbr.h>
 #include <wx/stc/stc.h>
-#include <wx/stdpaths.h>
 #include <wx/stopwatch.h>
 #include <wx/strconv.h>
+#include <wx/stream.h>
 #include <wx/string.h>
-#include <wx/sysopt.h>
 #include <wx/textctrl.h>
-#include <wx/textdlg.h>
-#include <wx/tglbtn.h>
 #include <wx/thread.h>
 #include <wx/timer.h>
 #include <wx/toolbar.h>
-#include <wx/treebook.h>
+#include <wx/toplevel.h>
 #include <wx/utils.h>
+#include <wx/valgen.h>
 #include <wx/validate.h>
-#include <wx/valgen.h>
-#include <wx/valnum.h>
-#include <wx/valgen.h>
 #include <wx/valtext.h>
 #include <wx/window.h>
+#include <wx/wxcrt.h>
+#include <wx/wxcrtvararg.h>
 
 #ifdef HAVE_OPENGL_GL_H
 #include <OpenGL/gl.h>
diff --git a/src/crash_writer.cpp b/src/crash_writer.cpp
index dcf325c4b..336301f70 100644
--- a/src/crash_writer.cpp
+++ b/src/crash_writer.cpp
@@ -22,6 +22,8 @@
 
 #include <boost/filesystem/fstream.hpp>
 #include <boost/format.hpp>
+#include <wx/string.h>
+#include <wx/stackwalk.h>
 
 using namespace agi;