diff --git a/src/core/pch.hpp b/src/core/pch.hpp
index 58ca346ce..9c84d8de2 100644
--- a/src/core/pch.hpp
+++ b/src/core/pch.hpp
@@ -37,4 +37,21 @@
     #include <sigslot/sigslot.h>
     #include <core/db/Connection.h>
     #include <core/db/Statement.h>
-#endif
\ No newline at end of file
+#endif
+
+#include <set>
+#include <vector>
+#include <map>
+#include <string>
+#include <algorithm>
+#include <unordered_map>
+#include <thread>
+
+#include <cmath>
+#include <string>
+
+#include <core/utfutil.h>
+
+#include <boost/filesystem.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
+#include <boost/algorithm/string.hpp>
\ No newline at end of file
diff --git a/src/musikcube/stdafx.h b/src/musikcube/stdafx.h
index 23a4936e6..4cd699bd5 100644
--- a/src/musikcube/stdafx.h
+++ b/src/musikcube/stdafx.h
@@ -36,4 +36,53 @@
 
 #include <core/config.h>
 #include <core/i18n/Locale.h>
+#include <core/library/ILibrary.h>
+#include <core/library/LocalLibrary.h>
+#include <core/library/track/Track.h>
+#include <core/library/track/TrackList.h>
+#include <core/audio/PlaybackService.h>
+#include <core/audio/ITransport.h>
+#include <core/support/Preferences.h>
 #include <cursespp/curses_config.h>
+#include <core/utfutil.h>
+
+#include <cursespp/App.h>
+#include <cursespp/AppLayout.h>
+#include <cursespp/Checkbox.h>
+#include <cursespp/Colors.h>
+#include <cursespp/DialogOverlay.h>
+#include <cursespp/InputOverlay.h>
+#include <cursespp/IMouseHandler.h>
+#include <cursespp/LayoutBase.h>
+#include <cursespp/ListOverlay.h>
+#include <cursespp/ListWindow.h>
+#include <cursespp/MultiLineEntry.h>
+#include <cursespp/OverlayStack.h>
+#include <cursespp/SchemaOverlay.h>
+#include <cursespp/Screen.h>
+#include <cursespp/ScrollableWindow.h>
+#include <cursespp/ScrollAdapterBase.h>
+#include <cursespp/Scrollbar.h>
+#include <cursespp/ShortcutsWindow.h>
+#include <cursespp/SimpleScrollAdapter.h>
+#include <cursespp/SingleLineEntry.h>
+#include <cursespp/Text.h>
+#include <cursespp/TextInput.h>
+#include <cursespp/TextLabel.h>
+#include <cursespp/ToastOverlay.h>
+#include <cursespp/Window.h>
+
+#include <set>
+#include <vector>
+#include <map>
+#include <string>
+#include <algorithm>
+#include <unordered_map>
+#include <thread>
+
+#include <cmath>
+#include <string>
+
+#include <boost/filesystem.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
+#include <boost/algorithm/string.hpp>
\ No newline at end of file