diff --git a/engines/qdengine/minigames/qd_empty_minigame_interface.h b/engines/qdengine/minigames/qd_empty_minigame_interface.h
index 4918b9832bb..91155aba02b 100644
--- a/engines/qdengine/minigames/qd_empty_minigame_interface.h
+++ b/engines/qdengine/minigames/qd_empty_minigame_interface.h
@@ -1,7 +1,7 @@
 #ifndef QDENGINE_MINIGAMES_QD_EMPTY_INTERFACE_H
 #define QDENGINE_MINIGAMES_QD_EMPTY_INTERFACE_H
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdcore/qd_minigame_interface.h"
 
 namespace QDEngine {
diff --git a/engines/qdengine/parser/qdscr_parser.cpp b/engines/qdengine/parser/qdscr_parser.cpp
index 32d860863f4..e2c78035c00 100644
--- a/engines/qdengine/parser/qdscr_parser.cpp
+++ b/engines/qdengine/parser/qdscr_parser.cpp
@@ -20,7 +20,7 @@
  */
 
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/parser/xml_parser.h"
 
diff --git a/engines/qdengine/parser/xml_parser.cpp b/engines/qdengine/parser/xml_parser.cpp
index 2b9529f2ad7..bdf5ec655de 100644
--- a/engines/qdengine/parser/xml_parser.cpp
+++ b/engines/qdengine/parser/xml_parser.cpp
@@ -22,7 +22,8 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "common/file.h"
 #include "common/textconsole.h"
-#include "qdengine/qd_precomp.h"
+
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_parser.h"
 
 namespace QDEngine {
diff --git a/engines/qdengine/parser/xml_tag_buffer.cpp b/engines/qdengine/parser/xml_tag_buffer.cpp
index 55d40210c3e..7228b0dd073 100644
--- a/engines/qdengine/parser/xml_tag_buffer.cpp
+++ b/engines/qdengine/parser/xml_tag_buffer.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 
 namespace QDEngine {
diff --git a/engines/qdengine/qd_fwd.h b/engines/qdengine/qd_fwd.h
index 86260628d5b..36b751af45c 100644
--- a/engines/qdengine/qd_fwd.h
+++ b/engines/qdengine/qd_fwd.h
@@ -22,6 +22,8 @@
 #ifndef QDENGINE_QD_FWD_H
 #define QDENGINE_QD_FWD_H
 
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
 #include <list>
 #include <string>
 
diff --git a/engines/qdengine/qd_precomp.h b/engines/qdengine/qd_precomp.h
deleted file mode 100644
index f85ab2e4c27..00000000000
--- a/engines/qdengine/qd_precomp.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#define FORBIDDEN_SYMBOL_ALLOW_ALL
-
-#ifndef QDENGINE_QD_PRECOMP_H
-#define QDENGINE_QD_PRECOMP_H
-
-#define __QD_DEBUG_ENABLE__
-
-#include "qdengine/xmath.h"
-
-#define FORBIDDEN_SYMBOL_ALLOW_ALL
-
-#include "engines/qdengine/qd_fwd.h"
-
-namespace QDEngine {
-
-#define VK_ESCAPE     0x1B
-#define VK_RETURN     0x0D
-#define VK_SPACE      0x20
-#define VK_LEFT       0x25
-#define VK_UP         0x26
-#define VK_RIGHT      0x27
-#define VK_DOWN       0x28
-#define VK_BACK       0x08
-#define VK_DELETE     0x2E
-#define VK_HOME       0x24
-#define VK_END        0x23
-#define VK_F10        0x79
-#define VK_F9         0x78
-#define VK_F5         0x74
-#define VK_F6         0x75
-#define VK_PAUSE      0x13
-#define VK_NEXT       0x22
-#define VK_PRIOR      0x21
-
-int engineMain();
-
-} // namespace QDEngine
-
-#endif // QDENGINE_QD_PRECOMP_H
diff --git a/engines/qdengine/qd_runtime.cpp b/engines/qdengine/qd_runtime.cpp
index 238004d9dbb..6ca050f018c 100644
--- a/engines/qdengine/qd_runtime.cpp
+++ b/engines/qdengine/qd_runtime.cpp
@@ -42,8 +42,6 @@
 #include "qdengine/system/input/mouse_input.h"
 #include "qdengine/system/input/keyboard_input.h"
 
-#include "qdengine/qd_precomp.h"
-
 namespace QDEngine {
 
 namespace qdrt {
diff --git a/engines/qdengine/qdcore/qd_animation.cpp b/engines/qdengine/qdcore/qd_animation.cpp
index f88a89a1daa..1a1649854dd 100644
--- a/engines/qdengine/qdcore/qd_animation.cpp
+++ b/engines/qdengine/qdcore/qd_animation.cpp
@@ -25,7 +25,7 @@
 
 #include "qdengine/qdengine.h"
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/system/graphics/gr_dispatcher.h"
 #include "qdengine/system/graphics/gr_tile_animation.h"
 
diff --git a/engines/qdengine/qdcore/qd_animation_frame.cpp b/engines/qdengine/qdcore/qd_animation_frame.cpp
index 9cda82c517f..e6aae9a7b98 100644
--- a/engines/qdengine/qdcore/qd_animation_frame.cpp
+++ b/engines/qdengine/qdcore/qd_animation_frame.cpp
@@ -21,11 +21,8 @@
 
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "common/file.h"
-#include "qdengine/qd_precomp.h"
-#ifndef __QD_SYSLIB__
-//#include "qdengine/parser/qdscr_parser.h"
-#endif
 
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdcore/qd_animation_frame.h"
 
 
diff --git a/engines/qdengine/qdcore/qd_animation_info.cpp b/engines/qdengine/qdcore/qd_animation_info.cpp
index 6d7bbc2205c..c94d6b2bf83 100644
--- a/engines/qdengine/qdcore/qd_animation_info.cpp
+++ b/engines/qdengine/qdcore/qd_animation_info.cpp
@@ -19,7 +19,9 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+#include "qdengine/qd_fwd.h"
+#include "qdengine/xmath.h"
 
 #ifndef __QD_SYSLIB__
 #include "qdengine/parser/xml_tag_buffer.h"
diff --git a/engines/qdengine/qdcore/qd_animation_set.cpp b/engines/qdengine/qdcore/qd_animation_set.cpp
index 165397a7912..f20a7f2d5c0 100644
--- a/engines/qdengine/qdcore/qd_animation_set.cpp
+++ b/engines/qdengine/qdcore/qd_animation_set.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/qdcore/qd_animation_set.h"
diff --git a/engines/qdengine/qdcore/qd_animation_set_info.cpp b/engines/qdengine/qdcore/qd_animation_set_info.cpp
index 51a185fa3df..cc04add810a 100644
--- a/engines/qdengine/qdcore/qd_animation_set_info.cpp
+++ b/engines/qdengine/qdcore/qd_animation_set_info.cpp
@@ -19,13 +19,12 @@
  *
  */
 
-
-#include "qdengine/qd_precomp.h"
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdcore/qd_animation_set_info.h"
 #include "qdengine/qdcore/qd_game_dispatcher.h"
 #include "qdengine/qdcore/qd_game_scene.h"
 
-
 namespace QDEngine {
 
 qdAnimationSet *qdAnimationSetInfo::animation_set() const {
diff --git a/engines/qdengine/qdcore/qd_animation_set_preview.cpp b/engines/qdengine/qdcore/qd_animation_set_preview.cpp
index 47c1d78b7b2..aa119dd0ab7 100644
--- a/engines/qdengine/qdcore/qd_animation_set_preview.cpp
+++ b/engines/qdengine/qdcore/qd_animation_set_preview.cpp
@@ -22,7 +22,7 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "common/system.h"
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdcore/qd_animation_set.h"
 #include "qdengine/qdcore/qd_animation_set_preview.h"
 #include "qdengine/qdcore/qd_camera.h"
diff --git a/engines/qdengine/qdcore/qd_camera.cpp b/engines/qdengine/qdcore/qd_camera.cpp
index c2120a52453..1811e836fbd 100644
--- a/engines/qdengine/qdcore/qd_camera.cpp
+++ b/engines/qdengine/qdcore/qd_camera.cpp
@@ -23,7 +23,7 @@
 #include "common/debug.h"
 #include "common/file.h"
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/system/graphics/gr_dispatcher.h"
diff --git a/engines/qdengine/qdcore/qd_camera_mode.cpp b/engines/qdengine/qdcore/qd_camera_mode.cpp
index be3a83d9d67..5dc7cf8e4bd 100644
--- a/engines/qdengine/qdcore/qd_camera_mode.cpp
+++ b/engines/qdengine/qdcore/qd_camera_mode.cpp
@@ -23,7 +23,7 @@
 #include "common/debug.h"
 #include "common/stream.h"
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/qdcore/qd_camera_mode.h"
diff --git a/engines/qdengine/qdcore/qd_camera_mode.h b/engines/qdengine/qdcore/qd_camera_mode.h
index 20365666406..3e534c0223f 100644
--- a/engines/qdengine/qdcore/qd_camera_mode.h
+++ b/engines/qdengine/qdcore/qd_camera_mode.h
@@ -23,10 +23,11 @@
 #ifndef QDENGINE_QDCORE_QD_CAMERA_MODE_H
 #define QDENGINE_QDCORE_QD_CAMERA_MODE_H
 
+#include "qdengine/xmath.h"
 #include "qdengine/parser/xml_fwd.h"
-#include "qdengine/qd_precomp.h"
 
 namespace Common {
+class SeekableReadStream;
 class WriteStream;
 }
 
diff --git a/engines/qdengine/qdcore/qd_condition.cpp b/engines/qdengine/qdcore/qd_condition.cpp
index d5991652a2d..661e5a09e7a 100644
--- a/engines/qdengine/qdcore/qd_condition.cpp
+++ b/engines/qdengine/qdcore/qd_condition.cpp
@@ -23,7 +23,7 @@
 #include "common/debug.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/qdcore/qd_rnd.h"
diff --git a/engines/qdengine/qdcore/qd_condition_data.cpp b/engines/qdengine/qdcore/qd_condition_data.cpp
index 886b4d873f2..92ca1afb471 100644
--- a/engines/qdengine/qdcore/qd_condition_data.cpp
+++ b/engines/qdengine/qdcore/qd_condition_data.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/qdcore/qd_condition_data.h"
diff --git a/engines/qdengine/qdcore/qd_condition_group.cpp b/engines/qdengine/qdcore/qd_condition_group.cpp
index fe1e2733a8b..f9b6bb632ad 100644
--- a/engines/qdengine/qdcore/qd_condition_group.cpp
+++ b/engines/qdengine/qdcore/qd_condition_group.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/qdcore/qd_condition_group.h"
diff --git a/engines/qdengine/qdcore/qd_condition_object_reference.cpp b/engines/qdengine/qdcore/qd_condition_object_reference.cpp
index dd8b9589f09..94bb1547282 100644
--- a/engines/qdengine/qdcore/qd_condition_object_reference.cpp
+++ b/engines/qdengine/qdcore/qd_condition_object_reference.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_tag.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/qdcore/qd_game_dispatcher.h"
diff --git a/engines/qdengine/qdcore/qd_conditional_object.cpp b/engines/qdengine/qdcore/qd_conditional_object.cpp
index 781805a0c1c..1fa59d4c5d5 100644
--- a/engines/qdengine/qdcore/qd_conditional_object.cpp
+++ b/engines/qdengine/qdcore/qd_conditional_object.cpp
@@ -24,7 +24,7 @@
 #include "common/debug.h"
 #include "common/stream.h"
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/qdcore/qd_conditional_object.h"
diff --git a/engines/qdengine/qdcore/qd_contour.cpp b/engines/qdengine/qdcore/qd_contour.cpp
index eec2c48dbee..f8473427748 100644
--- a/engines/qdengine/qdcore/qd_contour.cpp
+++ b/engines/qdengine/qdcore/qd_contour.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/qdcore/qd_contour.h"
diff --git a/engines/qdengine/qdcore/qd_contour.h b/engines/qdengine/qdcore/qd_contour.h
index 369d4a2232d..dff1285940c 100644
--- a/engines/qdengine/qdcore/qd_contour.h
+++ b/engines/qdengine/qdcore/qd_contour.h
@@ -23,6 +23,7 @@
 #define QDENGINE_QDCORE_QD_CONTOUR_H
 
 #include "qdengine/parser/xml_fwd.h"
+#include "qdengine/xmath.h"
 
 namespace Common {
 class WriteStream;
diff --git a/engines/qdengine/qdcore/qd_coords_animation.cpp b/engines/qdengine/qdcore/qd_coords_animation.cpp
index 88041defb0e..a4bab1d0bce 100644
--- a/engines/qdengine/qdcore/qd_coords_animation.cpp
+++ b/engines/qdengine/qdcore/qd_coords_animation.cpp
@@ -22,7 +22,8 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "common/debug.h"
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
+#include "qdengine/xmath.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/qdcore/qd_coords_animation.h"
diff --git a/engines/qdengine/qdcore/qd_coords_animation_point.cpp b/engines/qdengine/qdcore/qd_coords_animation_point.cpp
index f7e7cb28732..db84859d843 100644
--- a/engines/qdengine/qdcore/qd_coords_animation_point.cpp
+++ b/engines/qdengine/qdcore/qd_coords_animation_point.cpp
@@ -19,7 +19,8 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
+#include "qdengine/xmath.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/qdcore/qd_coords_animation_point.h"
diff --git a/engines/qdengine/qdcore/qd_counter.cpp b/engines/qdengine/qdcore/qd_counter.cpp
index 8a001aa5eb1..6bacfbfc941 100644
--- a/engines/qdengine/qdcore/qd_counter.cpp
+++ b/engines/qdengine/qdcore/qd_counter.cpp
@@ -24,7 +24,7 @@
 #include "common/stream.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/qdcore/qd_counter.h"
diff --git a/engines/qdengine/qdcore/qd_d3dutils.cpp b/engines/qdengine/qdcore/qd_d3dutils.cpp
index 2a19b8c7ed0..5dcbdef6649 100644
--- a/engines/qdengine/qdcore/qd_d3dutils.cpp
+++ b/engines/qdengine/qdcore/qd_d3dutils.cpp
@@ -20,7 +20,6 @@
  */
 
 // Note:  Must Define D3D_OVERLOADS to get C++ version of MATRIX3D
-#include "qdengine/qd_precomp.h"
 #include "qdengine/qdcore/qd_d3dutils.h"
 
 //набор своих функций, потому что те, что представлены в xMath.h
diff --git a/engines/qdengine/qdcore/qd_d3dutils.h b/engines/qdengine/qdcore/qd_d3dutils.h
index 3befba8ae77..db00011e201 100644
--- a/engines/qdengine/qdcore/qd_d3dutils.h
+++ b/engines/qdengine/qdcore/qd_d3dutils.h
@@ -19,8 +19,10 @@
  *
  */
 
-#ifndef D3DUTILS_H
-#define D3DUTILS_H
+#ifndef QDENGINE_QDCORE_QD_ENGINE_D3DUTILS_H
+#define QDENGINE_QDCORE_QD_ENGINE_D3DUTILS_H
+
+#include "qdengine/xmath.h"
 
 namespace QDEngine {
 
@@ -103,4 +105,4 @@ Vect3f TransformNormal(const Vect3f &v, const MATRIX3D &m);
 
 } // namespace QDEngine
 
-#endif // D3DUTILS_H
+#endif // QDENGINE_QDCORE_QD_ENGINE_D3DUTILS_H
diff --git a/engines/qdengine/qdcore/qd_file_manager.cpp b/engines/qdengine/qdcore/qd_file_manager.cpp
index 322469fbad0..930e0e3b591 100644
--- a/engines/qdengine/qdcore/qd_file_manager.cpp
+++ b/engines/qdengine/qdcore/qd_file_manager.cpp
@@ -25,6 +25,7 @@
 #include "common/compression/unzip.h"
 
 #include "qdengine/qdengine.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdcore/qd_file_manager.h"
 
 namespace QDEngine {
diff --git a/engines/qdengine/qdcore/qd_file_manager.h b/engines/qdengine/qdcore/qd_file_manager.h
index 1544698a1b5..51167130976 100644
--- a/engines/qdengine/qdcore/qd_file_manager.h
+++ b/engines/qdengine/qdcore/qd_file_manager.h
@@ -23,7 +23,6 @@
 #ifndef QDENGINE_QDCORE_QD_FILE_MANAGER_H
 #define QDENGINE_QDCORE_QD_FILE_MANAGER_H
 
-#include "qdengine/qd_precomp.h"
 #include "qdengine/qdcore/qd_file_owner.h"
 
 namespace Common {
diff --git a/engines/qdengine/qdcore/qd_font_info.cpp b/engines/qdengine/qdcore/qd_font_info.cpp
index a2fd0ca17e4..012382c0040 100644
--- a/engines/qdengine/qdcore/qd_font_info.cpp
+++ b/engines/qdengine/qdcore/qd_font_info.cpp
@@ -22,7 +22,7 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "common/path.h"
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdcore/qd_font_info.h"
 #include "qdengine/qdcore/qd_file_manager.h"
 
diff --git a/engines/qdengine/qdcore/qd_game_dispatcher.cpp b/engines/qdengine/qdcore/qd_game_dispatcher.cpp
index 7b14b1acc64..73b3119642b 100644
--- a/engines/qdengine/qdcore/qd_game_dispatcher.cpp
+++ b/engines/qdengine/qdcore/qd_game_dispatcher.cpp
@@ -29,7 +29,7 @@
 #include "video/mpegps_decoder.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/parser/xml_parser.h"
 
diff --git a/engines/qdengine/qdcore/qd_game_dispatcher_base.cpp b/engines/qdengine/qdcore/qd_game_dispatcher_base.cpp
index ff5c1560efa..da49f70ee92 100644
--- a/engines/qdengine/qdcore/qd_game_dispatcher_base.cpp
+++ b/engines/qdengine/qdcore/qd_game_dispatcher_base.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 
 #include "qdengine/parser/xml_tag.h"
 #include "qdengine/parser/qdscr_parser.h"
diff --git a/engines/qdengine/qdcore/qd_game_dispatcher_base.h b/engines/qdengine/qdcore/qd_game_dispatcher_base.h
index a39ea486e49..fd17053fbd0 100644
--- a/engines/qdengine/qdcore/qd_game_dispatcher_base.h
+++ b/engines/qdengine/qdcore/qd_game_dispatcher_base.h
@@ -26,6 +26,7 @@
 #include "qdengine/qdcore/qd_object_map_container.h"
 #include "qdengine/qdcore/qd_scale_info.h"
 
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_fwd.h"
 
 #ifdef __QD_DEBUG_ENABLE__
diff --git a/engines/qdengine/qdcore/qd_game_end.cpp b/engines/qdengine/qdcore/qd_game_end.cpp
index abaa223e885..f9b4819b37f 100644
--- a/engines/qdengine/qdcore/qd_game_end.cpp
+++ b/engines/qdengine/qdcore/qd_game_end.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/qdcore/qd_game_end.h"
diff --git a/engines/qdengine/qdcore/qd_game_object.cpp b/engines/qdengine/qdcore/qd_game_object.cpp
index c8b08bd3e04..278beeb9edc 100644
--- a/engines/qdengine/qdcore/qd_game_object.cpp
+++ b/engines/qdengine/qdcore/qd_game_object.cpp
@@ -23,7 +23,8 @@
 #include "common/debug.h"
 #include "common/stream.h"
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
+#include "qdengine/xmath.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/qdcore/qd_game_object.h"
diff --git a/engines/qdengine/qdcore/qd_game_object_animated.cpp b/engines/qdengine/qdcore/qd_game_object_animated.cpp
index 078cef71247..94b735db1d4 100644
--- a/engines/qdengine/qdcore/qd_game_object_animated.cpp
+++ b/engines/qdengine/qdcore/qd_game_object_animated.cpp
@@ -23,7 +23,7 @@
 #include "common/debug.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/qdcore/qd_game_object_mouse.h"
diff --git a/engines/qdengine/qdcore/qd_game_object_mouse.cpp b/engines/qdengine/qdcore/qd_game_object_mouse.cpp
index 2abcd76f2db..0b170c13890 100644
--- a/engines/qdengine/qdcore/qd_game_object_mouse.cpp
+++ b/engines/qdengine/qdcore/qd_game_object_mouse.cpp
@@ -22,8 +22,9 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "common/debug.h"
 #include "common/stream.h"
+
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdcore/qd_rnd.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/parser/xml_tag_buffer.h"
diff --git a/engines/qdengine/qdcore/qd_game_object_moving.cpp b/engines/qdengine/qdcore/qd_game_object_moving.cpp
index d669654bc64..dabb0e572df 100644
--- a/engines/qdengine/qdcore/qd_game_object_moving.cpp
+++ b/engines/qdengine/qdcore/qd_game_object_moving.cpp
@@ -23,7 +23,7 @@
 
 #include "common/debug.h"
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdengine.h"
 #include "qdengine/qdcore/qd_rnd.h"
 #include "qdengine/system/graphics/gr_dispatcher.h"
diff --git a/engines/qdengine/qdcore/qd_game_object_state.cpp b/engines/qdengine/qdcore/qd_game_object_state.cpp
index cb29de48d3a..b4d5d81f15e 100644
--- a/engines/qdengine/qdcore/qd_game_object_state.cpp
+++ b/engines/qdengine/qdcore/qd_game_object_state.cpp
@@ -21,8 +21,8 @@
 
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "common/debug.h"
-#include "qdengine/qd_precomp.h"
 
+#include "qdengine/qd_fwd.h"
 #include "qdengine/system/graphics/gr_dispatcher.h"
 #include "qdengine/system/sound/snd_dispatcher.h"
 #include "qdengine/parser/xml_tag_buffer.h"
diff --git a/engines/qdengine/qdcore/qd_game_object_static.cpp b/engines/qdengine/qdcore/qd_game_object_static.cpp
index 9e41bac6db7..d3bd97e0850 100644
--- a/engines/qdengine/qdcore/qd_game_object_static.cpp
+++ b/engines/qdengine/qdcore/qd_game_object_static.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_tag.h"
 #include "qdengine/parser/qdscr_parser.h"
 
diff --git a/engines/qdengine/qdcore/qd_game_scene.cpp b/engines/qdengine/qdcore/qd_game_scene.cpp
index 14dc584d044..56726d478f0 100644
--- a/engines/qdengine/qdcore/qd_game_scene.cpp
+++ b/engines/qdengine/qdcore/qd_game_scene.cpp
@@ -24,7 +24,7 @@
 #include "common/stream.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/system/graphics/gr_dispatcher.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/system/input/mouse_input.h"
diff --git a/engines/qdengine/qdcore/qd_grid_zone.cpp b/engines/qdengine/qdcore/qd_grid_zone.cpp
index b096421db7f..e7f48324b7b 100644
--- a/engines/qdengine/qdcore/qd_grid_zone.cpp
+++ b/engines/qdengine/qdcore/qd_grid_zone.cpp
@@ -24,7 +24,7 @@
 #include "common/stream.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/qdcore/qd_game_scene.h"
diff --git a/engines/qdengine/qdcore/qd_grid_zone_state.cpp b/engines/qdengine/qdcore/qd_grid_zone_state.cpp
index a65d658fe25..5f34d1767d9 100644
--- a/engines/qdengine/qdcore/qd_grid_zone_state.cpp
+++ b/engines/qdengine/qdcore/qd_grid_zone_state.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdcore/qd_grid_zone.h"
 #include "qdengine/qdcore/qd_grid_zone_state.h"
 
diff --git a/engines/qdengine/qdcore/qd_interface_background.cpp b/engines/qdengine/qdcore/qd_interface_background.cpp
index be080d5b88e..3f8ebb83e1f 100644
--- a/engines/qdengine/qdcore/qd_interface_background.cpp
+++ b/engines/qdengine/qdcore/qd_interface_background.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/parser/xml_tag.h"
diff --git a/engines/qdengine/qdcore/qd_interface_button.cpp b/engines/qdengine/qdcore/qd_interface_button.cpp
index de1ba17444a..99e2d3c726b 100644
--- a/engines/qdengine/qdcore/qd_interface_button.cpp
+++ b/engines/qdengine/qdcore/qd_interface_button.cpp
@@ -23,7 +23,7 @@
 #include "common/debug.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/parser/xml_tag.h"
 #include "qdengine/qdcore/qd_game_dispatcher.h"
diff --git a/engines/qdengine/qdcore/qd_interface_counter.cpp b/engines/qdengine/qdcore/qd_interface_counter.cpp
index ad2cbe64407..14f9a38c6a8 100644
--- a/engines/qdengine/qdcore/qd_interface_counter.cpp
+++ b/engines/qdengine/qdcore/qd_interface_counter.cpp
@@ -22,7 +22,7 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "common/debug.h"
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/qdcore/qd_game_dispatcher.h"
diff --git a/engines/qdengine/qdcore/qd_interface_dispatcher.cpp b/engines/qdengine/qdcore/qd_interface_dispatcher.cpp
index 8b06e53c05b..91251633c11 100644
--- a/engines/qdengine/qdcore/qd_interface_dispatcher.cpp
+++ b/engines/qdengine/qdcore/qd_interface_dispatcher.cpp
@@ -24,7 +24,7 @@
 #include "common/savefile.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/parser/qdscr_parser.h"
 
diff --git a/engines/qdengine/qdcore/qd_interface_element.cpp b/engines/qdengine/qdcore/qd_interface_element.cpp
index 895f1ad1ef0..54d0ab08c55 100644
--- a/engines/qdengine/qdcore/qd_interface_element.cpp
+++ b/engines/qdengine/qdcore/qd_interface_element.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/system/sound/snd_dispatcher.h"
diff --git a/engines/qdengine/qdcore/qd_interface_element_state.cpp b/engines/qdengine/qdcore/qd_interface_element_state.cpp
index b4a2f24fea4..1846250d380 100644
--- a/engines/qdengine/qdcore/qd_interface_element_state.cpp
+++ b/engines/qdengine/qdcore/qd_interface_element_state.cpp
@@ -23,7 +23,7 @@
 #include "common/debug.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/parser/qdscr_parser.h"
 
diff --git a/engines/qdengine/qdcore/qd_interface_element_state_mode.cpp b/engines/qdengine/qdcore/qd_interface_element_state_mode.cpp
index fe12d59feba..55ced064af9 100644
--- a/engines/qdengine/qdcore/qd_interface_element_state_mode.cpp
+++ b/engines/qdengine/qdcore/qd_interface_element_state_mode.cpp
@@ -19,14 +19,12 @@
  *
  */
 
-
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/parser/qdscr_parser.h"
 
 #include "qd_interface_element_state_mode.h"
 
-
 namespace QDEngine {
 
 qdInterfaceElementStateMode::qdInterfaceElementStateMode() : _sound(NULL),
diff --git a/engines/qdengine/qdcore/qd_interface_object_base.cpp b/engines/qdengine/qdcore/qd_interface_object_base.cpp
index f48329930b6..f7c8560866f 100644
--- a/engines/qdengine/qdcore/qd_interface_object_base.cpp
+++ b/engines/qdengine/qdcore/qd_interface_object_base.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdcore/qd_interface_object_base.h"
 
 
diff --git a/engines/qdengine/qdcore/qd_interface_save.cpp b/engines/qdengine/qdcore/qd_interface_save.cpp
index 352b31d808f..593ffbe95b2 100644
--- a/engines/qdengine/qdcore/qd_interface_save.cpp
+++ b/engines/qdengine/qdcore/qd_interface_save.cpp
@@ -28,7 +28,7 @@
 #include "engines/metaengine.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/qdcore/qd_game_dispatcher.h"
diff --git a/engines/qdengine/qdcore/qd_interface_screen.cpp b/engines/qdengine/qdcore/qd_interface_screen.cpp
index 0ea5092211e..69589ad6510 100644
--- a/engines/qdengine/qdcore/qd_interface_screen.cpp
+++ b/engines/qdengine/qdcore/qd_interface_screen.cpp
@@ -23,7 +23,7 @@
 #include "common/debug.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/parser/qdscr_parser.h"
diff --git a/engines/qdengine/qdcore/qd_interface_screen.h b/engines/qdengine/qdcore/qd_interface_screen.h
index 4c73ebabb9c..ec259c101ec 100644
--- a/engines/qdengine/qdcore/qd_interface_screen.h
+++ b/engines/qdengine/qdcore/qd_interface_screen.h
@@ -26,6 +26,7 @@
 #include "common/keyboard.h"
 
 #include "qdengine/parser/xml_fwd.h"
+#include "qdengine/xmath.h"
 #include "qdengine/qdcore/qd_interface_object_base.h"
 #include "qdengine/qdcore/qd_object_list_container.h"
 #include "qdengine/qdcore/qd_resource_dispatcher.h"
diff --git a/engines/qdengine/qdcore/qd_interface_slider.cpp b/engines/qdengine/qdcore/qd_interface_slider.cpp
index 9f743af31f1..b6d9378987d 100644
--- a/engines/qdengine/qdcore/qd_interface_slider.cpp
+++ b/engines/qdengine/qdcore/qd_interface_slider.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/qdcore/qd_interface_slider.h"
diff --git a/engines/qdengine/qdcore/qd_interface_text_window.cpp b/engines/qdengine/qdcore/qd_interface_text_window.cpp
index 092dcd5025e..2147d700e60 100644
--- a/engines/qdengine/qdcore/qd_interface_text_window.cpp
+++ b/engines/qdengine/qdcore/qd_interface_text_window.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 
@@ -649,6 +649,8 @@ bool qdInterfaceTextWindow::edit_input(Common::KeyCode vkey) {
 
 			return true;
 
+		default:
+			break;
 		}
 
 		return true;
diff --git a/engines/qdengine/qdcore/qd_inventory.cpp b/engines/qdengine/qdcore/qd_inventory.cpp
index e8ca425f7c9..ba28e13fe93 100644
--- a/engines/qdengine/qdcore/qd_inventory.cpp
+++ b/engines/qdengine/qdcore/qd_inventory.cpp
@@ -24,7 +24,7 @@
 #include "common/debug.h"
 #include "common/stream.h"
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdengine.h"
 
 #include "qdengine/parser/xml_tag_buffer.h"
diff --git a/engines/qdengine/qdcore/qd_inventory_cell.cpp b/engines/qdengine/qdcore/qd_inventory_cell.cpp
index 5943cab31e4..de3bbe6ebb3 100644
--- a/engines/qdengine/qdcore/qd_inventory_cell.cpp
+++ b/engines/qdengine/qdcore/qd_inventory_cell.cpp
@@ -23,7 +23,7 @@
 #include "common/debug.h"
 #include "common/stream.h"
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/qdcore/qd_game_dispatcher.h"
diff --git a/engines/qdengine/qdcore/qd_minigame.cpp b/engines/qdengine/qdcore/qd_minigame.cpp
index 87490024d9b..0cfd087361d 100644
--- a/engines/qdengine/qdcore/qd_minigame.cpp
+++ b/engines/qdengine/qdcore/qd_minigame.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/system/graphics/gr_dispatcher.h"
diff --git a/engines/qdengine/qdcore/qd_minigame_config.cpp b/engines/qdengine/qdcore/qd_minigame_config.cpp
index 93e812a4fc8..cdf28595b7a 100644
--- a/engines/qdengine/qdcore/qd_minigame_config.cpp
+++ b/engines/qdengine/qdcore/qd_minigame_config.cpp
@@ -21,7 +21,8 @@
 
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "common/str.h"
-#include "qdengine/qd_precomp.h"
+
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/qdcore/qd_setup.h"
diff --git a/engines/qdengine/qdcore/qd_minigame_interface.cpp b/engines/qdengine/qdcore/qd_minigame_interface.cpp
index 34c252dfe51..eaf4a195378 100644
--- a/engines/qdengine/qdcore/qd_minigame_interface.cpp
+++ b/engines/qdengine/qdcore/qd_minigame_interface.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_fwd.h"
 #include "qdengine/qdcore/qd_minigame.h"
 #include "qdengine/qdcore/qd_counter.h"
diff --git a/engines/qdengine/qdcore/qd_music_track.cpp b/engines/qdengine/qdcore/qd_music_track.cpp
index 8d363cd157c..6dce329ef56 100644
--- a/engines/qdengine/qdcore/qd_music_track.cpp
+++ b/engines/qdengine/qdcore/qd_music_track.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/qdcore/qd_game_dispatcher.h"
diff --git a/engines/qdengine/qdcore/qd_named_object.cpp b/engines/qdengine/qdcore/qd_named_object.cpp
index e6f1df056f2..af3fd5251f8 100644
--- a/engines/qdengine/qdcore/qd_named_object.cpp
+++ b/engines/qdengine/qdcore/qd_named_object.cpp
@@ -23,7 +23,7 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "common/stream.h"
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdcore/qd_named_object.h"
 
 
diff --git a/engines/qdengine/qdcore/qd_named_object_base.cpp b/engines/qdengine/qdcore/qd_named_object_base.cpp
index 656bbf2da10..adc09318823 100644
--- a/engines/qdengine/qdcore/qd_named_object_base.cpp
+++ b/engines/qdengine/qdcore/qd_named_object_base.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdcore/qd_named_object_base.h"
 
 namespace QDEngine {
diff --git a/engines/qdengine/qdcore/qd_named_object_indexer.cpp b/engines/qdengine/qdcore/qd_named_object_indexer.cpp
index 45c898a4f5b..f8ef617402d 100644
--- a/engines/qdengine/qdcore/qd_named_object_indexer.cpp
+++ b/engines/qdengine/qdcore/qd_named_object_indexer.cpp
@@ -23,7 +23,7 @@
 #include "common/debug.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdcore/qd_named_object_indexer.h"
 #include "qdengine/qdcore/qd_game_dispatcher.h"
 
diff --git a/engines/qdengine/qdcore/qd_named_object_reference.cpp b/engines/qdengine/qdcore/qd_named_object_reference.cpp
index 0254d3176f8..01b418dc1a5 100644
--- a/engines/qdengine/qdcore/qd_named_object_reference.cpp
+++ b/engines/qdengine/qdcore/qd_named_object_reference.cpp
@@ -23,7 +23,7 @@
 #include "common/debug.h"
 #include "common/stream.h"
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/qdcore/qd_named_object_reference.h"
diff --git a/engines/qdengine/qdcore/qd_object_list_container.h b/engines/qdengine/qdcore/qd_object_list_container.h
index 1be66b32467..d0846732337 100644
--- a/engines/qdengine/qdcore/qd_object_list_container.h
+++ b/engines/qdengine/qdcore/qd_object_list_container.h
@@ -22,6 +22,10 @@
 #ifndef QDENGINE_QDCORE_QD_OBJECT_LIST_CONTAINER_H
 #define QDENGINE_QDCORE_QD_OBJECT_LIST_CONTAINER_H
 
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
+#include <list>
+
 #include "common/str.h"
 
 
diff --git a/engines/qdengine/qdcore/qd_resource.cpp b/engines/qdengine/qdcore/qd_resource.cpp
index 1f378edf626..c25972ad74d 100644
--- a/engines/qdengine/qdcore/qd_resource.cpp
+++ b/engines/qdengine/qdcore/qd_resource.cpp
@@ -21,8 +21,8 @@
 
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "common/str.h"
-#include "qdengine/qd_precomp.h"
 
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdcore/qd_resource.h"
 #include "qdengine/qdcore/qd_named_object.h"
 #include "qdengine/parser/qdscr_parser.h"
diff --git a/engines/qdengine/qdcore/qd_scale_info.cpp b/engines/qdengine/qdcore/qd_scale_info.cpp
index a166d5e2f01..01a93cefbac 100644
--- a/engines/qdengine/qdcore/qd_scale_info.cpp
+++ b/engines/qdengine/qdcore/qd_scale_info.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/qdcore/qd_scale_info.h"
diff --git a/engines/qdengine/qdcore/qd_screen_text.cpp b/engines/qdengine/qdcore/qd_screen_text.cpp
index 33c38dbd44f..c6e000eb12f 100644
--- a/engines/qdengine/qdcore/qd_screen_text.cpp
+++ b/engines/qdengine/qdcore/qd_screen_text.cpp
@@ -21,7 +21,9 @@
 
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "common/stream.h"
-#include "qdengine/qd_precomp.h"
+
+#include "qdengine/qd_fwd.h"
+#include "qdengine/xmath.h"
 #include "qdengine/qdcore/qd_setup.h"
 #include "qdengine/qdcore/qd_screen_text.h"
 #include "qdengine/system/graphics/gr_dispatcher.h"
diff --git a/engines/qdengine/qdcore/qd_screen_text_dispatcher.cpp b/engines/qdengine/qdcore/qd_screen_text_dispatcher.cpp
index f1e274c2373..048e16961a4 100644
--- a/engines/qdengine/qdcore/qd_screen_text_dispatcher.cpp
+++ b/engines/qdengine/qdcore/qd_screen_text_dispatcher.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdcore/qd_game_scene.h"
 #include "qdengine/qdcore/qd_game_dispatcher.h"
 #include "qdengine/qdcore/qd_screen_text_dispatcher.h"
diff --git a/engines/qdengine/qdcore/qd_screen_text_set.cpp b/engines/qdengine/qdcore/qd_screen_text_set.cpp
index cd597d1887b..d67a9d704bf 100644
--- a/engines/qdengine/qdcore/qd_screen_text_set.cpp
+++ b/engines/qdengine/qdcore/qd_screen_text_set.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/system/graphics/gr_dispatcher.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/parser/xml_tag_buffer.h"
diff --git a/engines/qdengine/qdcore/qd_setup.cpp b/engines/qdengine/qdcore/qd_setup.cpp
index 671230753fc..b11de0500a0 100644
--- a/engines/qdengine/qdcore/qd_setup.cpp
+++ b/engines/qdengine/qdcore/qd_setup.cpp
@@ -22,8 +22,8 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "common/archive.h"
 #include "common/formats/ini-file.h"
-#include "qdengine/qd_precomp.h"
 
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdcore/qd_setup.h"
 #include "qdengine/system/graphics/gr_dispatcher.h"
 
diff --git a/engines/qdengine/qdcore/qd_sound.cpp b/engines/qdengine/qdcore/qd_sound.cpp
index 0d8b198993a..1406125bfbd 100644
--- a/engines/qdengine/qdcore/qd_sound.cpp
+++ b/engines/qdengine/qdcore/qd_sound.cpp
@@ -23,7 +23,7 @@
 #include "common/debug.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/qdcore/qd_sound.h"
diff --git a/engines/qdengine/qdcore/qd_sound_info.cpp b/engines/qdengine/qdcore/qd_sound_info.cpp
index 1ebb655f55b..dfa98f1135d 100644
--- a/engines/qdengine/qdcore/qd_sound_info.cpp
+++ b/engines/qdengine/qdcore/qd_sound_info.cpp
@@ -20,7 +20,7 @@
  */
 
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdcore/qd_sound_info.h"
 #include "qdengine/qdcore/qd_game_scene.h"
 #include "qdengine/qdcore/qd_game_dispatcher.h"
diff --git a/engines/qdengine/qdcore/qd_sprite.cpp b/engines/qdengine/qdcore/qd_sprite.cpp
index 5bf3b99a594..1cd7f19bf81 100644
--- a/engines/qdengine/qdcore/qd_sprite.cpp
+++ b/engines/qdengine/qdcore/qd_sprite.cpp
@@ -28,7 +28,7 @@
 #include "graphics/surface.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/system/graphics/gr_dispatcher.h"
 #include "qdengine/system/graphics/rle_compress.h"
 #include "qdengine/qdcore/qd_setup.h"
diff --git a/engines/qdengine/qdcore/qd_sprite.h b/engines/qdengine/qdcore/qd_sprite.h
index 887a8edce1c..6f0eaeac651 100644
--- a/engines/qdengine/qdcore/qd_sprite.h
+++ b/engines/qdengine/qdcore/qd_sprite.h
@@ -28,6 +28,7 @@ class SeekableReadStream;
 
 #include "qdengine/system/graphics/gr_screen_region.h"
 #include "qdengine/qdcore/qd_resource.h"
+#include "qdengine/xmath.h"
 
 
 namespace QDEngine {
diff --git a/engines/qdengine/qdcore/qd_textdb.cpp b/engines/qdengine/qdcore/qd_textdb.cpp
index fed2cde2880..dfe13d5513b 100644
--- a/engines/qdengine/qdcore/qd_textdb.cpp
+++ b/engines/qdengine/qdcore/qd_textdb.cpp
@@ -21,7 +21,8 @@
 
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "common/file.h"
-#include "qdengine/qd_precomp.h"
+
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdcore/qd_textdb.h"
 
 
diff --git a/engines/qdengine/qdcore/qd_trigger_chain.cpp b/engines/qdengine/qdcore/qd_trigger_chain.cpp
index c40432dd235..254cf239404 100644
--- a/engines/qdengine/qdcore/qd_trigger_chain.cpp
+++ b/engines/qdengine/qdcore/qd_trigger_chain.cpp
@@ -23,7 +23,7 @@
 #include "common/debug.h"
 #include "common/stream.h"
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/qdcore/qd_trigger_chain.h"
diff --git a/engines/qdengine/qdcore/qd_trigger_element.cpp b/engines/qdengine/qdcore/qd_trigger_element.cpp
index 9683b2f58d7..fa72498f5bf 100644
--- a/engines/qdengine/qdcore/qd_trigger_element.cpp
+++ b/engines/qdengine/qdcore/qd_trigger_element.cpp
@@ -24,7 +24,7 @@
 #include "common/stream.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 
 #include "qdengine/parser/xml_tag_buffer.h"
 #include "qdengine/parser/qdscr_parser.h"
diff --git a/engines/qdengine/qdcore/qd_trigger_profiler.cpp b/engines/qdengine/qdcore/qd_trigger_profiler.cpp
index aaa0c5a401e..5a78cc6e52f 100644
--- a/engines/qdengine/qdcore/qd_trigger_profiler.cpp
+++ b/engines/qdengine/qdcore/qd_trigger_profiler.cpp
@@ -22,7 +22,7 @@
 /* ---------------------------- INCLUDE SECTION ----------------------------- */
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "common/file.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdcore/qd_trigger_profiler.h"
 
 #ifdef __QD_TRIGGER_PROFILER__
diff --git a/engines/qdengine/qdcore/qd_video.cpp b/engines/qdengine/qdcore/qd_video.cpp
index 7e08f6ef412..a47aeb8bc4f 100644
--- a/engines/qdengine/qdcore/qd_video.cpp
+++ b/engines/qdengine/qdcore/qd_video.cpp
@@ -24,7 +24,7 @@
 #include "common/textconsole.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/system/graphics/gr_dispatcher.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/parser/xml_tag_buffer.h"
diff --git a/engines/qdengine/qdcore/util/AIAStar.h b/engines/qdengine/qdcore/util/AIAStar.h
index 5cefdbdf0e9..335c654d319 100644
--- a/engines/qdengine/qdcore/util/AIAStar.h
+++ b/engines/qdengine/qdcore/util/AIAStar.h
@@ -23,7 +23,6 @@
 #pragma once
 
 #include "common/multimap.h"
-#include "qdengine/qd_precomp.h"
 
 
 ///////////////////////////AIAStar/////////////////////
diff --git a/engines/qdengine/qdcore/util/AIAStar_API.cpp b/engines/qdengine/qdcore/util/AIAStar_API.cpp
index 43e19e58be1..766db4449f8 100644
--- a/engines/qdengine/qdcore/util/AIAStar_API.cpp
+++ b/engines/qdengine/qdcore/util/AIAStar_API.cpp
@@ -21,7 +21,8 @@
 
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
+#include "qdengine/xmath.h"
 #include "qdengine/qdcore/qd_camera.h"
 #include "qdengine/qdcore/qd_game_object_moving.h"
 #include "qdengine/qdcore/util/AIAStar_API.h"
diff --git a/engines/qdengine/qdcore/util/LZ77.cpp b/engines/qdengine/qdcore/util/LZ77.cpp
index 55d5501894f..83ed2937232 100644
--- a/engines/qdengine/qdcore/util/LZ77.cpp
+++ b/engines/qdengine/qdcore/util/LZ77.cpp
@@ -28,7 +28,6 @@
 #include "common/endian.h"
 #include "common/util.h"
 
-#include "qdengine/qd_precomp.h"
 #include "qdengine/qdcore/util/LZ77.h"
 
 namespace QDEngine {
diff --git a/engines/qdengine/qdcore/util/ResourceDispatcher.cpp b/engines/qdengine/qdcore/util/ResourceDispatcher.cpp
index c72e5977c2d..3088167fd4d 100644
--- a/engines/qdengine/qdcore/util/ResourceDispatcher.cpp
+++ b/engines/qdengine/qdcore/util/ResourceDispatcher.cpp
@@ -23,7 +23,7 @@
 #include "common/debug.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdcore/util/ResourceDispatcher.h"
 
 
diff --git a/engines/qdengine/qdcore/util/WinVideo.cpp b/engines/qdengine/qdcore/util/WinVideo.cpp
index 5c50d9afc2e..ea6f860fb20 100644
--- a/engines/qdengine/qdcore/util/WinVideo.cpp
+++ b/engines/qdengine/qdcore/util/WinVideo.cpp
@@ -20,9 +20,10 @@
  */
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "common/file.h"
-#include "video/mpegps_decoder.h"
 #include "graphics/managed_surface.h"
-#include "qdengine/qd_precomp.h"
+
+#include "video/mpegps_decoder.h"
+
 #include "qdengine/qdengine.h"
 #include "qdengine/qdcore/util/WinVideo.h"
 
diff --git a/engines/qdengine/qdcore/util/fps_counter.cpp b/engines/qdengine/qdcore/util/fps_counter.cpp
index 1f7f762b0e8..12ed3396190 100644
--- a/engines/qdengine/qdcore/util/fps_counter.cpp
+++ b/engines/qdengine/qdcore/util/fps_counter.cpp
@@ -22,7 +22,6 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "common/system.h"
 
-#include "qdengine/qd_precomp.h"
 #include "qdengine/qdcore/util/fps_counter.h"
 
 
diff --git a/engines/qdengine/qdcore/util/plaympp_api.cpp b/engines/qdengine/qdcore/util/plaympp_api.cpp
index 7f3dd5df702..2cc2f3f6ef6 100644
--- a/engines/qdengine/qdcore/util/plaympp_api.cpp
+++ b/engines/qdengine/qdcore/util/plaympp_api.cpp
@@ -24,7 +24,7 @@
 #include "audio/audiostream.h"
 #include "audio/decoders/vorbis.h"
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/qdcore/qd_file_manager.h"
 #include "qdengine/qdcore/util/plaympp_api.h"
 
diff --git a/engines/qdengine/qdcore/util/splash_screen.cpp b/engines/qdengine/qdcore/util/splash_screen.cpp
index 67058917985..a0f56dd9054 100644
--- a/engines/qdengine/qdcore/util/splash_screen.cpp
+++ b/engines/qdengine/qdcore/util/splash_screen.cpp
@@ -31,7 +31,6 @@
 
 #include "image/bmp.h"
 
-#include "qdengine/qd_precomp.h"
 #include "qdengine/qdcore/util/splash_screen.h"
 #include "qdengine/qdengine.h"
 
diff --git a/engines/qdengine/qdengine.cpp b/engines/qdengine/qdengine.cpp
index 602193fcd88..7ddce4e1dac 100644
--- a/engines/qdengine/qdengine.cpp
+++ b/engines/qdengine/qdengine.cpp
@@ -34,7 +34,6 @@
 
 #include "qdengine/qdengine.h"
 #include "qdengine/console.h"
-#include "qdengine/qd_precomp.h"
 #include "qdengine/parser/qdscr_parser.h"
 #include "qdengine/qdcore/qd_game_dispatcher.h"
 
diff --git a/engines/qdengine/qdengine.h b/engines/qdengine/qdengine.h
index 75aa10bde5c..b2b914c7e52 100644
--- a/engines/qdengine/qdengine.h
+++ b/engines/qdengine/qdengine.h
@@ -19,7 +19,6 @@
  *
  */
 
-
 #ifndef QDENGINE_H
 #define QDENGINE_H
 
@@ -110,6 +109,8 @@ public:
 extern QDEngineEngine *g_engine;
 #define SHOULD_QUIT ::QDEngine::g_engine->shouldQuit()
 
+int engineMain();
+
 } // namespace QDEngine
 
 byte *transCyrillic(const Common::String &str);
diff --git a/engines/qdengine/system/app_core.cpp b/engines/qdengine/system/app_core.cpp
index ca966ef8e76..c0a8a9d7636 100644
--- a/engines/qdengine/system/app_core.cpp
+++ b/engines/qdengine/system/app_core.cpp
@@ -25,7 +25,8 @@
 #include "common/file.h"
 #include "common/savefile.h"
 #include "common/textconsole.h"
-#include "qdengine/qd_precomp.h"
+
+#include "qdengine/qd_fwd.h"
 #include "qdengine/system/app_core.h"
 #include "qdengine/qdengine.h"
 
diff --git a/engines/qdengine/system/graphics/UI_TextParser.cpp b/engines/qdengine/system/graphics/UI_TextParser.cpp
index 174fa382340..3664fdae54f 100644
--- a/engines/qdengine/system/graphics/UI_TextParser.cpp
+++ b/engines/qdengine/system/graphics/UI_TextParser.cpp
@@ -22,7 +22,6 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "common/util.h"
 
-#include "qdengine/qd_precomp.h"
 #include "qdengine/system/graphics/gr_dispatcher.h"
 #include "qdengine/system/graphics/UI_TextParser.h"
 
diff --git a/engines/qdengine/system/graphics/gr_dispatcher.cpp b/engines/qdengine/system/graphics/gr_dispatcher.cpp
index fb11881414c..8f85fb9f48b 100644
--- a/engines/qdengine/system/graphics/gr_dispatcher.cpp
+++ b/engines/qdengine/system/graphics/gr_dispatcher.cpp
@@ -29,7 +29,7 @@
 #include "graphics/managed_surface.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/system/graphics/gr_dispatcher.h"
 #include "qdengine/system/graphics/gr_font.h"
 #include "qdengine/system/graphics/UI_TextParser.h"
diff --git a/engines/qdengine/system/graphics/gr_dispatcher.h b/engines/qdengine/system/graphics/gr_dispatcher.h
index 9f0e5be9c1f..7fb4e93f06e 100644
--- a/engines/qdengine/system/graphics/gr_dispatcher.h
+++ b/engines/qdengine/system/graphics/gr_dispatcher.h
@@ -22,6 +22,8 @@
 #ifndef QDENGINE_SYSTEM_GRAPHICS_GR_DISPATCHER_H
 #define QDENGINE_SYSTEM_GRAPHICS_GR_DISPATCHER_H
 
+#include <vector>
+#include "qdengine/xmath.h"
 #include "qdengine/system/graphics/gr_screen_region.h"
 
 namespace Graphics {
diff --git a/engines/qdengine/system/graphics/gr_draw_sprite.cpp b/engines/qdengine/system/graphics/gr_draw_sprite.cpp
index fb179d71619..ce1745b5414 100644
--- a/engines/qdengine/system/graphics/gr_draw_sprite.cpp
+++ b/engines/qdengine/system/graphics/gr_draw_sprite.cpp
@@ -26,7 +26,6 @@
 #include "graphics/managed_surface.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
 #include "qdengine/system/graphics/gr_dispatcher.h"
 
 namespace QDEngine {
diff --git a/engines/qdengine/system/graphics/gr_draw_sprite_rle.cpp b/engines/qdengine/system/graphics/gr_draw_sprite_rle.cpp
index 7f8249235b9..fe8dcbfedbd 100644
--- a/engines/qdengine/system/graphics/gr_draw_sprite_rle.cpp
+++ b/engines/qdengine/system/graphics/gr_draw_sprite_rle.cpp
@@ -25,7 +25,7 @@
 #include "graphics/managed_surface.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/system/graphics/gr_dispatcher.h"
 #include "qdengine/system/graphics/rle_compress.h"
 
diff --git a/engines/qdengine/system/graphics/gr_draw_sprite_rle_z.cpp b/engines/qdengine/system/graphics/gr_draw_sprite_rle_z.cpp
index c376f25858d..60916cb7d83 100644
--- a/engines/qdengine/system/graphics/gr_draw_sprite_rle_z.cpp
+++ b/engines/qdengine/system/graphics/gr_draw_sprite_rle_z.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/system/graphics/gr_dispatcher.h"
 #include "qdengine/system/graphics/rle_compress.h"
 
diff --git a/engines/qdengine/system/graphics/gr_draw_sprite_z.cpp b/engines/qdengine/system/graphics/gr_draw_sprite_z.cpp
index 12f3a158dd4..839ae2821ed 100644
--- a/engines/qdengine/system/graphics/gr_draw_sprite_z.cpp
+++ b/engines/qdengine/system/graphics/gr_draw_sprite_z.cpp
@@ -19,8 +19,8 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
-#include "gr_dispatcher.h"
+#include "qdengine/qd_fwd.h"
+#include "qdengine/system/graphics/gr_dispatcher.h"
 
 
 namespace QDEngine {
diff --git a/engines/qdengine/system/graphics/gr_font.cpp b/engines/qdengine/system/graphics/gr_font.cpp
index 43126024b6a..1c57d9907d7 100644
--- a/engines/qdengine/system/graphics/gr_font.cpp
+++ b/engines/qdengine/system/graphics/gr_font.cpp
@@ -25,7 +25,7 @@
 #include "common/stream.h"
 #include "common/textconsole.h"
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/system/graphics/gr_dispatcher.h"
 #include "qdengine/system/graphics/gr_font.h"
 #include "qdengine/qdcore/qd_file_manager.h"
diff --git a/engines/qdengine/system/graphics/gr_font.h b/engines/qdengine/system/graphics/gr_font.h
index 3942db7867a..cbff58c5507 100644
--- a/engines/qdengine/system/graphics/gr_font.h
+++ b/engines/qdengine/system/graphics/gr_font.h
@@ -24,6 +24,10 @@
 
 #include "qdengine/system/graphics/gr_screen_region.h"
 
+namespace Common {
+class SeekableReadStream;
+}
+
 namespace QDEngine {
 
 class grFont {
diff --git a/engines/qdengine/system/graphics/gr_screen_region.cpp b/engines/qdengine/system/graphics/gr_screen_region.cpp
index 5295974d900..f302b038ba5 100644
--- a/engines/qdengine/system/graphics/gr_screen_region.cpp
+++ b/engines/qdengine/system/graphics/gr_screen_region.cpp
@@ -19,7 +19,6 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
 #include "qdengine/system/graphics/gr_screen_region.h"
 
 
diff --git a/engines/qdengine/system/graphics/gr_tile_animation.cpp b/engines/qdengine/system/graphics/gr_tile_animation.cpp
index 1c914fb0026..e293f9655bd 100644
--- a/engines/qdengine/system/graphics/gr_tile_animation.cpp
+++ b/engines/qdengine/system/graphics/gr_tile_animation.cpp
@@ -24,7 +24,6 @@
 #include "common/file.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
 #include "qdengine/system/graphics/gr_dispatcher.h"
 #include "qdengine/system/graphics/gr_tile_animation.h"
 
diff --git a/engines/qdengine/system/graphics/gr_tile_animation.h b/engines/qdengine/system/graphics/gr_tile_animation.h
index 8b8d0a834da..0a6db9eaee5 100644
--- a/engines/qdengine/system/graphics/gr_tile_animation.h
+++ b/engines/qdengine/system/graphics/gr_tile_animation.h
@@ -23,6 +23,7 @@
 #ifndef QDENGINE_SYSTEM_GRAPHICS_GR_TILE_ANIMATION_H
 #define QDENGINE_SYSTEM_GRAPHICS_GR_TILE_ANIMATION_H
 
+#include "qdengine/xmath.h"
 #include "qdengine/system/graphics/gr_tile_sprite.h"
 
 namespace Common {
diff --git a/engines/qdengine/system/graphics/gr_tile_sprite.cpp b/engines/qdengine/system/graphics/gr_tile_sprite.cpp
index a8e96297c11..90390999590 100644
--- a/engines/qdengine/system/graphics/gr_tile_sprite.cpp
+++ b/engines/qdengine/system/graphics/gr_tile_sprite.cpp
@@ -21,7 +21,7 @@
 
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "graphics/managed_surface.h"
-#include "qdengine/qd_precomp.h"
+
 #include "qdengine/system/graphics/gr_dispatcher.h"
 #include "qdengine/system/graphics/gr_tile_sprite.h"
 #include "qdengine/qdcore/util/LZ77.h"
diff --git a/engines/qdengine/system/graphics/rle_compress.cpp b/engines/qdengine/system/graphics/rle_compress.cpp
index 150038aa8b9..26096dd035c 100644
--- a/engines/qdengine/system/graphics/rle_compress.cpp
+++ b/engines/qdengine/system/graphics/rle_compress.cpp
@@ -20,8 +20,10 @@
  */
 
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
+#include <vector>
+
 #include "common/file.h"
-#include "qdengine/qd_precomp.h"
+
 #include "qdengine/system/graphics/rle_compress.h"
 #include "qdengine/system/graphics/gr_dispatcher.h"
 
diff --git a/engines/qdengine/system/input/input_wndproc.cpp b/engines/qdengine/system/input/input_wndproc.cpp
index fa8a0d7301f..2f811466f23 100644
--- a/engines/qdengine/system/input/input_wndproc.cpp
+++ b/engines/qdengine/system/input/input_wndproc.cpp
@@ -22,7 +22,7 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "common/events.h"
 #include "common/textconsole.h"
-#include "qdengine/qd_precomp.h"
+
 #include "qdengine/system/input/input_wndproc.h"
 #include "qdengine/system/input/keyboard_input.h"
 #include "qdengine/system/input/mouse_input.h"
diff --git a/engines/qdengine/system/input/keyboard_input.cpp b/engines/qdengine/system/input/keyboard_input.cpp
index 4bfa2f801b2..119b668df89 100644
--- a/engines/qdengine/system/input/keyboard_input.cpp
+++ b/engines/qdengine/system/input/keyboard_input.cpp
@@ -19,7 +19,6 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
 #include "qdengine/system/input/keyboard_input.h"
 
 namespace QDEngine {
diff --git a/engines/qdengine/system/input/mouse_input.cpp b/engines/qdengine/system/input/mouse_input.cpp
index 435bfd5f0ac..6ba792a62b9 100644
--- a/engines/qdengine/system/input/mouse_input.cpp
+++ b/engines/qdengine/system/input/mouse_input.cpp
@@ -21,7 +21,7 @@
 
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #include "common/textconsole.h"
-#include "qdengine/qd_precomp.h"
+
 #include "qdengine/system/input/mouse_input.h"
 #include "qdengine/system/graphics/gr_dispatcher.h"
 
diff --git a/engines/qdengine/system/sound/snd_dispatcher.cpp b/engines/qdengine/system/sound/snd_dispatcher.cpp
index 79986c95144..8e56c4e6a5b 100644
--- a/engines/qdengine/system/sound/snd_dispatcher.cpp
+++ b/engines/qdengine/system/sound/snd_dispatcher.cpp
@@ -19,7 +19,8 @@
  *
  */
 
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
+#include "qdengine/xmath.h"
 #include "qdengine/system/app_core.h"
 #include "qdengine/system/graphics/gr_dispatcher.h"
 #include "qdengine/system/sound/snd_dispatcher.h"
diff --git a/engines/qdengine/system/sound/snd_sound.cpp b/engines/qdengine/system/sound/snd_sound.cpp
index c8fd382939b..efb1df9afbc 100644
--- a/engines/qdengine/system/sound/snd_sound.cpp
+++ b/engines/qdengine/system/sound/snd_sound.cpp
@@ -23,7 +23,6 @@
 #include "audio/audiostream.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
 #include "qdengine/system/sound/snd_sound.h"
 #include "qdengine/system/sound/wav_sound.h"
 
diff --git a/engines/qdengine/system/sound/wav_sound.cpp b/engines/qdengine/system/sound/wav_sound.cpp
index 167fa09bd9a..27916b38a45 100644
--- a/engines/qdengine/system/sound/wav_sound.cpp
+++ b/engines/qdengine/system/sound/wav_sound.cpp
@@ -25,7 +25,7 @@
 #include "common/system.h"
 
 #include "qdengine/qdengine.h"
-#include "qdengine/qd_precomp.h"
+#include "qdengine/qd_fwd.h"
 #include "qdengine/system/sound/wav_sound.h"
 #include "qdengine/qdcore/qd_file_manager.h"