diff --git a/analyzer/main.cpp b/analyzer/main.cpp
index 6caedc4a..cf6987c9 100644
--- a/analyzer/main.cpp
+++ b/analyzer/main.cpp
@@ -1,5 +1,5 @@
-#include <renderware/BinaryStream.hpp>
-#include <renderware/TextureArchive.hpp>
+#include <renderwure/BinaryStream.hpp>
+#include <renderwure/TextureArchive.hpp>
 
 #include <SFML/Graphics.hpp>
 
diff --git a/framework2/BinaryStream.cpp b/framework2/BinaryStream.cpp
index d35c831c..23bf9b8d 100644
--- a/framework2/BinaryStream.cpp
+++ b/framework2/BinaryStream.cpp
@@ -1,4 +1,4 @@
-#include <renderware/BinaryStream.hpp>
+#include <renderwure/BinaryStream.hpp>
 
 #include <cstring>
 #include <iostream>
diff --git a/framework2/GTAData.cpp b/framework2/GTAData.cpp
index c14694cb..d45876a8 100644
--- a/framework2/GTAData.cpp
+++ b/framework2/GTAData.cpp
@@ -1,6 +1,7 @@
-#include "engine/GTAData.h"
-#include "loaders/LoaderIPL.h"
-#include <loaders/LoaderDFF.h>
+#include <renderwure/engine/GTAData.hpp>
+#include <renderwure/loaders/LoaderIPL.hpp>
+#include <renderwure/loaders/LoaderDFF.hpp>
+
 #include <iostream>
 #include <fstream>
 #include <bits/algorithmfwd.h>
diff --git a/framework2/GTAEngine.cpp b/framework2/GTAEngine.cpp
index 36e051df..e1278b51 100644
--- a/framework2/GTAEngine.cpp
+++ b/framework2/GTAEngine.cpp
@@ -1,5 +1,5 @@
-#include "engine/GTAEngine.h"
-#include "loaders/LoaderIPL.h"
+#include <renderwure/engine/GTAEngine.hpp>
+#include <renderwure/loaders/LoaderIPL.hpp>
 
 GTAEngine::GTAEngine(const std::string& path)
 : gameData(path)
diff --git a/framework2/LoaderCOL.cpp b/framework2/LoaderCOL.cpp
index 74679214..c27d5980 100644
--- a/framework2/LoaderCOL.cpp
+++ b/framework2/LoaderCOL.cpp
@@ -1,4 +1,5 @@
-#include "loaders/LoaderCOL.h"
+#include <renderwure/loaders/LoaderCOL.hpp>
+
 #include <string>
 #include <fstream>
 
diff --git a/framework2/LoaderDFF.cpp b/framework2/LoaderDFF.cpp
index 1bfa7172..d688c36d 100644
--- a/framework2/LoaderDFF.cpp
+++ b/framework2/LoaderDFF.cpp
@@ -1,4 +1,4 @@
-#include "loaders/LoaderDFF.h"
+#include <renderwure/loaders/LoaderDFF.hpp>
 
 #include <iostream>
 
diff --git a/framework2/LoaderIMG.cpp b/framework2/LoaderIMG.cpp
index 74152b8b..35548c81 100644
--- a/framework2/LoaderIMG.cpp
+++ b/framework2/LoaderIMG.cpp
@@ -1,4 +1,5 @@
-#include "loaders/LoaderIMG.h"
+#include <renderwure/loaders/LoaderIMG.hpp>
+
 #include <cstring>
 
 LoaderIMG::LoaderIMG()
diff --git a/framework2/LoaderIPL.cpp b/framework2/LoaderIPL.cpp
index 2b1156f0..958fe9a7 100644
--- a/framework2/LoaderIPL.cpp
+++ b/framework2/LoaderIPL.cpp
@@ -1,4 +1,4 @@
-#include "loaders/LoaderIPL.h"
+#include <renderwure/loaders/LoaderIPL.hpp>
 
 #include <fstream>
 #include <string>
diff --git a/framework2/TextureArchive.cpp b/framework2/TextureArchive.cpp
index 2f74b37d..755af5dc 100644
--- a/framework2/TextureArchive.cpp
+++ b/framework2/TextureArchive.cpp
@@ -1,4 +1,4 @@
-#include <renderware/TextureArchive.hpp>
+#include <renderwure/TextureArchive.hpp>
 
 #include <cstring>
 #include <iostream>
diff --git a/framework2/TextureLoader.cpp b/framework2/TextureLoader.cpp
index d19658eb..6f22f55e 100644
--- a/framework2/TextureLoader.cpp
+++ b/framework2/TextureLoader.cpp
@@ -1,4 +1,4 @@
-#include "loaders/TextureLoader.h"
+#include <renderwure/loaders/TextureLoader.hpp>
 
 #include <fstream>
 #include <iostream>
diff --git a/framework2/include/renderware/BinaryStream.hpp b/framework2/include/renderwure/BinaryStream.hpp
similarity index 90%
rename from framework2/include/renderware/BinaryStream.hpp
rename to framework2/include/renderwure/BinaryStream.hpp
index 854c6685..30952ced 100644
--- a/framework2/include/renderware/BinaryStream.hpp
+++ b/framework2/include/renderwure/BinaryStream.hpp
@@ -1,4 +1,6 @@
 #pragma once
+#ifndef _BINARYSTREAM_HPP_
+#define _BINARYSTREAM_HPP_
 
 #include <string>
 #include <memory>
@@ -37,4 +39,6 @@ public:
 	static std::string sectionIdString(uint32_t id);
 };
 
-}
\ No newline at end of file
+}
+
+#endif
\ No newline at end of file
diff --git a/framework2/include/renderware/TextureArchive.hpp b/framework2/include/renderwure/TextureArchive.hpp
similarity index 87%
rename from framework2/include/renderware/TextureArchive.hpp
rename to framework2/include/renderwure/TextureArchive.hpp
index 195a2cf1..bd689b03 100644
--- a/framework2/include/renderware/TextureArchive.hpp
+++ b/framework2/include/renderwure/TextureArchive.hpp
@@ -1,6 +1,8 @@
 #pragma once
+#ifndef _TEXTUREARCHIVE_HPP_
+#define _TEXTUREARCHIVE_HPP_
 
-#include <renderware/BinaryStream.hpp>
+#include <renderwure/BinaryStream.hpp>
 
 #include <vector>
 
@@ -43,4 +45,6 @@ public:
 	static std::unique_ptr<TextureArchive> create(BinaryStream &binaryStream);
 };
 
-}
\ No newline at end of file
+}
+
+#endif
\ No newline at end of file
diff --git a/framework2/include/engine/GTAData.h b/framework2/include/renderwure/engine/GTAData.hpp
similarity index 89%
rename from framework2/include/engine/GTAData.h
rename to framework2/include/renderwure/engine/GTAData.hpp
index 1d4482c8..72ef2b2c 100644
--- a/framework2/include/engine/GTAData.h
+++ b/framework2/include/renderwure/engine/GTAData.hpp
@@ -1,11 +1,14 @@
-#ifndef _GTADATA_H_
-#define _GTADATA_H_
+#pragma once
+#ifndef _GTADATA_HPP_
+#define _GTADATA_HPP_
+
+#include <renderwure/loaders/LoaderIMG.hpp>
+#include <renderwure/loaders/TextureLoader.hpp>
+#include <renderwure/loaders/LoaderDFF.hpp>
+
 #include <string>
 #include <map>
 #include <memory>
-#include <loaders/LoaderIMG.h>
-#include <loaders/TextureLoader.h>
-#include <loaders/LoaderDFF.h>
 
 /**
  * Handles loading and management of the Game's DAT
diff --git a/framework2/include/engine/GTAEngine.h b/framework2/include/renderwure/engine/GTAEngine.hpp
similarity index 81%
rename from framework2/include/engine/GTAEngine.h
rename to framework2/include/renderwure/engine/GTAEngine.hpp
index 352960b5..9eb310b9 100644
--- a/framework2/include/engine/GTAEngine.h
+++ b/framework2/include/renderwure/engine/GTAEngine.hpp
@@ -1,10 +1,14 @@
-#ifndef _GTAENGINE_H_
-#define _GTAENGINE_H_
-#include "GTAData.h"
-#include <loaders/LoaderIPL.h>
-#include <vector>
+#pragma once
+#ifndef _GTAENGINE_HPP_
+#define _GTAENGINE_HPP_
+
+#include <renderwure/engine/GTAData.hpp>
+#include <renderwure/loaders/LoaderIPL.hpp>
+
 #include <glm/glm.hpp>
 
+#include <vector>
+
 /**
  * @class GTAEngine
  *  Provides a simple interface to the framework's internals
diff --git a/framework2/include/loaders/LoaderCOL.h b/framework2/include/renderwure/loaders/LoaderCOL.hpp
similarity index 96%
rename from framework2/include/loaders/LoaderCOL.h
rename to framework2/include/renderwure/loaders/LoaderCOL.hpp
index 79c57538..22659b98 100644
--- a/framework2/include/loaders/LoaderCOL.h
+++ b/framework2/include/renderwure/loaders/LoaderCOL.hpp
@@ -1,5 +1,7 @@
-#ifndef _LOADERCOL_H_
-#define _LOADERCOL_H_
+#pragma once
+#ifndef _LOADERCOL_HPP_
+#define _LOADERCOL_HPP_
+
 #include <string>
 #include <vector>
 #include <glm/glm.hpp>
diff --git a/framework2/include/loaders/LoaderDFF.h b/framework2/include/renderwure/loaders/LoaderDFF.hpp
similarity index 94%
rename from framework2/include/loaders/LoaderDFF.h
rename to framework2/include/renderwure/loaders/LoaderDFF.hpp
index a21fbbca..e3114ead 100644
--- a/framework2/include/loaders/LoaderDFF.h
+++ b/framework2/include/renderwure/loaders/LoaderDFF.hpp
@@ -1,4 +1,6 @@
 #pragma once
+#ifndef _LOADERDFF_HPP_
+#define _LOADERDFF_HPP_
 
 #define GLEW_STATIC
 #include <GL/glew.h>
@@ -55,3 +57,5 @@ private:
 public:
 	std::unique_ptr<Model> loadFromMemory(char *data);
 };
+
+#endif
\ No newline at end of file
diff --git a/framework2/include/loaders/LoaderIMG.h b/framework2/include/renderwure/loaders/LoaderIMG.hpp
similarity index 96%
rename from framework2/include/loaders/LoaderIMG.h
rename to framework2/include/renderwure/loaders/LoaderIMG.hpp
index 512c9a94..5e2b930b 100644
--- a/framework2/include/loaders/LoaderIMG.h
+++ b/framework2/include/renderwure/loaders/LoaderIMG.hpp
@@ -1,5 +1,6 @@
-#ifndef LoaderIMG_h__
-#define LoaderIMG_h__
+#pragma once
+#ifndef _LOADERIMG_HPP_
+#define _LOADERIMG_HPP_
 
 #include <iostream>
 #include <vector>
diff --git a/framework2/include/loaders/LoaderIPL.h b/framework2/include/renderwure/loaders/LoaderIPL.hpp
similarity index 93%
rename from framework2/include/loaders/LoaderIPL.h
rename to framework2/include/renderwure/loaders/LoaderIPL.hpp
index 11b99400..4d70211d 100644
--- a/framework2/include/loaders/LoaderIPL.h
+++ b/framework2/include/renderwure/loaders/LoaderIPL.hpp
@@ -1,5 +1,6 @@
-#ifndef LoaderIPL_h__
-#define LoaderIPL_h__
+#pragma once
+#ifndef _LOADERIPL_HPP_
+#define _LOADERIPL_HPP_
 
 #include <iostream>
 #include <vector>
diff --git a/framework2/include/loaders/TextureLoader.h b/framework2/include/renderwure/loaders/TextureLoader.hpp
similarity index 83%
rename from framework2/include/loaders/TextureLoader.h
rename to framework2/include/renderwure/loaders/TextureLoader.hpp
index b52d9103..bdf7106a 100644
--- a/framework2/include/loaders/TextureLoader.h
+++ b/framework2/include/renderwure/loaders/TextureLoader.hpp
@@ -1,4 +1,6 @@
 #pragma once
+#ifndef _TEXTURELOADER_HPP_
+#define _TEXTURELOADER_HPP_
 
 #define GLEW_STATIC
 #include <GL/glew.h>
@@ -17,3 +19,5 @@ public:
 
 	std::map<std::string, GLuint> textures;
 };
+
+#endif
\ No newline at end of file
diff --git a/viewer/main.cpp b/viewer/main.cpp
index a2e5aa3b..7c48f938 100644
--- a/viewer/main.cpp
+++ b/viewer/main.cpp
@@ -1,8 +1,8 @@
 #define GLEW_STATIC
 #include <GL/glew.h>
 
-#include <engine/GTAEngine.h>
-#include <loaders/LoaderDFF.h>
+#include <renderwure/engine/GTAEngine.hpp>
+#include <renderwure/loaders/LoaderDFF.hpp>
 
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>