diff --git a/ZAPDTR b/ZAPDTR
index a406a7d43..8c88631bf 160000
--- a/ZAPDTR
+++ b/ZAPDTR
@@ -1 +1 @@
-Subproject commit a406a7d4310c26f6e7aeece3bb4475cd8fd2d9e3
+Subproject commit 8c88631bf691f0abbab48127cabc55d2a704e022
diff --git a/libultraship b/libultraship
index 75344bb10..86bdd4654 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit 75344bb10111fef29152cf75ea8cf278c26fe5a2
+Subproject commit 86bdd465478dae2c929a65ca48ca3ac54eceef43
diff --git a/mm/2s2h/resource/type/Cutscene.h b/mm/2s2h/resource/type/Cutscene.h
index 3ca8b3d50..c4d5fb0d5 100644
--- a/mm/2s2h/resource/type/Cutscene.h
+++ b/mm/2s2h/resource/type/Cutscene.h
@@ -3,9 +3,6 @@
 #include <vector>
 #include <string>
 #include "Resource.h"
-#include "Vec2f.h"
-#include "Vec3f.h"
-#include "Color3b.h"
 
 namespace SOH {
 
diff --git a/mm/2s2h/resource/type/PlayerAnimation.h b/mm/2s2h/resource/type/PlayerAnimation.h
index 5d5af68f2..6ba9eeb9c 100644
--- a/mm/2s2h/resource/type/PlayerAnimation.h
+++ b/mm/2s2h/resource/type/PlayerAnimation.h
@@ -3,9 +3,6 @@
 #include <vector>
 #include <string>
 #include "Resource.h"
-#include "Vec2f.h"
-#include "Vec3f.h"
-#include "Color3b.h"
 
 namespace SOH {
 
@@ -20,4 +17,4 @@ class PlayerAnimation : public LUS::Resource<int16_t> {
 
     std::vector<int16_t> limbRotData;
 };
-} // namespace SOH
\ No newline at end of file
+} // namespace SOH