diff --git a/src/backend/generators.cpp b/src/backend/generators.cpp
index 36cce6d8..9a3ab6b8 100644
--- a/src/backend/generators.cpp
+++ b/src/backend/generators.cpp
@@ -23,6 +23,15 @@ along with LOOT.  If not, see
 */
 
 #include "generators.h"
+#include "helpers.h"
+#include "globals.h"
+#include "parsers.h"
+#include "streams.h"
+
+#include <pugixml.hpp>
+
+#include <boost/algorithm/string.hpp>
+#include <boost/locale.hpp>
 
 namespace loot {
     //LOOT Report generation stuff.
diff --git a/src/backend/generators.h b/src/backend/generators.h
index 77d7da82..d1ef053e 100644
--- a/src/backend/generators.h
+++ b/src/backend/generators.h
@@ -24,20 +24,13 @@
 #ifndef __LOOT_GENERATORS__
 #define __LOOT_GENERATORS__
 
-#include "helpers.h"
 #include "metadata.h"
-#include "globals.h"
-#include "parsers.h"
-#include "streams.h"
 
-#include <pugixml.hpp>
 #include <yaml-cpp/yaml.h>
 
 #include <string>
 #include <list>
-#include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
-#include <boost/locale.hpp>
 
 namespace loot {
     //LOOT Report generation stuff.
diff --git a/src/gui/editor.cpp b/src/gui/editor.cpp
index c769b293..88645acd 100644
--- a/src/gui/editor.cpp
+++ b/src/gui/editor.cpp
@@ -24,11 +24,13 @@
 
 #include "editor.h"
 #include "../backend/generators.h"
+#include "../backend/helpers.h"
 #include "../backend/streams.h"
 
 #include <algorithm>
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/log/trivial.hpp>
 
 #include <wx/clipbrd.h>
 #include <wx/msgdlg.h>