diff --git a/code/ObjExporter.cpp b/code/ObjExporter.cpp
index b236459dc..5e3d2d7fd 100644
--- a/code/ObjExporter.cpp
+++ b/code/ObjExporter.cpp
@@ -44,15 +44,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_OBJ_EXPORTER
 
 #include "ObjExporter.h"
-#include "../include/assimp/version.h"
-#include "../include/assimp/IOSystem.hpp"
-#include "../include/assimp/Exporter.hpp"
-#include <boost/scoped_ptr.hpp>
 #include "Exceptional.h"
-#include "../include/assimp/material.h"
-#include "../include/assimp/scene.h"
 #include "StringComparison.h"
+#include <assimp/version.h>
+#include <assimp/IOSystem.hpp>
+#include <assimp/Exporter.hpp>
+#include <assimp/material.h>
+#include <assimp/scene.h>
 #include <boost/foreach.hpp>
+#include <boost/scoped_ptr.hpp>
 
 
 using namespace Assimp;
diff --git a/code/ObjExporter.h b/code/ObjExporter.h
index 85c00e6ad..0a1252d0b 100644
--- a/code/ObjExporter.h
+++ b/code/ObjExporter.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_OBJEXPORTER_H_INC
 #define AI_OBJEXPORTER_H_INC
 
-#include "../include/assimp/types.h"
+#include <assimp/types.h>
 #include <sstream>
 #include <vector>
 #include <map>
diff --git a/code/ObjFileData.h b/code/ObjFileData.h
index faa54553b..d04c5f577 100644
--- a/code/ObjFileData.h
+++ b/code/ObjFileData.h
@@ -43,15 +43,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <vector>
 #include <map>
-#include "../include/assimp/types.h"
-#include "../include/assimp/mesh.h"
+#include <assimp/types.h>
+#include <assimp/mesh.h>
 
-namespace Assimp
-{
+namespace Assimp {
+namespace ObjFile {
 
-namespace ObjFile
-{
-// ------------------------------------------------------------------------------------------------
 struct Object;
 struct Face;
 struct Material;
diff --git a/code/ObjFileImporter.cpp b/code/ObjFileImporter.cpp
index 72f045d11..1da03726b 100644
--- a/code/ObjFileImporter.cpp
+++ b/code/ObjFileImporter.cpp
@@ -47,10 +47,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ObjFileParser.h"
 #include "ObjFileData.h"
 #include <boost/scoped_ptr.hpp>
-#include "../include/assimp/Importer.hpp"
-#include "../include/assimp/scene.h"
-#include "../include/assimp/ai_assert.h"
-#include "../include/assimp/DefaultLogger.hpp"
+#include <assimp/Importer.hpp>
+#include <assimp/scene.h>
+#include <assimp/ai_assert.h>
+#include <assimp/DefaultLogger.hpp>
 
 
 static const aiImporterDesc desc = {
diff --git a/code/ObjFileMtlImporter.cpp b/code/ObjFileMtlImporter.cpp
index ba008c500..c993cd203 100644
--- a/code/ObjFileMtlImporter.cpp
+++ b/code/ObjFileMtlImporter.cpp
@@ -48,8 +48,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ObjFileData.h"
 #include "fast_atof.h"
 #include "ParsingUtils.h"
-#include "../include/assimp/material.h"
-#include "../include/assimp/DefaultLogger.hpp"
+#include <assimp/material.h>
+#include <assimp/DefaultLogger.hpp>
 
 
 namespace Assimp    {
diff --git a/code/ObjFileMtlImporter.h b/code/ObjFileMtlImporter.h
index b51220c17..3278e380b 100644
--- a/code/ObjFileMtlImporter.h
+++ b/code/ObjFileMtlImporter.h
@@ -44,14 +44,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 struct aiColor3D;
 
-namespace Assimp
-{
-
-namespace ObjFile
-{
-struct Model;
-struct Material;
+namespace Assimp {
 
+namespace ObjFile {
+    struct Model;
+    struct Material;
 }
 
 
diff --git a/code/ObjFileParser.cpp b/code/ObjFileParser.cpp
index 6f9170e8c..4363eda2f 100644
--- a/code/ObjFileParser.cpp
+++ b/code/ObjFileParser.cpp
@@ -47,12 +47,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ObjTools.h"
 #include "ObjFileData.h"
 #include "ParsingUtils.h"
-#include "../include/assimp/types.h"
 #include "DefaultIOSystem.h"
 #include "BaseImporter.h"
-#include "../include/assimp/DefaultLogger.hpp"
-#include "../include/assimp/material.h"
-#include "../include/assimp/Importer.hpp"
+#include <assimp/DefaultLogger.hpp>
+#include <assimp/material.h>
+#include <assimp/Importer.hpp>
 #include <cstdlib>
 
 
diff --git a/code/ObjFileParser.h b/code/ObjFileParser.h
index 43afcfe7b..aa70880b6 100644
--- a/code/ObjFileParser.h
+++ b/code/ObjFileParser.h
@@ -43,21 +43,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 #include <string>
 #include <map>
-#include "../include/assimp/vector2.h"
-#include "../include/assimp/vector3.h"
-#include "../include/assimp/mesh.h"
+#include <assimp/vector2.h>
+#include <assimp/vector3.h>
+#include <assimp/mesh.h>
 
-namespace Assimp
-{
+namespace Assimp {
 
-namespace ObjFile
-{
-struct Model;
-struct Object;
-struct Material;
-struct Point3;
-struct Point2;
+namespace ObjFile {
+    struct Model;
+    struct Object;
+    struct Material;
+    struct Point3;
+    struct Point2;
 }
+
 class ObjFileImporter;
 class IOSystem;