diff --git a/es-app/src/CollectionSystemManager.cpp b/es-app/src/CollectionSystemManager.cpp
index 5896a11a3..8233663f1 100644
--- a/es-app/src/CollectionSystemManager.cpp
+++ b/es-app/src/CollectionSystemManager.cpp
@@ -1,20 +1,20 @@
-#include "SystemData.h"
-#include "Gamelist.h"
-#include <boost/filesystem.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/xpressive/xpressive.hpp>
-#include "Util.h"
-#include <algorithm>
-#include <fstream>
-#include <stdlib.h>
-#include <SDL_joystick.h>
-#include "Renderer.h"
-#include "Log.h"
-#include "InputManager.h"
-#include <iostream>
-#include "Settings.h"
-#include "pugixml/src/pugixml.hpp"
+#include "CollectionSystemManager.h"
+
 #include "guis/GuiInfoPopup.h"
+#include "views/gamelist/IGameListView.h"
+#include "views/ViewController.h"
+#include "FileData.h"
+#include "FileFilterIndex.h"
+#include "Log.h"
+#include "Settings.h"
+#include "SystemData.h"
+#include "ThemeData.h"
+#include "Util.h"
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/xpressive/xpressive.hpp>
+#include <fstream>
+#include <unordered_map>
 
 namespace fs = boost::filesystem;
 std::string myCollectionsName = "collections";
diff --git a/es-app/src/CollectionSystemManager.h b/es-app/src/CollectionSystemManager.h
index 5ec40673a..71709f8e3 100644
--- a/es-app/src/CollectionSystemManager.h
+++ b/es-app/src/CollectionSystemManager.h
@@ -2,16 +2,14 @@
 #ifndef ES_APP_COLLECTION_SYSTEM_MANAGER_H
 #define ES_APP_COLLECTION_SYSTEM_MANAGER_H
 
-#include <vector>
+#include <map>
 #include <string>
-#include "FileData.h"
-#include "Window.h"
-#include "MetaData.h"
-#include "PlatformId.h"
-#include "ThemeData.h"
-#include "FileFilterIndex.h"
-#include "SystemData.h"
-#include "views/ViewController.h"
+#include <vector>
+
+class FileData;
+class SystemData;
+class Window;
+struct SystemEnvironmentData;
 
 enum CollectionSystemType
 {
diff --git a/es-app/src/FileData.cpp b/es-app/src/FileData.cpp
index 05f994e06..49206227c 100644
--- a/es-app/src/FileData.cpp
+++ b/es-app/src/FileData.cpp
@@ -1,11 +1,18 @@
 #include "FileData.h"
-#include "FileSorts.h"
-#include "views/ViewController.h"
-#include "SystemData.h"
-#include "Log.h"
+
 #include "AudioManager.h"
-#include "VolumeControl.h"
+#include "CollectionSystemManager.h"
+#include "FileFilterIndex.h"
+#include "FileSorts.h"
+#include "Log.h"
+#include "platform.h"
+#include "SystemData.h"
 #include "Util.h"
+#include "VolumeControl.h"
+#include "Window.h"
+#include <boost/algorithm/string/trim.hpp>
+#include <boost/date_time/posix_time/posix_time_types.hpp>
+#include <boost/filesystem/operations.hpp>
 
 namespace fs = boost::filesystem;
 
diff --git a/es-app/src/FileData.h b/es-app/src/FileData.h
index 753c1484e..49c88630a 100644
--- a/es-app/src/FileData.h
+++ b/es-app/src/FileData.h
@@ -2,13 +2,12 @@
 #ifndef ES_APP_FILE_DATA_H
 #define ES_APP_FILE_DATA_H
 
-#include <unordered_map>
-#include <string>
-#include <vector>
-#include <boost/filesystem.hpp>
 #include "MetaData.h"
+#include <boost/filesystem/path.hpp>
+#include <unordered_map>
 
 class SystemData;
+class Window;
 struct SystemEnvironmentData;
 
 enum FileType
diff --git a/es-app/src/FileFilterIndex.cpp b/es-app/src/FileFilterIndex.cpp
index dd34c1418..1013bb77c 100644
--- a/es-app/src/FileFilterIndex.cpp
+++ b/es-app/src/FileFilterIndex.cpp
@@ -1,5 +1,10 @@
 #include "FileFilterIndex.h"
 
+#include "FileData.h"
+#include "Log.h"
+#include "Util.h"
+#include <boost/algorithm/string/trim.hpp>
+
 #define UNKNOWN_LABEL "UNKNOWN"
 #define INCLUDE_UNKNOWN false;
 
@@ -123,7 +128,7 @@ std::string FileFilterIndex::getIndexableKey(FileData* game, FilterIndexType typ
 				std::string ratingString = game->metadata.get("rating");
 				if (!ratingString.empty()) {
 					try {
-						ratingNumber = boost::math::iround(std::stod(ratingString)*5);
+						ratingNumber = (int)((std::stod(ratingString)*5)+0.5);
 						if (ratingNumber < 0)
 							ratingNumber = 0;
 
diff --git a/es-app/src/FileFilterIndex.h b/es-app/src/FileFilterIndex.h
index 1a6e3c8df..57575a172 100644
--- a/es-app/src/FileFilterIndex.h
+++ b/es-app/src/FileFilterIndex.h
@@ -3,13 +3,9 @@
 #define ES_APP_FILE_FILTER_INDEX_H
 
 #include <map>
-#include "FileData.h"
-#include "Log.h"
-#include <boost/math/special_functions/round.hpp>
-#include <boost/algorithm/string.hpp>
-#include <sstream>
-#include <iostream>
-#include "Util.h"
+#include <vector>
+
+class FileData;
 
 enum FilterIndexType
 {
diff --git a/es-app/src/FileSorts.h b/es-app/src/FileSorts.h
index f4403115c..d821ba0f9 100644
--- a/es-app/src/FileSorts.h
+++ b/es-app/src/FileSorts.h
@@ -2,9 +2,8 @@
 #ifndef ES_APP_FILE_SORTS_H
 #define ES_APP_FILE_SORTS_H
 
-#include <vector>
 #include "FileData.h"
-#include "SystemData.h"
+#include <vector>
 
 namespace FileSorts
 {
diff --git a/es-app/src/Gamelist.cpp b/es-app/src/Gamelist.cpp
index cae840264..e1994e9c7 100644
--- a/es-app/src/Gamelist.cpp
+++ b/es-app/src/Gamelist.cpp
@@ -1,10 +1,13 @@
 #include "Gamelist.h"
-#include "SystemData.h"
-#include "pugixml/src/pugixml.hpp"
-#include <boost/filesystem.hpp>
+
+#include "FileData.h"
+#include "FileFilterIndex.h"
 #include "Log.h"
 #include "Settings.h"
+#include "SystemData.h"
 #include "Util.h"
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
 
 namespace fs = boost::filesystem;
 
diff --git a/es-app/src/MetaData.cpp b/es-app/src/MetaData.cpp
index 56ae35150..161f6da84 100644
--- a/es-app/src/MetaData.cpp
+++ b/es-app/src/MetaData.cpp
@@ -1,7 +1,8 @@
 #include "MetaData.h"
-#include "components/TextComponent.h"
+
 #include "Log.h"
 #include "Util.h"
+#include <boost/date_time/posix_time/time_formatters.hpp>
 
 namespace fs = boost::filesystem;
 
diff --git a/es-app/src/MetaData.h b/es-app/src/MetaData.h
index 467659ac7..0fe4a9cc0 100644
--- a/es-app/src/MetaData.h
+++ b/es-app/src/MetaData.h
@@ -2,12 +2,9 @@
 #ifndef ES_APP_META_DATA_H
 #define ES_APP_META_DATA_H
 
-#include "pugixml/src/pugixml.hpp"
-#include <string>
-#include <map>
-#include "GuiComponent.h"
-#include <boost/date_time.hpp>
-#include <boost/filesystem.hpp>
+#include <boost/date_time/posix_time/ptime.hpp>
+#include <boost/filesystem/path.hpp>
+#include <pugixml/src/pugixml.hpp>
 
 enum MetaDataType
 {
diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp
index 5b9aaa9f0..bf37bc52b 100644
--- a/es-app/src/PlatformId.cpp
+++ b/es-app/src/PlatformId.cpp
@@ -1,4 +1,5 @@
 #include "PlatformId.h"
+
 #include <string.h>
 
 extern const char* mameNameToRealName[];
diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h
index 55197cc67..8b08cde0f 100644
--- a/es-app/src/PlatformId.h
+++ b/es-app/src/PlatformId.h
@@ -2,8 +2,6 @@
 #ifndef ES_APP_PLATFORM_ID_H
 #define ES_APP_PLATFORM_ID_H
 
-#include <map>
-
 namespace PlatformIds
 {
 	enum PlatformId : unsigned int
diff --git a/es-app/src/ScraperCmdLine.cpp b/es-app/src/ScraperCmdLine.cpp
index f6f695252..1ac73afdf 100644
--- a/es-app/src/ScraperCmdLine.cpp
+++ b/es-app/src/ScraperCmdLine.cpp
@@ -1,10 +1,15 @@
 #include "ScraperCmdLine.h"
-#include <iostream>
-#include <vector>
-#include "SystemData.h"
-#include "Settings.h"
-#include <signal.h>
+
 #include "Log.h"
+#include "platform.h"
+#include "SystemData.h"
+#include <iostream>
+#include <signal.h>
+#if defined(__linux__)
+#include <unistd.h>
+#elif defined(WIN32)
+#include <Windows.h>
+#endif
 
 std::ostream& out = std::cout;
 
diff --git a/es-app/src/SystemData.cpp b/es-app/src/SystemData.cpp
index 984fe6086..ee659dd0b 100644
--- a/es-app/src/SystemData.cpp
+++ b/es-app/src/SystemData.cpp
@@ -1,15 +1,18 @@
 #include "SystemData.h"
-#include "Gamelist.h"
-#include <boost/filesystem.hpp>
-#include <fstream>
-#include <stdlib.h>
-#include <SDL_joystick.h>
-#include "Renderer.h"
-#include "Log.h"
-#include "InputManager.h"
-#include <iostream>
-#include "Settings.h"
+
+#include "CollectionSystemManager.h"
+#include "FileFilterIndex.h"
 #include "FileSorts.h"
+#include "Gamelist.h"
+#include "Log.h"
+#include "platform.h"
+#include "Settings.h"
+#include "ThemeData.h"
+#include <boost/filesystem/operations.hpp>
+#include <fstream>
+#ifdef WIN32
+#include <Windows.h>
+#endif
 
 std::vector<SystemData*> SystemData::sSystemVector;
 
diff --git a/es-app/src/SystemData.h b/es-app/src/SystemData.h
index eab061ebe..09690f273 100644
--- a/es-app/src/SystemData.h
+++ b/es-app/src/SystemData.h
@@ -2,15 +2,15 @@
 #ifndef ES_APP_SYSTEM_DATA_H
 #define ES_APP_SYSTEM_DATA_H
 
-#include <vector>
-#include <string>
-#include "FileData.h"
-#include "Window.h"
-#include "MetaData.h"
 #include "PlatformId.h"
-#include "ThemeData.h"
-#include "FileFilterIndex.h"
-#include "CollectionSystemManager.h"
+#include <algorithm>
+#include <memory>
+#include <string>
+#include <vector>
+
+class FileData;
+class FileFilterIndex;
+class ThemeData;
 
 struct SystemEnvironmentData
 {
diff --git a/es-app/src/SystemScreenSaver.cpp b/es-app/src/SystemScreenSaver.cpp
index ba1e5ecd0..bdb7e7679 100644
--- a/es-app/src/SystemScreenSaver.cpp
+++ b/es-app/src/SystemScreenSaver.cpp
@@ -1,21 +1,21 @@
 #include "SystemScreenSaver.h"
+
 #ifdef _RPI_
 #include "components/VideoPlayerComponent.h"
 #endif
 #include "components/VideoVlcComponent.h"
-#include "components/ImageComponent.h"
-#include "platform.h"
+#include "views/gamelist/IGameListView.h"
+#include "views/ViewController.h"
+#include "FileData.h"
+#include "FileFilterIndex.h"
+#include "Log.h"
 #include "PowerSaver.h"
 #include "Renderer.h"
-#include "Settings.h"
+#include "Sound.h"
 #include "SystemData.h"
 #include "Util.h"
-#include "Log.h"
-#include "AudioManager.h"
-#include "Sound.h"
-#include "views/ViewController.h"
-#include "views/gamelist/IGameListView.h"
-#include <stdio.h>
+#include <boost/filesystem/operations.hpp>
+#include <unordered_map>
 
 #define FADE_TIME 			300
 
diff --git a/es-app/src/SystemScreenSaver.h b/es-app/src/SystemScreenSaver.h
index 4e085265c..e96a6b01e 100644
--- a/es-app/src/SystemScreenSaver.h
+++ b/es-app/src/SystemScreenSaver.h
@@ -4,9 +4,9 @@
 
 #include "Window.h"
 
-class VideoComponent;
 class ImageComponent;
 class Sound;
+class VideoComponent;
 
 // Screensaver implementation for main window
 class SystemScreenSaver : public Window::ScreenSaver
diff --git a/es-app/src/VolumeControl.cpp b/es-app/src/VolumeControl.cpp
index b072130a5..c72118307 100644
--- a/es-app/src/VolumeControl.cpp
+++ b/es-app/src/VolumeControl.cpp
@@ -1,8 +1,10 @@
 #include "VolumeControl.h"
-#include "Settings.h"
 
 #include "Log.h"
-
+#include "Settings.h"
+#ifdef WIN32
+#include <mmdeviceapi.h>
+#endif
 
 #if defined(__linux__)
     #ifdef _RPI_
diff --git a/es-app/src/VolumeControl.h b/es-app/src/VolumeControl.h
index 821676fc3..75f598ffc 100644
--- a/es-app/src/VolumeControl.h
+++ b/es-app/src/VolumeControl.h
@@ -3,7 +3,6 @@
 #define ES_APP_VOLUME_CONTROL_H
 
 #include <memory>
-#include <stdint.h>
 
 #if defined (__APPLE__)
     #error TODO: Not implemented for MacOS yet!!!
@@ -13,9 +12,8 @@
 	#include <alsa/asoundlib.h>
 #elif defined(WIN32) || defined(_WIN32)
 	#include <Windows.h>
-	#include <MMSystem.h>
-	#include <mmdeviceapi.h>
 	#include <endpointvolume.h>
+	#include <mmeapi.h>
 #endif
 
 /*!
diff --git a/es-app/src/animations/LaunchAnimation.h b/es-app/src/animations/LaunchAnimation.h
index c9120f238..be5327915 100644
--- a/es-app/src/animations/LaunchAnimation.h
+++ b/es-app/src/animations/LaunchAnimation.h
@@ -3,7 +3,6 @@
 #define ES_APP_ANIMATIONS_LAUNCH_ANIMATION_H
 
 #include "animations/Animation.h"
-#include "Log.h"
 
 // let's look at the game launch effect:
 // -move camera to center on point P (interpolation method: linear)
diff --git a/es-app/src/components/AsyncReqComponent.cpp b/es-app/src/components/AsyncReqComponent.cpp
index c2ee7d1dc..e05baa34a 100644
--- a/es-app/src/components/AsyncReqComponent.cpp
+++ b/es-app/src/components/AsyncReqComponent.cpp
@@ -1,4 +1,6 @@
 #include "components/AsyncReqComponent.h"
+
+#include "HttpReq.h"
 #include "Renderer.h"
 
 AsyncReqComponent::AsyncReqComponent(Window* window, std::shared_ptr<HttpReq> req, std::function<void(std::shared_ptr<HttpReq>)> onSuccess, std::function<void()> onCancel) 
diff --git a/es-app/src/components/AsyncReqComponent.h b/es-app/src/components/AsyncReqComponent.h
index ab3ff013f..35cb01734 100644
--- a/es-app/src/components/AsyncReqComponent.h
+++ b/es-app/src/components/AsyncReqComponent.h
@@ -3,9 +3,8 @@
 #define ES_APP_COMPONENTS_ASYNC_REQ_COMPONENT_H
 
 #include "GuiComponent.h"
-#include "HttpReq.h"
-#include <functional>
-#include <memory>
+
+class HttpReq;
 
 /* 
 	Used to asynchronously run an HTTP request.
diff --git a/es-app/src/components/RatingComponent.cpp b/es-app/src/components/RatingComponent.cpp
index d89305abe..3c39e92cd 100644
--- a/es-app/src/components/RatingComponent.cpp
+++ b/es-app/src/components/RatingComponent.cpp
@@ -1,7 +1,8 @@
 #include "components/RatingComponent.h"
+
+#include "resources/TextureResource.h"
 #include "Renderer.h"
-#include "Window.h"
-#include "Util.h"
+#include "ThemeData.h"
 
 RatingComponent::RatingComponent(Window* window) : GuiComponent(window), mColorShift(0xFFFFFFFF)
 {
diff --git a/es-app/src/components/RatingComponent.h b/es-app/src/components/RatingComponent.h
index 714532d0d..6c47f00d2 100644
--- a/es-app/src/components/RatingComponent.h
+++ b/es-app/src/components/RatingComponent.h
@@ -3,7 +3,10 @@
 #define ES_APP_COMPONENTS_RATING_COMPONENT_H
 
 #include "GuiComponent.h"
-#include "resources/TextureResource.h"
+#include "platform.h"
+#include GLHEADER
+
+class TextureResource;
 
 #define NUM_RATING_STARS 5
 
diff --git a/es-app/src/components/ScraperSearchComponent.cpp b/es-app/src/components/ScraperSearchComponent.cpp
index 9594a3328..fe8c6d006 100644
--- a/es-app/src/components/ScraperSearchComponent.cpp
+++ b/es-app/src/components/ScraperSearchComponent.cpp
@@ -1,18 +1,18 @@
 #include "components/ScraperSearchComponent.h"
 
-#include "guis/GuiMsgBox.h"
-#include "components/TextComponent.h"
-#include "components/ScrollableContainer.h"
+#include "components/ComponentList.h"
+#include "components/DateTimeComponent.h"
 #include "components/ImageComponent.h"
 #include "components/RatingComponent.h"
-#include "components/DateTimeComponent.h"
-#include "components/AnimatedImageComponent.h"
-#include "components/ComponentList.h"
-#include "HttpReq.h"
-#include "Settings.h"
+#include "components/ScrollableContainer.h"
+#include "components/TextComponent.h"
+#include "guis/GuiMsgBox.h"
+#include "guis/GuiTextEditPopup.h"
+#include "resources/Font.h"
+#include "FileData.h"
 #include "Log.h"
 #include "Util.h"
-#include "guis/GuiTextEditPopup.h"
+#include "Window.h"
 
 ScraperSearchComponent::ScraperSearchComponent(Window* window, SearchType type) : GuiComponent(window),
 	mGrid(window, Vector2i(4, 3)), mBusyAnim(window), 
diff --git a/es-app/src/components/ScraperSearchComponent.h b/es-app/src/components/ScraperSearchComponent.h
index e6f8fc31a..cb3ac6cae 100644
--- a/es-app/src/components/ScraperSearchComponent.h
+++ b/es-app/src/components/ScraperSearchComponent.h
@@ -2,20 +2,17 @@
 #ifndef ES_APP_COMPONENTS_SCRAPER_SEARCH_COMPONENT_H
 #define ES_APP_COMPONENTS_SCRAPER_SEARCH_COMPONENT_H
 
-#include "GuiComponent.h"
-#include "scrapers/Scraper.h"
-#include "components/ComponentGrid.h"
 #include "components/BusyComponent.h"
-#include <functional>
+#include "components/ComponentGrid.h"
+#include "scrapers/Scraper.h"
+#include "GuiComponent.h"
 
 class ComponentList;
+class DateTimeComponent;
 class ImageComponent;
 class RatingComponent;
-class TextComponent;
-class DateTimeComponent;
 class ScrollableContainer;
-class HttpReq;
-class AnimatedImageComponent;
+class TextComponent;
 
 class ScraperSearchComponent : public GuiComponent
 {
diff --git a/es-app/src/components/TextListComponent.h b/es-app/src/components/TextListComponent.h
index 4eb2780f4..f33b1f034 100644
--- a/es-app/src/components/TextListComponent.h
+++ b/es-app/src/components/TextListComponent.h
@@ -3,17 +3,12 @@
 #define ES_APP_COMPONENTS_TEXT_LIST_COMPONENT_H
 
 #include "components/IList.h"
-#include "Renderer.h"
-#include "resources/Font.h"
-#include "InputManager.h"
-#include "Sound.h"
 #include "Log.h"
-#include "ThemeData.h"
+#include "Sound.h"
 #include "Util.h"
-#include <vector>
-#include <string>
 #include <memory>
-#include <functional>
+
+class TextCache;
 
 struct TextListData
 {
diff --git a/es-app/src/guis/GuiCollectionSystemsOptions.cpp b/es-app/src/guis/GuiCollectionSystemsOptions.cpp
index d3487542b..c91968a8d 100644
--- a/es-app/src/guis/GuiCollectionSystemsOptions.cpp
+++ b/es-app/src/guis/GuiCollectionSystemsOptions.cpp
@@ -1,13 +1,12 @@
 #include "guis/GuiCollectionSystemsOptions.h"
-#include "guis/GuiMsgBox.h"
-#include "guis/GuiTextEditPopup.h"
-#include "Settings.h"
-#include "views/ViewController.h"
 
-#include "guis/GuiSettings.h"
-#include "Util.h"
-#include "components/TextComponent.h"
 #include "components/OptionListComponent.h"
+#include "components/SwitchComponent.h"
+#include "guis/GuiSettings.h"
+#include "guis/GuiTextEditPopup.h"
+#include "views/ViewController.h"
+#include "CollectionSystemManager.h"
+#include "Window.h"
 
 GuiCollectionSystemsOptions::GuiCollectionSystemsOptions(Window* window) : GuiComponent(window), mMenu(window, "GAME COLLECTION SETTINGS")
 {
diff --git a/es-app/src/guis/GuiCollectionSystemsOptions.h b/es-app/src/guis/GuiCollectionSystemsOptions.h
index 6b3945e2c..fc6113e0a 100644
--- a/es-app/src/guis/GuiCollectionSystemsOptions.h
+++ b/es-app/src/guis/GuiCollectionSystemsOptions.h
@@ -2,17 +2,12 @@
 #ifndef ES_APP_GUIS_GUI_COLLECTION_SYSTEM_OPTIONS_H
 #define ES_APP_GUIS_GUI_COLLECTION_SYSTEM_OPTIONS_H
 
-#include "GuiComponent.h"
-#include "SystemData.h"
 #include "components/MenuComponent.h"
-#include "CollectionSystemManager.h"
-#include "components/SwitchComponent.h"
-#include "Log.h"
-
 
 template<typename T>
 class OptionListComponent;
-
+class SwitchComponent;
+class SystemData;
 
 class GuiCollectionSystemsOptions : public GuiComponent
 {
diff --git a/es-app/src/guis/GuiFastSelect.cpp b/es-app/src/guis/GuiFastSelect.cpp
index 59715e9ff..bec8a06ae 100644
--- a/es-app/src/guis/GuiFastSelect.cpp
+++ b/es-app/src/guis/GuiFastSelect.cpp
@@ -1,5 +1,6 @@
 #include "guis/GuiFastSelect.h"
-#include "ThemeData.h"
+
+#include "views/gamelist/IGameListView.h"
 #include "FileSorts.h"
 #include "SystemData.h"
 
diff --git a/es-app/src/guis/GuiFastSelect.h b/es-app/src/guis/GuiFastSelect.h
index 5a880dc6f..302825059 100644
--- a/es-app/src/guis/GuiFastSelect.h
+++ b/es-app/src/guis/GuiFastSelect.h
@@ -2,11 +2,11 @@
 #ifndef ES_APP_GUIS_GUI_FAST_SELECT_H
 #define ES_APP_GUIS_GUI_FAST_SELECT_H
 
-#include "GuiComponent.h"
-#include "views/gamelist/IGameListView.h"
-
 #include "components/NinePatchComponent.h"
 #include "components/TextComponent.h"
+#include "GuiComponent.h"
+
+class IGameListView;
 
 class GuiFastSelect : public GuiComponent
 {
diff --git a/es-app/src/guis/GuiGameScraper.cpp b/es-app/src/guis/GuiGameScraper.cpp
index 99293cebc..a1e92a1cd 100644
--- a/es-app/src/guis/GuiGameScraper.cpp
+++ b/es-app/src/guis/GuiGameScraper.cpp
@@ -1,13 +1,11 @@
 #include "guis/GuiGameScraper.h"
-#include "guis/GuiTextEditPopup.h"
-#include "components/TextComponent.h"
+
 #include "components/ButtonComponent.h"
 #include "components/MenuComponent.h"
-#include "scrapers/Scraper.h"
-#include "Renderer.h"
-#include "Log.h"
+#include "components/TextComponent.h"
+#include "FileData.h"
 #include "PowerSaver.h"
-#include "Settings.h"
+#include "SystemData.h"
 
 GuiGameScraper::GuiGameScraper(Window* window, ScraperSearchParams params, std::function<void(const ScraperSearchResult&)> doneFunc) : GuiComponent(window),
 	mGrid(window, Vector2i(1, 7)),
diff --git a/es-app/src/guis/GuiGameScraper.h b/es-app/src/guis/GuiGameScraper.h
index 12bd7a1ff..2f3da8b47 100644
--- a/es-app/src/guis/GuiGameScraper.h
+++ b/es-app/src/guis/GuiGameScraper.h
@@ -2,9 +2,9 @@
 #ifndef ES_APP_GUIS_GUI_GAME_SCRAPER_H
 #define ES_APP_GUIS_GUI_GAME_SCRAPER_H
 
-#include "GuiComponent.h"
-#include "components/ScraperSearchComponent.h"
 #include "components/NinePatchComponent.h"
+#include "components/ScraperSearchComponent.h"
+#include "GuiComponent.h"
 
 class GuiGameScraper : public GuiComponent
 {
diff --git a/es-app/src/guis/GuiGamelistFilter.cpp b/es-app/src/guis/GuiGamelistFilter.cpp
index 8a59a1f29..a2c7f24b7 100644
--- a/es-app/src/guis/GuiGamelistFilter.cpp
+++ b/es-app/src/guis/GuiGamelistFilter.cpp
@@ -1,9 +1,7 @@
 #include "guis/GuiGamelistFilter.h"
-#include "guis/GuiMsgBox.h"
-#include "views/ViewController.h"
 
-#include "components/TextComponent.h"
 #include "components/OptionListComponent.h"
+#include "SystemData.h"
 
 GuiGamelistFilter::GuiGamelistFilter(Window* window, SystemData* system) : GuiComponent(window), mMenu(window, "FILTER GAMELIST BY"), mSystem(system)
 {
diff --git a/es-app/src/guis/GuiGamelistFilter.h b/es-app/src/guis/GuiGamelistFilter.h
index 560501aae..003b72e2a 100644
--- a/es-app/src/guis/GuiGamelistFilter.h
+++ b/es-app/src/guis/GuiGamelistFilter.h
@@ -2,16 +2,13 @@
 #ifndef ES_APP_GUIS_GUI_GAME_LIST_FILTER_H
 #define ES_APP_GUIS_GUI_GAME_LIST_FILTER_H
 
-#include "GuiComponent.h"
-#include "SystemData.h"
 #include "components/MenuComponent.h"
 #include "FileFilterIndex.h"
-#include "Log.h"
-
+#include "GuiComponent.h"
 
 template<typename T>
 class OptionListComponent;
-
+class SystemData;
 
 class GuiGamelistFilter : public GuiComponent
 {
diff --git a/es-app/src/guis/GuiGamelistOptions.cpp b/es-app/src/guis/GuiGamelistOptions.cpp
index b02f21a19..fc419ea1f 100644
--- a/es-app/src/guis/GuiGamelistOptions.cpp
+++ b/es-app/src/guis/GuiGamelistOptions.cpp
@@ -1,10 +1,14 @@
 #include "GuiGamelistOptions.h"
-#include "GuiMetaDataEd.h"
-#include "Util.h"
-#include "Settings.h"
+
+#include "guis/GuiGamelistFilter.h"
+#include "scrapers/Scraper.h"
 #include "views/gamelist/IGameListView.h"
 #include "views/ViewController.h"
 #include "CollectionSystemManager.h"
+#include "FileFilterIndex.h"
+#include "FileSorts.h"
+#include "GuiMetaDataEd.h"
+#include "SystemData.h"
 
 GuiGamelistOptions::GuiGamelistOptions(Window* window, SystemData* system) : GuiComponent(window),
 	mSystem(system), mMenu(window, "OPTIONS"), fromPlaceholder(false), mFiltersChanged(false)
diff --git a/es-app/src/guis/GuiGamelistOptions.h b/es-app/src/guis/GuiGamelistOptions.h
index 1c5b16026..acf861669 100644
--- a/es-app/src/guis/GuiGamelistOptions.h
+++ b/es-app/src/guis/GuiGamelistOptions.h
@@ -2,13 +2,13 @@
 #ifndef ES_APP_GUIS_GUI_GAME_LIST_OPTIONS_H
 #define ES_APP_GUIS_GUI_GAME_LIST_OPTIONS_H
 
-#include "GuiComponent.h"
 #include "components/MenuComponent.h"
 #include "components/OptionListComponent.h"
-#include "GuiGamelistFilter.h"
-#include "FileSorts.h"
+#include "FileData.h"
+#include "GuiComponent.h"
 
 class IGameListView;
+class SystemData;
 
 class GuiGamelistOptions : public GuiComponent
 {
diff --git a/es-app/src/guis/GuiGeneralScreensaverOptions.cpp b/es-app/src/guis/GuiGeneralScreensaverOptions.cpp
index 758e78362..88f71502e 100644
--- a/es-app/src/guis/GuiGeneralScreensaverOptions.cpp
+++ b/es-app/src/guis/GuiGeneralScreensaverOptions.cpp
@@ -1,19 +1,11 @@
 #include "guis/GuiGeneralScreensaverOptions.h"
-#include "Window.h"
-#include "Settings.h"
-#include "PowerSaver.h"
-#include "views/ViewController.h"
 
-#include "components/ButtonComponent.h"
-#include "components/SwitchComponent.h"
-#include "components/SliderComponent.h"
-#include "components/TextComponent.h"
-//#include "components/TextEditComponent.h"
 #include "components/OptionListComponent.h"
-#include "components/MenuComponent.h"
+#include "components/SliderComponent.h"
 #include "guis/GuiMsgBox.h"
-#include "guis/GuiVideoScreensaverOptions.h"
 #include "guis/GuiSlideshowScreensaverOptions.h"
+#include "guis/GuiVideoScreensaverOptions.h"
+#include "Settings.h"
 
 GuiGeneralScreensaverOptions::GuiGeneralScreensaverOptions(Window* window, const char* title) : GuiScreensaverOptions(window, title)
 {
diff --git a/es-app/src/guis/GuiGeneralScreensaverOptions.h b/es-app/src/guis/GuiGeneralScreensaverOptions.h
index 75f4f4c78..1992d9ad1 100644
--- a/es-app/src/guis/GuiGeneralScreensaverOptions.h
+++ b/es-app/src/guis/GuiGeneralScreensaverOptions.h
@@ -2,7 +2,6 @@
 #ifndef ES_APP_GUIS_GUI_GENERAL_SCREENSAVER_OPTIONS_H
 #define ES_APP_GUIS_GUI_GENERAL_SCREENSAVER_OPTIONS_H
 
-#include "components/MenuComponent.h"
 #include "GuiScreensaverOptions.h"
 
 class GuiGeneralScreensaverOptions : public GuiScreensaverOptions
diff --git a/es-app/src/guis/GuiInfoPopup.cpp b/es-app/src/guis/GuiInfoPopup.cpp
index 33f738af1..e39076263 100644
--- a/es-app/src/guis/GuiInfoPopup.cpp
+++ b/es-app/src/guis/GuiInfoPopup.cpp
@@ -1,7 +1,10 @@
 #include "guis/GuiInfoPopup.h"
-#include "Renderer.h"
+
+#include "components/ComponentGrid.h"
+#include "components/NinePatchComponent.h"
 #include "components/TextComponent.h"
-#include "Log.h"
+#include "Renderer.h"
+#include <SDL_timer.h>
 
 GuiInfoPopup::GuiInfoPopup(Window* window, std::string message, int duration) :
 	GuiComponent(window), mMessage(message), mDuration(duration), running(true)
diff --git a/es-app/src/guis/GuiInfoPopup.h b/es-app/src/guis/GuiInfoPopup.h
index 4e8a3baa1..8d4d3cfd1 100644
--- a/es-app/src/guis/GuiInfoPopup.h
+++ b/es-app/src/guis/GuiInfoPopup.h
@@ -3,12 +3,10 @@
 #define ES_APP_GUIS_GUI_INFO_POPUP_H
 
 #include "GuiComponent.h"
-#include "components/NinePatchComponent.h"
-#include "components/ComponentGrid.h"
 #include "Window.h"
-#include "Log.h"
-
 
+class ComponentGrid;
+class NinePatchComponent;
 
 class GuiInfoPopup : public GuiComponent, public Window::InfoPopup
 {
diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp
index 69a542514..85014f2a2 100644
--- a/es-app/src/guis/GuiMenu.cpp
+++ b/es-app/src/guis/GuiMenu.cpp
@@ -1,26 +1,20 @@
-#include "EmulationStation.h"
 #include "guis/GuiMenu.h"
-#include "Window.h"
-#include "Sound.h"
-#include "Log.h"
-#include "SystemData.h"
-#include "Settings.h"
-#include "PowerSaver.h"
-#include "guis/GuiMsgBox.h"
-#include "guis/GuiSettings.h"
-#include "guis/GuiGeneralScreensaverOptions.h"
-#include "guis/GuiCollectionSystemsOptions.h"
-#include "guis/GuiScraperStart.h"
-#include "guis/GuiDetectDevice.h"
-#include "views/ViewController.h"
 
-#include "components/ButtonComponent.h"
-#include "components/SwitchComponent.h"
-#include "components/SliderComponent.h"
-#include "components/TextComponent.h"
 #include "components/OptionListComponent.h"
-#include "components/MenuComponent.h"
+#include "components/SliderComponent.h"
+#include "components/SwitchComponent.h"
+#include "guis/GuiCollectionSystemsOptions.h"
+#include "guis/GuiDetectDevice.h"
+#include "guis/GuiGeneralScreensaverOptions.h"
+#include "guis/GuiMsgBox.h"
+#include "guis/GuiScraperStart.h"
+#include "guis/GuiSettings.h"
+#include "views/ViewController.h"
+#include "CollectionSystemManager.h"
+#include "EmulationStation.h"
+#include "SystemData.h"
 #include "VolumeControl.h"
+#include <SDL_events.h>
 
 GuiMenu::GuiMenu(Window* window) : GuiComponent(window), mMenu(window, "MAIN MENU"), mVersion(window)
 {
diff --git a/es-app/src/guis/GuiMenu.h b/es-app/src/guis/GuiMenu.h
index 5eda41ddb..da8406bb7 100644
--- a/es-app/src/guis/GuiMenu.h
+++ b/es-app/src/guis/GuiMenu.h
@@ -2,9 +2,8 @@
 #ifndef ES_APP_GUIS_GUI_MENU_H
 #define ES_APP_GUIS_GUI_MENU_H
 
-#include "GuiComponent.h"
 #include "components/MenuComponent.h"
-#include <functional>
+#include "GuiComponent.h"
 
 class GuiMenu : public GuiComponent
 {
diff --git a/es-app/src/guis/GuiMetaDataEd.cpp b/es-app/src/guis/GuiMetaDataEd.cpp
index e95cbdedb..fb55a9e82 100644
--- a/es-app/src/guis/GuiMetaDataEd.cpp
+++ b/es-app/src/guis/GuiMetaDataEd.cpp
@@ -1,18 +1,23 @@
 #include "guis/GuiMetaDataEd.h"
-#include "Renderer.h"
-#include "Log.h"
-#include "components/AsyncReqComponent.h"
-#include "Settings.h"
-#include "views/ViewController.h"
-#include "guis/GuiGameScraper.h"
-#include "guis/GuiMsgBox.h"
-#include <boost/filesystem.hpp>
 
-#include "components/TextEditComponent.h"
+#include "components/ButtonComponent.h"
+#include "components/ComponentList.h"
 #include "components/DateTimeComponent.h"
+#include "components/MenuComponent.h"
 #include "components/RatingComponent.h"
 #include "components/SwitchComponent.h"
+#include "components/TextComponent.h"
+#include "guis/GuiGameScraper.h"
+#include "guis/GuiMsgBox.h"
 #include "guis/GuiTextEditPopup.h"
+#include "resources/Font.h"
+#include "views/ViewController.h"
+#include "CollectionSystemManager.h"
+#include "FileData.h"
+#include "FileFilterIndex.h"
+#include "SystemData.h"
+#include "Util.h"
+#include "Window.h"
 
 GuiMetaDataEd::GuiMetaDataEd(Window* window, MetaDataList* md, const std::vector<MetaDataDecl>& mdd, ScraperSearchParams scraperParams,
 	const std::string& header, std::function<void()> saveCallback, std::function<void()> deleteFunc) : GuiComponent(window),
diff --git a/es-app/src/guis/GuiMetaDataEd.h b/es-app/src/guis/GuiMetaDataEd.h
index d93b3c231..ee192f982 100644
--- a/es-app/src/guis/GuiMetaDataEd.h
+++ b/es-app/src/guis/GuiMetaDataEd.h
@@ -2,12 +2,14 @@
 #ifndef ES_APP_GUIS_GUI_META_DATA_ED_H
 #define ES_APP_GUIS_GUI_META_DATA_ED_H
 
-#include "GuiComponent.h"
-#include "components/MenuComponent.h"
-#include "MetaData.h"
+#include "components/ComponentGrid.h"
+#include "components/NinePatchComponent.h"
 #include "scrapers/Scraper.h"
+#include "GuiComponent.h"
+#include "MetaData.h"
 
-#include <functional>
+class ComponentList;
+class TextComponent;
 
 class GuiMetaDataEd : public GuiComponent
 {
diff --git a/es-app/src/guis/GuiScraperMulti.cpp b/es-app/src/guis/GuiScraperMulti.cpp
index 53cf02529..e25fc9c08 100644
--- a/es-app/src/guis/GuiScraperMulti.cpp
+++ b/es-app/src/guis/GuiScraperMulti.cpp
@@ -1,15 +1,15 @@
 #include "guis/GuiScraperMulti.h"
-#include "Renderer.h"
-#include "Log.h"
+
+#include "components/ButtonComponent.h"
+#include "components/MenuComponent.h"
+#include "components/ScraperSearchComponent.h"
+#include "components/TextComponent.h"
+#include "guis/GuiMsgBox.h"
 #include "views/ViewController.h"
 #include "Gamelist.h"
 #include "PowerSaver.h"
-
-#include "components/TextComponent.h"
-#include "components/ButtonComponent.h"
-#include "components/ScraperSearchComponent.h"
-#include "components/MenuComponent.h" // for makeButtonGrid
-#include "guis/GuiMsgBox.h"
+#include "SystemData.h"
+#include "Window.h"
 
 GuiScraperMulti::GuiScraperMulti(Window* window, const std::queue<ScraperSearchParams>& searches, bool approveResults) :
 	GuiComponent(window), mBackground(window, ":/frame.png"), mGrid(window, Vector2i(1, 5)),
diff --git a/es-app/src/guis/GuiScraperMulti.h b/es-app/src/guis/GuiScraperMulti.h
index f4ce4ea43..39d4d5213 100644
--- a/es-app/src/guis/GuiScraperMulti.h
+++ b/es-app/src/guis/GuiScraperMulti.h
@@ -2,12 +2,10 @@
 #ifndef ES_APP_GUIS_GUI_SCRAPER_MULTI_H
 #define ES_APP_GUIS_GUI_SCRAPER_MULTI_H
 
-#include "GuiComponent.h"
-#include "components/NinePatchComponent.h"
 #include "components/ComponentGrid.h"
+#include "components/NinePatchComponent.h"
 #include "scrapers/Scraper.h"
-
-#include <queue>
+#include "GuiComponent.h"
 
 class ScraperSearchComponent;
 class TextComponent;
diff --git a/es-app/src/guis/GuiScraperStart.cpp b/es-app/src/guis/GuiScraperStart.cpp
index 7d1ebab43..9092d1fa3 100644
--- a/es-app/src/guis/GuiScraperStart.cpp
+++ b/es-app/src/guis/GuiScraperStart.cpp
@@ -1,11 +1,12 @@
 #include "guis/GuiScraperStart.h"
-#include "guis/GuiScraperMulti.h"
-#include "guis/GuiMsgBox.h"
-#include "views/ViewController.h"
 
-#include "components/TextComponent.h"
 #include "components/OptionListComponent.h"
 #include "components/SwitchComponent.h"
+#include "guis/GuiMsgBox.h"
+#include "guis/GuiScraperMulti.h"
+#include "views/ViewController.h"
+#include "FileData.h"
+#include "SystemData.h"
 
 GuiScraperStart::GuiScraperStart(Window* window) : GuiComponent(window),
 	mMenu(window, "SCRAPE NOW")
diff --git a/es-app/src/guis/GuiScraperStart.h b/es-app/src/guis/GuiScraperStart.h
index 8b494b469..6c442b9fe 100644
--- a/es-app/src/guis/GuiScraperStart.h
+++ b/es-app/src/guis/GuiScraperStart.h
@@ -2,18 +2,16 @@
 #ifndef ES_APP_GUIS_GUI_SCRAPER_START_H
 #define ES_APP_GUIS_GUI_SCRAPER_START_H
 
-#include "GuiComponent.h"
-#include "SystemData.h"
-#include "scrapers/Scraper.h"
 #include "components/MenuComponent.h"
-#include <queue>
-
-typedef std::function<bool(SystemData*, FileData*)> GameFilterFunc;
+#include "scrapers/Scraper.h"
 
+class FileData;
 template<typename T>
 class OptionListComponent;
-
 class SwitchComponent;
+class SystemData;
+
+typedef std::function<bool(SystemData*, FileData*)> GameFilterFunc;
 
 //The starting point for a multi-game scrape.
 //Allows the user to set various parameters (to set filters, to set which systems to scrape, to enable manual mode).
diff --git a/es-app/src/guis/GuiScreensaverOptions.cpp b/es-app/src/guis/GuiScreensaverOptions.cpp
index bfb15421b..aae8c0c2f 100644
--- a/es-app/src/guis/GuiScreensaverOptions.cpp
+++ b/es-app/src/guis/GuiScreensaverOptions.cpp
@@ -1,9 +1,9 @@
 #include "guis/GuiScreensaverOptions.h"
-#include "Window.h"
-#include "Settings.h"
-#include "views/ViewController.h"
 
-#include "components/ButtonComponent.h"
+#include "views/ViewController.h"
+#include "Settings.h"
+#include "SystemData.h"
+#include "Window.h"
 
 GuiScreensaverOptions::GuiScreensaverOptions(Window* window, const char* title) : GuiComponent(window), mMenu(window, title)
 {
diff --git a/es-app/src/guis/GuiScreensaverOptions.h b/es-app/src/guis/GuiScreensaverOptions.h
index 95ecbb549..6f61489f8 100644
--- a/es-app/src/guis/GuiScreensaverOptions.h
+++ b/es-app/src/guis/GuiScreensaverOptions.h
@@ -2,9 +2,7 @@
 #ifndef ES_APP_GUIS_GUI_SCREENSAVER_OPTIONS_H
 #define ES_APP_GUIS_GUI_SCREENSAVER_OPTIONS_H
 
-#include "GuiComponent.h"
 #include "components/MenuComponent.h"
-#include "SystemData.h"
 
 // This is just a really simple template for a GUI that calls some save functions when closed.
 class GuiScreensaverOptions : public GuiComponent
diff --git a/es-app/src/guis/GuiSettings.cpp b/es-app/src/guis/GuiSettings.cpp
index d1ed7ad60..99d986a62 100644
--- a/es-app/src/guis/GuiSettings.cpp
+++ b/es-app/src/guis/GuiSettings.cpp
@@ -1,7 +1,9 @@
 #include "guis/GuiSettings.h"
-#include "Window.h"
-#include "Settings.h"
+
 #include "views/ViewController.h"
+#include "Settings.h"
+#include "SystemData.h"
+#include "Window.h"
 
 GuiSettings::GuiSettings(Window* window, const char* title) : GuiComponent(window), mMenu(window, title)
 {
diff --git a/es-app/src/guis/GuiSettings.h b/es-app/src/guis/GuiSettings.h
index a1dc8ef56..d5b0d9799 100644
--- a/es-app/src/guis/GuiSettings.h
+++ b/es-app/src/guis/GuiSettings.h
@@ -2,9 +2,7 @@
 #ifndef ES_APP_GUIS_GUI_SETTINGS_H
 #define ES_APP_GUIS_GUI_SETTINGS_H
 
-#include "GuiComponent.h"
 #include "components/MenuComponent.h"
-#include "SystemData.h"
 
 // This is just a really simple template for a GUI that calls some save functions when closed.
 class GuiSettings : public GuiComponent
diff --git a/es-app/src/guis/GuiSlideshowScreensaverOptions.cpp b/es-app/src/guis/GuiSlideshowScreensaverOptions.cpp
index d64709743..3ddfe904f 100644
--- a/es-app/src/guis/GuiSlideshowScreensaverOptions.cpp
+++ b/es-app/src/guis/GuiSlideshowScreensaverOptions.cpp
@@ -1,16 +1,10 @@
 #include "guis/GuiSlideshowScreensaverOptions.h"
-#include "Window.h"
-#include "Settings.h"
-#include "views/ViewController.h"
 
-#include "components/SwitchComponent.h"
 #include "components/SliderComponent.h"
-#include "components/TextComponent.h"
-#include "components/OptionListComponent.h"
-#include "components/MenuComponent.h"
-#include "guis/GuiMsgBox.h"
+#include "components/SwitchComponent.h"
 #include "guis/GuiTextEditPopup.h"
-#include "PowerSaver.h"
+#include "Settings.h"
+#include "Window.h"
 
 GuiSlideshowScreensaverOptions::GuiSlideshowScreensaverOptions(Window* window, const char* title) : GuiScreensaverOptions(window, title)
 {
diff --git a/es-app/src/guis/GuiSlideshowScreensaverOptions.h b/es-app/src/guis/GuiSlideshowScreensaverOptions.h
index 012c38578..70705d0d2 100644
--- a/es-app/src/guis/GuiSlideshowScreensaverOptions.h
+++ b/es-app/src/guis/GuiSlideshowScreensaverOptions.h
@@ -2,7 +2,6 @@
 #ifndef ES_APP_GUIS_GUI_SLIDESHOW_SCREENSAVER_OPTIONS_H
 #define ES_APP_GUIS_GUI_SLIDESHOW_SCREENSAVER_OPTIONS_H
 
-#include "components/MenuComponent.h"
 #include "GuiScreensaverOptions.h"
 
 class GuiSlideshowScreensaverOptions : public GuiScreensaverOptions
diff --git a/es-app/src/guis/GuiVideoScreensaverOptions.cpp b/es-app/src/guis/GuiVideoScreensaverOptions.cpp
index efa940cfc..49307587f 100644
--- a/es-app/src/guis/GuiVideoScreensaverOptions.cpp
+++ b/es-app/src/guis/GuiVideoScreensaverOptions.cpp
@@ -1,14 +1,10 @@
 #include "guis/GuiVideoScreensaverOptions.h"
-#include "Window.h"
-#include "Settings.h"
-#include "views/ViewController.h"
 
-#include "components/SwitchComponent.h"
-#include "components/SliderComponent.h"
 #include "components/OptionListComponent.h"
-#include "components/MenuComponent.h"
+#include "components/SliderComponent.h"
+#include "components/SwitchComponent.h"
 #include "guis/GuiMsgBox.h"
-#include "PowerSaver.h"
+#include "Settings.h"
 
 GuiVideoScreensaverOptions::GuiVideoScreensaverOptions(Window* window, const char* title) : GuiScreensaverOptions(window, title)
 {
diff --git a/es-app/src/guis/GuiVideoScreensaverOptions.h b/es-app/src/guis/GuiVideoScreensaverOptions.h
index 55fa013ce..ecf4e4b2d 100644
--- a/es-app/src/guis/GuiVideoScreensaverOptions.h
+++ b/es-app/src/guis/GuiVideoScreensaverOptions.h
@@ -2,7 +2,6 @@
 #ifndef ES_APP_GUIS_GUI_VIDEO_SCREENSAVER_OPTIONS_H
 #define ES_APP_GUIS_GUI_VIDEO_SCREENSAVER_OPTIONS_H
 
-#include "components/MenuComponent.h"
 #include "GuiScreensaverOptions.h"
 
 class GuiVideoScreensaverOptions : public GuiScreensaverOptions
diff --git a/es-app/src/main.cpp b/es-app/src/main.cpp
index e2352ae19..2e9344a18 100644
--- a/es-app/src/main.cpp
+++ b/es-app/src/main.cpp
@@ -1,31 +1,30 @@
 //EmulationStation, a graphical front-end for ROM browsing. Created by Alec "Aloshi" Lofquist.
 //http://www.aloshi.com
 
-#include <SDL.h>
-#include <iostream>
-#include <iomanip>
-#include "Renderer.h"
-#include "views/ViewController.h"
-#include "SystemData.h"
-#include <boost/filesystem.hpp>
 #include "guis/GuiDetectDevice.h"
 #include "guis/GuiMsgBox.h"
-#include "AudioManager.h"
-#include "platform.h"
-#include "Log.h"
-#include "Window.h"
-#include "SystemScreenSaver.h"
+#include "views/ViewController.h"
+#include "CollectionSystemManager.h"
 #include "EmulationStation.h"
+#include "InputManager.h"
+#include "Log.h"
+#include "platform.h"
 #include "PowerSaver.h"
-#include "Settings.h"
 #include "ScraperCmdLine.h"
-#include <sstream>
-#include <FreeImage.h>
-
+#include "Settings.h"
+#include "SystemData.h"
+#include "SystemScreenSaver.h"
+#include <boost/filesystem/operations.hpp>
+#include <SDL_events.h>
+#include <SDL_main.h>
+#include <SDL_timer.h>
+#include <iostream>
 #ifdef WIN32
 #include <Windows.h>
 #endif
 
+#include <FreeImage.h>
+
 namespace fs = boost::filesystem;
 
 bool scrape_cmdline = false;
diff --git a/es-app/src/scrapers/GamesDBScraper.cpp b/es-app/src/scrapers/GamesDBScraper.cpp
index 2a92e891f..53b1b1302 100644
--- a/es-app/src/scrapers/GamesDBScraper.cpp
+++ b/es-app/src/scrapers/GamesDBScraper.cpp
@@ -1,10 +1,12 @@
 #include "scrapers/GamesDBScraper.h"
+
+#include "FileData.h"
 #include "Log.h"
-#include "pugixml/src/pugixml.hpp"
-#include "MetaData.h"
+#include "PlatformId.h"
 #include "Settings.h"
+#include "SystemData.h"
 #include "Util.h"
-#include <boost/assign.hpp>
+#include <boost/assign/list_of.hpp>
 
 using namespace PlatformIds;
 const std::map<PlatformId, const char*> gamesdb_platformid_map = boost::assign::map_list_of
diff --git a/es-app/src/scrapers/Scraper.cpp b/es-app/src/scrapers/Scraper.cpp
index bf91491cb..8d24d63f1 100644
--- a/es-app/src/scrapers/Scraper.cpp
+++ b/es-app/src/scrapers/Scraper.cpp
@@ -1,11 +1,15 @@
 #include "scrapers/Scraper.h"
-#include "Log.h"
-#include "Settings.h"
-#include <FreeImage.h>
-#include <boost/filesystem.hpp>
-#include <boost/assign.hpp>
 
+#include "FileData.h"
 #include "GamesDBScraper.h"
+#include "Log.h"
+#include "platform.h"
+#include "Settings.h"
+#include "SystemData.h"
+#include <boost/assign/list_of.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <FreeImage.h>
+#include <fstream>
 
 const std::map<std::string, generate_scraper_requests_func> scraper_request_funcs = boost::assign::map_list_of
 	("TheGamesDB", &thegamesdb_generate_scraper_requests);
diff --git a/es-app/src/scrapers/Scraper.h b/es-app/src/scrapers/Scraper.h
index 1539ac9a5..c22344637 100644
--- a/es-app/src/scrapers/Scraper.h
+++ b/es-app/src/scrapers/Scraper.h
@@ -2,16 +2,16 @@
 #ifndef ES_APP_SCRAPERS_SCRAPER_H
 #define ES_APP_SCRAPERS_SCRAPER_H
 
-#include "MetaData.h"
-#include "SystemData.h"
-#include "HttpReq.h"
 #include "AsyncHandle.h"
-#include <vector>
-#include <functional>
+#include "HttpReq.h"
+#include "MetaData.h"
 #include <queue>
 
 #define MAX_SCRAPER_RESULTS 7
 
+class FileData;
+class SystemData;
+
 struct ScraperSearchParams
 {
 	SystemData* system;
diff --git a/es-app/src/views/SystemView.cpp b/es-app/src/views/SystemView.cpp
index beadcfab8..b05566925 100644
--- a/es-app/src/views/SystemView.cpp
+++ b/es-app/src/views/SystemView.cpp
@@ -1,14 +1,12 @@
 #include "views/SystemView.h"
-#include "SystemData.h"
-#include "Renderer.h"
-#include "Log.h"
-#include "Window.h"
-#include "views/ViewController.h"
+
 #include "animations/LambdaAnimation.h"
-#include "PowerSaver.h"
-#include "SystemData.h"
+#include "views/ViewController.h"
+#include "Log.h"
+#include "Renderer.h"
 #include "Settings.h"
-#include "Util.h"
+#include "SystemData.h"
+#include "Window.h"
 
 // buffer values for scrolling velocity (left, stopped, right)
 const int logoBuffersLeft[] = { -5, -2, -1 };
diff --git a/es-app/src/views/SystemView.h b/es-app/src/views/SystemView.h
index 27e805ca0..02fdf1def 100644
--- a/es-app/src/views/SystemView.h
+++ b/es-app/src/views/SystemView.h
@@ -2,15 +2,14 @@
 #ifndef ES_APP_VIEWS_SYSTEM_VIEW_H
 #define ES_APP_VIEWS_SYSTEM_VIEW_H
 
-#include "GuiComponent.h"
-#include "components/ImageComponent.h"
-#include "components/TextComponent.h"
-#include "components/ScrollableContainer.h"
 #include "components/IList.h"
-#include "resources/TextureResource.h"
+#include "components/TextComponent.h"
+#include "resources/Font.h"
+#include "GuiComponent.h"
+#include <memory>
 
-class SystemData;
 class AnimatedImageComponent;
+class SystemData;
 
 enum CarouselType : unsigned int
 {
diff --git a/es-app/src/views/ViewController.cpp b/es-app/src/views/ViewController.cpp
index ee41d1d6c..3ae32b1a4 100644
--- a/es-app/src/views/ViewController.cpp
+++ b/es-app/src/views/ViewController.cpp
@@ -1,19 +1,18 @@
 #include "views/ViewController.h"
-#include "Log.h"
-#include "SystemData.h"
-#include "Settings.h"
-#include "PowerSaver.h"
 
-#include "views/gamelist/BasicGameListView.h"
-#include "views/gamelist/DetailedGameListView.h"
-#include "views/gamelist/VideoGameListView.h"
-#include "views/gamelist/GridGameListView.h"
-#include "guis/GuiMenu.h"
-#include "guis/GuiMsgBox.h"
+#include "animations/Animation.h"
+#include "animations/LambdaAnimation.h"
 #include "animations/LaunchAnimation.h"
 #include "animations/MoveCameraAnimation.h"
-#include "animations/LambdaAnimation.h"
-#include <SDL.h>
+#include "guis/GuiMenu.h"
+#include "views/gamelist/DetailedGameListView.h"
+#include "views/gamelist/IGameListView.h"
+#include "views/gamelist/VideoGameListView.h"
+#include "views/SystemView.h"
+#include "Log.h"
+#include "Settings.h"
+#include "SystemData.h"
+#include "Window.h"
 
 ViewController* ViewController::sInstance = NULL;
 
diff --git a/es-app/src/views/ViewController.h b/es-app/src/views/ViewController.h
index 9e8f2ce30..985df16a8 100644
--- a/es-app/src/views/ViewController.h
+++ b/es-app/src/views/ViewController.h
@@ -2,10 +2,14 @@
 #ifndef ES_APP_VIEWS_VIEW_CONTROLLER_H
 #define ES_APP_VIEWS_VIEW_CONTROLLER_H
 
-#include "views/gamelist/IGameListView.h"
-#include "views/SystemView.h"
+#include "FileData.h"
+#include "GuiComponent.h"
+#include "Renderer.h"
+#include <vector>
 
+class IGameListView;
 class SystemData;
+class SystemView;
 
 const std::vector<std::string> UIModes = { "Full", "Kiosk" };
 
diff --git a/es-app/src/views/gamelist/BasicGameListView.cpp b/es-app/src/views/gamelist/BasicGameListView.cpp
index 0a79250d4..b81e6462d 100644
--- a/es-app/src/views/gamelist/BasicGameListView.cpp
+++ b/es-app/src/views/gamelist/BasicGameListView.cpp
@@ -1,11 +1,10 @@
 #include "views/gamelist/BasicGameListView.h"
+
 #include "views/ViewController.h"
-#include "Renderer.h"
-#include "Window.h"
-#include "ThemeData.h"
-#include "SystemData.h"
+#include "CollectionSystemManager.h"
 #include "Settings.h"
-#include "FileFilterIndex.h"
+#include "SystemData.h"
+#include <boost/filesystem/operations.hpp>
 
 BasicGameListView::BasicGameListView(Window* window, FileData* root)
 	: ISimpleGameListView(window, root), mList(window)
diff --git a/es-app/src/views/gamelist/BasicGameListView.h b/es-app/src/views/gamelist/BasicGameListView.h
index 0ea7c1058..fe16b9636 100644
--- a/es-app/src/views/gamelist/BasicGameListView.h
+++ b/es-app/src/views/gamelist/BasicGameListView.h
@@ -2,8 +2,8 @@
 #ifndef ES_APP_VIEWS_GAME_LIST_BASIC_GAME_LIST_VIEW_H
 #define ES_APP_VIEWS_GAME_LIST_BASIC_GAME_LIST_VIEW_H
 
-#include "views/gamelist/ISimpleGameListView.h"
 #include "components/TextListComponent.h"
+#include "views/gamelist/ISimpleGameListView.h"
 
 class BasicGameListView : public ISimpleGameListView
 {
diff --git a/es-app/src/views/gamelist/DetailedGameListView.cpp b/es-app/src/views/gamelist/DetailedGameListView.cpp
index 145409286..e9d0e49e9 100644
--- a/es-app/src/views/gamelist/DetailedGameListView.cpp
+++ b/es-app/src/views/gamelist/DetailedGameListView.cpp
@@ -1,7 +1,7 @@
 #include "views/gamelist/DetailedGameListView.h"
-#include "views/ViewController.h"
-#include "Window.h"
+
 #include "animations/LambdaAnimation.h"
+#include "views/ViewController.h"
 
 DetailedGameListView::DetailedGameListView(Window* window, FileData* root) : 
 	BasicGameListView(window, root), 
diff --git a/es-app/src/views/gamelist/DetailedGameListView.h b/es-app/src/views/gamelist/DetailedGameListView.h
index bf7eb748f..dfcd389e3 100644
--- a/es-app/src/views/gamelist/DetailedGameListView.h
+++ b/es-app/src/views/gamelist/DetailedGameListView.h
@@ -2,10 +2,10 @@
 #ifndef ES_APP_VIEWS_GAME_LIST_DETAILED_GAME_LIST_VIEW_H
 #define ES_APP_VIEWS_GAME_LIST_DETAILED_GAME_LIST_VIEW_H
 
-#include "views/gamelist/BasicGameListView.h"
-#include "components/ScrollableContainer.h"
-#include "components/RatingComponent.h"
 #include "components/DateTimeComponent.h"
+#include "components/RatingComponent.h"
+#include "components/ScrollableContainer.h"
+#include "views/gamelist/BasicGameListView.h"
 
 class DetailedGameListView : public BasicGameListView
 {
diff --git a/es-app/src/views/gamelist/GridGameListView.cpp b/es-app/src/views/gamelist/GridGameListView.cpp
index 77f9a6f86..cc7680dce 100644
--- a/es-app/src/views/gamelist/GridGameListView.cpp
+++ b/es-app/src/views/gamelist/GridGameListView.cpp
@@ -1,6 +1,5 @@
 #include "views/gamelist/GridGameListView.h"
-#include "ThemeData.h"
-#include "Window.h"
+
 #include "views/ViewController.h"
 
 GridGameListView::GridGameListView(Window* window, FileData* root) : ISimpleGameListView(window, root),
diff --git a/es-app/src/views/gamelist/GridGameListView.h b/es-app/src/views/gamelist/GridGameListView.h
index acfa20a6d..b5072cdfe 100644
--- a/es-app/src/views/gamelist/GridGameListView.h
+++ b/es-app/src/views/gamelist/GridGameListView.h
@@ -2,10 +2,8 @@
 #ifndef ES_APP_VIEWS_GAME_LIST_GRID_GAME_LIST_VIEW_H
 #define ES_APP_VIEWS_GAME_LIST_GRID_GAME_LIST_VIEW_H
 
-#include "views/gamelist/ISimpleGameListView.h"
 #include "components/ImageGridComponent.h"
-#include "components/ImageComponent.h"
-#include <stack>
+#include "views/gamelist/ISimpleGameListView.h"
 
 class GridGameListView : public ISimpleGameListView
 {
diff --git a/es-app/src/views/gamelist/IGameListView.cpp b/es-app/src/views/gamelist/IGameListView.cpp
index 93586893b..5238bb970 100644
--- a/es-app/src/views/gamelist/IGameListView.cpp
+++ b/es-app/src/views/gamelist/IGameListView.cpp
@@ -1,12 +1,9 @@
 #include "views/gamelist/IGameListView.h"
-#include "Window.h"
-#include "guis/GuiMetaDataEd.h"
-#include "guis/GuiMenu.h"
+
 #include "guis/GuiGamelistOptions.h"
 #include "views/ViewController.h"
-#include "Settings.h"
-#include "Log.h"
 #include "Sound.h"
+#include "Window.h"
 
 bool IGameListView::input(InputConfig* config, Input input)
 {
diff --git a/es-app/src/views/gamelist/IGameListView.h b/es-app/src/views/gamelist/IGameListView.h
index da7fd9afd..988981593 100644
--- a/es-app/src/views/gamelist/IGameListView.h
+++ b/es-app/src/views/gamelist/IGameListView.h
@@ -3,12 +3,11 @@
 #define ES_APP_VIEWS_GAME_LIST_IGAME_LIST_VIEW_H
 
 #include "FileData.h"
+#include "GuiComponent.h"
 #include "Renderer.h"
 
-class Window;
-class GuiComponent;
-class FileData;
 class ThemeData;
+class Window;
 
 // This is an interface that defines the minimum for a GameListView.
 class IGameListView : public GuiComponent
diff --git a/es-app/src/views/gamelist/ISimpleGameListView.cpp b/es-app/src/views/gamelist/ISimpleGameListView.cpp
index e7566eaa7..de7e83cf5 100644
--- a/es-app/src/views/gamelist/ISimpleGameListView.cpp
+++ b/es-app/src/views/gamelist/ISimpleGameListView.cpp
@@ -1,11 +1,10 @@
 #include "views/gamelist/ISimpleGameListView.h"
-#include "ThemeData.h"
-#include "Window.h"
+
 #include "views/ViewController.h"
-#include "Sound.h"
-#include "Log.h"
-#include "Settings.h"
 #include "CollectionSystemManager.h"
+#include "Settings.h"
+#include "Sound.h"
+#include "SystemData.h"
 
 ISimpleGameListView::ISimpleGameListView(Window* window, FileData* root) : IGameListView(window, root),
 	mHeaderText(window), mHeaderImage(window), mBackground(window)
diff --git a/es-app/src/views/gamelist/ISimpleGameListView.h b/es-app/src/views/gamelist/ISimpleGameListView.h
index 41a56777e..f2d83b748 100644
--- a/es-app/src/views/gamelist/ISimpleGameListView.h
+++ b/es-app/src/views/gamelist/ISimpleGameListView.h
@@ -2,10 +2,10 @@
 #ifndef ES_APP_VIEWS_GAME_LIST_ISIMPLE_GAME_LIST_VIEW_H
 #define ES_APP_VIEWS_GAME_LIST_ISIMPLE_GAME_LIST_VIEW_H
 
-#include "views/gamelist/IGameListView.h"
-
-#include "components/TextComponent.h"
 #include "components/ImageComponent.h"
+#include "components/TextComponent.h"
+#include "views/gamelist/IGameListView.h"
+#include <stack>
 
 class ISimpleGameListView : public IGameListView
 {
diff --git a/es-app/src/views/gamelist/VideoGameListView.cpp b/es-app/src/views/gamelist/VideoGameListView.cpp
index b84f8ed6b..8f4da1115 100644
--- a/es-app/src/views/gamelist/VideoGameListView.cpp
+++ b/es-app/src/views/gamelist/VideoGameListView.cpp
@@ -1,14 +1,15 @@
 #include "views/gamelist/VideoGameListView.h"
-#include "views/ViewController.h"
-#include "Window.h"
+
 #include "animations/LambdaAnimation.h"
-#include <sys/stat.h>
-#include <fcntl.h>
 #ifdef _RPI_
 #include "components/VideoPlayerComponent.h"
-#include "Settings.h"
 #endif
 #include "components/VideoVlcComponent.h"
+#include "views/ViewController.h"
+#ifdef _RPI_
+#include "Settings.h"
+#endif
+#include <boost/filesystem/operations.hpp>
 
 VideoGameListView::VideoGameListView(Window* window, FileData* root) :
 	BasicGameListView(window, root),
diff --git a/es-app/src/views/gamelist/VideoGameListView.h b/es-app/src/views/gamelist/VideoGameListView.h
index f321056bc..37ba2253f 100644
--- a/es-app/src/views/gamelist/VideoGameListView.h
+++ b/es-app/src/views/gamelist/VideoGameListView.h
@@ -2,11 +2,12 @@
 #ifndef ES_APP_VIEWS_GAME_LIST_VIDEO_GAME_LIST_VIEW_H
 #define ES_APP_VIEWS_GAME_LIST_VIDEO_GAME_LIST_VIEW_H
 
-#include "views/gamelist/BasicGameListView.h"
-#include "components/ScrollableContainer.h"
-#include "components/RatingComponent.h"
 #include "components/DateTimeComponent.h"
-#include "components/VideoComponent.h"
+#include "components/RatingComponent.h"
+#include "components/ScrollableContainer.h"
+#include "views/gamelist/BasicGameListView.h"
+
+class VideoComponent;
 
 class VideoGameListView : public BasicGameListView
 {
diff --git a/es-core/src/AsyncHandle.h b/es-core/src/AsyncHandle.h
index 063983ce2..65ffb5317 100644
--- a/es-core/src/AsyncHandle.h
+++ b/es-core/src/AsyncHandle.h
@@ -2,6 +2,8 @@
 #ifndef ES_CORE_ASYNC_HANDLE_H
 #define ES_CORE_ASYNC_HANDLE_H
 
+#include <string>
+
 enum AsyncHandleStatus
 {
 	ASYNC_IN_PROGRESS,
diff --git a/es-core/src/AudioManager.cpp b/es-core/src/AudioManager.cpp
index 735099bc8..1f298c6fa 100644
--- a/es-core/src/AudioManager.cpp
+++ b/es-core/src/AudioManager.cpp
@@ -1,8 +1,9 @@
 #include "AudioManager.h"
-#include "Settings.h"
 
-#include <SDL.h>
 #include "Log.h"
+#include "Settings.h"
+#include "Sound.h"
+#include <SDL.h>
 
 std::vector<std::shared_ptr<Sound>> AudioManager::sSoundVector;
 SDL_AudioSpec AudioManager::sAudioFormat;
diff --git a/es-core/src/AudioManager.h b/es-core/src/AudioManager.h
index 2777dad59..e27ce1dc2 100644
--- a/es-core/src/AudioManager.h
+++ b/es-core/src/AudioManager.h
@@ -2,13 +2,11 @@
 #ifndef ES_CORE_AUDIO_MANAGER_H
 #define ES_CORE_AUDIO_MANAGER_H
 
-#include <vector>
+#include <SDL_audio.h>
 #include <memory>
+#include <vector>
 
-#include "SDL_audio.h"
-
-#include "Sound.h"
-
+class Sound;
 
 class AudioManager
 {
diff --git a/es-core/src/GuiComponent.cpp b/es-core/src/GuiComponent.cpp
index 8d0b633c5..7211a63bd 100644
--- a/es-core/src/GuiComponent.cpp
+++ b/es-core/src/GuiComponent.cpp
@@ -1,9 +1,11 @@
 #include "GuiComponent.h"
-#include "Window.h"
+
+#include "animations/Animation.h"
+#include "animations/AnimationController.h"
 #include "Log.h"
 #include "Renderer.h"
-#include "animations/AnimationController.h"
 #include "ThemeData.h"
+#include "Window.h"
 
 GuiComponent::GuiComponent(Window* window) : mWindow(window), mParent(NULL), mOpacity(255),
 	mPosition(Vector3f::Zero()), mOrigin(Vector2f::Zero()), mRotationOrigin(0.5, 0.5),
diff --git a/es-core/src/GuiComponent.h b/es-core/src/GuiComponent.h
index 6af92a743..ef1352d10 100644
--- a/es-core/src/GuiComponent.h
+++ b/es-core/src/GuiComponent.h
@@ -2,20 +2,19 @@
 #ifndef ES_CORE_GUI_COMPONENT_H
 #define ES_CORE_GUI_COMPONENT_H
 
-#include "InputConfig.h"
-#include <memory>
-#include <string>
-#include <functional>
-#include "HelpStyle.h"
 #include "math/Transform4x4f.h"
+#include "HelpPrompt.h"
+#include "HelpStyle.h"
+#include "InputConfig.h"
+#include <functional>
+#include <memory>
 
-class Window;
 class Animation;
 class AnimationController;
-class ThemeData;
 class Font;
-
-typedef std::pair<std::string, std::string> HelpPrompt;
+class InputConfig;
+class ThemeData;
+class Window;
 
 class GuiComponent
 {
diff --git a/es-core/src/HelpPrompt.h b/es-core/src/HelpPrompt.h
new file mode 100644
index 000000000..f5145624a
--- /dev/null
+++ b/es-core/src/HelpPrompt.h
@@ -0,0 +1,9 @@
+#pragma once
+#ifndef ES_CORE_HELP_PROMPT_H
+#define ES_CORE_HELP_PROMPT_H
+
+#include <string>
+
+typedef std::pair<std::string, std::string> HelpPrompt;
+
+#endif // ES_CORE_HELP_PROMPT_H
diff --git a/es-core/src/HelpStyle.cpp b/es-core/src/HelpStyle.cpp
index 24807c610..97e679ab5 100644
--- a/es-core/src/HelpStyle.cpp
+++ b/es-core/src/HelpStyle.cpp
@@ -1,7 +1,7 @@
 #include "HelpStyle.h"
-#include "ThemeData.h"
-#include "Renderer.h"
+
 #include "resources/Font.h"
+#include "Renderer.h"
 
 HelpStyle::HelpStyle()
 {
diff --git a/es-core/src/HelpStyle.h b/es-core/src/HelpStyle.h
index 00f8eee98..22f0e77d4 100644
--- a/es-core/src/HelpStyle.h
+++ b/es-core/src/HelpStyle.h
@@ -6,8 +6,8 @@
 #include <memory>
 #include <string>
 
-class ThemeData;
 class Font;
+class ThemeData;
 
 struct HelpStyle
 {
diff --git a/es-core/src/HttpReq.cpp b/es-core/src/HttpReq.cpp
index ca32b205b..f30d663c5 100644
--- a/es-core/src/HttpReq.cpp
+++ b/es-core/src/HttpReq.cpp
@@ -1,7 +1,7 @@
-#include <iostream>
 #include "HttpReq.h"
+
 #include "Log.h"
-#include <boost/filesystem.hpp>
+#include <boost/filesystem/operations.hpp>
 
 CURLM* HttpReq::s_multi_handle = curl_multi_init();
 
diff --git a/es-core/src/HttpReq.h b/es-core/src/HttpReq.h
index 76b2c905d..d5c55b420 100644
--- a/es-core/src/HttpReq.h
+++ b/es-core/src/HttpReq.h
@@ -3,8 +3,8 @@
 #define ES_CORE_HTTP_REQ_H
 
 #include <curl/curl.h>
-#include <sstream>
 #include <map>
+#include <sstream>
 
 /* Usage:
  * HttpReq myRequest("www.google.com", "/index.html");
diff --git a/es-core/src/ImageIO.cpp b/es-core/src/ImageIO.cpp
index 982aa97be..61c1c0c5f 100644
--- a/es-core/src/ImageIO.cpp
+++ b/es-core/src/ImageIO.cpp
@@ -1,9 +1,8 @@
 #include "ImageIO.h"
 
-#include <memory.h>
-
 #include "Log.h"
-
+#include <FreeImage.h>
+#include <string.h>
 
 std::vector<unsigned char> ImageIO::loadFromMemoryRGBA32(const unsigned char * data, const size_t size, size_t & width, size_t & height)
 {
diff --git a/es-core/src/ImageIO.h b/es-core/src/ImageIO.h
index 440efc5d0..ad8ab4806 100644
--- a/es-core/src/ImageIO.h
+++ b/es-core/src/ImageIO.h
@@ -2,8 +2,8 @@
 #ifndef ES_CORE_IMAGE_IO
 #define ES_CORE_IMAGE_IO
 
+#include <stdlib.h>
 #include <vector>
-#include <FreeImage.h>
 
 class ImageIO
 {
diff --git a/es-core/src/InputConfig.cpp b/es-core/src/InputConfig.cpp
index 90b272939..23c6dd6ce 100644
--- a/es-core/src/InputConfig.cpp
+++ b/es-core/src/InputConfig.cpp
@@ -1,10 +1,6 @@
 #include "InputConfig.h"
-#include <string>
-#include <algorithm>
-#include <SDL.h>
-#include <iostream>
+
 #include "Log.h"
-#include "InputManager.h"
 
 //some util functions
 std::string inputTypeToString(InputType type)
diff --git a/es-core/src/InputConfig.h b/es-core/src/InputConfig.h
index 2eaa7de97..d3d0be99e 100644
--- a/es-core/src/InputConfig.h
+++ b/es-core/src/InputConfig.h
@@ -2,12 +2,12 @@
 #ifndef ES_CORE_INPUT_CONFIG_H
 #define ES_CORE_INPUT_CONFIG_H
 
+#include <pugixml/src/pugixml.hpp>
+#include <SDL_joystick.h>
+#include <SDL_keyboard.h>
 #include <map>
-#include <vector>
-#include <string>
-#include <SDL.h>
 #include <sstream>
-#include "pugixml/src/pugixml.hpp"
+#include <vector>
 
 #define DEVICE_KEYBOARD -1
 
diff --git a/es-core/src/InputManager.cpp b/es-core/src/InputManager.cpp
index 610b2d0d2..f102c4911 100644
--- a/es-core/src/InputManager.cpp
+++ b/es-core/src/InputManager.cpp
@@ -1,11 +1,11 @@
 #include "InputManager.h"
-#include "InputConfig.h"
-#include "Settings.h"
-#include "Window.h"
+
 #include "Log.h"
-#include "pugixml/src/pugixml.hpp"
-#include <boost/filesystem.hpp>
 #include "platform.h"
+#include "Window.h"
+#include <boost/filesystem/operations.hpp>
+#include <SDL.h>
+#include <iostream>
 
 #define KEYBOARD_GUID_STRING "-1"
 
diff --git a/es-core/src/InputManager.h b/es-core/src/InputManager.h
index 7404e9ccf..6d24c0f4b 100644
--- a/es-core/src/InputManager.h
+++ b/es-core/src/InputManager.h
@@ -2,13 +2,12 @@
 #ifndef ES_CORE_INPUT_MANAGER_H
 #define ES_CORE_INPUT_MANAGER_H
 
-#include <SDL.h>
-#include <vector>
+#include <SDL_joystick.h>
 #include <map>
-#include <string>
 
 class InputConfig;
 class Window;
+union SDL_Event;
 
 //you should only ever instantiate one of these, by the way
 class InputManager
diff --git a/es-core/src/Log.cpp b/es-core/src/Log.cpp
index 811bbb8cc..536144aa2 100644
--- a/es-core/src/Log.cpp
+++ b/es-core/src/Log.cpp
@@ -1,9 +1,7 @@
 #include "Log.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <iostream>
-#include <stdio.h>
+
 #include "platform.h"
+#include <iostream>
 
 LogLevel Log::reportingLevel = LogInfo;
 FILE* Log::file = NULL; //fopen(getLogPath().c_str(), "w");
diff --git a/es-core/src/Log.h b/es-core/src/Log.h
index 1ef6e32b7..0b69a74fe 100644
--- a/es-core/src/Log.h
+++ b/es-core/src/Log.h
@@ -2,14 +2,12 @@
 #ifndef ES_CORE_LOG_H
 #define ES_CORE_LOG_H
 
+#include <sstream>
+
 #define LOG(level) \
 if(level > Log::getReportingLevel()) ; \
 else Log().get(level)
 
-#include <string>
-#include <sstream>
-#include <iostream>
-
 enum LogLevel { LogError, LogWarning, LogInfo, LogDebug };
 
 class Log
diff --git a/es-core/src/PowerSaver.cpp b/es-core/src/PowerSaver.cpp
index a7805ca71..8c68955f9 100644
--- a/es-core/src/PowerSaver.cpp
+++ b/es-core/src/PowerSaver.cpp
@@ -1,7 +1,7 @@
 #include "PowerSaver.h"
+
 #include "AudioManager.h"
 #include "Settings.h"
-#include <string.h>
 
 bool PowerSaver::mState = false;
 bool PowerSaver::mRunningScreenSaver = false;
diff --git a/es-core/src/Renderer.h b/es-core/src/Renderer.h
index 2700867c4..3a84ba360 100644
--- a/es-core/src/Renderer.h
+++ b/es-core/src/Renderer.h
@@ -2,15 +2,13 @@
 #ifndef ES_CORE_RENDERER_H
 #define ES_CORE_RENDERER_H
 
-#include <vector>
-#include <string>
+#include "math/Vector2i.h"
 #include "platform.h"
 #include GLHEADER
-#include "math/Transform4x4f.h"
-#include "math/Vector2i.h"
 
-class GuiComponent;
 class Font;
+class GuiComponent;
+class Transform4x4f;
 
 //The Renderer provides several higher-level functions for drawing (rectangles, text, etc.).
 //Renderer_draw_gl.cpp has most of the higher-level functions and wrappers.
diff --git a/es-core/src/Renderer_draw_gl.cpp b/es-core/src/Renderer_draw_gl.cpp
index 6677efe43..539ef5d6e 100644
--- a/es-core/src/Renderer_draw_gl.cpp
+++ b/es-core/src/Renderer_draw_gl.cpp
@@ -1,12 +1,8 @@
-#include "platform.h"
 #include "Renderer.h"
-#include GLHEADER
-#include <iostream>
-#include "resources/Font.h"
-#include <boost/filesystem.hpp>
+
 #include "Log.h"
+#include <math.h>
 #include <stack>
-#include "Util.h"
 
 namespace Renderer {
 	struct ClipRect {
diff --git a/es-core/src/Renderer_init_sdlgl.cpp b/es-core/src/Renderer_init_sdlgl.cpp
index b203f58f6..8e161405a 100644
--- a/es-core/src/Renderer_init_sdlgl.cpp
+++ b/es-core/src/Renderer_init_sdlgl.cpp
@@ -1,13 +1,10 @@
 #include "Renderer.h"
-#include <iostream>
-#include "platform.h"
-#include GLHEADER
-#include "resources/Font.h"
-#include <SDL.h>
-#include "Log.h"
-#include "ImageIO.h"
+
 #include "../data/Resources.h"
+#include "ImageIO.h"
+#include "Log.h"
 #include "Settings.h"
+#include <SDL.h>
 
 #ifdef USE_OPENGL_ES
 	#define glOrtho glOrthof
diff --git a/es-core/src/Settings.cpp b/es-core/src/Settings.cpp
index faf9529ba..cb1ff06d8 100644
--- a/es-core/src/Settings.cpp
+++ b/es-core/src/Settings.cpp
@@ -1,9 +1,10 @@
 #include "Settings.h"
+
 #include "Log.h"
-#include "pugixml/src/pugixml.hpp"
 #include "platform.h"
-#include <boost/filesystem.hpp>
-#include <boost/assign.hpp>
+#include <boost/assign/list_of.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <pugixml/src/pugixml.hpp>
 
 Settings* Settings::sInstance = NULL;
 
diff --git a/es-core/src/Settings.h b/es-core/src/Settings.h
index 6ab80c8fc..413694b71 100644
--- a/es-core/src/Settings.h
+++ b/es-core/src/Settings.h
@@ -2,7 +2,6 @@
 #ifndef ES_CORE_SETTINGS_H
 #define ES_CORE_SETTINGS_H
 
-#include <string>
 #include <map>
 
 //This is a singleton for storing settings.
diff --git a/es-core/src/Sound.cpp b/es-core/src/Sound.cpp
index 22d17b959..bf879379a 100644
--- a/es-core/src/Sound.cpp
+++ b/es-core/src/Sound.cpp
@@ -1,4 +1,5 @@
 #include "Sound.h"
+
 #include "AudioManager.h"
 #include "Log.h"
 #include "Settings.h"
diff --git a/es-core/src/Sound.h b/es-core/src/Sound.h
index 1f1421932..d54688d8d 100644
--- a/es-core/src/Sound.h
+++ b/es-core/src/Sound.h
@@ -2,10 +2,9 @@
 #ifndef ES_CORE_SOUND_H
 #define ES_CORE_SOUND_H
 
-#include <string>
+#include "SDL_audio.h"
 #include <map>
 #include <memory>
-#include "SDL_audio.h"
 
 class ThemeData;
 
diff --git a/es-core/src/ThemeData.cpp b/es-core/src/ThemeData.cpp
index c684e8bdd..0ed7bb9da 100644
--- a/es-core/src/ThemeData.cpp
+++ b/es-core/src/ThemeData.cpp
@@ -1,17 +1,13 @@
 #include "ThemeData.h"
-#include "Renderer.h"
-#include "resources/Font.h"
-#include "Sound.h"
-#include "resources/TextureResource.h"
-#include "Log.h"
-#include "Settings.h"
-#include "pugixml/src/pugixml.hpp"
-#include <boost/assign.hpp>
-#include <boost/xpressive/xpressive.hpp>
 
 #include "components/ImageComponent.h"
 #include "components/TextComponent.h"
-
+#include "Log.h"
+#include "platform.h"
+#include "Settings.h"
+#include <boost/assign/list_of.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/xpressive/xpressive_static.hpp>
 
 // This is a work around for some ambiguity that is introduced in C++11 that boost::assign::map_list_of leave open.
 // We use makeMap(actualmap) to implicitly convert the boost::assign::map_list_of's return type to ElementMapType.
diff --git a/es-core/src/ThemeData.h b/es-core/src/ThemeData.h
index 530e62455..55efdbec1 100644
--- a/es-core/src/ThemeData.h
+++ b/es-core/src/ThemeData.h
@@ -2,24 +2,22 @@
 #ifndef ES_CORE_THEME_DATA_H
 #define ES_CORE_THEME_DATA_H
 
-#include <iostream>
-#include <sstream>
-#include <memory>
-#include <map>
+#include "math/Vector2f.h"
+#include <boost/filesystem/path.hpp>
+#include <boost/variant/get.hpp>
+#include <boost/variant/variant.hpp>
+#include <pugixml/src/pugixml.hpp>
 #include <deque>
-#include <string>
-#include <boost/filesystem.hpp>
-#include <boost/variant.hpp>
-#include <boost/xpressive/xpressive.hpp>
-#include "pugixml/src/pugixml.hpp"
-#include "GuiComponent.h"
+#include <map>
+#include <sstream>
 
 template<typename T>
 class TextListComponent;
 
-class Sound;
+class GuiComponent;
 class ImageComponent;
 class NinePatchComponent;
+class Sound;
 class TextComponent;
 class Window;
 
diff --git a/es-core/src/Util.cpp b/es-core/src/Util.cpp
index a56050faa..b36d4d233 100644
--- a/es-core/src/Util.cpp
+++ b/es-core/src/Util.cpp
@@ -1,7 +1,10 @@
 #include "Util.h"
-#include "resources/ResourceManager.h"
+
 #include "platform.h"
-#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/date_time/posix_time/posix_time_io.hpp>
+#include <boost/filesystem/operations.hpp>
 
 namespace fs = boost::filesystem;
 
diff --git a/es-core/src/Util.h b/es-core/src/Util.h
index c0d91ecb5..44091ca35 100644
--- a/es-core/src/Util.h
+++ b/es-core/src/Util.h
@@ -2,11 +2,8 @@
 #ifndef ES_CORE_UTIL_H
 #define ES_CORE_UTIL_H
 
-#include <string>
-#include <boost/filesystem.hpp>
-#include <boost/date_time.hpp>
-#include "math/Transform4x4f.h"
-#include "math/Vector2f.h"
+#include <boost/date_time/posix_time/ptime.hpp>
+#include <boost/filesystem/path.hpp>
 
 std::string strToUpper(const char* from);
 std::string& strToUpper(std::string& str);
diff --git a/es-core/src/Window.cpp b/es-core/src/Window.cpp
index 81dcc1226..a5493cff2 100644
--- a/es-core/src/Window.cpp
+++ b/es-core/src/Window.cpp
@@ -1,13 +1,13 @@
 #include "Window.h"
-#include <iostream>
-#include "Renderer.h"
-#include "AudioManager.h"
-#include "Log.h"
-#include "Settings.h"
-#include <algorithm>
-#include <iomanip>
+
 #include "components/HelpComponent.h"
 #include "components/ImageComponent.h"
+#include "resources/Font.h"
+#include "resources/TextureResource.h"
+#include "InputManager.h"
+#include "Log.h"
+#include "Renderer.h"
+#include <iomanip>
 
 Window::Window() : mNormalizeNextUpdate(false), mFrameTimeElapsed(0), mFrameCountElapsed(0), mAverageDeltaTime(10),
 	mAllowSleep(true), mSleeping(false), mTimeSinceLastInput(0), mScreenSaver(NULL), mRenderScreenSaver(false), mInfoPopup(NULL)
diff --git a/es-core/src/Window.h b/es-core/src/Window.h
index 751bc12c1..3ae220398 100644
--- a/es-core/src/Window.h
+++ b/es-core/src/Window.h
@@ -2,15 +2,21 @@
 #ifndef ES_CORE_WINDOW_H
 #define ES_CORE_WInDOW_H
 
-#include "GuiComponent.h"
-#include "InputManager.h"
+#include "HelpPrompt.h"
+#include "InputConfig.h"
 #include "Settings.h"
-#include <vector>
-#include "resources/Font.h"
+
+#include <memory>
 
 class FileData;
+class Font;
+class GuiComponent;
 class HelpComponent;
 class ImageComponent;
+class InputConfig;
+class TextCache;
+class Transform4x4f;
+struct HelpStyle;
 
 class Window
 {
diff --git a/es-core/src/animations/AnimationController.cpp b/es-core/src/animations/AnimationController.cpp
index 245aeb926..b872af3d0 100644
--- a/es-core/src/animations/AnimationController.cpp
+++ b/es-core/src/animations/AnimationController.cpp
@@ -1,5 +1,7 @@
 #include "animations/AnimationController.h"
 
+#include "animations/Animation.h"
+
 AnimationController::AnimationController(Animation* anim, int delay, std::function<void()> finishedCallback, bool reverse)
 	: mAnimation(anim), mFinishedCallback(finishedCallback), mReverse(reverse), mTime(-delay), mDelay(delay)
 {
diff --git a/es-core/src/animations/AnimationController.h b/es-core/src/animations/AnimationController.h
index b9c8cf60a..202a7a7b6 100644
--- a/es-core/src/animations/AnimationController.h
+++ b/es-core/src/animations/AnimationController.h
@@ -2,9 +2,9 @@
 #ifndef ES_CORE_ANIMATIONS_ANIMATION_CONTROLLER_H
 #define ES_CORE_ANIMATIONS_ANIMATION_CONTROLLER_H
 
-#include <memory>
 #include <functional>
-#include "animations/Animation.h"
+
+class Animation;
 
 class AnimationController
 {
diff --git a/es-core/src/components/AnimatedImageComponent.cpp b/es-core/src/components/AnimatedImageComponent.cpp
index 6ecb8722f..6b36b10aa 100644
--- a/es-core/src/components/AnimatedImageComponent.cpp
+++ b/es-core/src/components/AnimatedImageComponent.cpp
@@ -1,4 +1,7 @@
 #include "components/AnimatedImageComponent.h"
+
+#include "components/ImageComponent.h"
+#include "resources/ResourceManager.h"
 #include "Log.h"
 
 AnimatedImageComponent::AnimatedImageComponent(Window* window) : GuiComponent(window), mEnabled(false)
diff --git a/es-core/src/components/AnimatedImageComponent.h b/es-core/src/components/AnimatedImageComponent.h
index 3d35e044d..dce1b9079 100644
--- a/es-core/src/components/AnimatedImageComponent.h
+++ b/es-core/src/components/AnimatedImageComponent.h
@@ -3,7 +3,8 @@
 #define ES_CORE_COMPONENTS_ANIMATED_IMAGE_COMPONENT_H
 
 #include "GuiComponent.h"
-#include "ImageComponent.h"
+
+class ImageComponent;
 
 struct AnimationFrame
 {
diff --git a/es-core/src/components/BusyComponent.cpp b/es-core/src/components/BusyComponent.cpp
index 39826f906..17f36df08 100644
--- a/es-core/src/components/BusyComponent.cpp
+++ b/es-core/src/components/BusyComponent.cpp
@@ -1,6 +1,7 @@
 #include "BusyComponent.h"
 
 #include "components/AnimatedImageComponent.h"
+#include "components/ImageComponent.h"
 #include "components/TextComponent.h"
 #include "Renderer.h"
 
diff --git a/es-core/src/components/BusyComponent.h b/es-core/src/components/BusyComponent.h
index 1831f205b..fe996a31c 100644
--- a/es-core/src/components/BusyComponent.h
+++ b/es-core/src/components/BusyComponent.h
@@ -2,9 +2,9 @@
 #ifndef ES_CORE_COMPONENTS_BUSY_COMPONENT_H
 #define ES_CORE_COMPONENTS_BUSY_COMPONENT_H
 
-#include "GuiComponent.h"
 #include "components/ComponentGrid.h"
 #include "components/NinePatchComponent.h"
+#include "GuiComponent.h"
 
 class AnimatedImageComponent;
 class TextComponent;
diff --git a/es-core/src/components/ButtonComponent.cpp b/es-core/src/components/ButtonComponent.cpp
index fce92ca9c..4ef998406 100644
--- a/es-core/src/components/ButtonComponent.cpp
+++ b/es-core/src/components/ButtonComponent.cpp
@@ -1,8 +1,8 @@
 #include "components/ButtonComponent.h"
+
+#include "resources/Font.h"
 #include "Renderer.h"
-#include "Window.h"
 #include "Util.h"
-#include "Log.h"
 
 ButtonComponent::ButtonComponent(Window* window, const std::string& text, const std::string& helpText, const std::function<void()>& func) : GuiComponent(window),
 	mBox(window, ":/button.png"),
diff --git a/es-core/src/components/ButtonComponent.h b/es-core/src/components/ButtonComponent.h
index 5a8c1c6ac..65288209c 100644
--- a/es-core/src/components/ButtonComponent.h
+++ b/es-core/src/components/ButtonComponent.h
@@ -2,10 +2,10 @@
 #ifndef ES_CORE_COMPONENTS_BUTTON_COMPONENT_H
 #define ES_CORE_COMPONENTS_BUTTON_COMPONENT_H
 
-#include "GuiComponent.h"
-#include <functional>
-#include "resources/Font.h"
 #include "components/NinePatchComponent.h"
+#include "GuiComponent.h"
+
+class TextCache;
 
 class ButtonComponent : public GuiComponent
 {
diff --git a/es-core/src/components/ComponentGrid.cpp b/es-core/src/components/ComponentGrid.cpp
index dd54cc7d8..5d004d6d8 100644
--- a/es-core/src/components/ComponentGrid.cpp
+++ b/es-core/src/components/ComponentGrid.cpp
@@ -1,5 +1,5 @@
 #include "components/ComponentGrid.h"
-#include "Log.h"
+
 #include "Renderer.h"
 #include "Settings.h"
 
diff --git a/es-core/src/components/ComponentGrid.h b/es-core/src/components/ComponentGrid.h
index 19297d917..c6b26c347 100644
--- a/es-core/src/components/ComponentGrid.h
+++ b/es-core/src/components/ComponentGrid.h
@@ -2,8 +2,8 @@
 #ifndef ES_CORE_COMPONENTS_COMPONENT_GRID_H
 #define ES_CORE_COMPONENTS_COMPONENT_GRID_H
 
-#include "GuiComponent.h"
 #include "math/Vector2i.h"
+#include "GuiComponent.h"
 
 namespace GridFlags
 {
diff --git a/es-core/src/components/ComponentList.cpp b/es-core/src/components/ComponentList.cpp
index 7f2a2fc26..1e28afffa 100644
--- a/es-core/src/components/ComponentList.cpp
+++ b/es-core/src/components/ComponentList.cpp
@@ -1,6 +1,6 @@
 #include "components/ComponentList.h"
-#include "Util.h"
-#include "Log.h"
+
+#include "Renderer.h"
 
 #define TOTAL_HORIZONTAL_PADDING_PX 20
 
diff --git a/es-core/src/components/ComponentList.h b/es-core/src/components/ComponentList.h
index b02196944..429b5f5d6 100644
--- a/es-core/src/components/ComponentList.h
+++ b/es-core/src/components/ComponentList.h
@@ -3,7 +3,6 @@
 #define ES_CORE_COMPONENTS_COMPONENT_LIST_H
 
 #include "IList.h"
-#include <functional>
 
 struct ComponentListElement
 {
diff --git a/es-core/src/components/DateTimeComponent.cpp b/es-core/src/components/DateTimeComponent.cpp
index 2c0f316d8..7d3433439 100644
--- a/es-core/src/components/DateTimeComponent.cpp
+++ b/es-core/src/components/DateTimeComponent.cpp
@@ -1,8 +1,9 @@
 #include "components/DateTimeComponent.h"
+
+#include "resources/Font.h"
 #include "Renderer.h"
-#include "Window.h"
-#include "Log.h"
 #include "Util.h"
+#include <boost/date_time.hpp>
 
 DateTimeComponent::DateTimeComponent(Window* window, DisplayMode dispMode) : GuiComponent(window), 
 	mEditing(false), mEditIndex(0), mDisplayMode(dispMode), mRelativeUpdateAccumulator(0), 
diff --git a/es-core/src/components/DateTimeComponent.h b/es-core/src/components/DateTimeComponent.h
index 303c848df..29e940c67 100644
--- a/es-core/src/components/DateTimeComponent.h
+++ b/es-core/src/components/DateTimeComponent.h
@@ -3,8 +3,9 @@
 #define ES_CORE_COMPONENTS_DATE_TIME_COMPONENT_H
 
 #include "GuiComponent.h"
-#include <boost/date_time.hpp>
-#include "resources/Font.h"
+#include <boost/date_time/posix_time/ptime.hpp>
+
+class TextCache;
 
 // Used to enter or display a specific point in time.
 class DateTimeComponent : public GuiComponent
diff --git a/es-core/src/components/HelpComponent.cpp b/es-core/src/components/HelpComponent.cpp
index ff6ca5c21..a54cdbf9a 100644
--- a/es-core/src/components/HelpComponent.cpp
+++ b/es-core/src/components/HelpComponent.cpp
@@ -1,12 +1,13 @@
 #include "components/HelpComponent.h"
-#include "Renderer.h"
-#include "Settings.h"
-#include "Log.h"
-#include "Util.h"
+
+#include "components/ComponentGrid.h"
 #include "components/ImageComponent.h"
 #include "components/TextComponent.h"
-#include "components/ComponentGrid.h"
-#include <boost/assign.hpp>
+#include "resources/TextureResource.h"
+#include "Log.h"
+#include "Settings.h"
+#include "Util.h"
+#include <boost/assign/list_of.hpp>
 
 #define OFFSET_X 12 // move the entire thing right by this amount (px)
 #define OFFSET_Y 12 // move the entire thing up by this amount (px)
diff --git a/es-core/src/components/HelpComponent.h b/es-core/src/components/HelpComponent.h
index 49710dea6..e9c5d2e07 100644
--- a/es-core/src/components/HelpComponent.h
+++ b/es-core/src/components/HelpComponent.h
@@ -5,9 +5,9 @@
 #include "GuiComponent.h"
 #include "HelpStyle.h"
 
+class ComponentGrid;
 class ImageComponent;
 class TextureResource;
-class ComponentGrid;
 
 class HelpComponent : public GuiComponent
 {
diff --git a/es-core/src/components/IList.h b/es-core/src/components/IList.h
index 261c63b70..dd584e7a0 100644
--- a/es-core/src/components/IList.h
+++ b/es-core/src/components/IList.h
@@ -2,13 +2,8 @@
 #ifndef ES_CORE_COMPONENTS_ILIST_H
 #define ES_CORE_COMPONENTS_ILIST_H
 
-#include <string>
-#include <vector>
-#include <memory>
-#include "GuiComponent.h"
 #include "components/ImageComponent.h"
 #include "resources/Font.h"
-#include "Renderer.h"
 #include "PowerSaver.h"
 
 enum CursorState
diff --git a/es-core/src/components/ImageComponent.cpp b/es-core/src/components/ImageComponent.cpp
index 6db4424a3..5cadc5534 100644
--- a/es-core/src/components/ImageComponent.cpp
+++ b/es-core/src/components/ImageComponent.cpp
@@ -1,11 +1,9 @@
 #include "components/ImageComponent.h"
-#include <iostream>
-#include <boost/filesystem.hpp>
-#include <math.h>
+
+#include "resources/TextureResource.h"
 #include "Log.h"
 #include "Renderer.h"
 #include "ThemeData.h"
-#include "Util.h"
 
 Vector2i ImageComponent::getTextureSize() const
 {
diff --git a/es-core/src/components/ImageComponent.h b/es-core/src/components/ImageComponent.h
index 7f0ef8379..d95fd6c18 100644
--- a/es-core/src/components/ImageComponent.h
+++ b/es-core/src/components/ImageComponent.h
@@ -2,13 +2,12 @@
 #ifndef ES_CORE_COMPONENTS_IMAGE_COMPONENT_H
 #define ES_CORE_COMPONENTS_IMAGE_COMPONENT_H
 
+#include "math/Vector2i.h"
+#include "GuiComponent.h"
 #include "platform.h"
 #include GLHEADER
 
-#include "GuiComponent.h"
-#include <string>
-#include <memory>
-#include "resources/TextureResource.h"
+class TextureResource;
 
 class ImageComponent : public GuiComponent
 {
diff --git a/es-core/src/components/ImageGridComponent.h b/es-core/src/components/ImageGridComponent.h
index 9c1b8645d..8f76f4c24 100644
--- a/es-core/src/components/ImageGridComponent.h
+++ b/es-core/src/components/ImageGridComponent.h
@@ -2,10 +2,8 @@
 #ifndef ES_CORE_COMPONENTS_IMAGE_GRID_COMPONENT_H
 #define ES_CORE_COMPONENTS_IMAGE_GRID_COMPONENT_H
 
-#include "GuiComponent.h"
 #include "components/IList.h"
-#include "components/ImageComponent.h"
-#include "Log.h"
+#include "resources/TextureResource.h"
 
 struct ImageGridData
 {
diff --git a/es-core/src/components/MenuComponent.cpp b/es-core/src/components/MenuComponent.cpp
index ad3c089a1..63348d6c4 100644
--- a/es-core/src/components/MenuComponent.cpp
+++ b/es-core/src/components/MenuComponent.cpp
@@ -1,4 +1,5 @@
 #include "components/MenuComponent.h"
+
 #include "components/ButtonComponent.h"
 
 #define BUTTON_GRID_VERT_PADDING 32
diff --git a/es-core/src/components/MenuComponent.h b/es-core/src/components/MenuComponent.h
index 221f1724d..8574d8823 100644
--- a/es-core/src/components/MenuComponent.h
+++ b/es-core/src/components/MenuComponent.h
@@ -2,10 +2,11 @@
 #ifndef ES_CORE_COMPONENTS_MENU_COMPONENT_H
 #define ES_CORE_COMPONENTS_MENU_COMPONENT_H
 
-#include "components/NinePatchComponent.h"
-#include "components/ComponentList.h"
-#include "components/TextComponent.h"
 #include "components/ComponentGrid.h"
+#include "components/ComponentList.h"
+#include "components/NinePatchComponent.h"
+#include "components/TextComponent.h"
+#include "Renderer.h"
 #include "Util.h"
 
 class ButtonComponent;
diff --git a/es-core/src/components/NinePatchComponent.cpp b/es-core/src/components/NinePatchComponent.cpp
index b003777de..cc346c0db 100644
--- a/es-core/src/components/NinePatchComponent.cpp
+++ b/es-core/src/components/NinePatchComponent.cpp
@@ -1,9 +1,9 @@
 #include "components/NinePatchComponent.h"
-#include "Window.h"
+
+#include "resources/TextureResource.h"
 #include "Log.h"
 #include "Renderer.h"
 #include "ThemeData.h"
-#include "Util.h"
 
 NinePatchComponent::NinePatchComponent(Window* window, const std::string& path, unsigned int edgeColor, unsigned int centerColor) : GuiComponent(window),
 	mEdgeColor(edgeColor), mCenterColor(centerColor), 
diff --git a/es-core/src/components/NinePatchComponent.h b/es-core/src/components/NinePatchComponent.h
index 43a634db5..5d08ecd64 100644
--- a/es-core/src/components/NinePatchComponent.h
+++ b/es-core/src/components/NinePatchComponent.h
@@ -3,7 +3,10 @@
 #define ES_CORE_COMPONENTS_NINE_PATCH_COMPONENT_H
 
 #include "GuiComponent.h"
-#include "resources/TextureResource.h"
+#include "platform.h"
+#include GLHEADER
+
+class TextureResource;
 
 // Display an image in a way so that edges don't get too distorted no matter the final size. Useful for UI elements like backgrounds, buttons, etc.
 // This is accomplished by splitting an image into 9 pieces:
diff --git a/es-core/src/components/OptionListComponent.h b/es-core/src/components/OptionListComponent.h
index 9047ee7f5..59585b296 100644
--- a/es-core/src/components/OptionListComponent.h
+++ b/es-core/src/components/OptionListComponent.h
@@ -3,14 +3,8 @@
 #define ES_CORE_COMPONENTS_OPTION_LIST_COMPONENT_H
 
 #include "GuiComponent.h"
-#include "resources/Font.h"
-#include "Renderer.h"
-#include "Window.h"
-#include "components/TextComponent.h"
-#include "components/ImageComponent.h"
-#include "components/MenuComponent.h"
-#include <sstream>
 #include "Log.h"
+#include "Window.h"
 
 //Used to display a list of options.
 //Can select one or multiple options.
diff --git a/es-core/src/components/ScrollableContainer.cpp b/es-core/src/components/ScrollableContainer.cpp
index cca09f967..489263e15 100644
--- a/es-core/src/components/ScrollableContainer.cpp
+++ b/es-core/src/components/ScrollableContainer.cpp
@@ -1,6 +1,6 @@
 #include "components/ScrollableContainer.h"
+
 #include "Renderer.h"
-#include "Log.h"
 
 #define AUTO_SCROLL_RESET_DELAY 3000 // ms to reset to top after we reach the bottom
 #define AUTO_SCROLL_DELAY 1000 // ms to wait before we start to scroll
diff --git a/es-core/src/components/SliderComponent.cpp b/es-core/src/components/SliderComponent.cpp
index b169c7c73..b2e9f61eb 100644
--- a/es-core/src/components/SliderComponent.cpp
+++ b/es-core/src/components/SliderComponent.cpp
@@ -1,9 +1,7 @@
 #include "components/SliderComponent.h"
-#include <assert.h>
-#include "Renderer.h"
+
 #include "resources/Font.h"
-#include "Log.h"
-#include "Util.h"
+#include "Renderer.h"
 
 #define MOVE_REPEAT_DELAY 500
 #define MOVE_REPEAT_RATE 40
diff --git a/es-core/src/components/SliderComponent.h b/es-core/src/components/SliderComponent.h
index 2dc784c8b..e4297d5b7 100644
--- a/es-core/src/components/SliderComponent.h
+++ b/es-core/src/components/SliderComponent.h
@@ -2,11 +2,11 @@
 #ifndef ES_CORE_COMPONENTS_SLIDER_COMPONENT_H
 #define ES_CORE_COMPONENTS_SLIDER_COMPONENT_H
 
-#include "GuiComponent.h"
 #include "components/ImageComponent.h"
+#include "GuiComponent.h"
 
-class TextCache;
 class Font;
+class TextCache;
 
 // Used to display/edit a value between some min and max values.
 class SliderComponent : public GuiComponent
diff --git a/es-core/src/components/SwitchComponent.cpp b/es-core/src/components/SwitchComponent.cpp
index f199109a6..ec549020b 100644
--- a/es-core/src/components/SwitchComponent.cpp
+++ b/es-core/src/components/SwitchComponent.cpp
@@ -1,7 +1,7 @@
 #include "SwitchComponent.h"
-#include "Renderer.h"
+
 #include "resources/Font.h"
-#include "Window.h"
+#include "Renderer.h"
 
 SwitchComponent::SwitchComponent(Window* window, bool state) : GuiComponent(window), mImage(window), mState(state)
 {
diff --git a/es-core/src/components/SwitchComponent.h b/es-core/src/components/SwitchComponent.h
index 1cff70e38..2e2d83f6b 100644
--- a/es-core/src/components/SwitchComponent.h
+++ b/es-core/src/components/SwitchComponent.h
@@ -2,8 +2,8 @@
 #ifndef ES_CORE_COMPONENTS_SWITCH_COMPONENT_H
 #define ES_CORE_COMPONENTS_SWITCH_COMPONENT_H
 
-#include "GuiComponent.h"
 #include "components/ImageComponent.h"
+#include "GuiComponent.h"
 
 // A very simple "on/off" switch.
 // Should hopefully be switched to use images instead of text in the future.
diff --git a/es-core/src/components/TextComponent.cpp b/es-core/src/components/TextComponent.cpp
index 29cdc0d9d..633d939d6 100644
--- a/es-core/src/components/TextComponent.cpp
+++ b/es-core/src/components/TextComponent.cpp
@@ -1,11 +1,9 @@
 #include "components/TextComponent.h"
 
-#include "Renderer.h"
 #include "Log.h"
-#include "Window.h"
-#include "ThemeData.h"
-#include "Util.h"
+#include "Renderer.h"
 #include "Settings.h"
+#include "Util.h"
 
 TextComponent::TextComponent(Window* window) : GuiComponent(window), 
 	mFont(Font::get(FONT_SIZE_MEDIUM)), mUppercase(false), mColor(0x000000FF), mAutoCalcExtent(true, true),
diff --git a/es-core/src/components/TextComponent.h b/es-core/src/components/TextComponent.h
index 1fc9c8036..2603327f9 100644
--- a/es-core/src/components/TextComponent.h
+++ b/es-core/src/components/TextComponent.h
@@ -2,8 +2,8 @@
 #ifndef ES_CORE_COMPONENTS_TEXT_COMPONENT_H
 #define ES_CORE_COMPONENTS_TEXT_COMPONENT_H
 
-#include "GuiComponent.h"
 #include "resources/Font.h"
+#include "GuiComponent.h"
 
 class ThemeData;
 
diff --git a/es-core/src/components/TextEditComponent.cpp b/es-core/src/components/TextEditComponent.cpp
index 10e4e192c..2fb4f16c4 100644
--- a/es-core/src/components/TextEditComponent.cpp
+++ b/es-core/src/components/TextEditComponent.cpp
@@ -1,9 +1,7 @@
 #include "components/TextEditComponent.h"
-#include "Log.h"
+
 #include "resources/Font.h"
-#include "Window.h"
 #include "Renderer.h"
-#include "Util.h"
 
 #define TEXT_PADDING_HORIZ 10
 #define TEXT_PADDING_VERT 2
diff --git a/es-core/src/components/TextEditComponent.h b/es-core/src/components/TextEditComponent.h
index 57ef54d13..74e743a2e 100644
--- a/es-core/src/components/TextEditComponent.h
+++ b/es-core/src/components/TextEditComponent.h
@@ -2,8 +2,8 @@
 #ifndef ES_CORE_COMPONENTS_TEXT_EDIT_COMPONENT_H
 #define ES_CORE_COMPONENTS_TEXT_EDIT_COMPONENT_H
 
-#include "GuiComponent.h"
 #include "components/NinePatchComponent.h"
+#include "GuiComponent.h"
 
 class Font;
 class TextCache;
diff --git a/es-core/src/components/VideoComponent.cpp b/es-core/src/components/VideoComponent.cpp
index b71d73fdb..9b4f585f6 100644
--- a/es-core/src/components/VideoComponent.cpp
+++ b/es-core/src/components/VideoComponent.cpp
@@ -1,13 +1,13 @@
 #include "components/VideoComponent.h"
+
+#include "resources/ResourceManager.h"
+#include "PowerSaver.h"
 #include "Renderer.h"
 #include "ThemeData.h"
-#include "Settings.h"
 #include "Util.h"
 #include "Window.h"
-#include "PowerSaver.h"
-#ifdef WIN32
-#include <codecvt>
-#endif
+#include <boost/filesystem/operations.hpp>
+#include <SDL_timer.h>
 
 #define FADE_TIME_MS	200
 
diff --git a/es-core/src/components/VideoComponent.h b/es-core/src/components/VideoComponent.h
index 55258c1aa..97f2dfc35 100644
--- a/es-core/src/components/VideoComponent.h
+++ b/es-core/src/components/VideoComponent.h
@@ -2,16 +2,12 @@
 #ifndef ES_CORE_COMPONENTS_VIDEO_COMPONENT_H
 #define ES_CORE_COMPONENTS_VIDEO_COMPONENT_H
 
-#include "platform.h"
-#include GLHEADER
-
+#include "components/ImageComponent.h"
 #include "GuiComponent.h"
-#include "ImageComponent.h"
+#include <boost/filesystem/path.hpp>
 #include <string>
-#include <memory>
-#include <SDL.h>
-#include <SDL_mutex.h>
-#include <boost/filesystem.hpp>
+
+class TextureResource;
 
 std::string	getTitlePath();
 std::string	getTitleFolder();
diff --git a/es-core/src/components/VideoPlayerComponent.cpp b/es-core/src/components/VideoPlayerComponent.cpp
index ef31f5813..dd2e950b6 100644
--- a/es-core/src/components/VideoPlayerComponent.cpp
+++ b/es-core/src/components/VideoPlayerComponent.cpp
@@ -1,17 +1,11 @@
 #ifdef _RPI_
 #include "components/VideoPlayerComponent.h"
-#include <boost/algorithm/string/predicate.hpp>
+
 #include "AudioManager.h"
-#include "Renderer.h"
-#include "ThemeData.h"
 #include "Settings.h"
-#include "Util.h"
-#include <signal.h>
-#include <wait.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+#include <boost/algorithm/string/predicate.hpp>
 #include <fcntl.h>
-#include <math.h>
+#include <wait.h>
 
 class VolumeControl
 {
diff --git a/es-core/src/components/VideoPlayerComponent.h b/es-core/src/components/VideoPlayerComponent.h
index cb6eedb88..a68c337a3 100644
--- a/es-core/src/components/VideoPlayerComponent.h
+++ b/es-core/src/components/VideoPlayerComponent.h
@@ -3,9 +3,6 @@
 #ifndef ES_CORE_COMPONENTS_VIDEO_PLAYER_COMPONENT_H
 #define ES_CORE_COMPONENTS_VIDEO_PLAYER_COMPONENT_H
 
-#include "platform.h"
-#include GLHEADER
-
 #include "components/VideoComponent.h"
 
 void catch_child(int sig_num);
diff --git a/es-core/src/components/VideoVlcComponent.cpp b/es-core/src/components/VideoVlcComponent.cpp
index cc3fe1548..2d0ab0d55 100644
--- a/es-core/src/components/VideoVlcComponent.cpp
+++ b/es-core/src/components/VideoVlcComponent.cpp
@@ -1,9 +1,11 @@
 #include "components/VideoVlcComponent.h"
-#include "Renderer.h"
-#include "ThemeData.h"
-#include "Util.h"
-#include "Settings.h"
+
+#include "resources/TextureResource.h"
 #include "PowerSaver.h"
+#include "Renderer.h"
+#include "Settings.h"
+#include <vlc/vlc.h>
+#include <SDL_mutex.h>
 
 #ifdef WIN32
 #include <codecvt>
diff --git a/es-core/src/components/VideoVlcComponent.h b/es-core/src/components/VideoVlcComponent.h
index f31aa6bfd..c350b8cb3 100644
--- a/es-core/src/components/VideoVlcComponent.h
+++ b/es-core/src/components/VideoVlcComponent.h
@@ -2,13 +2,13 @@
 #ifndef ES_CORE_COMPONENTS_VIDEO_VLC_COMPONENT_H
 #define ES_CORE_COMPONENTS_VIDEO_VLC_COMPONENT_H
 
-#include "platform.h"
-#include GLHEADER
-
 #include "VideoComponent.h"
-#include <vlc/vlc.h>
-#include <vlc/libvlc_media.h>
-#include "resources/TextureResource.h"
+
+struct SDL_mutex;
+struct SDL_Surface;
+struct libvlc_instance_t;
+struct libvlc_media_t;
+struct libvlc_media_player_t;
 
 struct VideoContext {
 	SDL_Surface*		surface;
diff --git a/es-core/src/guis/GuiDetectDevice.cpp b/es-core/src/guis/GuiDetectDevice.cpp
index 80f79fb38..8aa263cd8 100644
--- a/es-core/src/guis/GuiDetectDevice.cpp
+++ b/es-core/src/guis/GuiDetectDevice.cpp
@@ -1,15 +1,13 @@
 #include "guis/GuiDetectDevice.h"
-#include "Window.h"
-#include "Renderer.h"
-#include "PowerSaver.h"
-#include "resources/Font.h"
-#include "guis/GuiInputConfig.h"
+
 #include "components/TextComponent.h"
-#include <iostream>
-#include <string>
-#include <sstream>
+#include "guis/GuiInputConfig.h"
+#include "InputManager.h"
+#include "PowerSaver.h"
+#include "Renderer.h"
 #include "Util.h"
-#include <boost/filesystem.hpp>
+#include "Window.h"
+#include <boost/filesystem/operations.hpp>
 
 #define HOLD_TIME 1000
 
diff --git a/es-core/src/guis/GuiDetectDevice.h b/es-core/src/guis/GuiDetectDevice.h
index a9150bff2..f1b0f603d 100644
--- a/es-core/src/guis/GuiDetectDevice.h
+++ b/es-core/src/guis/GuiDetectDevice.h
@@ -2,9 +2,9 @@
 #ifndef ES_CORE_GUIS_GUI_DETECT_DEVICE_H
 #define ES_CORE_GUIS_GUI_DETECT_DEVICE_H
 
-#include "GuiComponent.h"
-#include "components/NinePatchComponent.h"
 #include "components/ComponentGrid.h"
+#include "components/NinePatchComponent.h"
+#include "GuiComponent.h"
 
 class TextComponent;
 
diff --git a/es-core/src/guis/GuiInputConfig.cpp b/es-core/src/guis/GuiInputConfig.cpp
index bd51f2954..b13474c14 100644
--- a/es-core/src/guis/GuiInputConfig.cpp
+++ b/es-core/src/guis/GuiInputConfig.cpp
@@ -1,12 +1,11 @@
 #include "guis/GuiInputConfig.h"
-#include "guis/GuiMsgBox.h"
-#include "Window.h"
-#include "Log.h"
-#include "components/TextComponent.h"
-#include "components/ImageComponent.h"
-#include "components/MenuComponent.h"
+
 #include "components/ButtonComponent.h"
-#include "Util.h"
+#include "components/MenuComponent.h"
+#include "guis/GuiMsgBox.h"
+#include "InputManager.h"
+#include "Log.h"
+#include "Window.h"
 
 // static const int inputCount = 10;
 // static const char* inputName[inputCount] = { "Up", "Down", "Left", "Right", "A", "B", "Start", "Select", "PageUp", "PageDown" };
diff --git a/es-core/src/guis/GuiInputConfig.h b/es-core/src/guis/GuiInputConfig.h
index 8c54d7e4b..134ad3903 100644
--- a/es-core/src/guis/GuiInputConfig.h
+++ b/es-core/src/guis/GuiInputConfig.h
@@ -2,12 +2,12 @@
 #ifndef ES_CORE_GUIS_GUI_INPUT_CONFIG_H
 #define ES_CORE_GUIS_GUI_INPUT_CONFIG_H
 
-#include "GuiComponent.h"
-#include "components/NinePatchComponent.h"
-#include "components/ComponentGrid.h"
-#include "components/ComponentList.h"
 #include "components/BusyComponent.h"
+#include "components/ComponentGrid.h"
+#include "components/NinePatchComponent.h"
+#include "GuiComponent.h"
 
+class ComponentList;
 class TextComponent;
 
 class GuiInputConfig : public GuiComponent
diff --git a/es-core/src/guis/GuiMsgBox.cpp b/es-core/src/guis/GuiMsgBox.cpp
index 68c2a2b08..5e2a9989a 100644
--- a/es-core/src/guis/GuiMsgBox.cpp
+++ b/es-core/src/guis/GuiMsgBox.cpp
@@ -1,10 +1,7 @@
 #include "guis/GuiMsgBox.h"
-#include "Renderer.h"
-#include "components/TextComponent.h"
+
 #include "components/ButtonComponent.h"
-#include "components/MenuComponent.h" // for makeButtonGrid
-#include "Util.h"
-#include "Log.h"
+#include "components/MenuComponent.h"
 
 #define HORIZONTAL_PADDING_PX 20
 
diff --git a/es-core/src/guis/GuiMsgBox.h b/es-core/src/guis/GuiMsgBox.h
index be01435cc..071918345 100644
--- a/es-core/src/guis/GuiMsgBox.h
+++ b/es-core/src/guis/GuiMsgBox.h
@@ -2,12 +2,12 @@
 #ifndef ES_CORE_GUIS_GUI_MSG_BOX_H
 #define ES_CORE_GUIS_GUI_MSG_BOX_H
 
-#include "GuiComponent.h"
-#include "components/NinePatchComponent.h"
 #include "components/ComponentGrid.h"
+#include "components/NinePatchComponent.h"
+#include "GuiComponent.h"
 
-class TextComponent;
 class ButtonComponent;
+class TextComponent;
 
 class GuiMsgBox : public GuiComponent
 {
diff --git a/es-core/src/guis/GuiTextEditPopup.cpp b/es-core/src/guis/GuiTextEditPopup.cpp
index 06cf20a27..a96dfddab 100644
--- a/es-core/src/guis/GuiTextEditPopup.cpp
+++ b/es-core/src/guis/GuiTextEditPopup.cpp
@@ -1,5 +1,8 @@
 #include "guis/GuiTextEditPopup.h"
+
+#include "components/ButtonComponent.h"
 #include "components/MenuComponent.h"
+#include "components/TextEditComponent.h"
 
 GuiTextEditPopup::GuiTextEditPopup(Window* window, const std::string& title, const std::string& initValue, 
 	const std::function<void(const std::string&)>& okCallback, bool multiLine, const char* acceptBtnText)
diff --git a/es-core/src/guis/GuiTextEditPopup.h b/es-core/src/guis/GuiTextEditPopup.h
index 58293330a..eca29ec41 100644
--- a/es-core/src/guis/GuiTextEditPopup.h
+++ b/es-core/src/guis/GuiTextEditPopup.h
@@ -2,13 +2,12 @@
 #ifndef ES_CORE_GUIS_GUI_TEXT_EDIT_POPUP_H
 #define ES_CORE_GUIS_GUI_TEXT_EDIT_POPUP_H
 
+#include "components/ComponentGrid.h"
+#include "components/NinePatchComponent.h"
 #include "GuiComponent.h"
 
-#include "components/NinePatchComponent.h"
-#include "components/ButtonComponent.h"
-#include "components/ComponentGrid.h"
-#include "components/TextEditComponent.h"
-#include "components/TextComponent.h"
+class TextComponent;
+class TextEditComponent;
 
 class GuiTextEditPopup : public GuiComponent
 {
diff --git a/es-core/src/platform.cpp b/es-core/src/platform.cpp
index 04d02b98f..b698765a7 100644
--- a/es-core/src/platform.cpp
+++ b/es-core/src/platform.cpp
@@ -1,13 +1,11 @@
 #include "platform.h"
-#include <stdlib.h>
-#include <boost/filesystem.hpp>
-#include <SDL.h>
-#include <iostream>
-#include <fcntl.h>
 
+#include <boost/filesystem/path.hpp>
+#include <SDL_events.h>
 #ifdef WIN32
 #include <codecvt>
 #endif
+#include <fcntl.h>
 
 std::string getHomePath()
 {
diff --git a/es-core/src/platform.h b/es-core/src/platform.h
index 11ffc1095..98826ac29 100644
--- a/es-core/src/platform.h
+++ b/es-core/src/platform.h
@@ -2,6 +2,8 @@
 #ifndef ES_CORE_PLATFORM_H
 #define ES_CORE_PLATFORM_H
 
+#include <string>
+
 //the Makefile defines one of these:
 //#define USE_OPENGL_ES
 //#define USE_OPENGL_DESKTOP
@@ -19,8 +21,6 @@
 	#define GLHEADER <SDL_opengl.h>
 #endif
 
-#include <string>
-
 std::string getHomePath();
 
 
diff --git a/es-core/src/resources/Font.cpp b/es-core/src/resources/Font.cpp
index b2356c9f0..4b88d9d76 100644
--- a/es-core/src/resources/Font.cpp
+++ b/es-core/src/resources/Font.cpp
@@ -1,10 +1,7 @@
 #include "resources/Font.h"
-#include <iostream>
-#include <algorithm>
-#include <vector>
-#include <boost/filesystem.hpp>
-#include "Renderer.h"
+
 #include "Log.h"
+#include "Renderer.h"
 #include "Util.h"
 
 FT_Library Font::sLibrary = NULL;
diff --git a/es-core/src/resources/Font.h b/es-core/src/resources/Font.h
index d11f6dc7a..acf55ca7e 100644
--- a/es-core/src/resources/Font.h
+++ b/es-core/src/resources/Font.h
@@ -2,14 +2,14 @@
 #ifndef ES_CORE_RESOURCES_FONT_H
 #define ES_CORE_RESOURCES_FONT_H
 
-#include <string>
-#include "platform.h"
-#include GLHEADER
+#include "math/Vector2f.h"
+#include "math/Vector2i.h"
+#include "resources/ResourceManager.h"
+#include "Renderer.h"
+#include "ThemeData.h"
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include "resources/ResourceManager.h"
-#include "ThemeData.h"
-#include "math/Vector2i.h"
+#include <vector>
 
 class TextCache;
 
diff --git a/es-core/src/resources/ResourceManager.cpp b/es-core/src/resources/ResourceManager.cpp
index b495c860f..a851baf52 100644
--- a/es-core/src/resources/ResourceManager.cpp
+++ b/es-core/src/resources/ResourceManager.cpp
@@ -1,8 +1,8 @@
 #include "ResourceManager.h"
-#include "Log.h"
+
 #include "../data/Resources.h"
+#include <boost/filesystem/operations.hpp>
 #include <fstream>
-#include <boost/filesystem.hpp>
 
 namespace fs = boost::filesystem;
 
diff --git a/es-core/src/resources/ResourceManager.h b/es-core/src/resources/ResourceManager.h
index edfbcb031..1bcf07f40 100644
--- a/es-core/src/resources/ResourceManager.h
+++ b/es-core/src/resources/ResourceManager.h
@@ -2,10 +2,8 @@
 #ifndef ES_CORE_RESOURCES_RESOURCE_MANAGER_H
 #define ES_CORE_RESOURCES_RESOURCE_MANAGER_H
 
-#include <stddef.h>
-#include <memory>
-#include <map>
 #include <list>
+#include <memory>
 
 //The ResourceManager exists to...
 //Allow loading resources embedded into the executable like an actual file.
diff --git a/es-core/src/resources/TextureData.cpp b/es-core/src/resources/TextureData.cpp
index f614e0ad8..18faf6cbd 100644
--- a/es-core/src/resources/TextureData.cpp
+++ b/es-core/src/resources/TextureData.cpp
@@ -1,12 +1,15 @@
 #include "resources/TextureData.h"
+
 #include "resources/ResourceManager.h"
-#include "Log.h"
 #include "ImageIO.h"
-#include "string.h"
-#include "Util.h"
-#include "nanosvg/nanosvg.h"
-#include "nanosvg/nanosvgrast.h"
-#include <vector>
+#include "Log.h"
+#include "platform.h"
+#include GLHEADER
+#include <nanosvg/nanosvg.h>
+#include <nanosvg/nanosvgrast.h>
+#include <assert.h>
+#include <math.h>
+#include <string.h>
 
 #define DPI 96
 
diff --git a/es-core/src/resources/TextureData.h b/es-core/src/resources/TextureData.h
index 362cdf0b1..3ac6f239e 100644
--- a/es-core/src/resources/TextureData.h
+++ b/es-core/src/resources/TextureData.h
@@ -2,11 +2,10 @@
 #ifndef ES_CORE_RESOURCES_TEXTURE_DATA_H
 #define ES_CORE_RESOURCES_TEXTURE_DATA_H
 
-#include <string>
-#include <memory>
 #include "platform.h"
-#include <mutex>
 #include GLHEADER
+#include <mutex>
+#include <string>
 
 class TextureResource;
 
diff --git a/es-core/src/resources/TextureDataManager.cpp b/es-core/src/resources/TextureDataManager.cpp
index bd1f04d3e..9ac155b0f 100644
--- a/es-core/src/resources/TextureDataManager.cpp
+++ b/es-core/src/resources/TextureDataManager.cpp
@@ -1,4 +1,6 @@
 #include "resources/TextureDataManager.h"
+
+#include "resources/TextureData.h"
 #include "resources/TextureResource.h"
 #include "Settings.h"
 
diff --git a/es-core/src/resources/TextureDataManager.h b/es-core/src/resources/TextureDataManager.h
index bc0da2511..a9c871596 100644
--- a/es-core/src/resources/TextureDataManager.h
+++ b/es-core/src/resources/TextureDataManager.h
@@ -2,16 +2,14 @@
 #ifndef ES_CORE_RESOURCES_TEXTURE_DATA_MANAGER_H
 #define ES_CORE_RESOURCES_TEXTURE_DATA_MANAGER_H
 
-#include "resources/ResourceManager.h"
-#include "platform.h"
-#include "resources/TextureData.h"
+#include <condition_variable>
+#include <list>
 #include <map>
 #include <memory>
-#include <thread>
 #include <mutex>
-#include <condition_variable>
-#include <functional>
+#include <thread>
 
+class TextureData;
 class TextureResource;
 
 class TextureLoader
diff --git a/es-core/src/resources/TextureResource.cpp b/es-core/src/resources/TextureResource.cpp
index 5c2cfdf0a..b63f0bc60 100644
--- a/es-core/src/resources/TextureResource.cpp
+++ b/es-core/src/resources/TextureResource.cpp
@@ -1,11 +1,7 @@
 #include "resources/TextureResource.h"
-#include "Log.h"
-#include "platform.h"
-#include GLHEADER
-#include "ImageIO.h"
-#include "Renderer.h"
+
+#include "resources/TextureData.h"
 #include "Util.h"
-#include "Settings.h"
 
 TextureDataManager		TextureResource::sTextureDataManager;
 std::map< TextureResource::TextureKeyType, std::weak_ptr<TextureResource> > TextureResource::sTextureMap;
diff --git a/es-core/src/resources/TextureResource.h b/es-core/src/resources/TextureResource.h
index 4cff40780..c2be59f1d 100644
--- a/es-core/src/resources/TextureResource.h
+++ b/es-core/src/resources/TextureResource.h
@@ -2,17 +2,14 @@
 #ifndef ES_CORE_RESOURCES_TEXTURE_RESOURCE_H
 #define ES_CORE_RESOURCES_TEXTURE_RESOURCE_H
 
-#include "resources/ResourceManager.h"
-
-#include <string>
-#include <set>
-#include <list>
-#include "platform.h"
-#include "resources/TextureData.h"
-#include "resources/TextureDataManager.h"
-#include GLHEADER
 #include "math/Vector2i.h"
 #include "math/Vector2f.h"
+#include "resources/ResourceManager.h"
+#include "resources/TextureDataManager.h"
+#include <set>
+#include <string>
+
+class TextureData;
 
 // An OpenGL texture.
 // Automatically recreates the texture with renderer deinit/reinit.