Use precompiled headers to improve compilation time

CMakeLists.txt

@@ -86,6 +86,7 @@ set(COMMON_SOURCES
 
 add_library(libcommon STATIC ${COMMON_HEADERS} ${COMMON_SOURCES})
 set_target_properties(libcommon PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+target_precompile_headers(libcommon PRIVATE src/engine/pch.h)
 
 ## END libcommon static library
 
@@ -154,6 +155,7 @@ set(RESOURCE_SOURCES
 
 add_library(libresource STATIC ${RESOURCE_HEADERS} ${RESOURCE_SOURCES})
 set_target_properties(libresource PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+target_precompile_headers(libresource PRIVATE src/engine/pch.h)
 
 ## END libresource static library
 
@@ -251,6 +253,7 @@ set(GRAPHICS_SOURCES
 
 add_library(libgraphics STATIC ${GRAPHICS_HEADERS} ${GRAPHICS_SOURCES})
 set_target_properties(libgraphics PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+target_precompile_headers(libgraphics PRIVATE src/engine/pch.h)
 
 ## END libgraphics static library
 
@@ -280,6 +283,7 @@ set(AUDIO_SOURCES
 
 add_library(libaudio STATIC ${AUDIO_HEADERS} ${AUDIO_SOURCES})
 set_target_properties(libaudio PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+target_precompile_headers(libaudio PRIVATE src/engine/pch.h)
 
 ## END libaudio static library
 
@@ -295,6 +299,7 @@ set(VIDEO_SOURCES
 
 add_library(libvideo STATIC ${VIDEO_HEADERS} ${VIDEO_SOURCES})
 set_target_properties(libvideo PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+target_precompile_headers(libvideo PRIVATE src/engine/pch.h)
 
 ## END libvideo static library
 
@@ -336,6 +341,7 @@ set(SCENE_SOURCES
 
 add_library(libscene STATIC ${SCENE_HEADERS} ${SCENE_SOURCES})
 set_target_properties(libscene PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+target_precompile_headers(libscene PRIVATE src/engine/pch.h)
 
 ## END libscene static library
 
@@ -374,6 +380,7 @@ set(GUI_SOURCES
 
 add_library(libgui STATIC ${GUI_HEADERS} ${GUI_SOURCES})
 set_target_properties(libgui PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+target_precompile_headers(libgui PRIVATE src/engine/pch.h)
 
 ## END libgui static library
 
@@ -403,6 +410,7 @@ set(SCRIPT_SOURCES
 
 add_library(libscript STATIC ${SCRIPT_HEADERS} ${SCRIPT_SOURCES})
 set_target_properties(libscript PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+target_precompile_headers(libscript PRIVATE src/engine/pch.h)
 
 ## END libscript static library
 
@@ -657,6 +665,7 @@ set(GAME_SOURCES
 
 add_library(libgame STATIC ${GAME_HEADERS} ${GAME_SOURCES})
 set_target_properties(libgame PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+target_precompile_headers(libgame PRIVATE src/engine/pch.h)
 
 ## END libgame static library
 
@@ -664,6 +673,7 @@ set_target_properties(libgame PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY
 
 set(REONE_HEADERS
     src/engine/engine.h
+    src/engine/pch.h
     src/engine/program.h)
 
 set(REONE_SOURCES
@@ -677,6 +687,7 @@ endif()
 
 add_executable(reone ${REONE_HEADERS} ${REONE_SOURCES})
 set_target_properties(reone PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+target_precompile_headers(reone PRIVATE src/engine/pch.h)
 
 target_link_libraries(reone PRIVATE
     libgame libscript libgui libscene libvideo libaudio libgraphics libresource libcommon
@@ -721,6 +732,7 @@ if(BUILD_TOOLS)
 
     add_executable(reone-tools ${TOOLS_HEADERS} ${TOOLS_SOURCES})
     set_target_properties(reone-tools PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+    target_precompile_headers(reone-tools PRIVATE src/engine/pch.h)
 
     target_link_libraries(reone-tools PRIVATE
         libgraphics libresource libcommon
@@ -762,6 +774,7 @@ if(BUILD_LAUNCHER)
         target_link_libraries(reone-launcher ${wxWidgets_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_SYSTEM_LIBRARY})
 
         set_target_properties(reone-launcher PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+        target_precompile_headers(reone-launcher PRIVATE src/engine/pch.h)
         list(APPEND InstallTargets reone-launcher)
     else()
         message(WARNING "wxWidgets not found - launcher cannot be built")
@@ -788,6 +801,7 @@ if(BUILD_TESTS)
         endif()
 
         add_test(${TEST_NAME} test_${TEST_NAME})
+        target_precompile_headers(test_${TEST_NAME} PRIVATE src/engine/pch.h)
     endforeach()
 endif()
 

src/engine/audio/files.h

@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include <string>
-
 #include "../common/cache.h"
 #include "../resource/resources.h"
 

src/engine/audio/format/mp3reader.h

@@ -17,15 +17,10 @@
 
 #pragma once
 
-#include <istream>
-#include <memory>
-
-#include <boost/noncopyable.hpp>
+#include "../stream.h"
 
 #include "mad.h"
 
-#include "../stream.h"
-
 namespace reone {
 
 namespace audio {

src/engine/audio/format/wavreader.cpp

@@ -17,8 +17,6 @@
 
 #include "wavreader.h"
 
-#include <utility>
-
 #include "../../common/streamutil.h"
 
 #include "mp3reader.h"

src/engine/audio/player.cpp

@@ -17,14 +17,6 @@
 
 #include "player.h"
 
-#include <algorithm>
-#include <functional>
-#include <stdexcept>
-
-#include "glm/gtx/norm.hpp"
-
-#include "AL/al.h"
-
 #include "../common/log.h"
 #include "../common/guardutil.h"
 

src/engine/audio/player.h

@@ -17,20 +17,6 @@
 
 #pragma once
 
-#include <atomic>
-#include <cstdint>
-#include <map>
-#include <mutex>
-#include <string>
-#include <thread>
-#include <vector>
-
-#include <boost/noncopyable.hpp>
-
-#include "AL/alc.h"
-
-#include "glm/vec3.hpp"
-
 #include "files.h"
 #include "options.h"
 #include "soundinstance.h"

src/engine/audio/services.h

@@ -17,10 +17,6 @@
 
 #pragma once
 
-#include <memory>
-
-#include <boost/noncopyable.hpp>
-
 #include "../resource/services.h"
 
 #include "files.h"

src/engine/audio/soundhandle.h

@@ -17,12 +17,6 @@
 
 #pragma once
 
-#include <atomic>
-
-#include <boost/noncopyable.hpp>
-
-#include "glm/vec3.hpp"
-
 namespace reone {
 
 namespace audio {

src/engine/audio/soundinstance.cpp

@@ -17,11 +17,6 @@
 
 #include "soundinstance.h"
 
-#include <stdexcept>
-#include <utility>
-
-#include "AL/al.h"
-
 #include "../common/log.h"
 
 #include "soundhandle.h"

src/engine/audio/soundinstance.h

@@ -17,13 +17,6 @@
 
 #pragma once
 
-#include <string>
-#include <memory>
-
-#include <boost/noncopyable.hpp>
-
-#include "glm/vec3.hpp"
-
 #include "stream.h"
 
 namespace reone {

src/engine/audio/stream.cpp

@@ -17,11 +17,6 @@
 
 #include "stream.h"
 
-#include <stdexcept>
-#include <string>
-
-#include "AL/al.h"
-
 using namespace std;
 
 namespace reone {

src/engine/common/cache.h

@@ -17,13 +17,6 @@
 
 #pragma once
 
-#include <functional>
-#include <memory>
-#include <stdexcept>
-#include <unordered_map>
-
-#include <boost/noncopyable.hpp>
-
 #include "guardutil.h"
 
 namespace reone {

src/engine/common/collectionutil.h

@@ -17,11 +17,6 @@
 
 #pragma once
 
-#include <functional>
-#include <map>
-#include <unordered_map>
-#include <vector>
-
 namespace reone {
 
 template <class T>

src/engine/common/guardutil.h

@@ -17,9 +17,6 @@
 
 #pragma once
 
-#include <stdexcept>
-#include <string>
-
 namespace reone {
 
 template <class T>

src/engine/common/log.cpp

@@ -17,11 +17,6 @@
 
 #include "log.h"
 
-#include <iostream>
-#include <memory>
-
-#include <boost/filesystem.hpp>
-
 namespace fs = boost::filesystem;
 
 using namespace std;

src/engine/common/log.h

@@ -17,11 +17,6 @@
 
 #pragma once
 
-#include <cstdint>
-#include <string>
-
-#include <boost/format.hpp>
-
 #include "types.h"
 
 namespace reone {

src/engine/common/mediastream.h

@@ -17,14 +17,6 @@
 
 #pragma once
 
-#include <memory>
-#include <stdexcept>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <boost/noncopyable.hpp>
-
 namespace reone {
 
 template <class Frame>

src/engine/common/pathutil.cpp

@@ -17,9 +17,6 @@
 
 #include "pathutil.h"
 
-#include <boost/algorithm/string.hpp>
-#include <boost/format.hpp>
-
 #include "log.h"
 
 using namespace std;

src/engine/common/pathutil.h

@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include <boost/filesystem.hpp>
-
 namespace reone {
 
 boost::filesystem::path getPathIgnoreCase(const boost::filesystem::path &basePath, const std::string &relPath, bool logNotFound = true);

src/engine/common/random.cpp

@@ -17,9 +17,6 @@
 
 #include "random.h"
 
-#include <ctime>
-#include <random>
-
 using namespace std;
 
 namespace reone {

src/engine/common/stopwatch.cpp

@@ -17,8 +17,6 @@
 
 #include "stopwatch.h"
 
-#include "SDL2/SDL_timer.h"
-
 namespace reone {
 
 Stopwatch::Stopwatch() :

src/engine/common/stopwatch.h

@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include <cstdint>
-
 namespace reone {
 
 /**

src/engine/common/streamreader.cpp

@@ -17,9 +17,6 @@
 
 #include "streamreader.h"
 
-#include <sstream>
-#include <stdexcept>
-
 #include "guardutil.h"
 
 using namespace std;

src/engine/common/streamreader.h

@@ -17,15 +17,6 @@
 
 #pragma once
 
-#include <cstdint>
-#include <istream>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <boost/endian/conversion.hpp>
-#include <boost/noncopyable.hpp>
-
 #include "types.h"
 
 namespace reone {

src/engine/common/streamutil.cpp

@@ -17,8 +17,6 @@
 
 #include "streamutil.h"
 
-#include <boost/iostreams/stream.hpp>
-
 using namespace std;
 
 namespace io = boost::iostreams;

src/engine/common/streamwriter.cpp

@@ -17,8 +17,6 @@
 
 #include "streamwriter.h"
 
-#include <stdexcept>
-
 #include "guardutil.h"
 
 using namespace std;

src/engine/common/streamwriter.h

@@ -17,15 +17,6 @@
 
 #pragma once
 
-#include <cstdint>
-#include <cstring>
-#include <memory>
-#include <ostream>
-#include <string>
-
-#include <boost/endian/conversion.hpp>
-#include <boost/noncopyable.hpp>
-
 #include "types.h"
 
 namespace reone {

src/engine/common/timer.cpp

@@ -17,8 +17,6 @@
 
 #include "timer.h"
 
-#include "glm/common.hpp"
-
 namespace reone {
 
 Timer::Timer(float timeout) {

src/engine/common/types.h

@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include <vector>
-
 namespace reone {
 
 struct DebugChannels {

src/engine/engine.h

@@ -17,9 +17,6 @@
 
 #pragma once
 
-#include <boost/filesystem/path.hpp>
-#include <boost/noncopyable.hpp>
-
 #include "game/options.h"
 
 namespace reone {

src/engine/game/action/action.h

@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include <boost/noncopyable.hpp>
-
 #include "../types.h"
 
 namespace reone {

src/engine/game/action/locationaction.h

@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "action.h"
 
 namespace reone {

src/engine/game/action/movetopoint.h

@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include "glm/vec3.hpp"
-
 #include "action.h"
 
 namespace reone {

src/engine/game/action/objectaction.h

@@ -17,9 +17,6 @@
 
 #pragma once
 
-#include <memory>
-#include <stdexcept>
-
 #include "../../common/guardutil.h"
 
 #include "action.h"

src/engine/game/action/waitaction.h

@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include "glm/common.hpp"
-
 #include "../../common/timer.h"
 
 #include "action.h"

src/engine/game/actionexecutor.cpp

@@ -17,10 +17,6 @@
 
 #include "actionexecutor.h"
 
-#include <stdexcept>
-
-#include "SDL2/SDL_timer.h"
-
 #include "../common/log.h"
 #include "../common/guardutil.h"
 #include "../scene/types.h"

src/engine/game/camera/animatedcamera.cpp

@@ -17,10 +17,6 @@
 
 #include "animatedcamera.h"
 
-#include <unordered_map>
-
-#include <boost/format.hpp>
-
 #include "../../graphics/types.h"
 #include "../../graphics/model/models.h"
 #include "../../resource/resources.h"

src/engine/game/camera/animatedcamera.h

@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include <string>
-
 #include "../../scene/node/modelnode.h"
 #include "../../scene/scenegraph.h"
 

src/engine/game/camera/camera.h

@@ -17,12 +17,6 @@
 
 #pragma once
 
-#include <memory>
-
-#include "SDL2/SDL_events.h"
-
-#include "glm/vec3.hpp"
-
 #include "../../scene/node/cameranode.h"
 
 namespace reone {

src/engine/game/camera/dialogcamera.cpp

@@ -17,8 +17,6 @@
 
 #include "dialogcamera.h"
 
-#include "glm/ext.hpp"
-
 using namespace std;
 
 using namespace reone::graphics;

src/engine/game/camera/dialogcamera.h

@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include <functional>
-
 #include "../../scene/scenegraph.h"
 
 #include "../types.h"

src/engine/game/camera/firstperson.cpp

@@ -17,8 +17,6 @@
 
 #include "firstperson.h"
 
-#include "glm/ext.hpp"
-
 #include "../../graphics/types.h"
 
 using namespace std;

src/engine/game/camera/staticcamera.cpp

@@ -17,8 +17,6 @@
 
 #include "staticcamera.h"
 
-#include "glm/ext.hpp"
-
 #include "../object/placeablecamera.h"
 
 using namespace std;

src/engine/game/camera/thirdperson.cpp

@@ -17,8 +17,6 @@
 
 #include "thirdperson.h"
 
-#include "glm/ext.hpp"
-
 #include "../game.h"
 
 using namespace std;

src/engine/game/camera/thirdperson.h

@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include <functional>
-
 #include "../types.h"
 
 #include "camera.h"

src/engine/game/combat/combat.h

@@ -17,12 +17,6 @@
 
 #pragma once
 
-#include <cstdint>
-#include <list>
-#include <map>
-#include <queue>
-#include <set>
-
 #include "../../common/timer.h"
 #include "../../scene/services.h"
 

src/engine/game/combat/combat_attack.cpp

@@ -17,8 +17,6 @@
 
 #include "combat.h"
 
-#include <stdexcept>
-
 #include "../../common/log.h"
 #include "../../common/random.h"
 

src/engine/game/combat/combat_projectiles.cpp

@@ -21,9 +21,6 @@
 
 #include "combat.h"
 
-#include "glm/gtx/euler_angles.hpp"
-#include "glm/gtx/transform.hpp"
-
 using namespace std;
 
 using namespace reone::graphics;

src/engine/game/console.cpp

@@ -17,13 +17,6 @@
 
 #include "console.h"
 
-#include <iomanip>
-#include <sstream>
-
-#include <boost/algorithm/string.hpp>
-
-#include "glm/ext.hpp"
-
 #include "../common/log.h"
 #include "../graphics/font.h"
 #include "../graphics/fonts.h"

src/engine/game/console.h

@@ -17,17 +17,6 @@
 
 #pragma once
 
-#include <functional>
-#include <memory>
-#include <stack>
-#include <string>
-#include <queue>
-#include <unordered_map>
-
-#include <boost/noncopyable.hpp>
-
-#include "SDL2/SDL_events.h"
-
 #include "../gui/textinput.h"
 #include "../graphics/font.h"
 #include "../graphics/options.h"

src/engine/game/cursors.cpp

@@ -17,8 +17,6 @@
 
 #include "cursors.h"
 
-#include <stdexcept>
-
 #include "../common/streamutil.h"
 #include "../graphics/texture/curreader.h"
 

src/engine/game/cursors.h

@@ -17,12 +17,6 @@
 
 #pragma once
 
-#include <cstdint>
-#include <memory>
-#include <unordered_map>
-
-#include <boost/noncopyable.hpp>
-
 #include "../graphics/services.h"
 #include "../resource/services.h"
 

src/engine/game/d20/attributes.h

@@ -17,10 +17,6 @@
 
 #pragma once
 
-#include <map>
-#include <set>
-#include <vector>
-
 #include "../types.h"
 
 #include "savingthrows.h"

src/engine/game/d20/attributes_classes.cpp

@@ -17,8 +17,6 @@
 
 #include "attributes.h"
 
-#include <algorithm>
-
 #include "classes.h"
 
 using namespace std;

src/engine/game/d20/class.cpp

@@ -17,10 +17,6 @@
 
 #include "class.h"
 
-#include <stdexcept>
-
-#include <boost/algorithm/string.hpp>
-
 #include "classes.h"
 
 using namespace std;

src/engine/game/d20/class.h

@@ -17,10 +17,6 @@
 
 #pragma once
 
-#include <string>
-#include <unordered_set>
-#include <vector>
-
 #include "../../resource/format/2dareader.h"
 #include "../../resource/services.h"
 

src/engine/game/d20/feat.h

@@ -17,10 +17,6 @@
 
 #pragma once
 
-#include <cstdint>
-#include <memory>
-#include <string>
-
 #include "../../graphics/texture/texture.h"
 
 #include "../types.h"

src/engine/game/d20/feats.cpp

@@ -17,9 +17,6 @@
 
 #include "feats.h"
 
-#include <stdexcept>
-#include <string>
-
 #include "../../common/collectionutil.h"
 
 using namespace std;

src/engine/game/d20/feats.h

@@ -17,10 +17,6 @@
 
 #pragma once
 
-#include <unordered_map>
-
-#include <boost/noncopyable.hpp>
-
 #include "../../graphics/texture/textures.h"
 #include "../../resource/services.h"
 

src/engine/game/d20/skill.h

@@ -17,9 +17,6 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
-
 #include "../../graphics/texture/texture.h"
 
 namespace reone {

src/engine/game/d20/skills.h

@@ -17,10 +17,6 @@
 
 #pragma once
 
-#include <unordered_map>
-
-#include <boost/noncopyable.hpp>
-
 #include "../../graphics/services.h"
 #include "../../resource/services.h"
 

src/engine/game/d20/spell.h

@@ -17,10 +17,6 @@
 
 #pragma once
 
-#include <cstdint>
-#include <memory>
-#include <string>
-
 #include "../../graphics/texture/texture.h"
 
 #include "../types.h"

src/engine/game/d20/spells.h

@@ -17,10 +17,6 @@
 
 #pragma once
 
-#include <unordered_map>
-
-#include <boost/noncopyable.hpp>
-
 #include "../../graphics/texture/textures.h"
 #include "../../resource/services.h"
 

src/engine/game/dialog.cpp

@@ -17,10 +17,6 @@
 
 #include "dialog.h"
 
-#include <stdexcept>
-
-#include <boost/algorithm/string.hpp>
-
 #include "../common/guardutil.h"
 #include "../resource/strings.h"
 

src/engine/game/dialog.h

@@ -17,11 +17,6 @@
 
 #pragma once
 
-#include <string>
-#include <vector>
-
-#include <boost/noncopyable.hpp>
-
 #include "../resource/format/gffreader.h"
 #include "../resource/strings.h"
 

src/engine/game/enginetype/effect.h

@@ -17,10 +17,6 @@
 
 #pragma once
 
-#include <memory>
-
-#include "glm/common.hpp"
-
 #include "../../script/enginetype.h"
 
 #include "../types.h"

src/engine/game/enginetype/location.h

@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include "glm/vec3.hpp"
-
 #include "../../script/enginetype.h"
 
 namespace reone {

src/engine/game/footstepsounds.cpp

@@ -17,8 +17,6 @@
 
 #include "footstepsounds.h"
 
-#include <boost/format.hpp>
-
 #include "../common/guardutil.h"
 
 using namespace std;

src/engine/game/footstepsounds.h

@@ -17,9 +17,6 @@
 
 #pragma once
 
-#include <memory>
-#include <vector>
-
 #include "../audio/files.h"
 #include "../audio/stream.h"
 #include "../common/cache.h"

src/engine/game/game.cpp

@@ -17,10 +17,6 @@
 
 #include "game.h"
 
-#include <boost/algorithm/string.hpp>
-
-#include "SDL2/SDL_timer.h"
-
 #include "../common/log.h"
 #include "../common/pathutil.h"
 #include "../video/bikreader.h"

src/engine/game/game.h

@@ -18,13 +18,6 @@
 
 #pragma once
 
-#include <cstdint>
-#include <memory>
-#include <set>
-#include <string>
-
-#include <boost/filesystem/path.hpp>
-
 #include "../audio/services.h"
 #include "../graphics/eventhandler.h"
 #include "../graphics/services.h"

src/engine/game/game_save.cpp

@@ -21,8 +21,6 @@
 
 #include "game.h"
 
-#include <boost/iostreams/stream.hpp>
-
 #include "../common/streamutil.h"
 #include "../graphics/texture/tgawriter.h"
 #include "../resource/format/erfreader.h"

src/engine/game/gameidutil.h

@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include <boost/filesystem/path.hpp>
-
 #include "types.h"
 
 namespace reone {

src/engine/game/gui/chargen/abilities.cpp

@@ -17,12 +17,6 @@
 
 #include "abilities.h"
 
-#include <unordered_map>
-
-#include <boost/algorithm/string.hpp>
-
-#include "glm/common.hpp"
-
 #include "../../../gui/control/listbox.h"
 #include "../../../resource/strings.h"
 

src/engine/game/gui/chargen/chargen.cpp

@@ -17,8 +17,6 @@
 
 #include "chargen.h"
 
-#include <stdexcept>
-
 #include "../../../gui/scenebuilder.h"
 #include "../../../graphics/model/models.h"
 #include "../../../resource/resources.h"

src/engine/game/gui/chargen/custom.cpp

@@ -17,8 +17,6 @@
 
 #include "custom.h"
 
-#include <boost/algorithm/string.hpp>
-
 #include "../../game.h"
 
 #include "../colorutil.h"

src/engine/game/gui/chargen/levelup.cpp

@@ -17,8 +17,6 @@
 
 #include "levelup.h"
 
-#include <boost/algorithm/string.hpp>
-
 #include "../../game.h"
 
 #include "../colorutil.h"

src/engine/game/gui/chargen/quick.cpp

@@ -17,8 +17,6 @@
 
 #include "quick.h"
 
-#include <boost/algorithm/string.hpp>
-
 #include "../../game.h"
 
 #include "../colorutil.h"

src/engine/game/gui/chargen/skills.cpp

@@ -17,10 +17,6 @@
 
 #include "skills.h"
 
-#include <unordered_map>
-
-#include <boost/algorithm/string.hpp>
-
 #include "../../../gui/control/listbox.h"
 #include "../../../resource/strings.h"
 

src/engine/game/gui/colorutil.h

@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include "glm/vec3.hpp"
-
 #include "../types.h"
 
 namespace reone {

src/engine/game/gui/dialog.cpp

@@ -17,13 +17,6 @@
 
 #include "dialog.h"
 
-#include <unordered_map>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/format.hpp>
-
-#include "SDL2/SDL_timer.h"
-
 #include "../../audio/files.h"
 #include "../../audio/player.h"
 #include "../../audio/soundhandle.h"

src/engine/game/gui/gui.cpp

@@ -17,8 +17,6 @@
 
 #include "gui.h"
 
-#include <boost/format.hpp>
-
 #include "../../audio/player.h"
 #include "../../graphics/texture/textures.h"
 

src/engine/game/gui/ingame/character.cpp

@@ -17,8 +17,6 @@
 
 #include "character.h"
 
-#include <boost/format.hpp>
-
 #include "../../../graphics/model/models.h"
 #include "../../../gui/scenebuilder.h"
 

src/engine/game/gui/ingame/character.h

@@ -17,13 +17,14 @@
 
 #pragma once
 
-#include "../gui.h"
 #include "../../../gui/control/button.h"
 #include "../../../gui/control/label.h"
 #include "../../../gui/control/listbox.h"
 #include "../../../gui/control/slider.h"
 #include "../../../scene/node/modelnode.h"
 
+#include "../gui.h"
+
 namespace reone {
 
 namespace game {

src/engine/game/gui/ingame/equip.cpp

@@ -17,9 +17,6 @@
 
 #include "equip.h"
 
-#include <boost/algorithm/string.hpp>
-#include <boost/format.hpp>
-
 #include "../../../graphics/texture/textures.h"
 #include "../../../resource/strings.h"
 

src/engine/game/gui/ingame/ingame.cpp

@@ -17,8 +17,6 @@
 
 #include "ingame.h"
 
-#include <unordered_map>
-
 #include "../../game.h"
 #include "../../gameidutil.h"
 

src/engine/game/gui/ingame/ingame.h

@@ -27,7 +27,6 @@
 #include "map.h"
 #include "messages.h"
 #include "options.h"
-#include <memory>
 
 namespace reone {
 

src/engine/game/gui/ingame/map.cpp

@@ -17,8 +17,6 @@
 
 #include "map.h"
 
-#include <stdexcept>
-
 #include "../../../resource/strings.h"
 
 #include "../../game.h"

src/engine/game/gui/mainmenu.cpp

@@ -17,8 +17,6 @@
 
 #include "mainmenu.h"
 
-#include "glm/glm.hpp"
-
 #include "../../audio/player.h"
 #include "../../common/log.h"
 #include "../../gui/control/listbox.h"

src/engine/game/gui/partyselect.cpp

@@ -17,8 +17,6 @@
 
 #include "partyselect.h"
 
-#include <boost/algorithm/string.hpp>
-
 #include "../../gui/control/label.h"
 #include "../../gui/control/togglebutton.h"
 #include "../../graphics/texture/textures.h"

src/engine/game/gui/profileoverlay.cpp

@@ -17,13 +17,6 @@
 
 #include "profileoverlay.h"
 
-#include <algorithm>
-#include <sstream>
-
-#include "SDL2/SDL_timer.h"
-
-#include "glm/ext.hpp"
-
 #include "../../common/guardutil.h"
 #include "../../graphics/fonts.h"
 #include "../../graphics/mesh/meshes.h"

src/engine/game/gui/profileoverlay.h

@@ -17,12 +17,6 @@
 
 #pragma once
 
-#include <cstdint>
-#include <memory>
-#include <vector>
-
-#include "SDL2/SDL_events.h"
-
 #include "../../common/timer.h"
 #include "../../graphics/font.h"
 #include "../../graphics/services.h"

src/engine/game/gui/saveload.cpp

@@ -17,11 +17,6 @@
 
 #include "saveload.h"
 
-#include <algorithm>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/filesystem.hpp>
-
 #include "../../common/log.h"
 #include "../../common/streamutil.h"
 #include "../../graphics/texture/tgareader.h"

src/engine/game/gui/saveload.h

@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include <boost/filesystem/path.hpp>
-
 #include "../savedgame.h"
 
 #include "gui.h"

src/engine/game/gui/selectoverlay.cpp

@@ -17,8 +17,6 @@
 
 #include "selectoverlay.h"
 
-#include <unordered_map>
-
 #include "../../common/guardutil.h"
 #include "../../graphics/context.h"
 #include "../../graphics/font.h"

src/engine/game/gui/selectoverlay.h

@@ -17,15 +17,6 @@
 
 #pragma once
 
-#include <memory>
-#include <unordered_map>
-#include <vector>
-
-#include "SDL2/SDL_events.h"
-
-#include "glm/mat4x4.hpp"
-#include "glm/vec3.hpp"
-
 #include "../../graphics/font.h"
 #include "../../graphics/texture/texture.h"
 

src/engine/game/gui/sounds.h

@@ -17,10 +17,6 @@
 
 #pragma once
 
-#include <memory>
-
-#include <boost/noncopyable.hpp>
-
 #include "../../audio/files.h"
 #include "../../audio/stream.h"
 #include "../../resource/2da.h"

src/engine/game/map.cpp

@@ -17,14 +17,6 @@
 
 #include "map.h"
 
-#include <stdexcept>
-
-#include "glm/mat4x4.hpp"
-
-#include "GL/glew.h"
-
-#include "SDL2/SDL_opengl.h"
-
 #include "../common/log.h"
 #include "../common/guardutil.h"
 #include "../graphics/context.h"

src/engine/game/map.h

@@ -17,12 +17,6 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
-
-#include "glm/vec2.hpp"
-#include "glm/vec4.hpp"
-
 #include "../graphics/texture/texture.h"
 #include "../resource/format/gffreader.h"
 

src/engine/game/object/area.cpp

@@ -17,15 +17,6 @@
 
 #include "area.h"
 
-#include <algorithm>
-#include <stdexcept>
-#include <sstream>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/format.hpp>
-
-#include "glm/gtx/norm.hpp"
-
 #include "../../common/guardutil.h"
 #include "../../common/log.h"
 #include "../../common/random.h"