diff --git a/aegisub/libaegisub/common/thesaurus.cpp b/aegisub/libaegisub/common/thesaurus.cpp
index aec4ee2f4..8359a3db7 100644
--- a/aegisub/libaegisub/common/thesaurus.cpp
+++ b/aegisub/libaegisub/common/thesaurus.cpp
@@ -24,6 +24,10 @@
 #include "libaegisub/io.h"
 #include "libaegisub/line_iterator.h"
 
+#ifndef LAGI_PRE
+#include <cstdlib>
+#endif
+
 template<class String, class Char, class Container>
 static void split(String const& str, Char sep, Container *out) {
 	typename String::size_type pos, prev = 0;
diff --git a/aegisub/libaegisub/include/libaegisub/scoped_ptr.h b/aegisub/libaegisub/include/libaegisub/scoped_ptr.h
index 83cba68af..e415930b0 100644
--- a/aegisub/libaegisub/include/libaegisub/scoped_ptr.h
+++ b/aegisub/libaegisub/include/libaegisub/scoped_ptr.h
@@ -20,10 +20,6 @@
 
 #pragma once
 
-#ifndef LAGI_PRE
-#include <algorithm>
-#endif
-
 namespace agi {
 
 /// @class scoped_ptr
@@ -48,14 +44,8 @@ public:
 		ptr = p;
 	}
 
-	void swap(scoped_ptr &b) { using std::swap; swap(ptr, b.ptr); }
-
 	explicit scoped_ptr(T *ptr = 0) : ptr(ptr){ }
 	~scoped_ptr() { delete ptr; }
 };
 
-template<class T>
-inline void swap(scoped_ptr<T> &a, scoped_ptr<T> &b) {
-	a.swap(b);
-}
 }
diff --git a/aegisub/src/audio_marker.h b/aegisub/src/audio_marker.h
index 792476098..ac4f39614 100644
--- a/aegisub/src/audio_marker.h
+++ b/aegisub/src/audio_marker.h
@@ -28,6 +28,8 @@
 
 #ifndef AGI_PRE
 #include <vector>
+
+#include <wx/string.h>
 #endif
 
 class AudioMarkerKeyframe;
@@ -35,14 +37,15 @@ class Pen;
 class VideoContext;
 class TimeRange;
 class VideoPositionMarker;
-
-#include "time_range.h"
+class wxPen;
 
 namespace agi {
 	class OptionValue;
 	struct Context;
 }
 
+#include "time_range.h"
+
 /// @class AudioMarker
 /// @brief A marker on the audio display
 class AudioMarker {
diff --git a/aegisub/src/dialog_selection.cpp b/aegisub/src/dialog_selection.cpp
index 5637646be..94c325798 100644
--- a/aegisub/src/dialog_selection.cpp
+++ b/aegisub/src/dialog_selection.cpp
@@ -26,6 +26,8 @@
 #include "dialog_selection.h"
 
 #ifndef AGI_PRE
+#include <algorithm>
+
 #include <wx/checkbox.h>
 #include <wx/combobox.h>
 #include <wx/msgdlg.h>
diff --git a/aegisub/src/hotkey_data_view_model.cpp b/aegisub/src/hotkey_data_view_model.cpp
index 3aa7428f8..80b5e6a2f 100644
--- a/aegisub/src/hotkey_data_view_model.cpp
+++ b/aegisub/src/hotkey_data_view_model.cpp
@@ -38,6 +38,7 @@
 #include <wx/dataview.h>
 #include <wx/regex.h>
 
+#include <algorithm>
 #include <list>
 #include <set>
 #endif
diff --git a/aegisub/src/menu.cpp b/aegisub/src/menu.cpp
index 981c2fa56..864ce4456 100644
--- a/aegisub/src/menu.cpp
+++ b/aegisub/src/menu.cpp
@@ -37,6 +37,7 @@
 #include <libaegisub/log.h>
 
 #ifndef AGI_PRE
+#include <algorithm>
 #include <deque>
 #include <sstream>
 #include <vector>