more cleanup

src/object/archway.c

@@ -1,7 +1,6 @@
 #include "global.h"
 #include "entity.h"
-#include "sprite.h"
-#include "functions.h"
+#include "game.h"
 
 void Archway(Entity* this) {
     u32 v1;

src/object/chestSpawner.c

@@ -1,6 +1,5 @@
 #include "global.h"
 #include "entity.h"
-#include "flags.h"
 
 extern void sub_080842D8(Entity*);
 extern void sub_08078828(Entity*);

src/object/cloud.c

@@ -60,7 +60,7 @@ void sub_0809F5B0(Entity* this) {
     if (--this->actionDelay == 0) {
         SoundReq(115);
         SetGlobalFlag(KUMOTATSUMAKI);
-        LoadRoomEntityList(&gUnk_080DD750);
+        LoadRoomEntityList((EntityData*)&gUnk_080DD750);
         DeleteThisEntity();
     }
 }

src/object/floatingBlock.c

@@ -1,6 +1,5 @@
 #include "global.h"
 #include "entity.h"
-#include "functions.h"
 
 void FloatingBlock(Entity* this) {
     if (this->action == 0) {

src/object/minishSizedEntrance.c

@@ -1,5 +1,6 @@
 #include "global.h"
 #include "entity.h"
+#include "game.h"
 #include "functions.h"
 
 extern void (*const gUnk_08122254[])(Entity*);

src/object/objectA.c

@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "room.h"
 #include "flags.h"
+#include "createObject.h"
 #include "functions.h"
 
 extern Hitbox gUnk_080FD170;

src/object/pinwheel.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "entity.h"
 #include "flags.h"
-#include "functions.h"
+#include "createObject.h"
 
 extern u32 ReadBit(u32*, u32);
 

src/object/windTribeFlag.c

@@ -1,7 +1,6 @@
 #include "global.h"
 #include "entity.h"
 #include "random.h"
-#include "functions.h"
 
 void WindTribeFlag(Entity* this) {
     if (this->action == 0) {