Decrease engine.h cost

15 files changed, 15 insertions, 8 deletions

diff --git a/Source/Main/engine.h b/Source/Main/engine.h
index ec6eedd2..45cec324 100644
--- a/Source/Main/engine.h
+++ b/Source/Main/engine.h
@@ -23,23 +23,18 @@
 #pragma once
 
 #include <Main/scenegraph.h>
-#include <Main/scenegraph.h>
 
 #include <UserInput/input.h>
 
 #include <Graphics/Cursor.h>
 #include <Graphics/graphics.h>
 #include <Graphics/text.h>
-#include <Graphics/model.h>
 #include <Graphics/font_renderer.h>
-#include <Graphics/particles.h>
-#include <Graphics/vbocontainer.h>
 #include <Graphics/animationeffectsystem.h>
 #include <Graphics/lipsyncsystem.h>
 
 #include <Sound/sound.h>
 #include <Sound/threaded_sound_wrapper.h>
-#include <Sound/threaded_sound_wrapper.h>
 
 
 #include <Game/avatar_control_manager.h>
@@ -50,7 +45,6 @@
 #include <Asset/assetmanager.h>
 #include <Network/asnetwork.h>
 #include <Internal/modloading.h>
-#include <Online/online.h>
 
 #include <stack>
 #include <iostream>
diff --git a/Source/Objects/object.cpp b/Source/Objects/object.cpp
index 31578844..e6ffac73 100644
--- a/Source/Objects/object.cpp
+++ b/Source/Objects/object.cpp
@@ -34,6 +34,7 @@
 #include <Editors/map_editor.h>
 #include <Utility/ieee.h>
 #include <GUI/gui.h>
+#include <Online/online.h>
 
 #include <tinyxml.h>
 #include <SDL_assert.h>
diff --git a/Source/Online/Message/audio_play_sound_group_voice_message.cpp b/Source/Online/Message/audio_play_sound_group_voice_message.cpp
index d385fa0e..a98ab973 100644
--- a/Source/Online/Message/audio_play_sound_group_voice_message.cpp
+++ b/Source/Online/Message/audio_play_sound_group_voice_message.cpp
@@ -24,6 +24,7 @@
 
 #include <Main/engine.h>
 #include <Utility/binn_util.h>
+#include <Online/online.h>
 
 namespace OnlineMessages {
     AudioPlaySoundGroupVoiceMessage::AudioPlaySoundGroupVoiceMessage(const std::string& path, ObjectID id, float delay) :
diff --git a/Source/Online/Message/audio_play_sound_impact_item_message.cpp b/Source/Online/Message/audio_play_sound_impact_item_message.cpp
index d6c13983..9c283a7f 100644
--- a/Source/Online/Message/audio_play_sound_impact_item_message.cpp
+++ b/Source/Online/Message/audio_play_sound_impact_item_message.cpp
@@ -26,6 +26,7 @@
 
 #include <Main/engine.h>
 #include <Utility/binn_util.h>
+#include <Online/online.h>
 
 namespace OnlineMessages {
     AudioPlaySoundImpactItemMessage::AudioPlaySoundImpactItemMessage(ObjectID id, vec3 pos, vec3 normal, float impulse) :
diff --git a/Source/Online/Message/chat_entry_message.cpp b/Source/Online/Message/chat_entry_message.cpp
index 925962e4..195964dc 100644
--- a/Source/Online/Message/chat_entry_message.cpp
+++ b/Source/Online/Message/chat_entry_message.cpp
@@ -24,6 +24,7 @@
 
 #include <Main/engine.h>
 #include <Utility/binn_util.h>
+#include <Online/online.h>
 #include <Online/online_utility.h>
 
 namespace OnlineMessages {
diff --git a/Source/Online/Message/cut_line.cpp b/Source/Online/Message/cut_line.cpp
index ef526986..bba614dc 100644
--- a/Source/Online/Message/cut_line.cpp
+++ b/Source/Online/Message/cut_line.cpp
@@ -23,6 +23,7 @@
 #include "cut_line.h"
 
 #include <Main/engine.h>
+#include <Online/online.h>
 
 namespace OnlineMessages {
     CutLine::CutLine() :
diff --git a/Source/Online/Message/editor_transform_change.cpp b/Source/Online/Message/editor_transform_change.cpp
index 51fca10d..2f8205f7 100644
--- a/Source/Online/Message/editor_transform_change.cpp
+++ b/Source/Online/Message/editor_transform_change.cpp
@@ -23,6 +23,7 @@
 #include "editor_transform_change.h"
 
 #include <Main/engine.h>
+#include <Online/online.h>
 
 namespace OnlineMessages {
     EditorTransformChange::EditorTransformChange(ObjectID id, const vec3& trans, const vec3& scale, const quaternion& rot) :
diff --git a/Source/Online/Message/env_object_update.cpp b/Source/Online/Message/env_object_update.cpp
index f401be29..2dee5196 100644
--- a/Source/Online/Message/env_object_update.cpp
+++ b/Source/Online/Message/env_object_update.cpp
@@ -23,6 +23,7 @@
 #include "env_object_update.h"
 
 #include <Main/engine.h>
+#include <Online/online.h>
 
 extern Timer game_timer;
 
diff --git a/Source/Online/Message/material_sound_event.cpp b/Source/Online/Message/material_sound_event.cpp
index 84251b56..90058cb3 100644
--- a/Source/Online/Message/material_sound_event.cpp
+++ b/Source/Online/Message/material_sound_event.cpp
@@ -23,6 +23,7 @@
 #include "material_sound_event.h"
 
 #include <Main/engine.h>
+#include <Online/online.h>
 
 namespace OnlineMessages {
     MaterialSoundEvent::MaterialSoundEvent(ObjectID object_id, const string& ev, const vec3& pos, float gain) :
diff --git a/Source/Online/Message/morph_target_update.cpp b/Source/Online/Message/morph_target_update.cpp
index 48fec29d..bbaa78ac 100644
--- a/Source/Online/Message/morph_target_update.cpp
+++ b/Source/Online/Message/morph_target_update.cpp
@@ -23,6 +23,7 @@
 #include "morph_target_update.h"
 
 #include <Main/engine.h>
+#include <Online/online.h>
 
 namespace OnlineMessages {
     MorphTargetUpdate::MorphTargetUpdate() :
diff --git a/Source/Online/Message/movement_object_update.cpp b/Source/Online/Message/movement_object_update.cpp
index d0615744..393dcff4 100644
--- a/Source/Online/Message/movement_object_update.cpp
+++ b/Source/Online/Message/movement_object_update.cpp
@@ -24,6 +24,7 @@
 
 #include <Utility/binn_util.h>
 #include <Main/engine.h>
+#include <Online/online.h>
 
 namespace OnlineMessages {
     MovementObjectUpdate::MovementObjectUpdate() :
diff --git a/Source/Online/Message/set_avatar_palette.cpp b/Source/Online/Message/set_avatar_palette.cpp
index 5754564c..95c32609 100644
--- a/Source/Online/Message/set_avatar_palette.cpp
+++ b/Source/Online/Message/set_avatar_palette.cpp
@@ -23,6 +23,7 @@
 #include "set_avatar_palette.h"
 
 #include <Main/engine.h>
+#include <Online/online.h>
 
 namespace OnlineMessages {
     SetAvatarPalette::SetAvatarPalette(ObjectID id, const vec3& color, uint8_t channel) :
diff --git a/Source/Online/Message/timed_slow_motion.cpp b/Source/Online/Message/timed_slow_motion.cpp
index 881f6000..13040f01 100644
--- a/Source/Online/Message/timed_slow_motion.cpp
+++ b/Source/Online/Message/timed_slow_motion.cpp
@@ -23,6 +23,7 @@
 #include "timed_slow_motion.h"
 
 #include <Main/engine.h>
+#include <Online/online.h>
 
 extern Timer game_timer;
 
diff --git a/Source/Online/online_utility.cpp b/Source/Online/online_utility.cpp
index 1b2c4103..64f34e61 100644
--- a/Source/Online/online_utility.cpp
+++ b/Source/Online/online_utility.cpp
@@ -20,8 +20,6 @@
 //   limitations under the License.
 //
 //-----------------------------------------------------------------------------
-#pragma once
-
 #include <Online/online_utility.h>
 #include <Main/engine.h>
 #include <Internal/config.h>
@@ -30,6 +28,8 @@
 #include <isteamfriends.h>
 #endif
 
+using std::stringstream;
+
 // Name is invalid if (less than 3 letters) or (contains any non alpha numerical characters)
 bool OnlineUtility::IsValidPlayerName(const std::string& name) {
     if (name.length() <= 2)
diff --git a/Source/Scripting/scriptparams.cpp b/Source/Scripting/scriptparams.cpp
index 61938633..bca4e505 100644
--- a/Source/Scripting/scriptparams.cpp
+++ b/Source/Scripting/scriptparams.cpp
@@ -27,6 +27,7 @@
 #include <Logging/logdata.h>
 #include <Utility/assert.h>
 #include <Main/engine.h>
+#include <Online/online.h>
 
 #include <tinyxml.h>