Introduce forward declarations as suggested by colobot-lint

src/app/input.h

@@ -24,14 +24,17 @@
 
 #pragma once
 
-#include "common/event.h"
 #include "common/key.h"
 #include "common/singleton.h"
 
 #include "math/intpoint.h"
+#include "math/point.h"
+#include "math/vector.h"
 
 #include <map>
 
+struct Event;
+
 /**
  * \struct InputBinding
  * \brief Binding for input slot

src/graphics/core/device.h

@@ -25,14 +25,9 @@
 #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 "math/intpoint.h"
-#include "math/matrix.h"
 
 #include <memory>
 #include <string>
@@ -41,11 +36,25 @@
 class CImage;
 struct ImageData;
 
+namespace Math
+{
+struct Matrix;
+struct Vector;
+} // namespace Math
+
 
 // Graphics module namespace
 namespace Gfx
 {
 
+class CFramebuffer;
+struct FramebufferParams;
+struct Light;
+struct Material;
+struct Vertex;
+struct VertexCol;
+struct VertexTex2;
+
 /**
  * \struct DeviceConfig
  * \brief General config for graphics device

src/graphics/core/nulldevice.h

@@ -24,9 +24,13 @@
 
 #pragma once
 
-
 #include "graphics/core/device.h"
 
+#include "graphics/core/light.h"
+#include "graphics/core/material.h"
+
+#include "math/matrix.h"
+
 // Graphics module namespace
 namespace Gfx
 {

src/graphics/engine/camera.cpp

@@ -23,6 +23,8 @@
 #include "app/app.h"
 #include "app/input.h"
 
+#include "common/event.h"
+
 #include "graphics/engine/engine.h"
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/water.h"
@@ -1086,7 +1088,7 @@ bool CCamera::EventProcess(const Event &event)
             break;
 
         case EVENT_MOUSE_WHEEL:
-            EventMouseWheel(event.GetData<MouseWheelEventData>()->y);
+            EventMouseWheel(event);
             break;
 
         default:
@@ -1101,8 +1103,10 @@ bool CCamera::EventMouseMove(const Event &event)
     return true;
 }
 
-void CCamera::EventMouseWheel(int dir)
+void CCamera::EventMouseWheel(const Event &event)
 {
+    auto dir = event.GetData<MouseWheelEventData>()->y;
+
     if (m_type == CAM_TYPE_BACK)
     {
         m_backDist -= 8.0f*dir;

src/graphics/engine/camera.h

@@ -24,15 +24,13 @@
 
 #pragma once
 
-
-#include "common/event.h"
-
 #include "graphics/engine/engine.h"
 
 
 class CObject;
 class CRobotMain;
 class CInput;
+struct Event;
 
 
 // Graphics module namespace
@@ -226,7 +224,7 @@ protected:
     //! Changes the camera according to the mouse moved
     bool        EventMouseMove(const Event &event);
     //! Mouse wheel operation
-    void        EventMouseWheel(int dir);
+    void        EventMouseWheel(const Event& event);
     //! Changes the camera according to the time elapsed
     bool        EventFrame(const Event &event);
     //! Moves the point of view

src/graphics/engine/engine.cpp

@@ -34,6 +34,7 @@
 #include "common/thread/resource_owning_thread.h"
 
 #include "graphics/core/device.h"
+#include "graphics/core/framebuffer.h"
 
 #include "graphics/engine/camera.h"
 #include "graphics/engine/cloud.h"

src/graphics/engine/engine.h

@@ -46,7 +46,6 @@
 
 
 class CApplication;
-class CObject;
 class CSoundInterface;
 class CImage;
 class CPauseManager;

src/graphics/engine/lightman.h

@@ -24,8 +24,6 @@
 
 #pragma once
 
-
-#include "graphics/core/color.h"
 #include "graphics/core/light.h"
 
 #include "graphics/engine/engine.h"
@@ -37,6 +35,8 @@
 namespace Gfx
 {
 
+struct Color;
+
 /**
  * \struct LightProgression
  * \brief Describes the progression of light parameters change

src/graphics/engine/oldmodelmanager.h

@@ -31,7 +31,6 @@ namespace Gfx
 {
 
 class CEngine;
-class CModelFile;
 
 /**
  * \class COldModelManager

src/graphics/engine/pyro.h

@@ -25,7 +25,6 @@
 #pragma once
 
 
-#include "common/event.h"
 #include "common/error.h"
 
 #include "graphics/core/color.h"
@@ -41,6 +40,7 @@
 class CObject;
 class CRobotMain;
 class CSoundInterface;
+struct Event;
 
 
 // Graphics module namespace
@@ -51,7 +51,6 @@ class CEngine;
 class CTerrain;
 class CCamera;
 class CParticle;
-class CLight;
 class CLightManager;
 
 /**

src/graphics/engine/terrain.h

@@ -24,7 +24,6 @@
 
 #pragma once
 
-#include "graphics/core/material.h"
 #include "graphics/core/vertex.h"
 
 #include "math/const.h"
@@ -41,6 +40,7 @@ namespace Gfx
 
 class CEngine;
 class CWater;
+struct Material;
 
 
 //! Limit of slope considered a flat piece of land

src/graphics/engine/water.h

@@ -24,13 +24,11 @@
 
 #pragma once
 
-
-#include "common/event.h"
-
 #include "graphics/engine/particle.h"
 
 
 class CSoundInterface;
+struct Event;
 
 
 // Graphics module namespace

src/graphics/model/model_mesh.h

@@ -28,8 +28,6 @@
 namespace Gfx
 {
 
-struct ModelTriangle;
-
 /**
  * \class CModelMesh
  * \brief Mesh data saved in model file

src/graphics/opengl/gl21device.cpp

@@ -26,6 +26,8 @@
 #include "common/image.h"
 #include "common/logger.h"
 
+#include "graphics/core/light.h"
+
 #include "graphics/engine/engine.h"
 
 #include "graphics/opengl/glframebuffer.h"

src/graphics/opengl/gl21device.h

@@ -26,8 +26,12 @@
 
 #include "graphics/core/device.h"
 
+#include "graphics/core/material.h"
+
 #include "graphics/opengl/glutil.h"
 
+#include "math/matrix.h"
+
 #include <string>
 #include <vector>
 #include <set>
@@ -38,8 +42,6 @@
 namespace Gfx
 {
 
-struct GLDevicePrivate;
-
 /**
   \class CGL21Device
   \brief Implementation of CDevice interface in OpenGL

src/graphics/opengl/gl33device.cpp

@@ -26,6 +26,8 @@
 #include "common/logger.h"
 #include "common/make_unique.h"
 
+#include "graphics/core/light.h"
+
 #include "graphics/engine/engine.h"
 
 #include "graphics/opengl/glframebuffer.h"

src/graphics/opengl/gl33device.h

@@ -26,9 +26,13 @@
 
 #include "graphics/core/device.h"
 
+#include "graphics/core/material.h"
+
 #include "graphics/opengl/glframebuffer.h"
 #include "graphics/opengl/glutil.h"
 
+#include "math/matrix.h"
+
 #include <map>
 #include <memory>
 #include <set>

src/graphics/opengl/gldevice.cpp

@@ -25,6 +25,8 @@
 #include "common/image.h"
 #include "common/logger.h"
 
+#include "graphics/core/light.h"
+
 #include "graphics/engine/engine.h"
 
 #include "graphics/opengl/glframebuffer.h"

src/graphics/opengl/gldevice.h

@@ -26,9 +26,13 @@
 
 #include "graphics/core/device.h"
 
+#include "graphics/core/material.h"
+
 #include "graphics/opengl/glframebuffer.h"
 #include "graphics/opengl/glutil.h"
 
+#include "math/matrix.h"
+
 #include <string>
 #include <vector>
 #include <set>
@@ -57,8 +61,6 @@ enum ShadowMappingSupport
     SMS_CORE            //! Core support
 };
 
-struct GLDevicePrivate;
-
 /**
   \class CGLDevice
   \brief Implementation of CDevice interface in OpenGL

src/level/mainmovie.h

@@ -24,20 +24,18 @@
 
 #pragma once
 
-
-#include "common/event.h"
-
 #include "math/vector.h"
 
 
 class CRobotMain;
 class CSoundInterface;
+struct Event;
 
 namespace Gfx
 {
 class CCamera;
 class CEngine;
-}
+} // namespace Gfx
 
 enum MainMovieType
 {

src/level/robotmain.cpp

@@ -95,6 +95,7 @@
 
 #include "ui/controls/button.h"
 #include "ui/controls/edit.h"
+#include "ui/controls/group.h"
 #include "ui/controls/interface.h"
 #include "ui/controls/label.h"
 #include "ui/controls/map.h"

src/level/robotmain.h

@@ -27,6 +27,7 @@
 #include "app/pausemanager.h"
 
 #include "common/error.h"
+#include "common/event.h"
 #include "common/singleton.h"
 
 #include "level/build_type.h"

src/object/auto/auto.h

@@ -35,22 +35,20 @@ namespace Ui
 {
 class CInterface;
 class CWindow;
-} /* Ui */
+} // namespace Ui
 
 namespace Gfx
 {
 
 class CEngine;
 class CParticle;
-class CLightManager;
-class CTarrain;
+class CTerrain;
 class CWater;
 class CCloud;
 class CCamera;
 class CPlanet;
 class CLightning;
-class CTerrain;
-} /* Gfx */
+} // namespace Gfx
 
 
 class CAuto

src/object/auto/autolabo.h

@@ -25,8 +25,6 @@
 #include "level/research_type.h"
 
 
-class CPoweredObject;
-
 enum AutoLaboPhase
 {
     ALAP_WAIT       = 1,

src/object/implementation/power_container_impl.h

@@ -21,7 +21,6 @@
 
 #include "object/interface/power_container_object.h"
 
-class CObject;
 
 class CPowerContainerObjectImpl : public CPowerContainerObject
 {

src/object/interface/programmable_object.h

@@ -21,12 +21,12 @@
 
 #include "object/object_interface_type.h"
 
-#include "object/interface/program_storage_object.h"
-
 #include <memory>
 #include <string>
 #include <vector>
 
+struct Program;
+
 /**
  * \class CProgrammableObject
  * \brief Interface for programmable objects

src/object/interface/task_executor_object.h

@@ -29,8 +29,6 @@
 #include "object/task/taskmanip.h"
 #include "object/task/taskshield.h"
 
-class CTask;
-
 /**
  * \class CTaskExecutorObject
  * \brief Interface for objects that can execute tasks

src/object/motion/motion.h

@@ -19,10 +19,10 @@
 
 #pragma once
 
-
-#include "common/event.h"
 #include "common/error.h"
 
+#include "math/vector.h"
+
 #include "object/object_type.h"
 
 namespace Gfx
@@ -33,7 +33,7 @@ class CTerrain;
 class CWater;
 class CCamera;
 class COldModelManager;
-}
+} // namespace Gfx
 
 class CApplication;
 class CPhysics;
@@ -41,6 +41,7 @@ class COldObject;
 class CRobotMain;
 class CSoundInterface;
 class CLevelParserLine;
+struct Event;
 
 
 class CMotion

src/object/motion/motionlevelcontroller.cpp

@@ -20,8 +20,6 @@
 
 #include "object/motion/motionlevelcontroller.h"
 
-#include "graphics/engine/oldmodelmanager.h"
-
 #include "object/old_object.h"
 
 #include "physics/physics.h"

src/object/motion/motiontoto.h

@@ -19,9 +19,9 @@
 
 #pragma once
 
-
 #include "object/motion/motion.h"
 
+#include "math/point.h"
 
 
 enum MotionTotoAction

src/object/object.h

@@ -25,9 +25,9 @@
 #pragma once
 
 #include "object/crash_sphere.h"
+#include "object/object_create_params.h"
 #include "object/object_interface_type.h"
 #include "object/old_object_interface.h"
-#include "object/object_create_params.h"
 
 #include <vector>
 

src/object/old_object.h

@@ -24,6 +24,8 @@
 
 #pragma once
 
+#include "common/event.h"
+
 #include "object/object.h"
 
 #include "object/interface/carrier_object.h"

src/object/old_object_interface.cpp

@@ -21,7 +21,6 @@
 
 #include <stdexcept>
 
-
 void COldObjectInterface::Simplify()
 {
     throw std::logic_error("Simplify: not implemented!");

src/object/old_object_interface.h

@@ -24,11 +24,14 @@
 
 #pragma once
 
-#include "math/matrix.h"
 #include "math/vector.h"
 
 #include "object/object_type.h"
 
+namespace Math
+{
+struct Matrix;
+} // namespace Math
 
 class CAuto;
 

src/object/task/task.h

@@ -19,8 +19,6 @@
 
 #pragma once
 
-
-#include "common/event.h"
 #include "common/error.h"
 
 #include "math/const.h"
@@ -32,7 +30,7 @@ class COldObject;
 class CProgrammableObject;
 class CRobotMain;
 class CSoundInterface;
-
+struct Event;
 
 namespace Gfx
 {

src/object/task/taskgoto.h

@@ -19,13 +19,17 @@
 
 #pragma once
 
-
 #include "object/task/task.h"
 
 #include "math/vector.h"
 
 #include <memory>
 
+namespace Math
+{
+struct Point;
+} // namespace Math;
+
 
 class CObject;
 

src/object/task/tasktake.h

@@ -19,9 +19,10 @@
 
 #pragma once
 
-
 #include "object/task/task.h"
 
+#include "math/vector.h"
+
 #include "object/object_type.h"
 
 

src/physics/physics.h

@@ -46,12 +46,11 @@ namespace Gfx
 {
 class CCamera;
 class CEngine;
-class CLight;
 class CParticle;
 class CTerrain;
 class CWater;
 class CLightManager;
-}
+} // namespace Gfx
 
 
 enum PhysicsMode

src/sound/oalsound/channel.cpp

@@ -20,6 +20,8 @@
 
 #include "sound/oalsound/channel.h"
 
+#include "sound/oalsound/buffer.h"
+
 Channel::Channel()
     : m_buffer(nullptr),
       m_source(0),

src/sound/oalsound/channel.h

@@ -24,9 +24,10 @@
 
 #pragma once
 
+#include "math/vector.h"
+
 #include "sound/sound.h"
 
-#include "sound/oalsound/buffer.h"
 #include "sound/oalsound/check.h"
 
 #include <string>
@@ -36,6 +37,8 @@
 #include <al.h>
 #include <alc.h>
 
+class Buffer;
+
 struct SoundOper
 {
     float finalAmplitude = 0.0f;
@@ -56,47 +59,47 @@ public:
     bool Pause();
     bool Stop();
 
-    bool SetPosition(const Math::Vector &);
+    bool SetPosition(const Math::Vector &pos);
 
-    bool SetFrequency(float);
+    bool SetFrequency(float freq);
     float GetFrequency();
 
     float GetCurrentTime();
-    void SetCurrentTime(float);
+    void SetCurrentTime(float current);
     float GetDuration();
 
-    bool SetVolume(float);
+    bool SetVolume(float vol);
     float GetVolume();
-    void SetVolumeAtrib(float);
+    void SetVolumeAtrib(float volume);
     float GetVolumeAtrib();
 
     bool IsPlaying();
     bool IsReady();
     bool IsLoaded();
 
-    bool SetBuffer(Buffer *);
+    bool SetBuffer(Buffer *buffer);
 
     bool HasEnvelope();
     SoundOper& GetEnvelope();
     void PopEnvelope();
 
     int GetPriority();
-    void SetPriority(int);
+    void SetPriority(int pri);
 
-    void SetStartAmplitude(float);
-    void SetStartFrequency(float);
-    void SetChangeFrequency(float);
+    void SetStartAmplitude(float gain);
+    void SetStartFrequency(float freq);
+    void SetChangeFrequency(float freq);
 
     float GetStartAmplitude();
     float GetStartFrequency();
     float GetChangeFrequency();
     float GetInitFrequency();
 
-    void AddOper(SoundOper);
+    void AddOper(SoundOper oper);
     void ResetOper();
     SoundType GetSoundType();
-    void SetLoop(bool);
-    void Mute(bool);
+    void SetLoop(bool loop);
+    void Mute(bool mute);
     bool IsMuted();
 
     void Reset();

src/sound/sound.h

@@ -24,12 +24,15 @@
 
 #pragma once
 
-#include "math/vector.h"
-
 #include "sound/sound_type.h"
 
 #include <string>
 
+namespace Math
+{
+struct Vector;
+} // namespace Math
+
 /*!
  * Maximum possible audio volume
  */

src/ui/controls/check.h

@@ -21,12 +21,6 @@
 
 #include "ui/controls/control.h"
 
-
-namespace Gfx
-{
-class CEngine;
-}
-
 namespace Ui
 {
 
@@ -43,4 +37,4 @@ public:
     void    Draw() override;
 };
 
-}
+} // namespace Ui

src/ui/controls/color.h

@@ -21,12 +21,7 @@
 
 #include "ui/controls/control.h"
 
-
-namespace Gfx
-{
-class CEngine;
-struct Color;
-}
+#include "graphics/core/color.h"
 
 namespace Ui
 {

src/ui/controls/editvalue.h

@@ -19,16 +19,10 @@
 
 #pragma once
 
-
 #include "ui/controls/control.h"
 
 #include <memory>
 
-namespace Gfx
-{
-class CEngine;
-}
-
 namespace Ui
 {
 
@@ -91,4 +85,4 @@ protected:
 };
 
 
-}
+} // namespace Ui

src/ui/controls/group.h

@@ -19,14 +19,8 @@
 
 #pragma once
 
-
 #include "ui/controls/control.h"
 
-namespace Gfx
-{
-class CEngine;
-}
-
 namespace Ui
 {
 
@@ -41,11 +35,7 @@ public:
     bool    EventProcess(const Event &event) override;
 
     void    Draw() override;
-
-protected:
-
-protected:
 };
 
 
-}
+} // namespace Ui

src/ui/controls/image.h

@@ -19,15 +19,8 @@
 
 #pragma once
 
-
 #include "ui/controls/control.h"
 
-namespace Gfx
-{
-class CEngine;
-}
-
-
 namespace Ui
 {
 
@@ -49,5 +42,4 @@ protected:
     std::string m_filename;
 };
 
-
-}
+} // namespace Ui

src/ui/controls/interface.cpp

@@ -24,6 +24,25 @@
 
 #include "level/robotmain.h"
 
+#include "ui/controls/button.h"
+#include "ui/controls/check.h"
+#include "ui/controls/color.h"
+#include "ui/controls/control.h"
+#include "ui/controls/edit.h"
+#include "ui/controls/editvalue.h"
+#include "ui/controls/enumslider.h"
+#include "ui/controls/group.h"
+#include "ui/controls/image.h"
+#include "ui/controls/key.h"
+#include "ui/controls/label.h"
+#include "ui/controls/list.h"
+#include "ui/controls/map.h"
+#include "ui/controls/scroll.h"
+#include "ui/controls/shortcut.h"
+#include "ui/controls/slider.h"
+#include "ui/controls/target.h"
+#include "ui/controls/window.h"
+
 #include <boost/range/adaptor/reversed.hpp>
 
 

src/ui/controls/interface.h

@@ -20,39 +20,41 @@
 #pragma once
 
 #include "common/event.h"
-#include "common/misc.h"
-
-#include "graphics/engine/camera.h"
-#include "graphics/engine/engine.h"
 
 #include "math/point.h"
 
-#include "ui/controls/button.h"
-#include "ui/controls/check.h"
-#include "ui/controls/color.h"
-#include "ui/controls/control.h"
-#include "ui/controls/edit.h"
-#include "ui/controls/editvalue.h"
-#include "ui/controls/enumslider.h"
-#include "ui/controls/group.h"
-#include "ui/controls/image.h"
-#include "ui/controls/key.h"
-#include "ui/controls/label.h"
-#include "ui/controls/list.h"
-#include "ui/controls/map.h"
-#include "ui/controls/scroll.h"
-#include "ui/controls/shortcut.h"
-#include "ui/controls/slider.h"
-#include "ui/controls/target.h"
-#include "ui/controls/window.h"
-
+#include <array>
 #include <memory>
 #include <string>
-#include <vector>
+
+namespace Gfx
+{
+class CCamera;
+class CEngine;
+} // namespace Gfx
 
 namespace Ui
 {
 
+class CButton;
+class CCheck;
+class CColor;
+class CControl;
+class CEdit;
+class CEditValue;
+class CEnumSlider;
+class CGroup;
+class CImage;
+class CKey;
+class CLabel;
+class CList;
+class CMap;
+class CScroll;
+class CShortcut;
+class CSlider;
+class CTarget;
+class CWindow;
+
 const int MAXCONTROL = 100;
 
 class CInterface

src/ui/controls/label.h

@@ -19,11 +19,9 @@
 
 #pragma once
 
-
 #include "ui/controls/control.h"
 
 #include "common/event.h"
-#include "common/misc.h"
 
 namespace Ui
 {
@@ -41,4 +39,4 @@ public:
 };
 
 
-}
+} // namespace Ui

src/ui/controls/list.h

@@ -19,11 +19,9 @@
 
 #pragma once
 
-
 #include "ui/controls/control.h"
 
 #include "common/event.h"
-#include "common/misc.h"
 
 #include "graphics/engine/text.h"
 

src/ui/controls/scroll.h

@@ -19,11 +19,10 @@
 
 #pragma once
 
+#include "ui/controls/control.h"
 
 #include "common/event.h"
 
-#include "ui/controls/control.h"
-
 #include <memory>
 
 namespace Ui

src/ui/controls/target.h

@@ -19,16 +19,14 @@
 
 #pragma once
 
-#include "common/event.h"
-#include "common/misc.h"
-#include "common/restext.h"
-
-#include "graphics/engine/engine.h"
-
 #include "ui/controls/control.h"
 
+#include "common/event.h"
+
 #include <string>
 
+class CObject;
+
 
 namespace Ui
 {
@@ -50,4 +48,4 @@ protected:
 };
 
 
-}
+} // namespace Ui

src/ui/controls/window.cpp

@@ -17,9 +17,27 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-
 #include "ui/controls/window.h"
 
+#include "ui/controls/button.h"
+#include "ui/controls/check.h"
+#include "ui/controls/color.h"
+#include "ui/controls/control.h"
+#include "ui/controls/edit.h"
+#include "ui/controls/editvalue.h"
+#include "ui/controls/enumslider.h"
+#include "ui/controls/gauge.h"
+#include "ui/controls/group.h"
+#include "ui/controls/image.h"
+#include "ui/controls/key.h"
+#include "ui/controls/label.h"
+#include "ui/controls/list.h"
+#include "ui/controls/map.h"
+#include "ui/controls/scroll.h"
+#include "ui/controls/shortcut.h"
+#include "ui/controls/slider.h"
+#include "ui/controls/target.h"
+
 #include <algorithm>
 
 

src/ui/controls/window.h

@@ -21,24 +21,7 @@
 
 #include "ui/controls/control.h"
 
-#include "ui/controls/button.h"
-#include "ui/controls/check.h"
-#include "ui/controls/color.h"
-#include "ui/controls/control.h"
-#include "ui/controls/edit.h"
-#include "ui/controls/editvalue.h"
-#include "ui/controls/enumslider.h"
-#include "ui/controls/gauge.h"
-#include "ui/controls/group.h"
-#include "ui/controls/image.h"
-#include "ui/controls/key.h"
-#include "ui/controls/label.h"
-#include "ui/controls/list.h"
-#include "ui/controls/map.h"
-#include "ui/controls/scroll.h"
-#include "ui/controls/shortcut.h"
-#include "ui/controls/slider.h"
-#include "ui/controls/target.h"
+#include "graphics/engine/engine.h" // TODO: only needed for EngineMouseType
 
 #include <memory>
 #include <string>
@@ -47,6 +30,24 @@
 namespace Ui
 {
 
+class CButton;
+class CColor;
+class CCheck;
+class CKey;
+class CGroup;
+class CImage;
+class CLabel;
+class CEdit;
+class CEditValue;
+class CScroll;
+class CSlider;
+class CEnumSlider;
+class CList;
+class CShortcut;
+class CMap;
+class CGauge;
+class CTarget;
+
 class CWindow : public CControl
 {
 public:
@@ -150,4 +151,4 @@ protected:
 };
 
 
-}
+} // namespace Ui

src/ui/displayinfo.h

@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include "common/event.h"
-
 #include "graphics/engine/camera.h"
 
 #include <string>
@@ -30,7 +28,6 @@ class CObject;
 class CEventQueue;
 class CPauseManager;
 struct ActivePause;
-
 struct Event;
 
 namespace Gfx
@@ -38,7 +35,7 @@ namespace Gfx
 class CEngine;
 class CParticle;
 class CLightManager;
-}
+} // namespace Gfx
 
 namespace Ui
 {

src/ui/maindialog.cpp

@@ -35,6 +35,7 @@
 #include "sound/sound.h"
 
 #include "ui/controls/button.h"
+#include "ui/controls/label.h"
 #include "ui/controls/interface.h"
 #include "ui/controls/window.h"
 

src/ui/maindialog.h

@@ -19,9 +19,10 @@
 
 #pragma once
 
-#include "common/event.h"
 #include "common/restext.h"
 
+#include "math/point.h"
+
 #include <vector>
 #include <functional>
 
@@ -29,12 +30,13 @@
 class CSettings;
 class CSoundInterface;
 class CRobotMain;
+struct Event;
 
 namespace Gfx
 {
 class CEngine;
 class CParticle;
-}
+} // namespace Gfx
 
 namespace Ui
 {
@@ -50,7 +52,7 @@ public:
     bool    EventProcess(const Event &event);
 
 
-    typedef std::function<void()> DialogCallback;
+    using DialogCallback = std::function<void()>;
     void    StartQuestion(const std::string& text,
                           bool warningYes = false, bool warningNo = false,
                           bool fireParticles = false,

src/ui/mainmap.cpp

@@ -24,6 +24,12 @@
 
 #include "level/robotmain.h"
 
+#include "ui/controls/interface.h"
+#include "ui/controls/map.h"
+#include "ui/controls/scroll.h"
+#include "ui/controls/slider.h"
+#include "ui/controls/window.h"
+
 
 namespace Ui
 {

src/ui/mainmap.h

@@ -19,18 +19,23 @@
 
 #pragma once
 
-#include "common/event.h"
-
 #include "graphics/core/color.h"
 
 #include "math/point.h"
 
-#include "ui/controls/interface.h"
+class CObject;
+class CEventQueue;
 
+namespace Gfx
+{
+class CEngine;
+} // namespace Gfx
 
 namespace Ui
 {
 
+class CInterface;
+
 class CMainMap
 {
 public:
@@ -64,4 +69,4 @@ protected:
     bool            m_bFixImage;
 };
 
-}
+} // namespace Ui

src/ui/mainshort.cpp

@@ -33,6 +33,9 @@
 #include "object/interface/controllable_object.h"
 #include "object/interface/programmable_object.h"
 
+#include "ui/controls/interface.h"
+#include "ui/controls/shortcut.h"
+
 #include <algorithm>
 
 

src/ui/mainshort.h

@@ -21,17 +21,24 @@
 
 #include "common/event.h"
 
-#include "graphics/engine/engine.h"
-
 #include "math/point.h"
 
 #include "object/object_type.h"
 
-#include "ui/controls/interface.h"
+#include <vector>
+
+class CRobotMain;
+class CObject;
+
+namespace Gfx
+{
+class CEngine;
+} // namespace Gfx
 
 namespace Ui
 {
 
+class CInterface;
 
 class CMainShort
 {
@@ -60,4 +67,4 @@ protected:
     bool            m_bBuilding;
 };
 
-}
+} // namespace Ui

src/ui/mainui.cpp

@@ -52,6 +52,7 @@
 #include "ui/screen/screen_welcome.h"
 
 #include "ui/controls/interface.h"
+#include "ui/controls/group.h"
 #include "ui/controls/label.h"
 #include "ui/controls/window.h"
 

src/ui/mainui.h

@@ -34,7 +34,7 @@ namespace Gfx
 {
 class CEngine;
 class CParticle;
-}
+} // namespace Gfx
 
 namespace Ui
 {

src/ui/object_interface.cpp

@@ -22,6 +22,7 @@
 #include "app/app.h"
 
 #include "common/global.h"
+#include "common/restext.h"
 
 #include "graphics/core/color.h"
 
@@ -52,8 +53,15 @@
 
 #include "ui/studio.h"
 
+#include "ui/controls/button.h"
+#include "ui/controls/color.h"
+#include "ui/controls/gauge.h"
+#include "ui/controls/group.h"
 #include "ui/controls/interface.h"
+#include "ui/controls/label.h"
+#include "ui/controls/list.h"
 #include "ui/controls/slider.h"
+#include "ui/controls/target.h"
 #include "ui/controls/window.h"
 
 

src/ui/object_interface.h

@@ -29,7 +29,6 @@ class CPhysics;
 class CMotion;
 class CRobotMain;
 class CSoundInterface;
-class CLevelParserLine;
 struct Program;
 
 namespace Gfx

src/ui/screen/screen_apperance.cpp

@@ -21,6 +21,8 @@
 
 #include "app/app.h"
 
+#include "common/restext.h"
+
 #include "graphics/engine/camera.h"
 
 #include "level/player_profile.h"

src/ui/screen/screen_io.cpp

@@ -20,6 +20,8 @@
 #include "ui/screen/screen_io.h"
 
 #include "common/logger.h"
+#include "common/misc.h"
+#include "common/restext.h"
 #include "common/stringutils.h"
 
 #include "level/player_profile.h"
@@ -35,6 +37,7 @@
 #include "ui/controls/edit.h"
 #include "ui/controls/interface.h"
 #include "ui/controls/image.h"
+#include "ui/controls/list.h"
 #include "ui/controls/window.h"
 
 #include <ctime>

src/ui/screen/screen_io_read.cpp

@@ -21,6 +21,8 @@
 
 #include "app/app.h"
 
+#include "common/restext.h"
+
 #include "level/robotmain.h"
 
 #include "ui/controls/button.h"

src/ui/screen/screen_io_write.cpp

@@ -21,6 +21,8 @@
 
 #include "app/app.h"
 
+#include "common/restext.h"
+
 #include "level/robotmain.h"
 
 #include "ui/controls/button.h"

src/ui/screen/screen_loading.cpp

@@ -24,6 +24,7 @@
 #include "ui/controls/button.h"
 #include "ui/controls/edit.h"
 #include "ui/controls/gauge.h"
+#include "ui/controls/group.h"
 #include "ui/controls/interface.h"
 #include "ui/controls/label.h"
 #include "ui/controls/window.h"

src/ui/screen/screen_main_menu.cpp

@@ -22,6 +22,7 @@
 #include "app/app.h"
 
 #include "common/logger.h"
+#include "common/restext.h"
 
 #include "level/parser/parser.h"
 

src/ui/screen/screen_main_menu.h

@@ -24,8 +24,6 @@
 namespace Ui
 {
 
-class CScreenSetup;
-
 class CScreenMainMenu : public CScreen
 {
 public:

src/ui/screen/screen_player_select.cpp

@@ -24,6 +24,7 @@
 #include "level/robotmain.h"
 
 #include "common/logger.h"
+#include "common/misc.h"
 #include "common/stringutils.h"
 
 #include "level/player_profile.h"
@@ -34,6 +35,8 @@
 
 #include "ui/controls/button.h"
 #include "ui/controls/edit.h"
+#include "ui/controls/gauge.h"
+#include "ui/controls/group.h"
 #include "ui/controls/interface.h"
 #include "ui/controls/label.h"
 #include "ui/controls/list.h"

src/ui/screen/screen_quit.cpp

@@ -21,6 +21,8 @@
 
 #include "app/app.h"
 
+#include "common/restext.h"
+
 #include "level/robotmain.h"
 
 #include "ui/controls/button.h"

src/ui/screen/screen_setup.cpp

@@ -23,6 +23,7 @@
 
 #include "app/app.h"
 
+#include "common/restext.h"
 #include "common/settings.h"
 #include "common/stringutils.h"
 

src/ui/screen/screen_setup_controls.cpp

@@ -27,6 +27,7 @@
 #include "graphics/engine/camera.h"
 
 #include "ui/controls/button.h"
+#include "ui/controls/check.h"
 #include "ui/controls/group.h"
 #include "ui/controls/interface.h"
 #include "ui/controls/key.h"

src/ui/screen/screen_setup_controls.h

@@ -21,13 +21,6 @@
 
 #include "ui/screen/screen_setup.h"
 
-class CSettings;
-
-namespace Gfx
-{
-class CCamera;
-}
-
 namespace Ui
 {
 

src/ui/screen/screen_setup_display.cpp

@@ -23,6 +23,7 @@
 
 #include "app/app.h"
 
+#include "common/restext.h"
 #include "common/settings.h"
 #include "common/stringutils.h"
 

src/ui/screen/screen_setup_display.h

@@ -21,13 +21,6 @@
 
 #include "ui/screen/screen_setup.h"
 
-class CSettings;
-
-namespace Gfx
-{
-class CCamera;
-}
-
 namespace Ui
 {
 

src/ui/screen/screen_setup_game.cpp

@@ -21,6 +21,7 @@
 
 #include "app/app.h"
 
+#include "common/restext.h"
 #include "common/settings.h"
 #include "common/stringutils.h"
 

src/ui/screen/screen_setup_game.h

@@ -21,13 +21,6 @@
 
 #include "ui/screen/screen_setup.h"
 
-class CSettings;
-
-namespace Gfx
-{
-class CCamera;
-}
-
 namespace Ui
 {
 

src/ui/screen/screen_setup_graphics.cpp

@@ -23,6 +23,7 @@
 
 #include "app/app.h"
 
+#include "common/restext.h"
 #include "common/settings.h"
 #include "common/stringutils.h"
 

src/ui/screen/screen_setup_graphics.h

@@ -21,13 +21,6 @@
 
 #include "ui/screen/screen_setup.h"
 
-class CSettings;
-
-namespace Gfx
-{
-class CCamera;
-}
-
 namespace Ui
 {
 

src/ui/screen/screen_setup_sound.cpp

@@ -21,6 +21,7 @@
 
 #include "app/app.h"
 
+#include "common/restext.h"
 #include "common/settings.h"
 #include "common/stringutils.h"
 

src/ui/screen/screen_setup_sound.h

@@ -21,13 +21,6 @@
 
 #include "ui/screen/screen_setup.h"
 
-class CSettings;
-
-namespace Gfx
-{
-class CCamera;
-}
-
 namespace Ui
 {
 

src/ui/studio.cpp

@@ -40,6 +40,7 @@
 
 #include "object/object.h"
 
+#include "object/interface/program_storage_object.h"
 #include "object/interface/programmable_object.h"
 
 #include "script/cbottoken.h"
@@ -59,6 +60,7 @@
 #include "ui/controls/list.h"
 #include "ui/controls/map.h"
 #include "ui/controls/shortcut.h"
+#include "ui/controls/slider.h"
 #include "ui/controls/target.h"
 #include "ui/controls/window.h"
 

src/ui/studio.h

@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include "common/event.h"
-
 #include "graphics/engine/camera.h"
 
 #include <string>
@@ -32,6 +30,7 @@ class CSettings;
 struct Program;
 class CPauseManager;
 struct ActivePause;
+struct Event;
 
 namespace Ui
 {