diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c133e83..dfcabe6f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,7 +151,7 @@ add_library(misc STATIC
 )
 register_lego1_target(misc)
 set_property(TARGET misc PROPERTY ARCHIVE_OUTPUT_NAME "misc$<$<CONFIG:Debug>:d>")
-target_include_directories(misc PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/LEGO1/realtime" "${CMAKE_SOURCE_DIR}/util")
+target_include_directories(misc PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/LEGO1/realtime" "${CMAKE_SOURCE_DIR}/util")
 target_link_libraries(misc PRIVATE)
 
 add_library(3dmanager STATIC
@@ -249,7 +249,7 @@ add_library(omni STATIC
 )
 register_lego1_target(omni)
 set_property(TARGET omni PROPERTY ARCHIVE_OUTPUT_NAME "omni$<$<CONFIG:Debug>:d>")
-target_include_directories(omni PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util")
+target_include_directories(omni PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util")
 target_link_libraries(omni PRIVATE dsound winmm FLIC::FLIC Smacker::Smacker)
 
 add_library(lego1 SHARED
diff --git a/LEGO1/lego/legoomni/include/legoutil.h b/LEGO1/lego/legoomni/include/legoutil.h
index 06910148..af231191 100644
--- a/LEGO1/lego/legoomni/include/legoutil.h
+++ b/LEGO1/lego/legoomni/include/legoutil.h
@@ -26,7 +26,7 @@ class NamedTexture {
 
 private:
 	MxString m_name;        // 0x00
-	LegoTexture* m_texture; // 0x4
+	LegoTexture* m_texture; // 0x04
 };
 
 void FUN_1003e050(LegoAnimPresenter* p_presenter);
diff --git a/LEGO1/lego/sources/misc/legostorage.h b/LEGO1/lego/sources/misc/legostorage.h
index b2f4381e..9d232ee6 100644
--- a/LEGO1/lego/sources/misc/legostorage.h
+++ b/LEGO1/lego/sources/misc/legostorage.h
@@ -2,8 +2,8 @@
 #define __LEGOSTORAGE_H
 
 #include "legotypes.h"
+#include "mxgeometry/mxgeometry3d.h"
 #include "mxstring.h"
-#include "vector.h"
 
 #include <stdio.h>
 
@@ -74,7 +74,7 @@ class LegoFile : public LegoStorage {
 	LegoResult Open(const char* p_name, LegoU32 p_mode);
 
 	// FUNCTION: LEGO1 0x10034430
-	LegoStorage* ReadVector3(Vector3* p_vec3)
+	LegoStorage* ReadVector3(Mx3DPointFloat* p_vec3)
 	{
 		Read(&(*p_vec3)[0], sizeof(float));
 		Read(&(*p_vec3)[1], sizeof(float));
@@ -83,7 +83,7 @@ class LegoFile : public LegoStorage {
 	}
 
 	// FUNCTION: LEGO1 0x100343d0
-	LegoStorage* WriteVector3(Vector3 p_vec3)
+	LegoStorage* WriteVector3(Mx3DPointFloat p_vec3)
 	{
 		Write(&p_vec3[0], sizeof(float));
 		Write(&p_vec3[1], sizeof(float));