diff --git a/aegisub/libaegisub/common/mru.cpp b/aegisub/libaegisub/common/mru.cpp
index a698f5b4d..3e32b5670 100644
--- a/aegisub/libaegisub/common/mru.cpp
+++ b/aegisub/libaegisub/common/mru.cpp
@@ -28,6 +28,8 @@
 #include "libaegisub/option.h"
 #include "libaegisub/option_value.h"
 
+#include <fstream>
+
 namespace agi {
 
 MRUManager::MRUManager(agi::fs::path const& config, std::string const& default_config, agi::Options *options)
diff --git a/aegisub/libaegisub/common/option.cpp b/aegisub/libaegisub/common/option.cpp
index a70b92eb0..3d3a3c811 100644
--- a/aegisub/libaegisub/common/option.cpp
+++ b/aegisub/libaegisub/common/option.cpp
@@ -33,6 +33,7 @@
 
 #include <boost/range/adaptor/map.hpp>
 #include <cassert>
+#include <fstream>
 #include <memory>
 #include <sstream>
 
diff --git a/aegisub/src/audio_controller.cpp b/aegisub/src/audio_controller.cpp
index bb3d4dbf8..6c5658783 100644
--- a/aegisub/src/audio_controller.cpp
+++ b/aegisub/src/audio_controller.cpp
@@ -54,6 +54,7 @@
 #include <libaegisub/path.h>
 
 #include <algorithm>
+#include <fstream>
 
 AudioController::AudioController(agi::Context *context)
 : context(context)
diff --git a/aegisub/src/audio_provider_hd.cpp b/aegisub/src/audio_provider_hd.cpp
index ed29eaad7..f0153e8de 100644
--- a/aegisub/src/audio_provider_hd.cpp
+++ b/aegisub/src/audio_provider_hd.cpp
@@ -52,6 +52,7 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/filesystem.hpp>
+#include <fstream>
 
 namespace {
 agi::fs::path cache_dir() {
diff --git a/aegisub/src/dialog_shift_times.cpp b/aegisub/src/dialog_shift_times.cpp
index 85ccf3831..c23c0c68a 100644
--- a/aegisub/src/dialog_shift_times.cpp
+++ b/aegisub/src/dialog_shift_times.cpp
@@ -47,6 +47,7 @@
 #include <libaegisub/cajun/writer.h>
 
 #include <algorithm>
+#include <fstream>
 #include <vector>
 
 #include <wx/listbox.h>
diff --git a/aegisub/src/spellchecker_hunspell.cpp b/aegisub/src/spellchecker_hunspell.cpp
index 794c69f92..17d6cbc87 100644
--- a/aegisub/src/spellchecker_hunspell.cpp
+++ b/aegisub/src/spellchecker_hunspell.cpp
@@ -32,9 +32,9 @@
 #include <libaegisub/log.h>
 #include <libaegisub/path.h>
 
-#include <hunspell/hunspell.hxx>
-
 #include <boost/format.hpp>
+#include <fstream>
+#include <hunspell/hunspell.hxx>
 
 HunspellSpellChecker::HunspellSpellChecker()
 : lang_listener(OPT_SUB("Tool/Spell Checker/Language", &HunspellSpellChecker::OnLanguageChanged, this))
diff --git a/aegisub/src/subtitle_format_ebu3264.cpp b/aegisub/src/subtitle_format_ebu3264.cpp
index dd7901150..5d821c7d7 100644
--- a/aegisub/src/subtitle_format_ebu3264.cpp
+++ b/aegisub/src/subtitle_format_ebu3264.cpp
@@ -40,6 +40,7 @@
 #include <libaegisub/of_type_adaptor.h>
 
 #include <boost/algorithm/string/replace.hpp>
+#include <fstream>
 
 namespace
 {
diff --git a/aegisub/src/text_file_writer.cpp b/aegisub/src/text_file_writer.cpp
index 57e6179e8..d616a113a 100644
--- a/aegisub/src/text_file_writer.cpp
+++ b/aegisub/src/text_file_writer.cpp
@@ -30,6 +30,7 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
+#include <fstream>
 
 TextFileWriter::TextFileWriter(agi::fs::path const& filename, std::string encoding)
 : file(new agi::io::Save(filename, true))