diff --git a/ZAPDTR b/ZAPDTR
index eff29036118..9f9d0be3c91 160000
--- a/ZAPDTR
+++ b/ZAPDTR
@@ -1 +1 @@
-Subproject commit eff29036118349e142ee8efca80fd975a2a2b6ff
+Subproject commit 9f9d0be3c914354ecabab3695581f1123c13ac20
diff --git a/libultraship b/libultraship
index d795e6ac783..b135db823aa 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit d795e6ac7837be79dd14f18f4567f3330c74a423
+Subproject commit b135db823aaabf6e848fcbd2796933b0771f9968
diff --git a/soh/soh/resource/type/Cutscene.h b/soh/soh/resource/type/Cutscene.h
index 3ca8b3d50a5..c4d5fb0d505 100644
--- a/soh/soh/resource/type/Cutscene.h
+++ b/soh/soh/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/soh/soh/resource/type/PlayerAnimation.h b/soh/soh/resource/type/PlayerAnimation.h
index d8c47a5f603..416b3928c23 100644
--- a/soh/soh/resource/type/PlayerAnimation.h
+++ b/soh/soh/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 {
 class PlayerAnimation : public LUS::Resource<int16_t> {