diff --git a/code/ByteSwap.h b/code/ByteSwap.h
index a90c1a84c..4be039599 100644
--- a/code/ByteSwap.h
+++ b/code/ByteSwap.h
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_BYTESWAP_H_INC
 #define AI_BYTESWAP_H_INC
 
-#include "../include/assimp/assert.h"
+#include "../include/assimp/ai_assert.h"
 #include "../include/assimp/types.h"
 
 #if _MSC_VER >= 1400 
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 8db1ab8a6..c74c747b8 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -19,7 +19,7 @@ SOURCE_GROUP( Compiler FILES ${COMPILER_HEADERS})
 
 SET( PUBLIC_HEADERS
 	${HEADER_PATH}/anim.h
-	${HEADER_PATH}/assert.h
+	${HEADER_PATH}/ai_assert.h
 	${HEADER_PATH}/camera.h
 	${HEADER_PATH}/color4.h
 	${HEADER_PATH}/color4.inl
diff --git a/code/ColladaExporter.h b/code/ColladaExporter.h
index 198e42591..014e98db4 100644
--- a/code/ColladaExporter.h
+++ b/code/ColladaExporter.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_COLLADAEXPORTER_H_INC
 #define AI_COLLADAEXPORTER_H_INC
 
-#include "../include/assimp/assert.h"
+#include "../include/assimp/ai_assert.h"
 #include <sstream>
 
 struct aiScene;
diff --git a/code/RemoveComments.h b/code/RemoveComments.h
index 4b5e28cee..8b8185fcb 100644
--- a/code/RemoveComments.h
+++ b/code/RemoveComments.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_REMOVE_COMMENTS_H_INC
 #define AI_REMOVE_COMMENTS_H_INC
 
-#include "../include/assimp/assert.h"
+#include "../include/assimp/ai_assert.h"
 
 namespace Assimp	{
 
diff --git a/code/SceneCombiner.h b/code/SceneCombiner.h
index a4be54c6b..bda8f907d 100644
--- a/code/SceneCombiner.h
+++ b/code/SceneCombiner.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_SCENE_COMBINER_H_INC
 #define AI_SCENE_COMBINER_H_INC
 
-#include "../include/assimp/assert.h"
+#include "../include/assimp/ai_assert.h"
 
 namespace Assimp	{
 
diff --git a/code/StringComparison.h b/code/StringComparison.h
index 132962abf..ca6f3e87f 100644
--- a/code/StringComparison.h
+++ b/code/StringComparison.h
@@ -50,6 +50,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INCLUDED_AI_STRING_WORKERS_H
 #define INCLUDED_AI_STRING_WORKERS_H
 
+#include "../include/assimp/ai_assert.h"
+
 namespace Assimp	{
 
 // -------------------------------------------------------------------------------
diff --git a/code/VertexTriangleAdjacency.h b/code/VertexTriangleAdjacency.h
index 462d5796e..aa9517a9b 100644
--- a/code/VertexTriangleAdjacency.h
+++ b/code/VertexTriangleAdjacency.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BaseProcess.h"
 #include "../include/assimp/types.h"
-#include "../include/assimp/assert.h"
+#include "../include/assimp/ai_assert.h"
 
 struct aiMesh;
 namespace Assimp	{
diff --git a/include/assimp/assert.h b/include/assimp/ai_assert.h
similarity index 100%
rename from include/assimp/assert.h
rename to include/assimp/ai_assert.h
diff --git a/tools/assimp_view/assimp_view.h b/tools/assimp_view/assimp_view.h
index f8bdf54e4..dcd65de15 100644
--- a/tools/assimp_view/assimp_view.h
+++ b/tools/assimp_view/assimp_view.h
@@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // Include ASSIMP headers (XXX: do we really need all of them?)
 #include <assimp/cimport.h>
 #include <assimp/Importer.hpp>
-#include <assimp/assert.h>
+#include <assimp/ai_assert.h>
 #include <assimp/cfileio.h>
 #include <assimp/postprocess.h>
 #include <assimp/scene.h>
diff --git a/workspaces/vc9/assimp.vcproj b/workspaces/vc9/assimp.vcproj
index 8c8e7148f..5a1b92338 100644
--- a/workspaces/vc9/assimp.vcproj
+++ b/workspaces/vc9/assimp.vcproj
@@ -1173,11 +1173,11 @@
 				Name="Common"
 				>
 				<File
-					RelativePath="..\..\include\assimp\anim.h"
+					RelativePath="..\..\include\assimp\ai_assert.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\assimp\assert.h"
+					RelativePath="..\..\include\assimp\anim.h"
 					>
 				</File>
 				<File