diff --git a/aegisub/src/audio_provider_pcm.cpp b/aegisub/src/audio_provider_pcm.cpp
index 33c83651d..c4cf0bae0 100644
--- a/aegisub/src/audio_provider_pcm.cpp
+++ b/aegisub/src/audio_provider_pcm.cpp
@@ -55,6 +55,7 @@
 
 #include "aegisub_endian.h"
 #include "audio_provider_pcm.h"
+#include "compat.h"
 #include "utils.h"
 
 
@@ -74,7 +75,7 @@ PCMAudioProvider::PCMAudioProvider(const wxString &filename)
 		0);
 
 	if (file_handle == INVALID_HANDLE_VALUE) {
-		throw agi::FileNotFoundError(filename);
+		throw agi::FileNotFoundError(STD_STR(filename));
 	}
 
 	LARGE_INTEGER li_file_size = {0};
@@ -103,7 +104,7 @@ PCMAudioProvider::PCMAudioProvider(const wxString &filename)
 	file_handle = open(filename.mb_str(*wxConvFileName), O_RDONLY);
 
 	if (file_handle == -1) {
-		throw agi::FileNotFoundError(filename);
+		throw agi::FileNotFoundError(STD_STR(filename));
 	}
 
 	struct stat filestats;
diff --git a/aegisub/src/subtitles_provider_libass.cpp b/aegisub/src/subtitles_provider_libass.cpp
index 69c272a24..464b06dd9 100644
--- a/aegisub/src/subtitles_provider_libass.cpp
+++ b/aegisub/src/subtitles_provider_libass.cpp
@@ -56,6 +56,7 @@ extern "C" {
 #include "subtitles_provider_libass.h"
 #include "utils.h"
 #include "video_context.h"
+#include "video_frame.h"
 
 
 /// @brief Handle libass messages
diff --git a/aegisub/src/threaded_frame_source.cpp b/aegisub/src/threaded_frame_source.cpp
index 50dc1f5b5..ecece1dbc 100644
--- a/aegisub/src/threaded_frame_source.cpp
+++ b/aegisub/src/threaded_frame_source.cpp
@@ -204,7 +204,7 @@ VideoProviderErrorEvent::VideoProviderErrorEvent(VideoProviderError const& err)
 	SetEventType(EVT_VIDEO_ERROR);
 }
 SubtitlesProviderErrorEvent::SubtitlesProviderErrorEvent(wxString err)
-: agi::Exception(err, NULL)
+: agi::Exception(STD_STR(err), NULL)
 {
 	SetEventType(EVT_SUBTITLES_ERROR);
 }