diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index fc905b79d..993ec6623 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -11,7 +11,7 @@
 // For OutputDebugString
 #include <Windows.h>
 // makes __argc and __argv available on windows
-#include <stdlib.h>
+#include <cstdlib>
 
 #endif
 
diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
index 8f605b8ed..053191c9b 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsa_file.cpp
@@ -24,8 +24,8 @@
 #include "bsa_file.hpp"
 
 #include <stdexcept>
-#include <stdlib.h>
-#include <assert.h>
+#include <cstdlib>
+#include <cassert>
 
 #include <OgreDataStream.h>
 
diff --git a/components/bsa/tests/bsatool_cmd.c b/components/bsa/tests/bsatool_cmd.c
index f6e10d793..caa8cd720 100644
--- a/components/bsa/tests/bsatool_cmd.c
+++ b/components/bsa/tests/bsatool_cmd.c
@@ -13,8 +13,8 @@
 #include "config.h"
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <string.h>
 
 #ifndef FIX_UNUSED
diff --git a/components/bsa/tests/bsatool_cmd.h b/components/bsa/tests/bsatool_cmd.h
index 65ebc3e96..98fe2633f 100644
--- a/components/bsa/tests/bsatool_cmd.h
+++ b/components/bsa/tests/bsatool_cmd.h
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <stdio.h> /* for FILE */
+#include <cstdio> /* for FILE */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/esm_store/reclists.hpp b/components/esm_store/reclists.hpp
index 48bf050cd..ffecfc8de 100644
--- a/components/esm_store/reclists.hpp
+++ b/components/esm_store/reclists.hpp
@@ -7,7 +7,7 @@
 #include <vector>
 #include <algorithm>
 #include <cctype>
-#include <assert.h>
+#include <cassert>
 #include <stdexcept>
 #include <iterator>
 #include    <boost/algorithm/string.hpp>
diff --git a/components/misc/tests/strops_test.cpp b/components/misc/tests/strops_test.cpp
index 2a1fdd77d..24ab8a298 100644
--- a/components/misc/tests/strops_test.cpp
+++ b/components/misc/tests/strops_test.cpp
@@ -1,4 +1,4 @@
-#include <assert.h>
+#include <cassert>
 
 #include "../stringops.hpp"
 
diff --git a/components/nifbullet/bullet_nif_loader.cpp b/components/nifbullet/bullet_nif_loader.cpp
index 4105c4c79..ea94e7758 100644
--- a/components/nifbullet/bullet_nif_loader.cpp
+++ b/components/nifbullet/bullet_nif_loader.cpp
@@ -23,7 +23,7 @@ http://www.gnu.org/licenses/ .
 
 #include "bullet_nif_loader.hpp"
 #include <Ogre.h>
-#include <stdio.h>
+#include <cstdio>
 
 #include "../nif/nif_file.hpp"
 #include "../nif/node.hpp"
diff --git a/components/terrain/heightmapbuf.hpp b/components/terrain/heightmapbuf.hpp
index 82154ce88..d147e6015 100644
--- a/components/terrain/heightmapbuf.hpp
+++ b/components/terrain/heightmapbuf.hpp
@@ -8,7 +8,7 @@
 #include "heightmap.hpp"
 #include "land_factory.hpp"
 #include <vector>
-#include <assert.h>
+#include <cassert>
 
 namespace Terrain
 {
diff --git a/components/terrain/triangulator.hpp b/components/terrain/triangulator.hpp
index cedf0c6a2..c5c0e699b 100644
--- a/components/terrain/triangulator.hpp
+++ b/components/terrain/triangulator.hpp
@@ -28,7 +28,7 @@
   terrains of the same size, once instance can usually be shared.
 */
 
-#include <assert.h>
+#include <cassert>
 
 namespace Terrain
 {
diff --git a/components/to_utf8/gen_iconv.cpp b/components/to_utf8/gen_iconv.cpp
index b7298e304..cc7cc191a 100644
--- a/components/to_utf8/gen_iconv.cpp
+++ b/components/to_utf8/gen_iconv.cpp
@@ -5,7 +5,7 @@
 using namespace std;
 
 #include <iconv.h>
-#include <assert.h>
+#include <cassert>
 
 void tab() { cout << "   "; }
 
diff --git a/components/to_utf8/to_utf8.cpp b/components/to_utf8/to_utf8.cpp
index 3fbbeb733..6bcbbd0e6 100644
--- a/components/to_utf8/to_utf8.cpp
+++ b/components/to_utf8/to_utf8.cpp
@@ -1,7 +1,7 @@
 #include "to_utf8.hpp"
 
 #include <vector>
-#include <assert.h>
+#include <cassert>
 
 /* This file contains the code to translate from WINDOWS-1252 (native
    charset used in English version of Morrowind) to UTF-8. The library
diff --git a/libs/mangle/input/servers/ois_driver.cpp b/libs/mangle/input/servers/ois_driver.cpp
index b8e4f5eb9..07ba3e83a 100644
--- a/libs/mangle/input/servers/ois_driver.cpp
+++ b/libs/mangle/input/servers/ois_driver.cpp
@@ -1,6 +1,6 @@
 #include "ois_driver.hpp"
 
-#include <assert.h>
+#include <cassert>
 #include <sstream>
 #include <OgreRenderWindow.h>
 #include <OIS/OIS.h>
diff --git a/libs/mangle/rend2d/servers/sdl_driver.cpp b/libs/mangle/rend2d/servers/sdl_driver.cpp
index aa1ff6c6d..84a17933f 100644
--- a/libs/mangle/rend2d/servers/sdl_driver.cpp
+++ b/libs/mangle/rend2d/servers/sdl_driver.cpp
@@ -3,7 +3,7 @@
 #include <SDL.h>
 #include <SDL_image.h>
 #include <stdexcept>
-#include <assert.h>
+#include <cassert>
 
 using namespace Mangle::Rend2D;
 
diff --git a/libs/mangle/rend2d/servers/sdl_gl_driver.cpp b/libs/mangle/rend2d/servers/sdl_gl_driver.cpp
index 2bcb1d677..db519e091 100644
--- a/libs/mangle/rend2d/servers/sdl_gl_driver.cpp
+++ b/libs/mangle/rend2d/servers/sdl_gl_driver.cpp
@@ -4,7 +4,7 @@
 #include <SDL_image.h>
 #include <SDL_opengl.h>
 #include <stdexcept>
-#include <assert.h>
+#include <cassert>
 
 using namespace Mangle::Rend2D;
 
diff --git a/libs/openengine/gui/events.cpp b/libs/openengine/gui/events.cpp
index bce70704b..35b01158b 100644
--- a/libs/openengine/gui/events.cpp
+++ b/libs/openengine/gui/events.cpp
@@ -1,6 +1,6 @@
 #include <MyGUI.h>
 #include <OIS/OIS.h>
-#include <assert.h>
+#include <cassert>
 
 #include "events.hpp"
 
diff --git a/libs/openengine/gui/manager.cpp b/libs/openengine/gui/manager.cpp
index 022c5efb5..9c6ca37eb 100644
--- a/libs/openengine/gui/manager.cpp
+++ b/libs/openengine/gui/manager.cpp
@@ -1,6 +1,6 @@
 #include <MyGUI.h>
 #include <MyGUI_OgrePlatform.h>
-#include <assert.h>
+#include <cassert>
 
 #include "manager.hpp"
 
diff --git a/libs/openengine/input/dispatch_map.hpp b/libs/openengine/input/dispatch_map.hpp
index f0d4cabe9..be13e7f01 100644
--- a/libs/openengine/input/dispatch_map.hpp
+++ b/libs/openengine/input/dispatch_map.hpp
@@ -3,7 +3,7 @@
 
 #include <set>
 #include <map>
-#include <assert.h>
+#include <cassert>
 
 namespace OEngine {
 namespace Input {
diff --git a/libs/openengine/input/func_binder.hpp b/libs/openengine/input/func_binder.hpp
index 7aa733edf..a815ba0ce 100644
--- a/libs/openengine/input/func_binder.hpp
+++ b/libs/openengine/input/func_binder.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 #include <boost/function.hpp>
-#include <assert.h>
+#include <cassert>
 
 namespace OEngine {
 namespace Input {
diff --git a/libs/openengine/misc/list.hpp b/libs/openengine/misc/list.hpp
index b08b57494..bda9cb8de 100644
--- a/libs/openengine/misc/list.hpp
+++ b/libs/openengine/misc/list.hpp
@@ -1,7 +1,7 @@
 #ifndef MISC_LIST_H
 #define MISC_LIST_H
 
-#include <assert.h>
+#include <cassert>
 
 namespace Misc{
 
diff --git a/libs/openengine/ogre/renderer.cpp b/libs/openengine/ogre/renderer.cpp
index 275b7385a..f2f4b4c81 100644
--- a/libs/openengine/ogre/renderer.cpp
+++ b/libs/openengine/ogre/renderer.cpp
@@ -9,7 +9,7 @@
 #include "OgreTexture.h"
 #include "OgreHardwarePixelBuffer.h"
 
-#include <assert.h>
+#include <cassert>
 #include <stdexcept>
 
 using namespace Ogre;