Re-organize includes.

engine/engine.xcodeproj/project.pbxproj

@@ -194,7 +194,7 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/include/ $(PROJECT_DIR)/../include/expect/include $(PROJECT_DIR)/../";
+				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/include/ $(PROJECT_DIR)/../include/expect/include $(PROJECT_DIR)/../ $(PROJECT_DIR)/../math/include/ $(PROJECT_DIR)/../math/";
 			};
 			name = Debug;
 		};
@@ -240,7 +240,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/include/ $(PROJECT_DIR)/../include/expect/include $(PROJECT_DIR)/../";
+				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/include/ $(PROJECT_DIR)/../include/expect/include $(PROJECT_DIR)/../ $(PROJECT_DIR)/../math/include/ $(PROJECT_DIR)/../math/";
 			};
 			name = Release;
 		};

engine/include/game/engine/events.hpp

@@ -7,9 +7,10 @@
 
 #pragma once
 
+#include "game/math/math_fwd.hpp"
+#include "vector/vector.hpp"
+
 #include "engine_fwd.hpp"
-#include "math/math_fwd.hpp"
-#include "math/vector/vector.hpp"
 
 namespace engine {
   namespace key {

engine/include/game/engine/game_dispatch.hpp

@@ -11,11 +11,12 @@
 #include <memory>
 #include <unordered_map>
 
+#include "game/math/math_fwd.hpp"
+#include "vector/vector.hpp"
+
 #include "time.hpp"
 #include "engine_fwd.hpp"
 #include "events.hpp"
-#include "math/math_fwd.hpp"
-#include "math/vector/vector.hpp"
 
 namespace engine {
   class game_dispatch {

engine/include/game/engine/scene.hpp

@@ -9,11 +9,12 @@
 
 #include <memory>
 
-#include "engine_fwd.hpp"
-#include "math/math_fwd.hpp"
-#include "math/vector/vector.hpp"
+#include "game/math/math_fwd.hpp"
+#include "vector/vector.hpp"
 #include "util/identity.hpp"
 
+#include "engine_fwd.hpp"
+
 namespace engine {  
   class scene : public identity<scene, std::string> {
   public:

graphics/graphics.xcodeproj/project.pbxproj

@@ -194,7 +194,7 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/include/ $(PROJECT_DIR)/../include/expect/include/ $(PROJECT_DIR)/../ $(PROJECT_DIR)/../include/";
+				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/include/ $(PROJECT_DIR)/../include/expect/include/ $(PROJECT_DIR)/../math/ $(PROJECT_DIR)/../include/ $(PROJECT_DIR)/../math/include/ $(PROJECT_DIR)/../";
 			};
 			name = Debug;
 		};
@@ -240,7 +240,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/include/ $(PROJECT_DIR)/../include/expect/include/ $(PROJECT_DIR)/../ $(PROJECT_DIR)/../include/";
+				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/include/ $(PROJECT_DIR)/../include/expect/include/ $(PROJECT_DIR)/../math/ $(PROJECT_DIR)/../include/ $(PROJECT_DIR)/../math/include/ $(PROJECT_DIR)/../";
 			};
 			name = Release;
 		};

graphics/include/game/graphics/material.hpp

@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include "shader_program.hpp"
-
 #include "util/identity.hpp"
 
+#include "shader_program.hpp"
+
 namespace graphics {
   class material : public identity<material> {
   public:

graphics/include/game/graphics/object.hpp

@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include "math/vector/vector.hpp"
-#include "math/math_fwd.hpp"
-#include "math/shape.hpp"
+#include "game/math/math_fwd.hpp"
+#include "game/math/shape.hpp"
+#include "vector/vector.hpp"
 
 #include "material.hpp"
 

graphics/include/game/graphics/texture.hpp

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "math/vector/vector.hpp"
-#include "math/math_fwd.hpp"
+#include "game/math/math_fwd.hpp"
+#include "vector/vector.hpp"
 #include "util/identity.hpp"
 
 namespace graphics {