From 0549e949ba6cab8fb06919ebcc0ee4dee558ef59 Mon Sep 17 00:00:00 2001
From: guidoj <guido@thuisbasis.net>
Date: Tue, 17 Jul 2012 09:27:12 +0200
Subject: [PATCH] Mostly removal of unnecessary #include's and a little clean
 up

---
 .gitignore                                 |  1 +
 apps/openmw/engine.cpp                     | 19 -----------------
 apps/openmw/engine.hpp                     |  4 ----
 apps/openmw/main.cpp                       | 15 --------------
 apps/openmw/mwbase/world.hpp               |  2 --
 apps/openmw/mwclass/creature.hpp           |  1 -
 apps/openmw/mwgui/class.cpp                |  1 -
 apps/openmw/mwgui/dialogue.cpp             |  1 -
 apps/openmw/mwgui/dialogue_history.cpp     |  1 -
 apps/openmw/mwgui/race.cpp                 |  1 -
 apps/openmw/mwgui/window_manager.hpp       |  4 ----
 apps/openmw/mwrender/actors.hpp            | 10 ---------
 apps/openmw/mwrender/animation.hpp         |  6 +-----
 apps/openmw/mwrender/creatureanimation.hpp |  4 ----
 apps/openmw/mwrender/npcanimation.hpp      | 10 +--------
 apps/openmw/mwrender/renderingmanager.hpp  | 12 -----------
 apps/openmw/mwscript/scriptmanager.hpp     |  1 -
 apps/openmw/mwworld/cells.cpp              |  4 ----
 apps/openmw/mwworld/cellstore.hpp          |  3 ---
 apps/openmw/mwworld/containerstore.hpp     |  2 --
 apps/openmw/mwworld/physicssystem.hpp      |  2 --
 apps/openmw/mwworld/ptr.hpp                |  4 ----
 apps/openmw/mwworld/refdata.hpp            |  2 --
 apps/openmw/mwworld/scene.cpp              |  2 --
 apps/openmw/mwworld/scene.hpp              |  8 --------
 apps/openmw/mwworld/worldimp.cpp           |  9 --------
 apps/openmw/mwworld/worldimp.hpp           | 15 --------------
 components/compiler/streamerrorhandler.cpp |  3 ++-
 components/esm/esm_reader.hpp              |  6 +-----
 components/files/collections.hpp           |  2 --
 components/files/configurationmanager.hpp  |  1 -
 components/misc/tests/slice_test.cpp       |  2 --
 components/nif/nif_file.hpp                |  3 +--
 components/nifbullet/bullet_nif_loader.hpp |  8 +-------
 components/nifogre/ogre_nif_loader.hpp     | 24 +++++++---------------
 components/nifogre/tests/ogre_common.cpp   |  1 -
 libs/openengine/gui/layout.hpp             |  1 -
 libs/openengine/ogre/fader.cpp             |  2 --
 38 files changed, 15 insertions(+), 182 deletions(-)

diff --git a/.gitignore b/.gitignore
index b3bb8d82d..26ba80e1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ cmake_install.cmake
 Makefile
 makefile
 data
+*.kdev4
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 45b4ab514..7966639a6 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -1,25 +1,13 @@
 #include "engine.hpp"
 #include "components/esm/loadcell.hpp"
 
-#include <cassert>
-
-#include <iostream>
-#include <utility>
-
 #include <OgreRoot.h>
 #include <OgreRenderWindow.h>
 
 #include <MyGUI_WidgetManager.h>
 
-#include <openengine/ogre/renderer.hpp>
-#include <openengine/gui/manager.hpp>
-
-#include <components/esm/records.hpp>
 #include <components/bsa/bsa_archive.hpp>
-#include <components/esm/esm_reader.hpp>
-#include <components/files/fixedpath.hpp>
 #include <components/files/configurationmanager.hpp>
-#include <components/settings/settings.hpp>
 #include <components/nifoverrides/nifoverrides.hpp>
 
 #include <components/nifbullet/bullet_nif_loader.hpp>
@@ -31,16 +19,12 @@
 #include "mwgui/cursorreplace.hpp"
 
 #include "mwscript/scriptmanager.hpp"
-#include "mwscript/compilercontext.hpp"
-#include "mwscript/interpretercontext.hpp"
 #include "mwscript/extensions.hpp"
-#include "mwscript/globalscripts.hpp"
 
 #include "mwsound/soundmanager.hpp"
 
 #include "mwworld/class.hpp"
 #include "mwworld/player.hpp"
-#include "mwworld/cellstore.hpp"
 #include "mwworld/worldimp.hpp"
 
 #include "mwclass/classes.hpp"
@@ -50,9 +34,6 @@
 
 #include "mwmechanics/mechanicsmanager.hpp"
 
-#include "mwbase/environment.hpp"
-#include "mwbase/world.hpp"
-
 
 void OMW::Engine::executeLocalScripts()
 {
diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index cf1ef3b9c..031cae551 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -1,10 +1,6 @@
 #ifndef ENGINE_H
 #define ENGINE_H
 
-#include <string>
-
-#include <boost/filesystem.hpp>
-
 #include <OgreFrameListener.h>
 
 #include <components/compiler/extensions.hpp>
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index 68aa12fb3..fc905b79d 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -1,13 +1,5 @@
 #include <iostream>
 
-#include <string>
-#include <fstream>
-
-#include <boost/program_options.hpp>
-
-#include <components/files/fileops.hpp>
-#include <components/files/fixedpath.hpp>
-#include <components/files/collections.hpp>
 #include <components/files/configurationmanager.hpp>
 
 #include "engine.hpp"
@@ -16,11 +8,6 @@
 #include <boost/iostreams/concepts.hpp>
 #include <boost/iostreams/stream_buffer.hpp>
 
-#  if !defined(_DEBUG)
-#  include <iostream>
-#  include <fstream>
-#  endif
-
 // For OutputDebugString
 #include <Windows.h>
 // makes __argc and __argv available on windows
@@ -52,8 +39,6 @@ inline boost::filesystem::path lexical_cast<boost::filesystem::path, std::string
 } /* namespace boost */
 #endif /* (BOOST_VERSION <= 104600) */
 
-using namespace std;
-
 struct FallbackMap {
     std::map<std::string,std::string> mMap;
 };
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 51d0a4f8e..6937cbf3b 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -1,8 +1,6 @@
 #ifndef GAME_MWBASE_WORLD_H
 #define GAME_MWBASE_WORLD_H
 
-#include <string>
-#include <map>
 #include <vector>
 
 #include <components/settings/settings.hpp>
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index 237f54e82..1274be09a 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -1,7 +1,6 @@
 #ifndef GAME_MWCLASS_CREATURE_H
 #define GAME_MWCLASS_CREATURE_H
 
-#include "../mwworld/class.hpp"
 #include "../mwrender/renderinginterface.hpp"
 #include "../mwrender/actors.hpp"
 
diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp
index d0f21f945..9f291bae7 100644
--- a/apps/openmw/mwgui/class.cpp
+++ b/apps/openmw/mwgui/class.cpp
@@ -1,6 +1,5 @@
 #include "class.hpp"
 
-#include <assert.h>
 #include <iterator>
 
 #include <boost/algorithm/string.hpp>
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index acf0bf130..018fbb178 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -1,6 +1,5 @@
 #include "dialogue.hpp"
 
-#include <assert.h>
 #include <iostream>
 #include <iterator>
 
diff --git a/apps/openmw/mwgui/dialogue_history.cpp b/apps/openmw/mwgui/dialogue_history.cpp
index cd34ee119..009f42044 100644
--- a/apps/openmw/mwgui/dialogue_history.cpp
+++ b/apps/openmw/mwgui/dialogue_history.cpp
@@ -3,7 +3,6 @@
 #include "widgets.hpp"
 #include "components/esm_store/store.hpp"
 
-#include <assert.h>
 #include <iostream>
 #include <iterator>
 
diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index 9ae453016..9f4a4965d 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -1,6 +1,5 @@
 #include "race.hpp"
 
-#include <assert.h>
 #include <iostream>
 #include <iterator>
 
diff --git a/apps/openmw/mwgui/window_manager.hpp b/apps/openmw/mwgui/window_manager.hpp
index 03ffa6b59..9d1516ccf 100644
--- a/apps/openmw/mwgui/window_manager.hpp
+++ b/apps/openmw/mwgui/window_manager.hpp
@@ -10,10 +10,6 @@
    this class.
 **/
 
-#include <string>
-#include <vector>
-#include <set>
-
 #include "MyGUI_UString.h"
 
 #include <components/esm_store/store.hpp>
diff --git a/apps/openmw/mwrender/actors.hpp b/apps/openmw/mwrender/actors.hpp
index 63cd3baa1..4b0b2e572 100644
--- a/apps/openmw/mwrender/actors.hpp
+++ b/apps/openmw/mwrender/actors.hpp
@@ -1,18 +1,8 @@
 #ifndef _GAME_RENDER_ACTORS_H
 #define _GAME_RENDER_ACTORS_H
 
-#include <map>
-#include <list>
-
-#include <openengine/ogre/renderer.hpp>
-#include "components/nifogre/ogre_nif_loader.hpp"
-
-#include "../mwworld/refdata.hpp"
-#include "../mwworld/actiontalk.hpp"
-
 #include "npcanimation.hpp"
 #include "creatureanimation.hpp"
-#include <openengine/bullet/physic.hpp>
 
 namespace MWWorld
 {
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 4ab60cff4..28ef9d706 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -1,17 +1,13 @@
 #ifndef _GAME_RENDER_ANIMATION_H
 #define _GAME_RENDER_ANIMATION_H
-#include <components/nif/data.hpp>
+
 #include <openengine/ogre/renderer.hpp>
-#include "../mwworld/refdata.hpp"
-#include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontalk.hpp"
 #include <components/nif/node.hpp>
-#include <map>
 #include <openengine/bullet/physic.hpp>
 
 
 
-
 namespace MWRender{
 
 struct PosAndRot{
diff --git a/apps/openmw/mwrender/creatureanimation.hpp b/apps/openmw/mwrender/creatureanimation.hpp
index f50b7904b..4fea1a9d9 100644
--- a/apps/openmw/mwrender/creatureanimation.hpp
+++ b/apps/openmw/mwrender/creatureanimation.hpp
@@ -2,11 +2,7 @@
 #define _GAME_RENDER_CREATUREANIMATION_H
 
 #include "animation.hpp"
-#include <components/nif/node.hpp>
 
-
-#include "../mwworld/refdata.hpp"
-#include "../mwworld/ptr.hpp"
 #include "components/nifogre/ogre_nif_loader.hpp"
 
 
diff --git a/apps/openmw/mwrender/npcanimation.hpp b/apps/openmw/mwrender/npcanimation.hpp
index 8f4f8181d..4233d2803 100644
--- a/apps/openmw/mwrender/npcanimation.hpp
+++ b/apps/openmw/mwrender/npcanimation.hpp
@@ -1,20 +1,12 @@
 #ifndef _GAME_RENDER_NPCANIMATION_H
 #define _GAME_RENDER_NPCANIMATION_H
+
 #include "animation.hpp"
-#include <components/nif/data.hpp>
-#include <components/nif/node.hpp>
-#include <components/nif/property.hpp>
-#include <components/nif/controller.hpp>
-#include <components/nif/extra.hpp>
-#include <utility>
 
-#include "../mwworld/refdata.hpp"
-#include "../mwworld/ptr.hpp"
 #include "components/nifogre/ogre_nif_loader.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwclass/npc.hpp"
 #include "../mwworld/containerstore.hpp"
-#include "components/esm/loadarmo.hpp"
 
 namespace MWRender{
 
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 9aaba3803..c30f52979 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -1,25 +1,14 @@
 #ifndef _GAME_RENDERING_MANAGER_H
 #define _GAME_RENDERING_MANAGER_H
 
-
 #include "sky.hpp"
 #include "terrain.hpp"
 #include "debugging.hpp"
 
-#include "../mwworld/class.hpp"
-
-#include <OgreWindowEventUtilities.h>
-
-#include <utility>
-#include <openengine/ogre/renderer.hpp>
 #include <openengine/ogre/fader.hpp>
-#include <openengine/bullet/physic.hpp>
 
 #include <components/settings/settings.hpp>
 
-#include <vector>
-#include <string>
-
 #include <boost/filesystem.hpp>
 
 #include "renderinginterface.hpp"
@@ -45,7 +34,6 @@ namespace MWWorld
 
 namespace MWRender
 {
-
     class Shadows;
     class ShaderHelper;
     class LocalMap;
diff --git a/apps/openmw/mwscript/scriptmanager.hpp b/apps/openmw/mwscript/scriptmanager.hpp
index 34cc0defe..a466f903d 100644
--- a/apps/openmw/mwscript/scriptmanager.hpp
+++ b/apps/openmw/mwscript/scriptmanager.hpp
@@ -2,7 +2,6 @@
 #define GAME_SCRIPT_SCRIPTMANAGER_H
 
 #include <map>
-#include <vector>
 #include <string>
 
 #include <components/compiler/streamerrorhandler.hpp>
diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp
index cd7ebf79a..cffaf70ea 100644
--- a/apps/openmw/mwworld/cells.cpp
+++ b/apps/openmw/mwworld/cells.cpp
@@ -1,9 +1,5 @@
 #include "cells.hpp"
 
-#include <cctype>
-
-#include <algorithm>
-
 #include <components/esm_store/store.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index 8253f3f0b..de3ac12ae 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -4,9 +4,6 @@
 #include <components/esm/records.hpp>
 
 #include <list>
-#include <string>
-#include <vector>
-#include <stdexcept>
 #include <algorithm>
 
 #include "refdata.hpp"
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index f71b493bd..ae27fad3d 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -3,8 +3,6 @@
 
 #include <iterator>
 
-#include "cellstore.hpp"
-#include "refdata.hpp"
 #include "ptr.hpp"
 
 namespace ESM
diff --git a/apps/openmw/mwworld/physicssystem.hpp b/apps/openmw/mwworld/physicssystem.hpp
index b46ce117b..a6b679833 100644
--- a/apps/openmw/mwworld/physicssystem.hpp
+++ b/apps/openmw/mwworld/physicssystem.hpp
@@ -1,9 +1,7 @@
 #ifndef GAME_MWWORLD_PHYSICSSYSTEM_H
 #define GAME_MWWORLD_PHYSICSSYSTEM_H
 
-#include <vector>
 #include <openengine/ogre/renderer.hpp>
-#include <openengine/bullet/physic.hpp>
 #include "ptr.hpp"
 #include <openengine/bullet/pmove.h>
 
diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp
index b7469b8f5..f74fdd3ef 100644
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@@ -1,12 +1,8 @@
 #ifndef GAME_MWWORLD_PTR_H
 #define GAME_MWWORLD_PTR_H
 
-#include <cassert>
-
 #include <boost/any.hpp>
 
-#include <components/esm/loadcell.hpp>
-
 #include "cellstore.hpp"
 
 namespace MWWorld
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index 41521e47a..3a6e0fc9f 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -1,8 +1,6 @@
 #ifndef GAME_MWWORLD_REFDATA_H
 #define GAME_MWWORLD_REFDATA_H
 
-#include <string>
-
 #include <components/esm/defs.hpp>
 
 #include "../mwscript/locals.hpp"
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 39496def3..33c67aad8 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -11,9 +11,7 @@
 
 #include "../mwworld/manualref.hpp" /// FIXME
 
-#include "ptr.hpp"
 #include "player.hpp"
-#include "class.hpp"
 #include "localscripts.hpp"
 
 #include "cellfunctors.hpp"
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index 64a8c9f8e..c0b93796a 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -1,15 +1,7 @@
 #ifndef GAME_MWWORLD_SCENE_H
 #define GAME_MWWORLD_SCENE_H
 
-#include <vector>
-#include <map>
-
-#include <boost/filesystem.hpp>
-
-#include <openengine/bullet/physic.hpp>
-
 #include "../mwrender/renderingmanager.hpp"
-#include "../mwrender/renderinginterface.hpp"
 
 #include "physicssystem.hpp"
 #include "globals.hpp"
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 24baac144..a68f08e34 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1,8 +1,5 @@
 #include "worldimp.hpp"
 
-#include <cmath>
-#include <iostream>
-
 #include <components/bsa/bsa_archive.hpp>
 #include <components/files/collections.hpp>
 
@@ -17,16 +14,10 @@
 
 #include "../mwgui/window_manager.hpp"
 
-#include "ptr.hpp"
-#include "class.hpp"
 #include "player.hpp"
-#include "weather.hpp"
 #include "manualref.hpp"
-#include "refdata.hpp"
-#include "globals.hpp"
 #include "cellfunctors.hpp"
 
-#include <OgreVector3.h>
 using namespace Ogre;
 
 namespace
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 8b39a78f1..43b178fe3 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -1,32 +1,17 @@
 #ifndef GAME_MWWORLD_WORLDIMP_H
 #define GAME_MWWORLD_WORLDIMP_H
 
-#include <vector>
-#include <map>
-
-#include <boost/filesystem.hpp>
-
 #include <components/esm_store/store.hpp>
 
-#include <components/settings/settings.hpp>
-
 #include "../mwrender/debugging.hpp"
-#include "../mwrender/renderingmanager.hpp"
 
-#include "refdata.hpp"
 #include "ptr.hpp"
-#include "globals.hpp"
 #include "scene.hpp"
 #include "physicssystem.hpp"
 #include "cells.hpp"
 #include "localscripts.hpp"
 #include "timestamp.hpp"
 
-#include <openengine/bullet/physic.hpp>
-#include <openengine/ogre/fader.hpp>
-
-#include <OgreTimer.h>
-
 #include "../mwbase/world.hpp"
 
 namespace Ogre
diff --git a/components/compiler/streamerrorhandler.cpp b/components/compiler/streamerrorhandler.cpp
index a1d12b708..8a74ad086 100644
--- a/components/compiler/streamerrorhandler.cpp
+++ b/components/compiler/streamerrorhandler.cpp
@@ -35,4 +35,5 @@ namespace Compiler
             << "    " << message << std::endl;
     }
 
-    StreamErrorHandler::StreamErrorHandler (std::ostream& ErrorStream) : mStream (ErrorStream) {}}
+    StreamErrorHandler::StreamErrorHandler (std::ostream& ErrorStream) : mStream (ErrorStream) {}
+}
diff --git a/components/esm/esm_reader.hpp b/components/esm/esm_reader.hpp
index 17cca7a91..13f1f4a01 100644
--- a/components/esm/esm_reader.hpp
+++ b/components/esm/esm_reader.hpp
@@ -1,15 +1,11 @@
 #ifndef _ESM_READER_H
 #define _ESM_READER_H
 
-#include <string.h>
-
-#include <string>
 #include <libs/platform/stdint.h>
 #include <libs/platform/string.h>
-#include <assert.h>
+#include <cassert>
 #include <vector>
 #include <sstream>
-#include <stdexcept>
 
 #include <OgreDataStream.h>
 
diff --git a/components/files/collections.hpp b/components/files/collections.hpp
index 70aaec55e..ed4aafa13 100644
--- a/components/files/collections.hpp
+++ b/components/files/collections.hpp
@@ -1,8 +1,6 @@
 #ifndef COMPONENTS_FILES_COLLECTION_HPP
 #define COMPONENTS_FILES_COLLECTION_HPP
 
-#include <string>
-#include <map>
 #include <boost/filesystem.hpp>
 
 #include "multidircollection.hpp"
diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp
index af9d02b91..0c22c6f7d 100644
--- a/components/files/configurationmanager.hpp
+++ b/components/files/configurationmanager.hpp
@@ -8,7 +8,6 @@
 #endif
 
 #include <boost/program_options.hpp>
-#include <boost/filesystem.hpp>
 
 #include <components/files/fixedpath.hpp>
 #include <components/files/collections.hpp>
diff --git a/components/misc/tests/slice_test.cpp b/components/misc/tests/slice_test.cpp
index a0ea55311..0d9d7b4ab 100644
--- a/components/misc/tests/slice_test.cpp
+++ b/components/misc/tests/slice_test.cpp
@@ -2,8 +2,6 @@
 
 using namespace std;
 
-#include <assert.h>
-
 #include "../slice_array.hpp"
 
 int main()
diff --git a/components/nif/nif_file.hpp b/components/nif/nif_file.hpp
index 42e312b7f..4072b4307 100644
--- a/components/nif/nif_file.hpp
+++ b/components/nif/nif_file.hpp
@@ -32,8 +32,7 @@
 
 #include <stdexcept>
 #include <vector>
-#include <string>
-#include <assert.h>
+#include <cassert>
 
 #include "record.hpp"
 #include "nif_types.hpp"
diff --git a/components/nifbullet/bullet_nif_loader.hpp b/components/nifbullet/bullet_nif_loader.hpp
index b2f023301..88e1ab189 100644
--- a/components/nifbullet/bullet_nif_loader.hpp
+++ b/components/nifbullet/bullet_nif_loader.hpp
@@ -25,22 +25,16 @@
 #define _BULLET_NIF_LOADER_H_
 
 #include <OgreMesh.h>
-#include <assert.h>
+#include <cassert>
 #include <string>
 #include <BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h>
 #include <BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h>
 #include <btBulletDynamicsCommon.h>
-#include <btBulletCollisionCommon.h>
 #include "openengine/bullet/BulletShapeLoader.h"
 
-#include <vector>
-#include <list>
 // For warning messages
 #include <iostream>
 
-// float infinity
-#include <limits>
-
 namespace Nif
 {
     class Node;
diff --git a/components/nifogre/ogre_nif_loader.hpp b/components/nifogre/ogre_nif_loader.hpp
index 0620ddf49..7b32d24d1 100644
--- a/components/nifogre/ogre_nif_loader.hpp
+++ b/components/nifogre/ogre_nif_loader.hpp
@@ -28,31 +28,20 @@
 #include <OgreMesh.h>
 
 #include <cassert>
-#include <string>
 #include <boost/algorithm/string.hpp>
 
-#include "../nif/nif_file.hpp"
 #include "../nif/node.hpp"
-#include "../nif/data.hpp"
-#include "../nif/property.hpp"
-#include "../nif/controller.hpp"
-#include "../nif/extra.hpp"
-#include <libs/platform/strings.h>
-
-#include <vector>
-#include <list>
-// For warning messages
-#include <limits>
-using namespace boost::algorithm;
 
+#include <libs/platform/strings.h>
 
 class BoundsFinder;
 
 struct ciLessBoost : std::binary_function<std::string, std::string, bool>
 {
-    bool operator() (const std::string & s1, const std::string & s2) const {
-                                               //case insensitive version of is_less
-        return lexicographical_compare(s1, s2, is_iless());
+    bool operator() (const std::string & s1, const std::string & s2) const
+    {
+        //case insensitive version of is_less
+        return boost::algorithm::lexicographical_compare(s1, s2, boost::algorithm::is_iless());
     }
 };
 
@@ -63,7 +52,6 @@ namespace Nif
     class NiTriShape;
 }
 
-
 namespace NifOgre
 {
 
@@ -177,3 +165,5 @@ class NIFLoader : Ogre::ManualResourceLoader
 }
 
 #endif
+
+
diff --git a/components/nifogre/tests/ogre_common.cpp b/components/nifogre/tests/ogre_common.cpp
index 949c91c4f..657913f30 100644
--- a/components/nifogre/tests/ogre_common.cpp
+++ b/components/nifogre/tests/ogre_common.cpp
@@ -1,6 +1,5 @@
 #include <Ogre.h>
 #include <iostream>
-#include <assert.h>
 
 using namespace std;
 using namespace Ogre;
diff --git a/libs/openengine/gui/layout.hpp b/libs/openengine/gui/layout.hpp
index e6feb3d0e..9040dfb90 100644
--- a/libs/openengine/gui/layout.hpp
+++ b/libs/openengine/gui/layout.hpp
@@ -1,7 +1,6 @@
 #ifndef OENGINE_MYGUI_LAYOUT_H
 #define OENGINE_MYGUI_LAYOUT_H
 
-#include <assert.h>
 #include <MyGUI.h>
 
 namespace OEngine {
diff --git a/libs/openengine/ogre/fader.cpp b/libs/openengine/ogre/fader.cpp
index 062559e00..41b7773ea 100644
--- a/libs/openengine/ogre/fader.cpp
+++ b/libs/openengine/ogre/fader.cpp
@@ -8,8 +8,6 @@
 #include <OgreMaterialManager.h>
 #include <OgreResourceGroupManager.h>
 
-#include <assert.h>
-
 #define FADE_OVERLAY_NAME       "FadeInOutOverlay"
 #define FADE_OVERLAY_PANEL_NAME "FadeInOutOverlayPanel"
 #define FADE_MATERIAL_NAME      "FadeInOutMaterial"