Include refactoring

* reordered includes according to correct style
 * removed some unnecessary includes

src/app/app.cpp

@@ -17,27 +17,29 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-#include "common/config.h"
-
 #include "app/app.h"
 
+#include "common/config.h"
+
 #include "app/controller.h"
 #include "app/input.h"
 #include "app/system.h"
 
-#include "common/logger.h"
 #include "common/image.h"
 #include "common/key.h"
-#include "common/pathman.h"
+#include "common/logger.h"
 #include "common/make_unique.h"
+#include "common/pathman.h"
 #include "common/stringutils.h"
+
 #include "common/resources/resourcemanager.h"
 
 #include "graphics/core/nulldevice.h"
+
 #include "graphics/opengl/glutil.h"
 
-#include "object/robotmain.h"
 #include "object/object_manager.h"
+#include "object/robotmain.h"
 
 #ifdef OPENAL_SOUND
     #include "sound/oalsound/alsound.h"

src/app/app.h

@@ -24,12 +24,13 @@
 
 #pragma once
 
+#include "common/config_file.h"
 #include "common/event.h"
 #include "common/global.h"
 #include "common/singleton.h"
-#include "common/config_file.h"
 
 #include "graphics/core/device.h"
+
 #include "graphics/engine/engine.h"
 
 #include "object/level_category.h"

src/app/input.cpp

@@ -19,9 +19,8 @@
 
 #include "app/input.h"
 
-
-#include "common/logger.h"
 #include "common/config_file.h"
+#include "common/logger.h"
 #include "common/restext.h"
 
 #include "graphics/engine/engine.h"

src/app/main.cpp

@@ -22,18 +22,22 @@
  * \brief Entry point of application - main() function
  */
 
+#include "common/config.h"
+
 #include "app/app.h"
 #include "app/system.h"
+#if PLATFORM_WINDOWS
+    #include "app/system_windows.h"
+#endif
 
-#include "common/config.h"
 #include "common/logger.h"
 #include "common/misc.h"
 #include "common/restext.h"
+
 #include "common/resources/resourcemanager.h"
 
 #if PLATFORM_WINDOWS
     #include <windows.h>
-    #include "app/system_windows.h"
 #endif
 
 

src/app/pausemanager.cpp

@@ -17,9 +17,10 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-#include "app/app.h"
 #include "app/pausemanager.h"
 
+#include "app/app.h"
+
 #include "common/logger.h"
 
 #include "object/robotmain.h"

src/app/pausemanager.h

@@ -24,6 +24,7 @@
 #pragma once
 
 #include "common/singleton.h"
+
 #include "sound/sound.h"
 
 #include <string>

src/common/config_file.cpp

@@ -20,12 +20,13 @@
 
 #include "common/config_file.h"
 
-#include "common/resources/inputstream.h"
-#include "common/resources/outputstream.h"
 #include "app/system.h"
 
 #include "common/logger.h"
 
+#include "common/resources/inputstream.h"
+#include "common/resources/outputstream.h"
+
 #include <memory>
 #include <utility>
 #include <cstring>

src/common/config_file.h

@@ -27,13 +27,8 @@
 #include "common/singleton.h"
 
 #include <boost/property_tree/ptree.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/algorithm/string/replace.hpp>
 
 #include <string>
-#include <vector>
-
-namespace fs = boost::filesystem;
 
 
 /**

src/common/image.cpp

@@ -20,9 +20,10 @@
 
 #include "common/image.h"
 
-#include "math/func.h"
 #include "common/resources/resourcemanager.h"
 
+#include "math/func.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

src/common/pathman.cpp

@@ -20,12 +20,16 @@
 
 #include "common/pathman.h"
 
+#include "common/config.h"
 
 #include "app/app.h"
 #include "app/system.h"
+#ifdef PLATFORM_WINDOWS
+    #include "app/system_windows.h"
+#endif
 
-#include "common/config.h"
 #include "common/logger.h"
+
 #include "common/resources/resourcemanager.h"
 
 #include "object/robotmain.h"
@@ -35,10 +39,6 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
 
-#ifdef PLATFORM_WINDOWS
-    #include "app/system_windows.h"
-#endif
-
 template<> CPathManager* CSingleton<CPathManager>::m_instance = nullptr;
 
 CPathManager::CPathManager()

src/common/resources/inputstream.cpp

@@ -18,6 +18,7 @@
  */
 
 #include "common/resources/inputstream.h"
+
 #include "common/resources/inputstreambuffer.h"
 
 

src/common/resources/outputstream.cpp

@@ -18,6 +18,7 @@
  */
 
 #include "common/resources/outputstream.h"
+
 #include "common/resources/outputstreambuffer.h"
 
 

src/common/resources/resourcemanager.cpp

@@ -21,6 +21,11 @@
 #include "common/resources/resourcemanager.h"
 
 #include "common/config.h"
+
+#if PLATFORM_WINDOWS
+    #include "app/system_windows.h"
+#endif
+
 #include "common/logger.h"
 #include "common/make_unique.h"
 
@@ -29,10 +34,6 @@
 #include <boost/filesystem.hpp>
 #include <boost/regex.hpp>
 
-#if PLATFORM_WINDOWS
-    #include "app/system_windows.h"
-#endif
-
 namespace fs = boost::filesystem;
 
 

src/common/resources/resourcemanager.h

@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include "common/resources/sndfile_wrapper.h"
 #include "common/resources/sdl_file_wrapper.h"
+#include "common/resources/sndfile_wrapper.h"
 
 #include <memory>
 #include <string>

src/common/restext.cpp

@@ -20,17 +20,17 @@
 
 #include "common/restext.h"
 
-#include "app/input.h"
-
 #include "common/config.h"
 
-#include "common/global.h"
+#include "CBot/resource.h"
+
+#include "app/input.h"
+
 #include "common/event.h"
+#include "common/global.h"
 #include "common/logger.h"
 #include "common/stringutils.h"
 
-#include "CBot/resource.h"
-
 #include "object/object_type.h"
 #include "object/robotmain.h"
 

src/graphics/core/device.h

@@ -24,13 +24,12 @@
 
 #pragma once
 
-
 #include "graphics/core/color.h"
+#include "graphics/core/framebuffer.h"
 #include "graphics/core/light.h"
 #include "graphics/core/material.h"
 #include "graphics/core/texture.h"
 #include "graphics/core/vertex.h"
-#include "graphics/core/framebuffer.h"
 
 #include "math/intpoint.h"
 #include "math/matrix.h"

src/graphics/core/nulldevice.cpp

@@ -20,11 +20,6 @@
 
 #include "graphics/core/nulldevice.h"
 
-#include "common/config.h"
-#include "common/logger.h"
-
-#include "math/geometry.h"
-
 
 // Graphics module namespace
 namespace Gfx

src/graphics/core/vertex.h

@@ -27,8 +27,8 @@
 
 #include "graphics/core/color.h"
 
-#include "math/vector.h"
 #include "math/point.h"
+#include "math/vector.h"
 
 #include <sstream>
 

src/graphics/engine/camera.cpp

@@ -33,6 +33,7 @@
 #include "object/object.h"
 #include "object/object_manager.h"
 #include "object/robotmain.h"
+
 #include "object/interface/carrier_object.h"
 #include "object/interface/powered_object.h"
 #include "object/interface/transportable_object.h"

src/graphics/engine/cloud.cpp

@@ -21,13 +21,14 @@
 #include "graphics/engine/cloud.h"
 
 #include "graphics/core/device.h"
+
 #include "graphics/engine/engine.h"
 #include "graphics/engine/terrain.h"
 
-#include "object/robotmain.h"
-
 #include "math/geometry.h"
 
+#include "object/robotmain.h"
+
 
 // Graphics module namespace
 namespace Gfx

src/graphics/engine/engine.cpp

@@ -29,6 +29,7 @@
 #include "common/make_unique.h"
 
 #include "graphics/core/device.h"
+
 #include "graphics/engine/camera.h"
 #include "graphics/engine/cloud.h"
 #include "graphics/engine/lightman.h"

src/graphics/engine/lightman.h

@@ -27,6 +27,7 @@
 
 #include "graphics/core/color.h"
 #include "graphics/core/light.h"
+
 #include "graphics/engine/engine.h"
 
 #include "math/vector.h"

src/graphics/engine/lightning.cpp

@@ -25,6 +25,7 @@
 #include "common/logger.h"
 
 #include "graphics/core/device.h"
+
 #include "graphics/engine/camera.h"
 #include "graphics/engine/terrain.h"
 
@@ -33,10 +34,11 @@
 #include "object/object.h"
 #include "object/object_manager.h"
 #include "object/robotmain.h"
-#include "object/interface/transportable_object.h"
 
 #include "object/auto/autopowercaptor.h"
 
+#include "object/interface/transportable_object.h"
+
 
 // Graphics module namespace
 namespace Gfx

src/graphics/engine/oldmodelmanager.cpp

@@ -22,9 +22,10 @@
 #include "app/app.h"
 
 #include "common/logger.h"
-#include "common/resources/inputstream.h"
 #include "common/stringutils.h"
 
+#include "common/resources/inputstream.h"
+
 #include "graphics/engine/engine.h"
 
 #include "graphics/model/model_input.h"

src/graphics/engine/particle.cpp

@@ -25,6 +25,7 @@
 #include "common/logger.h"
 
 #include "graphics/core/device.h"
+
 #include "graphics/engine/engine.h"
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/water.h"

src/graphics/engine/planet.cpp

@@ -21,6 +21,7 @@
 #include "graphics/engine/planet.h"
 
 #include "graphics/core/device.h"
+
 #include "graphics/engine/engine.h"
 
 

src/graphics/engine/pyro.cpp

@@ -30,9 +30,10 @@
 
 #include "math/geometry.h"
 
-#include "object/old_object.h"
 #include "object/object_manager.h"
+#include "object/old_object.h"
 #include "object/robotmain.h"
+
 #include "object/motion/motionhuman.h"
 
 

src/graphics/engine/pyro.h

@@ -29,6 +29,7 @@
 #include "common/global.h"
 
 #include "graphics/core/color.h"
+
 #include "graphics/engine/pyro_type.h"
 
 #include "math/sphere.h"

src/graphics/engine/text.cpp

@@ -25,6 +25,7 @@
 #include "common/image.h"
 #include "common/logger.h"
 #include "common/stringutils.h"
+
 #include "common/resources/resourcemanager.h"
 
 #include "math/func.h"

src/graphics/engine/water.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-
 #include "graphics/engine/water.h"
 
 #include "app/app.h"
@@ -25,6 +24,7 @@
 #include "common/logger.h"
 
 #include "graphics/core/device.h"
+
 #include "graphics/engine/engine.h"
 #include "graphics/engine/terrain.h"
 

src/graphics/model/model_input.cpp

@@ -21,6 +21,7 @@
 
 #include "common/ioutils.h"
 #include "common/logger.h"
+
 #include "common/resources/inputstream.h"
 
 #include "graphics/model/model_io_exception.h"

src/graphics/model/model_io_structs.h

@@ -20,6 +20,7 @@
 #pragma once
 
 #include "graphics/core/material.h"
+
 #include "graphics/model/model_triangle.h"
 
 #include <cstring>

src/graphics/model/model_manager.cpp

@@ -20,6 +20,7 @@
 #include "graphics/model/model_manager.h"
 
 #include "common/logger.h"
+
 #include "common/resources/inputstream.h"
 
 #include "graphics/model/model_input.h"

src/graphics/model/model_mesh.h

@@ -19,10 +19,10 @@
 
 #pragma once
 
-#include "math/vector.h"
-
 #include "graphics/model/model_triangle.h"
 
+#include "math/vector.h"
+
 #include <vector>
 
 namespace Gfx

src/graphics/model/model_output.cpp

@@ -21,11 +21,10 @@
 
 #include "common/ioutils.h"
 
+#include "graphics/model/model.h"
 #include "graphics/model/model_io_exception.h"
 #include "graphics/model/model_io_structs.h"
 
-#include "graphics/model/model.h"
-
 #include <fstream>
 
 namespace Gfx

src/graphics/opengl/gl21device.cpp

@@ -19,13 +19,16 @@
 
 
 #include "graphics/opengl/gl21device.h"
-#include "graphics/opengl/glframebuffer.h"
-#include "graphics/engine/engine.h"
 
 #include "common/config.h"
+
+#include "common/config_file.h"
 #include "common/image.h"
 #include "common/logger.h"
-#include "common/config_file.h"
+
+#include "graphics/engine/engine.h"
+
+#include "graphics/opengl/glframebuffer.h"
 
 #include "math/geometry.h"
 

src/graphics/opengl/gl21device.h

@@ -25,6 +25,7 @@
 #pragma once
 
 #include "graphics/core/device.h"
+
 #include "graphics/opengl/glutil.h"
 
 #include <string>

src/graphics/opengl/gl33device.cpp

@@ -18,13 +18,16 @@
  */
 
 #include "graphics/opengl/gl33device.h"
-#include "graphics/opengl/glframebuffer.h"
-#include "graphics/engine/engine.h"
 
 #include "common/config.h"
+
+#include "common/config_file.h"
 #include "common/image.h"
 #include "common/logger.h"
-#include "common/config_file.h"
+
+#include "graphics/engine/engine.h"
+
+#include "graphics/opengl/glframebuffer.h"
 
 #include "math/geometry.h"
 

src/graphics/opengl/gl33device.h

@@ -25,8 +25,9 @@
 #pragma once
 
 #include "graphics/core/device.h"
-#include "graphics/opengl/glutil.h"
+
 #include "graphics/opengl/glframebuffer.h"
+#include "graphics/opengl/glutil.h"
 
 #include <string>
 #include <vector>

src/graphics/opengl/gldevice.cpp

@@ -19,13 +19,16 @@
 
 
 #include "graphics/opengl/gldevice.h"
-#include "graphics/opengl/glframebuffer.h"
-#include "graphics/engine/engine.h"
 
 #include "common/config.h"
+
 #include "common/image.h"
 #include "common/logger.h"
 
+#include "graphics/engine/engine.h"
+
+#include "graphics/opengl/glframebuffer.h"
+
 #include "math/geometry.h"
 
 

src/graphics/opengl/gldevice.h

@@ -25,8 +25,9 @@
 #pragma once
 
 #include "graphics/core/device.h"
-#include "graphics/opengl/glutil.h"
+
 #include "graphics/opengl/glframebuffer.h"
+#include "graphics/opengl/glutil.h"
 
 #include <string>
 #include <vector>

src/graphics/opengl/glframebuffer.h

@@ -20,6 +20,7 @@
 #pragma once
 
 #include "graphics/core/framebuffer.h"
+
 #include "graphics/opengl/glutil.h"
 
 namespace Gfx

src/graphics/opengl/glutil.cpp

@@ -22,9 +22,9 @@
 #include "common/logger.h"
 #include "common/make_unique.h"
 
-#include "graphics/opengl/gldevice.h"
 #include "graphics/opengl/gl21device.h"
 #include "graphics/opengl/gl33device.h"
+#include "graphics/opengl/gldevice.h"
 
 #include <physfs.h>
 #include <cstring>

src/graphics/opengl/glutil.h

@@ -19,11 +19,11 @@
 
 #pragma once
 
-#include "graphics/core/device.h"
-
-// config.h must be included before glew.h
+// config.h must be included first
 #include "common/config.h"
 
+#include "graphics/core/device.h"
+
 #include <GL/glew.h>
 
 #include <memory>

src/math/all.h

@@ -27,8 +27,8 @@
 
 #include "math/const.h"
 #include "math/func.h"
+#include "math/geometry.h"
+#include "math/matrix.h"
 #include "math/point.h"
 #include "math/vector.h"
-#include "math/matrix.h"
-#include "math/geometry.h"
 

src/math/geometry.h

@@ -27,8 +27,8 @@
 
 #include "math/const.h"
 #include "math/func.h"
-#include "math/point.h"
 #include "math/matrix.h"
+#include "math/point.h"
 #include "math/vector.h"
 
 

src/object/auto/auto.cpp

@@ -25,12 +25,13 @@
 #include "common/event.h"
 #include "common/make_unique.h"
 
-#include "object/level/parserline.h"
-#include "object/level/parserparam.h"
 #include "object/old_object.h"
 
-#include "ui/interface.h"
+#include "object/level/parserline.h"
+#include "object/level/parserparam.h"
+
 #include "ui/gauge.h"
+#include "ui/interface.h"
 #include "ui/window.h"
 
 

src/object/auto/autobase.cpp

@@ -19,12 +19,11 @@
 
 
 #include "object/auto/autobase.h"
-#include "object/interface/transportable_object.h"
 
-#include "graphics/engine/terrain.h"
 #include "graphics/engine/cloud.h"
-#include "graphics/engine/planet.h"
 #include "graphics/engine/lightning.h"
+#include "graphics/engine/planet.h"
+#include "graphics/engine/terrain.h"
 
 #include "math/geometry.h"
 
@@ -32,6 +31,8 @@
 #include "object/old_object.h"
 #include "object/robotmain.h"
 
+#include "object/interface/transportable_object.h"
+
 #include "physics/physics.h"
 
 #include "ui/interface.h"

src/object/auto/autoconvert.cpp

@@ -26,9 +26,11 @@
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
+
+#include "object/interface/transportable_object.h"
+
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
-#include "object/interface/transportable_object.h"
 
 #include "ui/interface.h"
 #include "ui/window.h"

src/object/auto/autoderrick.cpp

@@ -28,6 +28,7 @@
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
+
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
 

src/object/auto/autodestroyer.cpp

@@ -26,12 +26,14 @@
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
+
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
 
 #include "ui/interface.h"
 #include "ui/window.h"
 
+#include <limits>
 
 
 // Object's constructor.

src/object/auto/autoegg.cpp

@@ -29,8 +29,10 @@
 #include "object/brain.h"
 #include "object/object_manager.h"
 #include "object/old_object.h"
+
 #include "object/interface/programmable_object.h"
 #include "object/interface/transportable_object.h"
+
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
 

src/object/auto/autofactory.cpp

@@ -26,15 +26,17 @@
 #include "math/geometry.h"
 
 #include "object/brain.h"
-#include "object/old_object.h"
 #include "object/object_create_params.h"
 #include "object/object_manager.h"
+#include "object/old_object.h"
 #include "object/robotmain.h"
-#include "object/level/parserline.h"
-#include "object/level/parserparam.h"
+
 #include "object/interface/programmable_object.h"
 #include "object/interface/transportable_object.h"
 
+#include "object/level/parserline.h"
+#include "object/level/parserparam.h"
+
 #include "physics/physics.h"
 
 #include "script/script.h"

src/object/auto/autohouston.h

@@ -23,6 +23,7 @@
 
 
 #include "object/auto/auto.h"
+
 #include "graphics/engine/particle.h"
 
 

src/object/auto/autolabo.cpp

@@ -29,9 +29,11 @@
 #include "object/object_manager.h"
 #include "object/old_object.h"
 #include "object/robotmain.h"
+
+#include "object/interface/powered_object.h"
+
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
-#include "object/interface/powered_object.h"
 
 #include "ui/interface.h"
 #include "ui/window.h"

src/object/auto/automush.cpp

@@ -24,6 +24,7 @@
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
+
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
 

src/object/auto/autonest.cpp

@@ -26,6 +26,7 @@
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
+
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
 

src/object/auto/autonuclearplant.cpp

@@ -26,11 +26,13 @@
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
-#include "object/level/parserline.h"
-#include "object/level/parserparam.h"
+
 #include "object/interface/powered_object.h"
 #include "object/interface/transportable_object.h"
 
+#include "object/level/parserline.h"
+#include "object/level/parserparam.h"
+
 #include "ui/interface.h"
 #include "ui/window.h"
 

src/object/auto/autoportico.cpp

@@ -20,11 +20,10 @@
 
 #include "object/auto/autoportico.h"
 
-
 #include "common/stringutils.h"
 
-#include "object/robotmain.h"
 #include "object/old_object.h"
+#include "object/robotmain.h"
 
 
 const int PARAM_DEPOSE = 2;     // run=2 -> deposits the spaceship

src/object/auto/autopowercaptor.cpp

@@ -26,12 +26,14 @@
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
-#include "object/level/parserline.h"
-#include "object/level/parserparam.h"
+
 #include "object/interface/carrier_object.h"
 #include "object/interface/powered_object.h"
 #include "object/interface/transportable_object.h"
 
+#include "object/level/parserline.h"
+#include "object/level/parserparam.h"
+
 #include "ui/interface.h"
 #include "ui/window.h"
 

src/object/auto/autopowerplant.cpp

@@ -28,13 +28,15 @@
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
+
 #include "object/interface/powered_object.h"
 #include "object/interface/transportable_object.h"
+
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
 
-#include "ui/interface.h"
 #include "ui/gauge.h"
+#include "ui/interface.h"
 #include "ui/window.h"
 
 

src/object/auto/autopowerstation.cpp

@@ -27,11 +27,12 @@
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
+
 #include "object/interface/carrier_object.h"
 #include "object/interface/powered_object.h"
 
-#include "ui/interface.h"
 #include "ui/gauge.h"
+#include "ui/interface.h"
 #include "ui/window.h"
 
 

src/object/auto/autoradar.cpp

@@ -25,9 +25,9 @@
 #include "object/object_manager.h"
 #include "object/old_object.h"
 
+#include "ui/gauge.h"
 #include "ui/interface.h"
 #include "ui/window.h"
-#include "ui/gauge.h"
 
 
 

src/object/auto/autorepair.cpp

@@ -24,6 +24,7 @@
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
+
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
 

src/object/auto/autoresearch.cpp

@@ -25,14 +25,16 @@
 
 #include "math/geometry.h"
 
-#include "object/robotmain.h"
 #include "object/old_object.h"
-#include "object/level/parserline.h"
-#include "object/level/parserparam.h"
+#include "object/robotmain.h"
+
 #include "object/interface/powered_object.h"
 
-#include "ui/interface.h"
+#include "object/level/parserline.h"
+#include "object/level/parserparam.h"
+
 #include "ui/gauge.h"
+#include "ui/interface.h"
 #include "ui/window.h"
 
 

src/object/auto/autoroot.cpp

@@ -23,10 +23,10 @@
 #include "graphics/engine/particle.h"
 #include "graphics/engine/terrain.h"
 
-#include "object/old_object.h"
-
 #include "math/geometry.h"
 
+#include "object/old_object.h"
+
 
 
 // Object's constructor.

src/object/auto/autotower.cpp

@@ -26,15 +26,17 @@
 
 #include "object/object_manager.h"
 #include "object/old_object.h"
+
+#include "object/interface/powered_object.h"
+
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
-#include "object/interface/powered_object.h"
 
 #include "physics/physics.h"
 
+#include "ui/gauge.h"
 #include "ui/interface.h"
 #include "ui/window.h"
-#include "ui/gauge.h"
 
 
 const float TOWER_SCOPE     = 200.0f;   // range of beam

src/object/auto/autovault.cpp

@@ -27,9 +27,11 @@
 #include "object/object_manager.h"
 #include "object/old_object.h"
 #include "object/robotmain.h"
+
+#include "object/interface/transportable_object.h"
+
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
-#include "object/interface/transportable_object.h"
 
 #include "ui/interface.h"
 #include "ui/window.h"

src/object/brain.cpp

@@ -26,18 +26,25 @@
 #include "common/misc.h"
 
 #include "graphics/core/color.h"
+
 #include "graphics/engine/terrain.h"
 
-#include "object/old_object.h"
+#include "math/geometry.h"
+
 #include "object/object_manager.h"
-#include "object/motion/motion.h"
-#include "object/motion/motionvehicle.h"
-#include "object/task/taskmanager.h"
-#include "object/level/parserline.h"
-#include "object/level/parserparam.h"
+#include "object/old_object.h"
+
 #include "object/interface/carrier_object.h"
 #include "object/interface/powered_object.h"
 
+#include "object/level/parserline.h"
+#include "object/level/parserparam.h"
+
+#include "object/motion/motion.h"
+#include "object/motion/motionvehicle.h"
+
+#include "object/task/taskmanager.h"
+
 #include "physics/physics.h"
 
 #include "script/script.h"

src/object/brain.h

@@ -24,15 +24,15 @@
 
 #pragma once
 
-
 #include "common/event.h"
 #include "common/misc.h"
 
-#include "object/task/taskmanip.h"
-#include "object/task/taskflag.h"
-#include "object/task/taskshield.h"
 #include "object/trace_color.h"
 
+#include "object/task/taskflag.h"
+#include "object/task/taskmanip.h"
+#include "object/task/taskshield.h"
+
 #include <vector>
 #include <sstream>
 #include <memory>

src/object/interface/jostleable_object.h

@@ -19,10 +19,10 @@
 
 #pragma once
 
-#include "object/object_interface_type.h"
-
 #include "math/sphere.h"
 
+#include "object/object_interface_type.h"
+
 struct Event;
 
 /**

src/object/level/parser.cpp

@@ -19,18 +19,18 @@
 
 #include "object/level/parser.h"
 
-
 #include "app/app.h"
 
 #include "common/make_unique.h"
-#include "common/resources/resourcemanager.h"
+
 #include "common/resources/inputstream.h"
 #include "common/resources/outputstream.h"
-
-#include "object/level/parserexceptions.h"
+#include "common/resources/resourcemanager.h"
 
 #include "object/robotmain.h"
 
+#include "object/level/parserexceptions.h"
+
 #include <string>
 #include <exception>
 #include <sstream>

src/object/level/parser.h

@@ -24,11 +24,11 @@
 
 #pragma once
 
+#include "object/level_category.h"
+
+#include "object/level/parserexceptions.h"
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
-#include "object/level/parserexceptions.h"
-
-#include "object/level_category.h"
 
 #include <string>
 #include <vector>

src/object/level/parserparam.cpp

@@ -17,18 +17,20 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-#include "object/level/parserline.h"
+#include "object/level/parserparam.h"
 
 #include "app/app.h"
 
 #include "common/logger.h"
 #include "common/make_unique.h"
 #include "common/pathman.h"
+
 #include "common/resources/resourcemanager.h"
 
-#include "object/level/parser.h"
 #include "object/robotmain.h"
 
+#include "object/level/parser.h"
+
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
 

src/object/level/parserparam.h

@@ -25,16 +25,17 @@
 #pragma once
 
 #include "graphics/core/color.h"
+
 #include "graphics/engine/camera.h"
-#include "graphics/engine/water.h"
 #include "graphics/engine/pyro_type.h"
+#include "graphics/engine/water.h"
 
 #include "math/point.h"
 
 #include "object/drive_type.h"
+#include "object/mission_type.h"
 #include "object/object_type.h"
 #include "object/tool_type.h"
-#include "object/mission_type.h"
 
 #include <string>
 #include <vector>

src/object/mainmovie.cpp

@@ -24,12 +24,13 @@
 
 #include "math/geometry.h"
 
-#include "object/motion/motionhuman.h"
 #include "object/object.h"
 #include "object/robotmain.h"
 
+#include "object/motion/motionhuman.h"
 
-#include <stdio.h>
+
+#include <cstdio>
 
 
 // Constructor of the application card.

src/object/motion/motion.cpp

@@ -24,15 +24,16 @@
 
 #include "common/make_unique.h"
 
-#include "object/robotmain.h"
 #include "object/old_object.h"
+#include "object/robotmain.h"
+
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
 
 
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 
 // Object's constructor.

src/object/motion/motionhuman.cpp

@@ -30,6 +30,7 @@
 
 #include "object/old_object.h"
 #include "object/robotmain.h"
+
 #include "object/interface/carrier_object.h"
 
 #include "physics/physics.h"

src/object/motion/motiontoto.cpp

@@ -22,12 +22,12 @@
 
 #include "app/app.h"
 
-#include "math/geometry.h"
-
 #include "graphics/engine/oldmodelmanager.h"
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/water.h"
 
+#include "math/geometry.h"
+
 #include "object/old_object.h"
 #include "object/robotmain.h"
 

src/object/motion/motionvehicle.cpp

@@ -33,6 +33,7 @@
 #include "object/brain.h"
 #include "object/object_manager.h"
 #include "object/old_object.h"
+
 #include "object/interface/powered_object.h"
 #include "object/interface/transportable_object.h"
 

src/object/motion/motionvehicle.h

@@ -21,6 +21,7 @@
 
 
 #include "object/motion/motion.h"
+
 #include "object/trace_color.h"
 
 

src/object/object_factory.cpp

@@ -22,21 +22,24 @@
 #include "common/make_unique.h"
 
 #include "graphics/engine/engine.h"
+#include "graphics/engine/lightning.h"
 #include "graphics/engine/oldmodelmanager.h"
 #include "graphics/engine/terrain.h"
-#include "graphics/engine/lightning.h"
+
 #include "graphics/model/model_manager.h"
 
-#include "object/old_object.h"
+#include "math/geometry.h"
+
 #include "object/brain.h"
 #include "object/object_create_params.h"
+#include "object/old_object.h"
 #include "object/robotmain.h"
+
 #include "object/auto/autobase.h"
 #include "object/auto/autoconvert.h"
 #include "object/auto/autoderrick.h"
 #include "object/auto/autodestroyer.h"
 #include "object/auto/autoegg.h"
-#include "object/auto/autopowerplant.h"
 #include "object/auto/autofactory.h"
 #include "object/auto/autoflag.h"
 #include "object/auto/autohouston.h"
@@ -45,29 +48,30 @@
 #include "object/auto/automush.h"
 #include "object/auto/autonest.h"
 #include "object/auto/autonuclearplant.h"
-#include "object/auto/autopowercaptor.h"
 #include "object/auto/autoportico.h"
+#include "object/auto/autopowercaptor.h"
+#include "object/auto/autopowerplant.h"
+#include "object/auto/autopowerstation.h"
 #include "object/auto/autoradar.h"
 #include "object/auto/autorepair.h"
 #include "object/auto/autoresearch.h"
 #include "object/auto/autoroot.h"
-#include "object/auto/autovault.h"
-#include "object/auto/autopowerstation.h"
 #include "object/auto/autotower.h"
+#include "object/auto/autovault.h"
+
 #include "object/motion/motionant.h"
 #include "object/motion/motionbee.h"
-#include "object/motion/motionlevelcontroller.h"
 #include "object/motion/motionhuman.h"
+#include "object/motion/motionlevelcontroller.h"
 #include "object/motion/motionqueen.h"
 #include "object/motion/motionspider.h"
 #include "object/motion/motiontoto.h"
 #include "object/motion/motionvehicle.h"
 #include "object/motion/motionworm.h"
+
 #include "object/subclass/exchange_post.h"
 #include "object/subclass/static_object.h"
 
-#include "math/geometry.h"
-
 #include "physics/physics.h"
 
 using COldObjectUPtr = std::unique_ptr<COldObject>;

src/object/object_manager.cpp

@@ -23,10 +23,11 @@
 #include "math/all.h"
 
 #include "object/object.h"
-#include "object/object_create_params.h"
 #include "object/object_create_exception.h"
+#include "object/object_create_params.h"
 #include "object/object_factory.h"
 #include "object/old_object.h"
+
 #include "object/auto/auto.h"
 
 #include "physics/physics.h"

src/object/old_object.cpp

@@ -37,16 +37,19 @@
 
 #include "math/geometry.h"
 
+#include "object/brain.h"
+#include "object/object_manager.h"
+#include "object/robotmain.h"
+
 #include "object/auto/auto.h"
 #include "object/auto/autojostle.h"
-#include "object/brain.h"
-#include "object/motion/motion.h"
-#include "object/motion/motionvehicle.h"
-#include "object/robotmain.h"
-#include "object/object_manager.h"
+
+#include "object/level/parserexceptions.h"
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
-#include "object/level/parserexceptions.h"
+
+#include "object/motion/motion.h"
+#include "object/motion/motionvehicle.h"
 
 #include "physics/physics.h"
 

src/object/old_object_interface.h

@@ -24,9 +24,8 @@
 
 #pragma once
 
-
-#include "graphics/engine/engine.h"
 #include "graphics/engine/camera.h"
+#include "graphics/engine/engine.h"
 
 #include "object/object_type.h"
 

src/object/player_profile.cpp

@@ -16,19 +16,23 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see http://gnu.org/licenses
  */
+
 #include "object/player_profile.h"
 
+#include "common/config_file.h"
 #include "common/logger.h"
 #include "common/make_unique.h"
-#include "common/config_file.h"
-#include "common/resources/resourcemanager.h"
-#include "common/resources/inputstream.h"
-#include "common/resources/outputstream.h"
 #include "common/restext.h"
 
-#include "object/level/parser.h"
+#include "common/resources/inputstream.h"
+#include "common/resources/outputstream.h"
+#include "common/resources/resourcemanager.h"
+
 #include "object/robotmain.h"
 
+#include "object/level/parser.h"
+
+
 void PlayerApperance::DefPerso()
 {
     this->colorCombi.r = 206.0f/256.0f;

src/object/robotmain.cpp

@@ -17,7 +17,6 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-
 #include "object/robotmain.h"
 
 #include "CBot/CBotDll.h"
@@ -26,20 +25,18 @@
 #include "app/controller.h"
 #include "app/input.h"
 
-#include "clipboard/clipboard.h"
-
+#include "common/config_file.h"
 #include "common/event.h"
 #include "common/global.h"
 #include "common/logger.h"
 #include "common/make_unique.h"
 #include "common/misc.h"
-#include "common/config_file.h"
 #include "common/restext.h"
 #include "common/stringutils.h"
 
-#include "common/resources/resourcemanager.h"
 #include "common/resources/inputstream.h"
 #include "common/resources/outputstream.h"
+#include "common/resources/resourcemanager.h"
 
 #include "graphics/engine/camera.h"
 #include "graphics/engine/cloud.h"
@@ -53,28 +50,34 @@
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/text.h"
 #include "graphics/engine/water.h"
+
 #include "graphics/model/model_manager.h"
 
 #include "math/const.h"
 #include "math/geometry.h"
 
-#include "object/auto/auto.h"
-#include "object/auto/autobase.h"
 #include "object/brain.h"
 #include "object/mainmovie.h"
-#include "object/motion/motion.h"
-#include "object/motion/motionhuman.h"
-#include "object/motion/motiontoto.h"
 #include "object/object.h"
 #include "object/object_create_exception.h"
 #include "object/object_manager.h"
 #include "object/player_profile.h"
 #include "object/scene_conditions.h"
+
+#include "object/auto/auto.h"
+#include "object/auto/autobase.h"
+
+#include "object/level/parser.h"
+
+#include "object/motion/motion.h"
+#include "object/motion/motionhuman.h"
+#include "object/motion/motiontoto.h"
+
+#include "object/subclass/exchange_post.h"
+
 #include "object/task/task.h"
 #include "object/task/taskbuild.h"
 #include "object/task/taskmanip.h"
-#include "object/level/parser.h"
-#include "object/subclass/exchange_post.h"
 
 #include "physics/physics.h"
 
@@ -100,6 +103,7 @@
 
 #include <iomanip>
 
+#include <clipboard/clipboard.h>
 #include <boost/lexical_cast.hpp>
 
 

src/object/robotmain.h

@@ -24,20 +24,19 @@
 
 #pragma once
 
+#include "app/pausemanager.h"
 
 #include "common/global.h"
 #include "common/singleton.h"
 
 #include "graphics/engine/particle.h"
 
-#include "object/level_category.h"
-#include "object/object_type.h"
 #include "object/drive_type.h"
-#include "object/tool_type.h"
+#include "object/level_category.h"
 #include "object/mainmovie.h"
 #include "object/mission_type.h"
-
-#include "app/pausemanager.h"
+#include "object/object_type.h"
+#include "object/tool_type.h"
 
 #include <deque>
 

src/object/scene_conditions.cpp

@@ -17,17 +17,19 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-
 #include "object/scene_conditions.h"
 
 #include "math/geometry.h"
 
-#include "object/level/parserline.h"
-#include "object/object_manager.h"
 #include "object/object.h"
+#include "object/object_manager.h"
+
 #include "object/interface/powered_object.h"
 #include "object/interface/transportable_object.h"
 
+#include "object/level/parserline.h"
+
+
 void CSceneCondition::Read(CLevelParserLine* line)
 {
     this->pos      = line->GetParam("pos")->AsPoint(Math::Vector(0.0f, 0.0f, 0.0f))*g_unit;

src/object/scene_conditions.h

@@ -28,9 +28,9 @@
 
 #include "math/vector.h"
 
+#include "object/drive_type.h"
 #include "object/object_type.h"
 #include "object/tool_type.h"
-#include "object/drive_type.h"
 
 class CLevelParserLine;
 

src/object/subclass/exchange_post.cpp

@@ -25,10 +25,10 @@
 #include "graphics/engine/oldmodelmanager.h"
 
 #include "object/object_create_params.h"
+
+#include "object/level/parserexceptions.h"
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
-#include "object/level/parserexceptions.h"
-
 
 #include "ui/interface.h"
 #include "ui/list.h"

src/object/subclass/exchange_post.h

@@ -21,6 +21,7 @@
 #pragma once
 
 #include "object/old_object.h"
+
 #include "object/auto/auto.h"
 
 #include <string>

src/object/subclass/static_object.cpp

@@ -22,14 +22,15 @@
 #include "common/make_unique.h"
 
 #include "graphics/engine/terrain.h"
+
 #include "graphics/model/model.h"
 #include "graphics/model/model_io_exception.h"
 #include "graphics/model/model_manager.h"
 
-#include "object/object_create_exception.h"
-
 #include "math/geometry.h"
 
+#include "object/object_create_exception.h"
+
 
 const std::unordered_map<ObjectType, std::string, ObjectTypeHash> CStaticObject::m_staticModelNames =
 {

src/object/task/task.cpp

@@ -24,6 +24,7 @@
 
 #include "object/old_object.h"
 #include "object/robotmain.h"
+
 #include "object/interface/programmable_object.h"
 
 

src/object/task/taskadvance.cpp

@@ -27,6 +27,7 @@
 #include "object/object.h"
 
 #include "object/old_object.h"
+
 #include "physics/physics.h"
 
 

src/object/task/taskbuild.cpp

@@ -22,20 +22,24 @@
 
 #include "graphics/core/color.h"
 #include "graphics/core/light.h"
+
 #include "graphics/engine/lightman.h"
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/water.h"
 
 #include "math/geometry.h"
 
-#include "object/auto/auto.h"
-#include "object/motion/motionhuman.h"
 #include "object/object_manager.h"
 #include "object/old_object.h"
 #include "object/robotmain.h"
+
+#include "object/auto/auto.h"
+
 #include "object/interface/carrier_object.h"
 #include "object/interface/transportable_object.h"
 
+#include "object/motion/motionhuman.h"
+
 #include "physics/physics.h"
 
 #include <string.h>

src/object/task/taskbuild.h

@@ -24,10 +24,10 @@
 
 #include "object/task/task.h"
 
-#include "object/object_type.h"
-
 #include "math/vector.h"
 
+#include "object/object_type.h"
+
 
 class CObject;
 

src/object/task/taskdeletemark.cpp

@@ -20,16 +20,15 @@
 
 #include "object/task/taskdeletemark.h"
 
-
 #include "graphics/engine/particle.h"
 #include "graphics/engine/terrain.h"
 
-#include "object/old_object.h"
-#include "object/object_manager.h"
-#include "object/robotmain.h"
-
 #include "math/geometry.h"
 
+#include "object/object_manager.h"
+#include "object/old_object.h"
+#include "object/robotmain.h"
+
 #include "physics/physics.h"
 
 

src/object/task/taskfireant.cpp

@@ -24,9 +24,10 @@
 
 #include "math/geometry.h"
 
-#include "object/motion/motionant.h"
 #include "object/old_object.h"
 
+#include "object/motion/motionant.h"
+
 #include "physics/physics.h"
 
 

src/object/task/taskfireant.h

@@ -23,8 +23,8 @@
 
 
 #include "object/task/task.h"
-#include "math/vector.h"
 
+#include "math/vector.h"
 
 
 enum TaskFireAnt