diff --git a/configure.py b/configure.py
index 1780ee2a..9043e95f 100755
--- a/configure.py
+++ b/configure.py
@@ -212,7 +212,6 @@
 cflags_pikmin = [
     *cflags_base,
     "-fp_contract off",
-    "-common on",
     "-RTTI on",
 ]
 
diff --git a/include/BombItem.h b/include/BombItem.h
index 2dafe2a0..b6ea7ff1 100644
--- a/include/BombItem.h
+++ b/include/BombItem.h
@@ -4,8 +4,10 @@
 #include "types.h"
 #include "ItemMgr.h"
 #include "CreatureProp.h"
+#include "SimpleAI.h"
 
-struct SimpleAI;
+struct InteractBikkuri;
+struct InteractSwallow;
 
 /**
  * @brief TODO
@@ -42,4 +44,112 @@ struct BombItem : public ItemCreature {
 	// TODO: members
 };
 
+/**
+ * @brief TODO
+ */
+struct BombAI : public SimpleAI {
+
+	/**
+	 * @brief TODO
+	 */
+	struct BombExec : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct BombInit : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct DieExec : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct DieInit : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct MizuExec : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct MizuInit : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct SetExec : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct SetInit : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	BombAI();
+
+	// _00     = VTBL
+	// _00-_?? = SimpleAI
+	// TODO: members
+};
+
 #endif
diff --git a/include/Collision.h b/include/Collision.h
index f6c33a92..17c9fa08 100644
--- a/include/Collision.h
+++ b/include/Collision.h
@@ -70,6 +70,16 @@ struct CndCollPart {
 	// TODO: members
 };
 
+/**
+ * @brief TODO
+ */
+struct CndBombable : public CndCollPart {
+	virtual bool satisfy(CollPart*); // _08 (weak)
+
+	// _00 = VTBL?
+	// TODO: members
+};
+
 enum ObjCollType {
 	OCT_Sphere   = 1,
 	OCT_Platform = 2,
diff --git a/include/Demo.h b/include/Demo.h
index 3749eb0c..6379ab65 100644
--- a/include/Demo.h
+++ b/include/Demo.h
@@ -75,4 +75,6 @@ struct DemoEventMgr {
 	// TODO: members
 };
 
+extern DemoEventMgr* demoEventMgr;
+
 #endif
diff --git a/include/GameCoreSection.h b/include/GameCoreSection.h
new file mode 100644
index 00000000..289c7ff4
--- /dev/null
+++ b/include/GameCoreSection.h
@@ -0,0 +1,51 @@
+#ifndef _GAMECORESECTION_H
+#define _GAMECORESECTION_H
+
+#include "types.h"
+#include "Node.h"
+
+struct Camera;
+struct Controller;
+struct Creature;
+struct MapMgr;
+struct RectArea;
+
+/**
+ * @brief TODO
+ */
+struct GameCoreSection : public Node {
+	GameCoreSection(Controller*, MapMgr*, Camera&);
+
+	virtual void update();        // _10
+	virtual void draw(Graphics&); // _14
+
+	void startTextDemo(Creature*, int);
+	void updateTextDemo();
+	void startMovie(u32, bool);
+	void endMovie(int);
+	void exitDayEnd();
+	void forceDayEnd();
+	void clearDeadlyPikmins();
+	void enterFreePikmins();
+	void cleanupDayEnd();
+	void prepareBadEnd();
+	void exitStage();
+	void initStage();
+	void finalSetup();
+	void startContainerDemo();
+	void startSundownWarn();
+	void updateAI();
+	void draw1D(Graphics&);
+	void draw2D(Graphics&);
+
+	// unused/inlined:
+	void hideTeki();
+	void hideAllPellet();
+	void hidePelletExceptSucked();
+
+	// _00     = VTBL
+	// _00-_20 = Node
+	// TODO: members
+};
+
+#endif
diff --git a/include/GameStat.h b/include/GameStat.h
new file mode 100644
index 00000000..ef9a4c6e
--- /dev/null
+++ b/include/GameStat.h
@@ -0,0 +1,66 @@
+#ifndef _GAMESTAT_H
+#define _GAMESTAT_H
+
+#include "types.h"
+
+/**
+ * @brief TODO
+ */
+struct GameStat {
+
+	/**
+	 * @brief TODO
+	 */
+	struct Counter {
+		inline Counter() { mCount = 0; }
+
+		inline void init() { mCount = 0; }
+
+		// unused/inlined:
+		void dump(char*);
+
+		int mCount; // _00
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct ColCounter {
+		inline ColCounter() { mCounts[0] = mCounts[1] = mCounts[2] = 0; }
+
+		inline void init() { mCounts[0] = mCounts[1] = mCounts[2] = 0; }
+
+		inline int& operator()(int idx) { return mCounts[idx]; }
+
+		// unused/inlined:
+		void dump(char*);
+
+		int mCounts[3]; // _00, indexed by piki color, probably
+	};
+
+	void init();
+	void update();
+	void dump();
+
+	static ColCounter deadPikis;
+	static ColCounter fallPikis;
+	static ColCounter formationPikis;
+	static ColCounter freePikis;
+	static ColCounter workPikis;
+	static ColCounter mePikis;
+	static ColCounter containerPikis;
+	static ColCounter bornPikis;
+	static ColCounter victimPikis;
+	static ColCounter mapPikis;
+	static ColCounter allPikis;
+
+	static Counter killTekis;
+	static Counter getPellets;
+	static int minPikis;
+	static int maxPikis;
+	static bool orimaDead;
+
+	// TODO: members
+};
+
+#endif
diff --git a/include/GemItem.h b/include/GemItem.h
index 3630fa9a..909ae128 100644
--- a/include/GemItem.h
+++ b/include/GemItem.h
@@ -3,8 +3,7 @@
 
 #include "types.h"
 #include "ItemMgr.h"
-
-struct SimpleAI;
+#include "SimpleAI.h"
 
 /*
  * @brief TODO
@@ -43,4 +42,52 @@ struct GemItem : public ItemCreature {
 	// TODO: members
 };
 
+/**
+ * @brief TODO
+ */
+struct GemAI : public SimpleAI {
+
+	/**
+	 * @brief TODO
+	 */
+	struct Die : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct RiseExec : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct RiseInit : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	GemAI();
+
+	// _00     = VTBL
+	// _00-_?? = SimpleAI
+	// TODO: members
+};
+
 #endif
diff --git a/include/GoalItem.h b/include/GoalItem.h
index c238057a..c40e9f8c 100644
--- a/include/GoalItem.h
+++ b/include/GoalItem.h
@@ -6,6 +6,7 @@
 #include "zen/CallBack.h"
 #include "zen/particle.h"
 #include "CreatureProp.h"
+#include "SimpleAI.h"
 
 namespace zen {
 struct particleGenerator;
@@ -75,4 +76,112 @@ struct GoalItem : public Suckable, public zen::CallBack2<zen::particleGenerator*
 	// TODO: members
 };
 
+/**
+ * @brief TODO
+ */
+struct GoalAI : public SimpleAI {
+
+	/**
+	 * @brief TODO
+	 */
+	struct NotFinished : public SAICondition {
+
+		virtual bool satisfy(AICreature*); // _10
+
+		// _00     = VTBL
+		// _00-_14 = SAICondition
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct BootDone : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct BootEmit : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct BootInit : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct Effect : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct EmitPiki : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct EmitWait : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct WaitInit : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	GoalAI();
+
+	// _00     = VTBL
+	// _00-_?? = SimpleAI
+	// TODO: members
+};
+
 #endif
diff --git a/include/ItemAI.h b/include/ItemAI.h
new file mode 100644
index 00000000..b620a246
--- /dev/null
+++ b/include/ItemAI.h
@@ -0,0 +1,175 @@
+#ifndef _ITEMAI_H
+#define _ITEMAI_H
+
+#include "types.h"
+#include "SimpleAI.h"
+
+/**
+ * @brief TODO
+ */
+struct SluiceAI : public SimpleAI {
+
+	/**
+	 * @brief TODO
+	 */
+	struct AddCount : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct ChangeInit : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct DamageInit : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct Init : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct MotionDone : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct WaitInit : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	SluiceAI();
+
+	// _00     = VTBL
+	// _00-_?? = SimpleAI
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct WaterAI : public SimpleAI {
+
+	/**
+	 * @brief TODO
+	 */
+	struct CollideChar : public SAICondition {
+
+		virtual bool satisfy(AICreature*); // _10
+
+		// _00     = VTBL
+		// _00-_14 = SAICondition
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct Die : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	WaterAI();
+
+	// _00     = VTBL
+	// _00-_?? = SimpleAI
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct FallWaterAI : public SimpleAI {
+
+	/**
+	 * @brief TODO
+	 */
+	struct CollideInit : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct DisappearInit : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct EmitInit : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	FallWaterAI();
+
+	// _00     = VTBL
+	// _00-_?? = SimpleAI
+	// TODO: members
+};
+
+#endif
diff --git a/include/NaviMgr.h b/include/NaviMgr.h
new file mode 100644
index 00000000..17a6913c
--- /dev/null
+++ b/include/NaviMgr.h
@@ -0,0 +1,48 @@
+#ifndef _NAVIMGR_H
+#define _NAVIMGR_H
+
+#include "types.h"
+#include "ObjectMgr.h"
+#include "CreatureProp.h"
+#include "Navi.h"
+
+/**
+ * @brief TODO
+ */
+struct NaviProp : public CreatureProp {
+	NaviProp();
+
+	virtual void read(RandomAccessStream&); // _08 (weak)
+
+	// _F8     = VTBL
+	// _00-_FC = CreatureProp
+	// TODO: work out members
+};
+
+/**
+ * @brief TODO
+ */
+struct NaviMgr : public MonoObjectMgr {
+	NaviMgr();
+
+	virtual ~NaviMgr();                     // _48
+	virtual void update();                  // _4C
+	virtual Navi* createObject();           // _80
+	virtual void read(RandomAccessStream&); // _84
+
+	Navi* getNavi();
+	Navi* getNavi(int);
+	void refresh2d(Graphics&);
+	void renderCircle(Graphics&);
+	void drawShadow(Graphics&);
+
+	// unused/inlined:
+	void init();
+
+	// _00     = VTBL 1
+	// _08     = VTBL 2
+	// _00-_?? = MonoObjectMgr
+	// TODO: members
+};
+
+#endif
diff --git a/include/NaviProp.h b/include/NaviProp.h
deleted file mode 100644
index 7839eec2..00000000
--- a/include/NaviProp.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _NAVIPROP_H
-#define _NAVIPROP_H
-
-#include "types.h"
-#include "CreatureProp.h"
-
-/**
- * @brief TODO
- */
-struct NaviProp : public CreatureProp {
-	NaviProp();
-
-	virtual void read(RandomAccessStream&); // _08 (weak)
-
-	// _F8     = VTBL
-	// _00-_FC = CreatureProp
-	// TODO: work out members
-};
-
-#endif
diff --git a/include/PikiHeadItem.h b/include/PikiHeadItem.h
index 4e103317..e7f5f7f5 100644
--- a/include/PikiHeadItem.h
+++ b/include/PikiHeadItem.h
@@ -4,6 +4,7 @@
 #include "types.h"
 #include "ItemMgr.h"
 #include "CreatureProp.h"
+#include "SimpleAI.h"
 
 struct InteractBikkuri;
 struct InteractSwallow;
@@ -49,6 +50,222 @@ struct PikiHeadItem : public ItemCreature {
 	// TODO: members
 };
 
+/**
+ * @brief TODO
+ */
+struct PikiHeadAI : public SimpleAI {
+
+	/**
+	 * @brief TODO
+	 */
+	struct BounceSound : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct BuryExec : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct BuryExec2 : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct BuryInit : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct BuryInit2 : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct Dead : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct FlyingCleanup : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct FlyingEffect : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct FlyingExec : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct GrowEffect : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct GrowupedExec : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct KaretaExec : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct KaretaInit : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct TaneExec : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct TaneInit : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct WaitExec : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct WaitInit : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = SAIAction
+		// TODO: members
+	};
+
+	PikiHeadAI();
+
+	// _00     = VTBL
+	// _00-_?? = SimpleAI
+	// TODO: members
+};
+
 /**
  * @brief TODO
  */
diff --git a/include/PlantMgr.h b/include/PlantMgr.h
new file mode 100644
index 00000000..7b8f5a86
--- /dev/null
+++ b/include/PlantMgr.h
@@ -0,0 +1,125 @@
+#ifndef _PLANTMGR_H
+#define _PLANTMGR_H
+
+#include "types.h"
+#include "CreatureNode.h"
+#include "SimpleAI.h"
+
+struct MapMgr;
+
+/**
+ * @brief TODO
+ */
+struct PlantShapeObject {
+	PlantShapeObject(Shape*, char*, char*);
+
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct Plant : public AICreature {
+	Plant();
+
+	virtual void startAI(int);        // _34
+	virtual f32 getiMass();           // _38
+	virtual bool isAlive();           // _88
+	virtual void update();            // _E0
+	virtual void refresh(Graphics&);  // _EC
+	virtual void doAnimation();       // _108
+	virtual void doKill();            // _10C
+	virtual void startMotion(int);    // _130
+	virtual void setMotionSpeed(f32); // _14C
+	virtual void stopMotion();        // _150
+
+	// unused/inlined:
+	void reset(int);
+
+	// _00      = VTBL
+	// _00-_??? = AICreature?
+	// TODO: work out members
+};
+
+/**
+ * @brief TODO
+ */
+struct PlantAI : public SimpleAI {
+
+	/**
+	 * @brief TODO
+	 */
+	struct OpponentMove : public SAICondition {
+
+		virtual bool satisfy(AICreature*); // _10
+
+		// _00     = VTBL
+		// _00-_14 = CoreNode
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct TouchInit : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = CoreNode
+		// TODO: members
+	};
+
+	/**
+	 * @brief TODO
+	 */
+	struct WaitInit : public SAIAction {
+
+		virtual void act(AICreature*); // _08
+
+		// _00     = VTBL
+		// _00-_14 = CoreNode
+		// TODO: members
+	};
+
+	PlantAI();
+
+	// _00     = VTBL
+	// _00-_?? = SimpleAI
+	// TODO: members
+};
+
+/**
+ * @brief TODO
+ */
+struct PlantMgr : public CreatureNodeMgr {
+
+	/**
+	 * @brief TODO
+	 */
+	struct UseNode : public CoreNode {
+		// _00     = VTBL
+		// _00-_14 = CoreNode
+		// TODO: members
+	};
+
+	PlantMgr(MapMgr*);
+
+	virtual ~PlantMgr();           // _48
+	virtual Plant* createObject(); // _78
+
+	void initialise();
+	void usePlantType(int);
+
+	// unused/inlined:
+	void getPlantName(int);
+	void addUseList(int);
+	void birth();
+
+	// _00     = VTBL 1
+	// _08     = VTBL 2
+	// _00-_?? = CreatureNodeMgr
+	// TODO: members
+};
+
+#endif
diff --git a/src/plugPikiKando/actorMgr.cpp b/src/plugPikiKando/actorMgr.cpp
index 6f30ecd5..ea773268 100644
--- a/src/plugPikiKando/actorMgr.cpp
+++ b/src/plugPikiKando/actorMgr.cpp
@@ -39,6 +39,7 @@ ActorMgr::ActorMgr(MapMgr*)
  */
 Creature* ActorMgr::createObject()
 {
+	return nullptr;
 	// UNUSED FUNCTION
 }
 
diff --git a/src/plugPikiKando/gameCoreSection.cpp b/src/plugPikiKando/gameCoreSection.cpp
index 700d83a5..62583f73 100644
--- a/src/plugPikiKando/gameCoreSection.cpp
+++ b/src/plugPikiKando/gameCoreSection.cpp
@@ -1,4 +1,4 @@
-#include "types.h"
+#include "GameCoreSection.h"
 
 /*
  * --INFO--
@@ -4787,7 +4787,7 @@ void GameCoreSection::update()
 void GameCoreSection::startContainerDemo()
 {
 	// Generated from stw r0, 0x34(r3)
-	_34 = 2;
+	// _34 = 2;
 }
 
 /*
diff --git a/src/plugPikiKando/gameStat.cpp b/src/plugPikiKando/gameStat.cpp
index 195b004e..1c8b205b 100644
--- a/src/plugPikiKando/gameStat.cpp
+++ b/src/plugPikiKando/gameStat.cpp
@@ -1,4 +1,24 @@
-#include "types.h"
+#include "GameStat.h"
+
+GameStat::ColCounter GameStat::deadPikis;
+GameStat::ColCounter GameStat::fallPikis;
+
+GameStat::Counter GameStat::killTekis;
+GameStat::Counter GameStat::getPellets;
+
+GameStat::ColCounter GameStat::formationPikis;
+GameStat::ColCounter GameStat::freePikis;
+GameStat::ColCounter GameStat::workPikis;
+GameStat::ColCounter GameStat::mePikis;
+GameStat::ColCounter GameStat::containerPikis;
+GameStat::ColCounter GameStat::bornPikis;
+GameStat::ColCounter GameStat::victimPikis;
+GameStat::ColCounter GameStat::mapPikis;
+GameStat::ColCounter GameStat::allPikis;
+
+int GameStat::minPikis;
+int GameStat::maxPikis;
+bool GameStat::orimaDead;
 
 /*
  * --INFO--
@@ -27,51 +47,25 @@ static void _Print(char*, ...)
  */
 void GameStat::init()
 {
-	/*
-	.loc_0x0:
-	  lis       r3, 0x803D
-	  addi      r3, r3, 0x1E58
-	  li        r0, 0
-	  stw       r0, 0x8(r3)
-	  stw       r0, 0x4(r3)
-	  stw       r0, 0x0(r3)
-	  stw       r0, 0x14(r3)
-	  stw       r0, 0x10(r3)
-	  stw       r0, 0xC(r3)
-	  stw       r0, 0x30F8(r13)
-	  stw       r0, 0x30FC(r13)
-	  stw       r0, 0x20(r3)
-	  stw       r0, 0x1C(r3)
-	  stw       r0, 0x18(r3)
-	  stw       r0, 0x2C(r3)
-	  stw       r0, 0x28(r3)
-	  stw       r0, 0x24(r3)
-	  stw       r0, 0x38(r3)
-	  stw       r0, 0x34(r3)
-	  stw       r0, 0x30(r3)
-	  stw       r0, 0x44(r3)
-	  stw       r0, 0x40(r3)
-	  stw       r0, 0x3C(r3)
-	  stw       r0, 0x50(r3)
-	  stw       r0, 0x4C(r3)
-	  stw       r0, 0x48(r3)
-	  stw       r0, 0x5C(r3)
-	  stw       r0, 0x58(r3)
-	  stw       r0, 0x54(r3)
-	  stw       r0, 0x68(r3)
-	  stw       r0, 0x64(r3)
-	  stw       r0, 0x60(r3)
-	  stw       r0, 0x74(r3)
-	  stw       r0, 0x70(r3)
-	  stw       r0, 0x6C(r3)
-	  stw       r0, 0x80(r3)
-	  stw       r0, 0x7C(r3)
-	  stw       r0, 0x78(r3)
-	  stw       r0, 0x3104(r13)
-	  stw       r0, 0x3100(r13)
-	  stb       r0, 0x3108(r13)
-	  blr
-	*/
+	deadPikis.init();
+	fallPikis.init();
+
+	killTekis.init();
+	getPellets.init();
+
+	formationPikis.init();
+	freePikis.init();
+	workPikis.init();
+	mePikis.init();
+	containerPikis.init();
+	bornPikis.init();
+	victimPikis.init();
+	mapPikis.init();
+	allPikis.init();
+
+	maxPikis  = 0;
+	minPikis  = 0;
+	orimaDead = false;
 }
 
 /*
@@ -81,6 +75,18 @@ void GameStat::init()
  */
 void GameStat::update()
 {
+	for (int i = 0; i < 3; i++) {
+		mapPikis(i) = formationPikis(i) + freePikis(i) + mePikis(i) + workPikis(i);
+	}
+
+	for (int i = 0; i < 3; i++) {
+		allPikis(i) = mapPikis(i) + containerPikis(i);
+	}
+
+	int total = allPikis(0) + allPikis(1) + allPikis(2);
+	if (total > maxPikis) {
+		maxPikis = total;
+	}
 	/*
 	.loc_0x0:
 	  lis       r3, 0x803D
@@ -161,54 +167,3 @@ void GameStat::ColCounter::dump(char*)
  * Size:	000004
  */
 void GameStat::dump() { }
-
-/*
- * --INFO--
- * Address:	80112628
- * Size:	00009C
- */
-void __sinit_gameStat_cpp(void)
-{
-	/*
-	.loc_0x0:
-	  lis       r3, 0x803D
-	  addi      r3, r3, 0x1E58
-	  li        r0, 0
-	  stw       r0, 0x8(r3)
-	  stw       r0, 0x4(r3)
-	  stw       r0, 0x0(r3)
-	  stw       r0, 0x14(r3)
-	  stw       r0, 0x10(r3)
-	  stw       r0, 0xC(r3)
-	  stw       r0, 0x30F8(r13)
-	  stw       r0, 0x30FC(r13)
-	  stw       r0, 0x20(r3)
-	  stw       r0, 0x1C(r3)
-	  stw       r0, 0x18(r3)
-	  stw       r0, 0x2C(r3)
-	  stw       r0, 0x28(r3)
-	  stw       r0, 0x24(r3)
-	  stw       r0, 0x38(r3)
-	  stw       r0, 0x34(r3)
-	  stw       r0, 0x30(r3)
-	  stw       r0, 0x44(r3)
-	  stw       r0, 0x40(r3)
-	  stw       r0, 0x3C(r3)
-	  stw       r0, 0x50(r3)
-	  stw       r0, 0x4C(r3)
-	  stw       r0, 0x48(r3)
-	  stw       r0, 0x5C(r3)
-	  stw       r0, 0x58(r3)
-	  stw       r0, 0x54(r3)
-	  stw       r0, 0x68(r3)
-	  stw       r0, 0x64(r3)
-	  stw       r0, 0x60(r3)
-	  stw       r0, 0x74(r3)
-	  stw       r0, 0x70(r3)
-	  stw       r0, 0x6C(r3)
-	  stw       r0, 0x80(r3)
-	  stw       r0, 0x7C(r3)
-	  stw       r0, 0x78(r3)
-	  blr
-	*/
-}
diff --git a/src/plugPikiKando/itemAI.cpp b/src/plugPikiKando/itemAI.cpp
index 15bc4476..d9b7e940 100644
--- a/src/plugPikiKando/itemAI.cpp
+++ b/src/plugPikiKando/itemAI.cpp
@@ -1,4 +1,9 @@
-#include "types.h"
+#include "ItemAI.h"
+#include "PikiHeadItem.h"
+#include "BombItem.h"
+#include "GoalItem.h"
+#include "GemItem.h"
+#include "Collision.h"
 
 /*
  * --INFO--
@@ -3447,7 +3452,7 @@ GoalAI::GoalAI()
  * Address:	800F17A0
  * Size:	000028
  */
-void GoalAI::NotFinished::satisfy(AICreature*)
+bool GoalAI::NotFinished::satisfy(AICreature*)
 {
 	/*
 	.loc_0x0:
@@ -4585,7 +4590,7 @@ WaterAI::WaterAI()
  * Address:	800F25E8
  * Size:	000040
  */
-void WaterAI::CollideChar::satisfy(AICreature*)
+bool WaterAI::CollideChar::satisfy(AICreature*)
 {
 	/*
 	.loc_0x0:
@@ -4876,7 +4881,7 @@ void FallWaterAI::DisappearInit::act(AICreature*)
  * Address:	800F2924
  * Size:	000054
  */
-void CndBombable::satisfy(CollPart*)
+bool CndBombable::satisfy(CollPart*)
 {
 	/*
 	.loc_0x0:
diff --git a/src/plugPikiKando/navi.cpp b/src/plugPikiKando/navi.cpp
index 32debecf..ea6bc129 100644
--- a/src/plugPikiKando/navi.cpp
+++ b/src/plugPikiKando/navi.cpp
@@ -1,6 +1,6 @@
 #include "Interactions.h"
 #include "Navi.h"
-#include "NaviProp.h"
+#include "NaviMgr.h"
 #include "NaviState.h"
 
 /*
diff --git a/src/plugPikiKando/naviMgr.cpp b/src/plugPikiKando/naviMgr.cpp
index d7efd18a..c111d8ef 100644
--- a/src/plugPikiKando/naviMgr.cpp
+++ b/src/plugPikiKando/naviMgr.cpp
@@ -1,4 +1,4 @@
-#include "types.h"
+#include "NaviMgr.h"
 
 /*
  * --INFO--
@@ -147,7 +147,7 @@ void NaviMgr::init()
  * Address:	80117344
  * Size:	000060
  */
-void NaviMgr::createObject()
+Navi* NaviMgr::createObject()
 {
 	/*
 	.loc_0x0:
@@ -205,7 +205,7 @@ void NaviMgr::update()
  * Address:	801173C4
  * Size:	000074
  */
-void NaviMgr::getNavi()
+Navi* NaviMgr::getNavi()
 {
 	/*
 	.loc_0x0:
@@ -250,7 +250,7 @@ void NaviMgr::getNavi()
  * Address:	80117438
  * Size:	000018
  */
-void NaviMgr::getNavi(int)
+Navi* NaviMgr::getNavi(int)
 {
 	/*
 	.loc_0x0:
@@ -623,31 +623,3 @@ NaviMgr::~NaviMgr()
 	  blr
 	*/
 }
-
-/*
- * --INFO--
- * Address:	8011784C
- * Size:	000008
- */
-void NaviMgr::@8 @read(RandomAccessStream&)
-{
-	/*
-	.loc_0x0:
-	  subi      r3, r3, 0x8
-	  b         -0xB8
-	*/
-}
-
-/*
- * --INFO--
- * Address:	80117854
- * Size:	000008
- */
-void NaviMgr::@8 @update()
-{
-	/*
-	.loc_0x0:
-	  subi      r3, r3, 0x8
-	  b         -0x4B4
-	*/
-}
diff --git a/src/plugPikiKando/plantMgr.cpp b/src/plugPikiKando/plantMgr.cpp
index 19aba1ab..e7e34f55 100644
--- a/src/plugPikiKando/plantMgr.cpp
+++ b/src/plugPikiKando/plantMgr.cpp
@@ -1,4 +1,5 @@
-#include "types.h"
+#include "PlantMgr.h"
+#include "Generator.h"
 
 /*
  * --INFO--
@@ -26,6 +27,7 @@ static void _Print(char*, ...)
  * Size:	0000C8
  */
 Plant::Plant()
+    : AICreature(nullptr)
 {
 	/*
 	.loc_0x0:
@@ -559,7 +561,7 @@ PlantAI::PlantAI()
  * Address:	8011A3A4
  * Size:	0000AC
  */
-void PlantAI::OpponentMove::satisfy(AICreature*)
+bool PlantAI::OpponentMove::satisfy(AICreature*)
 {
 	/*
 	.loc_0x0:
@@ -1123,7 +1125,7 @@ void PlantMgr::initialise()
  * Address:	8011AAAC
  * Size:	0000D8
  */
-void PlantMgr::createObject()
+Plant* PlantMgr::createObject()
 {
 	/*
 	.loc_0x0:
@@ -1334,6 +1336,7 @@ PlantShapeObject::PlantShapeObject(Shape*, char*, char*)
  * Size:	000068
  */
 GenObjectPlant::GenObjectPlant()
+    : GenObject('plnt', "")
 {
 	// UNUSED FUNCTION
 }
@@ -1343,7 +1346,7 @@ GenObjectPlant::GenObjectPlant()
  * Address:	8011ACCC
  * Size:	000078
  */
-void makeObjectPlant()
+static GenObjectPlant* makeObjectPlant()
 {
 	/*
 	.loc_0x0:
@@ -1537,7 +1540,7 @@ void GenObjectPlant::updateUseList(Generator*, int)
  * Address:	8011AEDC
  * Size:	000190
  */
-void GenObjectPlant::birth(BirthInfo&)
+void* GenObjectPlant::birth(BirthInfo&)
 {
 	/*
 	.loc_0x0:
@@ -1731,7 +1734,7 @@ PlantMgr::~PlantMgr()
  * Address:	8011B11C
  * Size:	000008
  */
-void Plant::getiMass()
+f32 Plant::getiMass()
 {
 	/*
 	.loc_0x0:
@@ -1745,7 +1748,7 @@ void Plant::getiMass()
  * Address:	8011B124
  * Size:	000010
  */
-void Plant::isAlive()
+bool Plant::isAlive()
 {
 	/*
 	.loc_0x0:
diff --git a/unsorted_include_todo/BombAI.h b/unsorted_include_todo/BombAI.h
deleted file mode 100644
index ba30194b..00000000
--- a/unsorted_include_todo/BombAI.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef _BOMBAI_H
-#define _BOMBAI_H
-
-/**
- * .obj __vt__6BombAI, weak
- * .4byte __RTTI__6BombAI
- * .4byte 0
- * .4byte "init__26StateMachine<10AICreature>FP10AICreature"
- * .4byte exec__8SimpleAIFP10AICreature
- * .4byte procMsg__8SimpleAIFP10AICreatureP3Msg
- * .4byte "transit__26StateMachine<10AICreature>FP10AICreaturei"
- */
-
-struct StateMachine<AICreature> {
-	virtual void init(AICreature*);         // _08 (weak)
-	virtual void _0C() = 0;                 // _0C
-	virtual void _10() = 0;                 // _10
-	virtual void transit(AICreature*, int); // _14 (weak)
-};
-
-struct SimpleAI {
-	virtual void _08() = 0;                  // _08
-	virtual void exec(AICreature*);          // _0C
-	virtual void procMsg(AICreature*, Msg*); // _10
-};
-
-/**
- * @brief TODO
- */
-struct BombAI : public StateMachine<AICreature>, public SimpleAI {
-
-	BombAI();
-};
-
-#endif
diff --git a/unsorted_include_todo/BombAI/BombExec.h b/unsorted_include_todo/BombAI/BombExec.h
deleted file mode 100644
index ff544584..00000000
--- a/unsorted_include_todo/BombAI/BombExec.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _BOMBAI_BOMBEXEC_H
-#define _BOMBAI_BOMBEXEC_H
-
-/**
- * .obj __vt__Q26BombAI8BombExec, global
- * .4byte __RTTI__Q26BombAI8BombExec
- * .4byte 0
- * .4byte act__Q26BombAI8BombExecFP10AICreature
- */
-
-namespace BombAI {
-/**
- * @brief TODO
- */
-struct BombExec {
-	virtual void act(AICreature*); // _08
-};
-} // namespace BombAI
-
-#endif
diff --git a/unsorted_include_todo/BombAI/BombInit.h b/unsorted_include_todo/BombAI/BombInit.h
deleted file mode 100644
index aaae5c6d..00000000
--- a/unsorted_include_todo/BombAI/BombInit.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _BOMBAI_BOMBINIT_H
-#define _BOMBAI_BOMBINIT_H
-
-/**
- * .obj __vt__Q26BombAI8BombInit, global
- * .4byte __RTTI__Q26BombAI8BombInit
- * .4byte 0
- * .4byte act__Q26BombAI8BombInitFP10AICreature
- */
-
-namespace BombAI {
-/**
- * @brief TODO
- */
-struct BombInit {
-	virtual void act(AICreature*); // _08
-};
-} // namespace BombAI
-
-#endif
diff --git a/unsorted_include_todo/BombAI/DieExec.h b/unsorted_include_todo/BombAI/DieExec.h
deleted file mode 100644
index 3915874e..00000000
--- a/unsorted_include_todo/BombAI/DieExec.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _BOMBAI_DIEEXEC_H
-#define _BOMBAI_DIEEXEC_H
-
-/**
- * .obj __vt__Q26BombAI7DieExec, global
- * .4byte __RTTI__Q26BombAI7DieExec
- * .4byte 0
- * .4byte act__Q26BombAI7DieExecFP10AICreature
- */
-
-namespace BombAI {
-/**
- * @brief TODO
- */
-struct DieExec {
-	virtual void act(AICreature*); // _08
-};
-} // namespace BombAI
-
-#endif
diff --git a/unsorted_include_todo/BombAI/DieInit.h b/unsorted_include_todo/BombAI/DieInit.h
deleted file mode 100644
index 989e67d7..00000000
--- a/unsorted_include_todo/BombAI/DieInit.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _BOMBAI_DIEINIT_H
-#define _BOMBAI_DIEINIT_H
-
-/**
- * .obj __vt__Q26BombAI7DieInit, global
- * .4byte __RTTI__Q26BombAI7DieInit
- * .4byte 0
- * .4byte act__Q26BombAI7DieInitFP10AICreature
- */
-
-namespace BombAI {
-/**
- * @brief TODO
- */
-struct DieInit {
-	virtual void act(AICreature*); // _08
-};
-} // namespace BombAI
-
-#endif
diff --git a/unsorted_include_todo/BombAI/MizuExec.h b/unsorted_include_todo/BombAI/MizuExec.h
deleted file mode 100644
index 111e5bae..00000000
--- a/unsorted_include_todo/BombAI/MizuExec.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _BOMBAI_MIZUEXEC_H
-#define _BOMBAI_MIZUEXEC_H
-
-/**
- * .obj __vt__Q26BombAI8MizuExec, global
- * .4byte __RTTI__Q26BombAI8MizuExec
- * .4byte 0
- * .4byte act__Q26BombAI8MizuExecFP10AICreature
- */
-
-namespace BombAI {
-/**
- * @brief TODO
- */
-struct MizuExec {
-	virtual void act(AICreature*); // _08
-};
-} // namespace BombAI
-
-#endif
diff --git a/unsorted_include_todo/BombAI/MizuInit.h b/unsorted_include_todo/BombAI/MizuInit.h
deleted file mode 100644
index 51db46d7..00000000
--- a/unsorted_include_todo/BombAI/MizuInit.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _BOMBAI_MIZUINIT_H
-#define _BOMBAI_MIZUINIT_H
-
-/**
- * .obj __vt__Q26BombAI8MizuInit, global
- * .4byte __RTTI__Q26BombAI8MizuInit
- * .4byte 0
- * .4byte act__Q26BombAI8MizuInitFP10AICreature
- */
-
-namespace BombAI {
-/**
- * @brief TODO
- */
-struct MizuInit {
-	virtual void act(AICreature*); // _08
-};
-} // namespace BombAI
-
-#endif
diff --git a/unsorted_include_todo/BombAI/SetExec.h b/unsorted_include_todo/BombAI/SetExec.h
deleted file mode 100644
index e53341e2..00000000
--- a/unsorted_include_todo/BombAI/SetExec.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _BOMBAI_SETEXEC_H
-#define _BOMBAI_SETEXEC_H
-
-/**
- * .obj __vt__Q26BombAI7SetExec, global
- * .4byte __RTTI__Q26BombAI7SetExec
- * .4byte 0
- * .4byte act__Q26BombAI7SetExecFP10AICreature
- */
-
-namespace BombAI {
-/**
- * @brief TODO
- */
-struct SetExec {
-	virtual void act(AICreature*); // _08
-};
-} // namespace BombAI
-
-#endif
diff --git a/unsorted_include_todo/BombAI/SetInit.h b/unsorted_include_todo/BombAI/SetInit.h
deleted file mode 100644
index 1de4a7e1..00000000
--- a/unsorted_include_todo/BombAI/SetInit.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _BOMBAI_SETINIT_H
-#define _BOMBAI_SETINIT_H
-
-/**
- * .obj __vt__Q26BombAI7SetInit, global
- * .4byte __RTTI__Q26BombAI7SetInit
- * .4byte 0
- * .4byte act__Q26BombAI7SetInitFP10AICreature
- */
-
-namespace BombAI {
-/**
- * @brief TODO
- */
-struct SetInit {
-	virtual void act(AICreature*); // _08
-};
-} // namespace BombAI
-
-#endif
diff --git a/unsorted_include_todo/CndBombable.h b/unsorted_include_todo/CndBombable.h
deleted file mode 100644
index c9068964..00000000
--- a/unsorted_include_todo/CndBombable.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _CNDBOMBABLE_H
-#define _CNDBOMBABLE_H
-
-/**
- * .obj __vt__11CndBombable, weak
- * .4byte __RTTI__11CndBombable
- * .4byte 0
- * .4byte satisfy__11CndBombableFP8CollPart
- */
-
-/**
- * @brief TODO
- */
-struct CndBombable {
-	virtual void satisfy(CollPart*); // _08 (weak)
-};
-
-#endif
diff --git a/unsorted_include_todo/FallWaterAI.h b/unsorted_include_todo/FallWaterAI.h
deleted file mode 100644
index 21c87bd3..00000000
--- a/unsorted_include_todo/FallWaterAI.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef _FALLWATERAI_H
-#define _FALLWATERAI_H
-
-/**
- * .obj __vt__11FallWaterAI, weak
- * .4byte __RTTI__11FallWaterAI
- * .4byte 0
- * .4byte "init__26StateMachine<10AICreature>FP10AICreature"
- * .4byte exec__8SimpleAIFP10AICreature
- * .4byte procMsg__8SimpleAIFP10AICreatureP3Msg
- * .4byte "transit__26StateMachine<10AICreature>FP10AICreaturei"
- */
-
-struct StateMachine<AICreature> {
-	virtual void init(AICreature*);         // _08 (weak)
-	virtual void _0C() = 0;                 // _0C
-	virtual void _10() = 0;                 // _10
-	virtual void transit(AICreature*, int); // _14 (weak)
-};
-
-struct SimpleAI {
-	virtual void _08() = 0;                  // _08
-	virtual void exec(AICreature*);          // _0C
-	virtual void procMsg(AICreature*, Msg*); // _10
-};
-
-/**
- * @brief TODO
- */
-struct FallWaterAI : public StateMachine<AICreature>, public SimpleAI {
-
-	FallWaterAI();
-};
-
-#endif
diff --git a/unsorted_include_todo/FallWaterAI/CollideInit.h b/unsorted_include_todo/FallWaterAI/CollideInit.h
deleted file mode 100644
index 0d1089f3..00000000
--- a/unsorted_include_todo/FallWaterAI/CollideInit.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _FALLWATERAI_COLLIDEINIT_H
-#define _FALLWATERAI_COLLIDEINIT_H
-
-/**
- * .obj __vt__Q211FallWaterAI11CollideInit, global
- * .4byte __RTTI__Q211FallWaterAI11CollideInit
- * .4byte 0
- * .4byte act__Q211FallWaterAI11CollideInitFP10AICreature
- */
-
-namespace FallWaterAI {
-/**
- * @brief TODO
- */
-struct CollideInit {
-	virtual void act(AICreature*); // _08
-};
-} // namespace FallWaterAI
-
-#endif
diff --git a/unsorted_include_todo/FallWaterAI/DisappearInit.h b/unsorted_include_todo/FallWaterAI/DisappearInit.h
deleted file mode 100644
index 5fc99d58..00000000
--- a/unsorted_include_todo/FallWaterAI/DisappearInit.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _FALLWATERAI_DISAPPEARINIT_H
-#define _FALLWATERAI_DISAPPEARINIT_H
-
-/**
- * .obj __vt__Q211FallWaterAI13DisappearInit, global
- * .4byte __RTTI__Q211FallWaterAI13DisappearInit
- * .4byte 0
- * .4byte act__Q211FallWaterAI13DisappearInitFP10AICreature
- */
-
-namespace FallWaterAI {
-/**
- * @brief TODO
- */
-struct DisappearInit {
-	virtual void act(AICreature*); // _08
-};
-} // namespace FallWaterAI
-
-#endif
diff --git a/unsorted_include_todo/FallWaterAI/EmitInit.h b/unsorted_include_todo/FallWaterAI/EmitInit.h
deleted file mode 100644
index f1ba5076..00000000
--- a/unsorted_include_todo/FallWaterAI/EmitInit.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _FALLWATERAI_EMITINIT_H
-#define _FALLWATERAI_EMITINIT_H
-
-/**
- * .obj __vt__Q211FallWaterAI8EmitInit, global
- * .4byte __RTTI__Q211FallWaterAI8EmitInit
- * .4byte 0
- * .4byte act__Q211FallWaterAI8EmitInitFP10AICreature
- */
-
-namespace FallWaterAI {
-/**
- * @brief TODO
- */
-struct EmitInit {
-	virtual void act(AICreature*); // _08
-};
-} // namespace FallWaterAI
-
-#endif
diff --git a/unsorted_include_todo/GameCoreSection.h b/unsorted_include_todo/GameCoreSection.h
deleted file mode 100644
index fdf1f8e1..00000000
--- a/unsorted_include_todo/GameCoreSection.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef _GAMECORESECTION_H
-#define _GAMECORESECTION_H
-
-/**
- * .obj __vt__15GameCoreSection, global
- * .4byte __RTTI__15GameCoreSection
- * .4byte 0
- * .4byte getAgeNodeType__5ANodeFv
- * .4byte read__8CoreNodeFR18RandomAccessStream
- * .4byte update__15GameCoreSectionFv
- * .4byte draw__15GameCoreSectionFR8Graphics
- * .4byte render__4NodeFR8Graphics
- * .4byte concat__4NodeFv
- * .4byte concat__4NodeFR3VQS
- * .4byte concat__4NodeFR3SRT
- * .4byte concat__4NodeFR8Matrix4f
- * .4byte getModelMatrix__4NodeFv
- */
-
-struct ANode {
-	virtual void getAgeNodeType(); // _08 (weak)
-};
-
-struct CoreNode {
-	virtual void _08() = 0;                 // _08
-	virtual void read(RandomAccessStream&); // _0C (weak)
-};
-
-struct Node {
-	virtual void _08() = 0;         // _08
-	virtual void _0C() = 0;         // _0C
-	virtual void update();          // _10
-	virtual void draw(Graphics&);   // _14
-	virtual void render(Graphics&); // _18
-	virtual void concat();          // _1C (weak)
-	virtual void concat(VQS&);      // _20 (weak)
-	virtual void concat(SRT&);      // _24 (weak)
-	virtual void concat(Matrix4f&); // _28 (weak)
-	virtual void getModelMatrix();  // _2C (weak)
-};
-
-/**
- * @brief TODO
- */
-struct GameCoreSection : public ANode, public CoreNode, public Node {
-	virtual void update();        // _10
-	virtual void draw(Graphics&); // _14
-};
-
-#endif
diff --git a/unsorted_include_todo/GameStat.h b/unsorted_include_todo/GameStat.h
deleted file mode 100644
index 075fab84..00000000
--- a/unsorted_include_todo/GameStat.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _GAMESTAT_H
-#define _GAMESTAT_H
-
-/*
- * @brief TODO
- */
-struct GameStat {
-	void init();
-	void update();
-	void dump();
-};
-
-#endif
diff --git a/unsorted_include_todo/GemAI.h b/unsorted_include_todo/GemAI.h
deleted file mode 100644
index e8d99c73..00000000
--- a/unsorted_include_todo/GemAI.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef _GEMAI_H
-#define _GEMAI_H
-
-/**
- * .obj __vt__5GemAI, weak
- * .4byte __RTTI__5GemAI
- * .4byte 0
- * .4byte "init__26StateMachine<10AICreature>FP10AICreature"
- * .4byte exec__8SimpleAIFP10AICreature
- * .4byte procMsg__8SimpleAIFP10AICreatureP3Msg
- * .4byte "transit__26StateMachine<10AICreature>FP10AICreaturei"
- */
-
-struct StateMachine<AICreature> {
-	virtual void init(AICreature*);         // _08 (weak)
-	virtual void _0C() = 0;                 // _0C
-	virtual void _10() = 0;                 // _10
-	virtual void transit(AICreature*, int); // _14 (weak)
-};
-
-struct SimpleAI {
-	virtual void _08() = 0;                  // _08
-	virtual void exec(AICreature*);          // _0C
-	virtual void procMsg(AICreature*, Msg*); // _10
-};
-
-/**
- * @brief TODO
- */
-struct GemAI : public StateMachine<AICreature>, public SimpleAI {
-};
-
-#endif
diff --git a/unsorted_include_todo/GemAI/Die.h b/unsorted_include_todo/GemAI/Die.h
deleted file mode 100644
index b48e9940..00000000
--- a/unsorted_include_todo/GemAI/Die.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _GEMAI_DIE_H
-#define _GEMAI_DIE_H
-
-/**
- * .obj __vt__Q25GemAI3Die, global
- * .4byte __RTTI__Q25GemAI3Die
- * .4byte 0
- * .4byte act__Q25GemAI3DieFP10AICreature
- */
-
-namespace GemAI {
-/**
- * @brief TODO
- */
-struct Die {
-	virtual void act(AICreature*); // _08
-};
-} // namespace GemAI
-
-#endif
diff --git a/unsorted_include_todo/GemAI/RiseExec.h b/unsorted_include_todo/GemAI/RiseExec.h
deleted file mode 100644
index 3a13051a..00000000
--- a/unsorted_include_todo/GemAI/RiseExec.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _GEMAI_RISEEXEC_H
-#define _GEMAI_RISEEXEC_H
-
-/**
- * .obj __vt__Q25GemAI8RiseExec, global
- * .4byte __RTTI__Q25GemAI8RiseExec
- * .4byte 0
- * .4byte act__Q25GemAI8RiseExecFP10AICreature
- */
-
-namespace GemAI {
-/**
- * @brief TODO
- */
-struct RiseExec {
-	virtual void act(AICreature*); // _08
-};
-} // namespace GemAI
-
-#endif
diff --git a/unsorted_include_todo/GemAI/RiseInit.h b/unsorted_include_todo/GemAI/RiseInit.h
deleted file mode 100644
index f2b70b71..00000000
--- a/unsorted_include_todo/GemAI/RiseInit.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _GEMAI_RISEINIT_H
-#define _GEMAI_RISEINIT_H
-
-/**
- * .obj __vt__Q25GemAI8RiseInit, global
- * .4byte __RTTI__Q25GemAI8RiseInit
- * .4byte 0
- * .4byte act__Q25GemAI8RiseInitFP10AICreature
- */
-
-namespace GemAI {
-/**
- * @brief TODO
- */
-struct RiseInit {
-	virtual void act(AICreature*); // _08
-};
-} // namespace GemAI
-
-#endif
diff --git a/unsorted_include_todo/GoalAI.h b/unsorted_include_todo/GoalAI.h
deleted file mode 100644
index 5e102065..00000000
--- a/unsorted_include_todo/GoalAI.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef _GOALAI_H
-#define _GOALAI_H
-
-/**
- * .obj __vt__6GoalAI, weak
- * .4byte __RTTI__6GoalAI
- * .4byte 0
- * .4byte "init__26StateMachine<10AICreature>FP10AICreature"
- * .4byte exec__8SimpleAIFP10AICreature
- * .4byte procMsg__8SimpleAIFP10AICreatureP3Msg
- * .4byte "transit__26StateMachine<10AICreature>FP10AICreaturei"
- */
-
-struct StateMachine<AICreature> {
-	virtual void init(AICreature*);         // _08 (weak)
-	virtual void _0C() = 0;                 // _0C
-	virtual void _10() = 0;                 // _10
-	virtual void transit(AICreature*, int); // _14 (weak)
-};
-
-struct SimpleAI {
-	virtual void _08() = 0;                  // _08
-	virtual void exec(AICreature*);          // _0C
-	virtual void procMsg(AICreature*, Msg*); // _10
-};
-
-/**
- * @brief TODO
- */
-struct GoalAI : public StateMachine<AICreature>, public SimpleAI {
-
-	GoalAI();
-};
-
-#endif
diff --git a/unsorted_include_todo/GoalAI/BootDone.h b/unsorted_include_todo/GoalAI/BootDone.h
deleted file mode 100644
index 335349c4..00000000
--- a/unsorted_include_todo/GoalAI/BootDone.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _GOALAI_BOOTDONE_H
-#define _GOALAI_BOOTDONE_H
-
-/**
- * .obj __vt__Q26GoalAI8BootDone, global
- * .4byte __RTTI__Q26GoalAI8BootDone
- * .4byte 0
- * .4byte act__Q26GoalAI8BootDoneFP10AICreature
- */
-
-namespace GoalAI {
-/**
- * @brief TODO
- */
-struct BootDone {
-	virtual void act(AICreature*); // _08
-};
-} // namespace GoalAI
-
-#endif
diff --git a/unsorted_include_todo/GoalAI/BootEmit.h b/unsorted_include_todo/GoalAI/BootEmit.h
deleted file mode 100644
index 947f4d2f..00000000
--- a/unsorted_include_todo/GoalAI/BootEmit.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _GOALAI_BOOTEMIT_H
-#define _GOALAI_BOOTEMIT_H
-
-/**
- * .obj __vt__Q26GoalAI8BootEmit, global
- * .4byte __RTTI__Q26GoalAI8BootEmit
- * .4byte 0
- * .4byte act__Q26GoalAI8BootEmitFP10AICreature
- */
-
-namespace GoalAI {
-/**
- * @brief TODO
- */
-struct BootEmit {
-	virtual void act(AICreature*); // _08
-};
-} // namespace GoalAI
-
-#endif
diff --git a/unsorted_include_todo/GoalAI/BootInit.h b/unsorted_include_todo/GoalAI/BootInit.h
deleted file mode 100644
index 176a7714..00000000
--- a/unsorted_include_todo/GoalAI/BootInit.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _GOALAI_BOOTINIT_H
-#define _GOALAI_BOOTINIT_H
-
-/**
- * .obj __vt__Q26GoalAI8BootInit, global
- * .4byte __RTTI__Q26GoalAI8BootInit
- * .4byte 0
- * .4byte act__Q26GoalAI8BootInitFP10AICreature
- */
-
-namespace GoalAI {
-/**
- * @brief TODO
- */
-struct BootInit {
-	virtual void act(AICreature*); // _08
-};
-} // namespace GoalAI
-
-#endif
diff --git a/unsorted_include_todo/GoalAI/Effect.h b/unsorted_include_todo/GoalAI/Effect.h
deleted file mode 100644
index a0cf54b2..00000000
--- a/unsorted_include_todo/GoalAI/Effect.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _GOALAI_EFFECT_H
-#define _GOALAI_EFFECT_H
-
-/**
- * .obj __vt__Q26GoalAI6Effect, global
- * .4byte __RTTI__Q26GoalAI6Effect
- * .4byte 0
- * .4byte act__Q26GoalAI6EffectFP10AICreature
- */
-
-namespace GoalAI {
-/**
- * @brief TODO
- */
-struct Effect {
-	virtual void act(AICreature*); // _08
-};
-} // namespace GoalAI
-
-#endif
diff --git a/unsorted_include_todo/GoalAI/EmitPiki.h b/unsorted_include_todo/GoalAI/EmitPiki.h
deleted file mode 100644
index 2e3d58d3..00000000
--- a/unsorted_include_todo/GoalAI/EmitPiki.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _GOALAI_EMITPIKI_H
-#define _GOALAI_EMITPIKI_H
-
-/**
- * .obj __vt__Q26GoalAI8EmitPiki, global
- * .4byte __RTTI__Q26GoalAI8EmitPiki
- * .4byte 0
- * .4byte act__Q26GoalAI8EmitPikiFP10AICreature
- */
-
-namespace GoalAI {
-/**
- * @brief TODO
- */
-struct EmitPiki {
-	virtual void act(AICreature*); // _08
-};
-} // namespace GoalAI
-
-#endif
diff --git a/unsorted_include_todo/GoalAI/EmitWait.h b/unsorted_include_todo/GoalAI/EmitWait.h
deleted file mode 100644
index 495d073a..00000000
--- a/unsorted_include_todo/GoalAI/EmitWait.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _GOALAI_EMITWAIT_H
-#define _GOALAI_EMITWAIT_H
-
-/**
- * .obj __vt__Q26GoalAI8EmitWait, global
- * .4byte __RTTI__Q26GoalAI8EmitWait
- * .4byte 0
- * .4byte act__Q26GoalAI8EmitWaitFP10AICreature
- */
-
-namespace GoalAI {
-/**
- * @brief TODO
- */
-struct EmitWait {
-	virtual void act(AICreature*); // _08
-};
-} // namespace GoalAI
-
-#endif
diff --git a/unsorted_include_todo/GoalAI/NotFinished.h b/unsorted_include_todo/GoalAI/NotFinished.h
deleted file mode 100644
index efa885b4..00000000
--- a/unsorted_include_todo/GoalAI/NotFinished.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _GOALAI_NOTFINISHED_H
-#define _GOALAI_NOTFINISHED_H
-
-/**
- * .obj __vt__Q26GoalAI11NotFinished, global
- * .4byte __RTTI__Q26GoalAI11NotFinished
- * .4byte 0
- * .4byte getAgeNodeType__5ANodeFv
- * .4byte read__8CoreNodeFR18RandomAccessStream
- * .4byte satisfy__Q26GoalAI11NotFinishedFP10AICreature
- */
-
-struct ANode {
-	virtual void getAgeNodeType(); // _08 (weak)
-};
-
-struct CoreNode {
-	virtual void _08() = 0;                 // _08
-	virtual void read(RandomAccessStream&); // _0C (weak)
-};
-
-namespace GoalAI {
-/**
- * @brief TODO
- */
-struct NotFinished : public ANode, public CoreNode {
-	virtual void satisfy(AICreature*); // _10
-};
-} // namespace GoalAI
-
-#endif
diff --git a/unsorted_include_todo/GoalAI/WaitInit.h b/unsorted_include_todo/GoalAI/WaitInit.h
deleted file mode 100644
index a3cbbc3b..00000000
--- a/unsorted_include_todo/GoalAI/WaitInit.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _GOALAI_WAITINIT_H
-#define _GOALAI_WAITINIT_H
-
-/**
- * .obj __vt__Q26GoalAI8WaitInit, global
- * .4byte __RTTI__Q26GoalAI8WaitInit
- * .4byte 0
- * .4byte act__Q26GoalAI8WaitInitFP10AICreature
- */
-
-namespace GoalAI {
-/**
- * @brief TODO
- */
-struct WaitInit {
-	virtual void act(AICreature*); // _08
-};
-} // namespace GoalAI
-
-#endif
diff --git a/unsorted_include_todo/NaviMgr.h b/unsorted_include_todo/NaviMgr.h
deleted file mode 100644
index 133a30c6..00000000
--- a/unsorted_include_todo/NaviMgr.h
+++ /dev/null
@@ -1,145 +0,0 @@
-#ifndef _NAVIMGR_H
-#define _NAVIMGR_H
-
-/**
- * .obj __vt__7NaviMgr, global
- * .4byte __RTTI__7NaviMgr
- * .4byte 0
- * .4byte getCreature__13MonoObjectMgrFi
- * .4byte getFirst__13MonoObjectMgrFv
- * .4byte getNext__13MonoObjectMgrFi
- * .4byte isDone__13MonoObjectMgrFi
- * .4byte __RTTI__7NaviMgr
- * .4byte 0xFFFFFFF8
- * .4byte getAgeNodeType__5ANodeFv
- * .4byte "@8@read__7NaviMgrFR18RandomAccessStream"
- * .4byte "@8@update__7NaviMgrFv"
- * .4byte draw__4NodeFR8Graphics
- * .4byte render__4NodeFR8Graphics
- * .4byte concat__4NodeFv
- * .4byte concat__4NodeFR3VQS
- * .4byte concat__4NodeFR3SRT
- * .4byte concat__4NodeFR8Matrix4f
- * .4byte getModelMatrix__4NodeFv
- * .4byte __dt__7NaviMgrFv
- * .4byte update__7NaviMgrFv
- * .4byte postUpdate__13MonoObjectMgrFif
- * .4byte stickUpdate__9ObjectMgrFv
- * .4byte refresh__13MonoObjectMgrFR8Graphics
- * .4byte drawShadow__13MonoObjectMgrFR8GraphicsP7Texture
- * .4byte getSize__13MonoObjectMgrFv
- * .4byte getMax__13MonoObjectMgrFv
- * .4byte findClosest__9ObjectMgrFR8Vector3ffP9Condition
- * .4byte findClosest__9ObjectMgrFR8Vector3fP9Condition
- * .4byte search__13MonoObjectMgrFP9ObjectMgr
- * .4byte killAll__9ObjectMgrFv
- * .4byte birth__13MonoObjectMgrFv
- * .4byte kill__13MonoObjectMgrFP8Creature
- * .4byte createObject__7NaviMgrFv
- * .4byte read__7NaviMgrFR18RandomAccessStream
- */
-
-struct MonoObjectMgr {
-	virtual void getCreature(int);                // _08
-	virtual void getFirst();                      // _0C
-	virtual void getNext(int);                    // _10
-	virtual void isDone(int);                     // _14
-	virtual void _18() = 0;                       // _18
-	virtual void _1C() = 0;                       // _1C
-	virtual void _20() = 0;                       // _20
-	virtual void _24() = 0;                       // _24
-	virtual void _28() = 0;                       // _28
-	virtual void _2C() = 0;                       // _2C
-	virtual void _30() = 0;                       // _30
-	virtual void _34() = 0;                       // _34
-	virtual void _38() = 0;                       // _38
-	virtual void _3C() = 0;                       // _3C
-	virtual void _40() = 0;                       // _40
-	virtual void _44() = 0;                       // _44
-	virtual ~MonoObjectMgr();                     // _48
-	virtual void update();                        // _4C
-	virtual void postUpdate(int, float);          // _50
-	virtual void _54() = 0;                       // _54
-	virtual void refresh(Graphics&);              // _58
-	virtual void drawShadow(Graphics&, Texture*); // _5C
-	virtual void getSize();                       // _60 (weak)
-	virtual void getMax();                        // _64 (weak)
-	virtual void _68() = 0;                       // _68
-	virtual void _6C() = 0;                       // _6C
-	virtual void search(ObjectMgr*);              // _70
-	virtual void _74() = 0;                       // _74
-	virtual void birth();                         // _78
-	virtual void kill(Creature*);                 // _7C
-};
-
-struct ANode {
-	virtual void _08() = 0;        // _08
-	virtual void _0C() = 0;        // _0C
-	virtual void _10() = 0;        // _10
-	virtual void _14() = 0;        // _14
-	virtual void _18() = 0;        // _18
-	virtual void _1C() = 0;        // _1C
-	virtual void getAgeNodeType(); // _20 (weak)
-};
-
-struct Node {
-	virtual void _08() = 0;         // _08
-	virtual void _0C() = 0;         // _0C
-	virtual void _10() = 0;         // _10
-	virtual void _14() = 0;         // _14
-	virtual void _18() = 0;         // _18
-	virtual void _1C() = 0;         // _1C
-	virtual void _20() = 0;         // _20
-	virtual void _24() = 0;         // _24
-	virtual void _28() = 0;         // _28
-	virtual void draw(Graphics&);   // _2C
-	virtual void render(Graphics&); // _30
-	virtual void concat();          // _34 (weak)
-	virtual void concat(VQS&);      // _38 (weak)
-	virtual void concat(SRT&);      // _3C (weak)
-	virtual void concat(Matrix4f&); // _40 (weak)
-	virtual void getModelMatrix();  // _44 (weak)
-};
-
-struct ObjectMgr {
-	virtual void _08() = 0;                                 // _08
-	virtual void _0C() = 0;                                 // _0C
-	virtual void _10() = 0;                                 // _10
-	virtual void _14() = 0;                                 // _14
-	virtual void _18() = 0;                                 // _18
-	virtual void _1C() = 0;                                 // _1C
-	virtual void _20() = 0;                                 // _20
-	virtual void _24() = 0;                                 // _24
-	virtual void _28() = 0;                                 // _28
-	virtual void _2C() = 0;                                 // _2C
-	virtual void _30() = 0;                                 // _30
-	virtual void _34() = 0;                                 // _34
-	virtual void _38() = 0;                                 // _38
-	virtual void _3C() = 0;                                 // _3C
-	virtual void _40() = 0;                                 // _40
-	virtual void _44() = 0;                                 // _44
-	virtual ~ObjectMgr();                                   // _48
-	virtual void update();                                  // _4C
-	virtual void _50() = 0;                                 // _50
-	virtual void stickUpdate();                             // _54
-	virtual void _58() = 0;                                 // _58
-	virtual void _5C() = 0;                                 // _5C
-	virtual void _60() = 0;                                 // _60
-	virtual void _64() = 0;                                 // _64
-	virtual void findClosest(Vector3f&, float, Condition*); // _68
-	virtual void findClosest(Vector3f&, Condition*);        // _6C
-	virtual void _70() = 0;                                 // _70
-	virtual void killAll();                                 // _74
-};
-
-/**
- * @brief TODO
- */
-struct NaviMgr : public MonoObjectMgr, public ANode, public Node, public ObjectMgr {
-	virtual ~NaviMgr();                     // _48
-	virtual void update();                  // _4C
-	virtual void createObject();            // _80
-	virtual void read(RandomAccessStream&); // _84
-};
-
-#endif
diff --git a/unsorted_include_todo/PikiHeadAI.h b/unsorted_include_todo/PikiHeadAI.h
deleted file mode 100644
index 0f4b9751..00000000
--- a/unsorted_include_todo/PikiHeadAI.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef _PIKIHEADAI_H
-#define _PIKIHEADAI_H
-
-/**
- * .obj __vt__10PikiHeadAI, weak
- * .4byte __RTTI__10PikiHeadAI
- * .4byte 0
- * .4byte "init__26StateMachine<10AICreature>FP10AICreature"
- * .4byte exec__8SimpleAIFP10AICreature
- * .4byte procMsg__8SimpleAIFP10AICreatureP3Msg
- * .4byte "transit__26StateMachine<10AICreature>FP10AICreaturei"
- */
-
-struct StateMachine<AICreature> {
-	virtual void init(AICreature*);         // _08 (weak)
-	virtual void _0C() = 0;                 // _0C
-	virtual void _10() = 0;                 // _10
-	virtual void transit(AICreature*, int); // _14 (weak)
-};
-
-struct SimpleAI {
-	virtual void _08() = 0;                  // _08
-	virtual void exec(AICreature*);          // _0C
-	virtual void procMsg(AICreature*, Msg*); // _10
-};
-
-/**
- * @brief TODO
- */
-struct PikiHeadAI : public StateMachine<AICreature>, public SimpleAI {
-
-	PikiHeadAI();
-};
-
-#endif
diff --git a/unsorted_include_todo/PikiHeadAI/BounceSound.h b/unsorted_include_todo/PikiHeadAI/BounceSound.h
deleted file mode 100644
index 81888f75..00000000
--- a/unsorted_include_todo/PikiHeadAI/BounceSound.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _PIKIHEADAI_BOUNCESOUND_H
-#define _PIKIHEADAI_BOUNCESOUND_H
-
-/**
- * .obj __vt__Q210PikiHeadAI11BounceSound, global
- * .4byte __RTTI__Q210PikiHeadAI11BounceSound
- * .4byte 0
- * .4byte act__Q210PikiHeadAI11BounceSoundFP10AICreature
- */
-
-namespace PikiHeadAI {
-/**
- * @brief TODO
- */
-struct BounceSound {
-	virtual void act(AICreature*); // _08
-};
-} // namespace PikiHeadAI
-
-#endif
diff --git a/unsorted_include_todo/PikiHeadAI/BuryExec.h b/unsorted_include_todo/PikiHeadAI/BuryExec.h
deleted file mode 100644
index 5c0bddb3..00000000
--- a/unsorted_include_todo/PikiHeadAI/BuryExec.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _PIKIHEADAI_BURYEXEC_H
-#define _PIKIHEADAI_BURYEXEC_H
-
-/**
- * .obj __vt__Q210PikiHeadAI8BuryExec, global
- * .4byte __RTTI__Q210PikiHeadAI8BuryExec
- * .4byte 0
- * .4byte act__Q210PikiHeadAI8BuryExecFP10AICreature
- */
-
-namespace PikiHeadAI {
-/**
- * @brief TODO
- */
-struct BuryExec {
-	virtual void act(AICreature*); // _08
-};
-} // namespace PikiHeadAI
-
-#endif
diff --git a/unsorted_include_todo/PikiHeadAI/BuryExec2.h b/unsorted_include_todo/PikiHeadAI/BuryExec2.h
deleted file mode 100644
index cc9678da..00000000
--- a/unsorted_include_todo/PikiHeadAI/BuryExec2.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _PIKIHEADAI_BURYEXEC2_H
-#define _PIKIHEADAI_BURYEXEC2_H
-
-/**
- * .obj __vt__Q210PikiHeadAI9BuryExec2, global
- * .4byte __RTTI__Q210PikiHeadAI9BuryExec2
- * .4byte 0
- * .4byte act__Q210PikiHeadAI9BuryExec2FP10AICreature
- */
-
-namespace PikiHeadAI {
-/**
- * @brief TODO
- */
-struct BuryExec2 {
-	virtual void act(AICreature*); // _08
-};
-} // namespace PikiHeadAI
-
-#endif
diff --git a/unsorted_include_todo/PikiHeadAI/BuryInit.h b/unsorted_include_todo/PikiHeadAI/BuryInit.h
deleted file mode 100644
index ac6d4d3f..00000000
--- a/unsorted_include_todo/PikiHeadAI/BuryInit.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _PIKIHEADAI_BURYINIT_H
-#define _PIKIHEADAI_BURYINIT_H
-
-/**
- * .obj __vt__Q210PikiHeadAI8BuryInit, global
- * .4byte __RTTI__Q210PikiHeadAI8BuryInit
- * .4byte 0
- * .4byte act__Q210PikiHeadAI8BuryInitFP10AICreature
- */
-
-namespace PikiHeadAI {
-/**
- * @brief TODO
- */
-struct BuryInit {
-	virtual void act(AICreature*); // _08
-};
-} // namespace PikiHeadAI
-
-#endif
diff --git a/unsorted_include_todo/PikiHeadAI/BuryInit2.h b/unsorted_include_todo/PikiHeadAI/BuryInit2.h
deleted file mode 100644
index 749919d0..00000000
--- a/unsorted_include_todo/PikiHeadAI/BuryInit2.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _PIKIHEADAI_BURYINIT2_H
-#define _PIKIHEADAI_BURYINIT2_H
-
-/**
- * .obj __vt__Q210PikiHeadAI9BuryInit2, global
- * .4byte __RTTI__Q210PikiHeadAI9BuryInit2
- * .4byte 0
- * .4byte act__Q210PikiHeadAI9BuryInit2FP10AICreature
- */
-
-namespace PikiHeadAI {
-/**
- * @brief TODO
- */
-struct BuryInit2 {
-	virtual void act(AICreature*); // _08
-};
-} // namespace PikiHeadAI
-
-#endif
diff --git a/unsorted_include_todo/PikiHeadAI/Dead.h b/unsorted_include_todo/PikiHeadAI/Dead.h
deleted file mode 100644
index 9f0b4dd0..00000000
--- a/unsorted_include_todo/PikiHeadAI/Dead.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _PIKIHEADAI_DEAD_H
-#define _PIKIHEADAI_DEAD_H
-
-/**
- * .obj __vt__Q210PikiHeadAI4Dead, global
- * .4byte __RTTI__Q210PikiHeadAI4Dead
- * .4byte 0
- * .4byte act__Q210PikiHeadAI4DeadFP10AICreature
- */
-
-namespace PikiHeadAI {
-/**
- * @brief TODO
- */
-struct Dead {
-	virtual void act(AICreature*); // _08
-};
-} // namespace PikiHeadAI
-
-#endif
diff --git a/unsorted_include_todo/PikiHeadAI/FlyingCleanup.h b/unsorted_include_todo/PikiHeadAI/FlyingCleanup.h
deleted file mode 100644
index 59737862..00000000
--- a/unsorted_include_todo/PikiHeadAI/FlyingCleanup.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _PIKIHEADAI_FLYINGCLEANUP_H
-#define _PIKIHEADAI_FLYINGCLEANUP_H
-
-/**
- * .obj __vt__Q210PikiHeadAI13FlyingCleanup, global
- * .4byte __RTTI__Q210PikiHeadAI13FlyingCleanup
- * .4byte 0
- * .4byte act__Q210PikiHeadAI13FlyingCleanupFP10AICreature
- */
-
-namespace PikiHeadAI {
-/**
- * @brief TODO
- */
-struct FlyingCleanup {
-	virtual void act(AICreature*); // _08
-};
-} // namespace PikiHeadAI
-
-#endif
diff --git a/unsorted_include_todo/PikiHeadAI/FlyingEffect.h b/unsorted_include_todo/PikiHeadAI/FlyingEffect.h
deleted file mode 100644
index 3fe8b4e7..00000000
--- a/unsorted_include_todo/PikiHeadAI/FlyingEffect.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _PIKIHEADAI_FLYINGEFFECT_H
-#define _PIKIHEADAI_FLYINGEFFECT_H
-
-/**
- * .obj __vt__Q210PikiHeadAI12FlyingEffect, global
- * .4byte __RTTI__Q210PikiHeadAI12FlyingEffect
- * .4byte 0
- * .4byte act__Q210PikiHeadAI12FlyingEffectFP10AICreature
- */
-
-namespace PikiHeadAI {
-/**
- * @brief TODO
- */
-struct FlyingEffect {
-	virtual void act(AICreature*); // _08
-};
-} // namespace PikiHeadAI
-
-#endif
diff --git a/unsorted_include_todo/PikiHeadAI/FlyingExec.h b/unsorted_include_todo/PikiHeadAI/FlyingExec.h
deleted file mode 100644
index 66b45670..00000000
--- a/unsorted_include_todo/PikiHeadAI/FlyingExec.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _PIKIHEADAI_FLYINGEXEC_H
-#define _PIKIHEADAI_FLYINGEXEC_H
-
-/**
- * .obj __vt__Q210PikiHeadAI10FlyingExec, global
- * .4byte __RTTI__Q210PikiHeadAI10FlyingExec
- * .4byte 0
- * .4byte act__Q210PikiHeadAI10FlyingExecFP10AICreature
- */
-
-namespace PikiHeadAI {
-/**
- * @brief TODO
- */
-struct FlyingExec {
-	virtual void act(AICreature*); // _08
-};
-} // namespace PikiHeadAI
-
-#endif
diff --git a/unsorted_include_todo/PikiHeadAI/GrowEffect.h b/unsorted_include_todo/PikiHeadAI/GrowEffect.h
deleted file mode 100644
index b9ad7ecb..00000000
--- a/unsorted_include_todo/PikiHeadAI/GrowEffect.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _PIKIHEADAI_GROWEFFECT_H
-#define _PIKIHEADAI_GROWEFFECT_H
-
-/**
- * .obj __vt__Q210PikiHeadAI10GrowEffect, global
- * .4byte __RTTI__Q210PikiHeadAI10GrowEffect
- * .4byte 0
- * .4byte act__Q210PikiHeadAI10GrowEffectFP10AICreature
- */
-
-namespace PikiHeadAI {
-/**
- * @brief TODO
- */
-struct GrowEffect {
-	virtual void act(AICreature*); // _08
-};
-} // namespace PikiHeadAI
-
-#endif
diff --git a/unsorted_include_todo/PikiHeadAI/GrowupedExec.h b/unsorted_include_todo/PikiHeadAI/GrowupedExec.h
deleted file mode 100644
index 7a2b27fe..00000000
--- a/unsorted_include_todo/PikiHeadAI/GrowupedExec.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _PIKIHEADAI_GROWUPEDEXEC_H
-#define _PIKIHEADAI_GROWUPEDEXEC_H
-
-/**
- * .obj __vt__Q210PikiHeadAI12GrowupedExec, global
- * .4byte __RTTI__Q210PikiHeadAI12GrowupedExec
- * .4byte 0
- * .4byte act__Q210PikiHeadAI12GrowupedExecFP10AICreature
- */
-
-namespace PikiHeadAI {
-/**
- * @brief TODO
- */
-struct GrowupedExec {
-	virtual void act(AICreature*); // _08
-};
-} // namespace PikiHeadAI
-
-#endif
diff --git a/unsorted_include_todo/PikiHeadAI/KaretaExec.h b/unsorted_include_todo/PikiHeadAI/KaretaExec.h
deleted file mode 100644
index 922c0254..00000000
--- a/unsorted_include_todo/PikiHeadAI/KaretaExec.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _PIKIHEADAI_KARETAEXEC_H
-#define _PIKIHEADAI_KARETAEXEC_H
-
-/**
- * .obj __vt__Q210PikiHeadAI10KaretaExec, global
- * .4byte __RTTI__Q210PikiHeadAI10KaretaExec
- * .4byte 0
- * .4byte act__Q210PikiHeadAI10KaretaExecFP10AICreature
- */
-
-namespace PikiHeadAI {
-/**
- * @brief TODO
- */
-struct KaretaExec {
-	virtual void act(AICreature*); // _08
-};
-} // namespace PikiHeadAI
-
-#endif
diff --git a/unsorted_include_todo/PikiHeadAI/KaretaInit.h b/unsorted_include_todo/PikiHeadAI/KaretaInit.h
deleted file mode 100644
index 19481ca1..00000000
--- a/unsorted_include_todo/PikiHeadAI/KaretaInit.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _PIKIHEADAI_KARETAINIT_H
-#define _PIKIHEADAI_KARETAINIT_H
-
-/**
- * .obj __vt__Q210PikiHeadAI10KaretaInit, global
- * .4byte __RTTI__Q210PikiHeadAI10KaretaInit
- * .4byte 0
- * .4byte act__Q210PikiHeadAI10KaretaInitFP10AICreature
- */
-
-namespace PikiHeadAI {
-/**
- * @brief TODO
- */
-struct KaretaInit {
-	virtual void act(AICreature*); // _08
-};
-} // namespace PikiHeadAI
-
-#endif
diff --git a/unsorted_include_todo/PikiHeadAI/TaneExec.h b/unsorted_include_todo/PikiHeadAI/TaneExec.h
deleted file mode 100644
index e4585e8a..00000000
--- a/unsorted_include_todo/PikiHeadAI/TaneExec.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _PIKIHEADAI_TANEEXEC_H
-#define _PIKIHEADAI_TANEEXEC_H
-
-/**
- * .obj __vt__Q210PikiHeadAI8TaneExec, global
- * .4byte __RTTI__Q210PikiHeadAI8TaneExec
- * .4byte 0
- * .4byte act__Q210PikiHeadAI8TaneExecFP10AICreature
- */
-
-namespace PikiHeadAI {
-/**
- * @brief TODO
- */
-struct TaneExec {
-	virtual void act(AICreature*); // _08
-};
-} // namespace PikiHeadAI
-
-#endif
diff --git a/unsorted_include_todo/PikiHeadAI/TaneInit.h b/unsorted_include_todo/PikiHeadAI/TaneInit.h
deleted file mode 100644
index 5071c66c..00000000
--- a/unsorted_include_todo/PikiHeadAI/TaneInit.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _PIKIHEADAI_TANEINIT_H
-#define _PIKIHEADAI_TANEINIT_H
-
-/**
- * .obj __vt__Q210PikiHeadAI8TaneInit, global
- * .4byte __RTTI__Q210PikiHeadAI8TaneInit
- * .4byte 0
- * .4byte act__Q210PikiHeadAI8TaneInitFP10AICreature
- */
-
-namespace PikiHeadAI {
-/**
- * @brief TODO
- */
-struct TaneInit {
-	virtual void act(AICreature*); // _08
-};
-} // namespace PikiHeadAI
-
-#endif
diff --git a/unsorted_include_todo/PikiHeadAI/WaitExec.h b/unsorted_include_todo/PikiHeadAI/WaitExec.h
deleted file mode 100644
index 8046c03d..00000000
--- a/unsorted_include_todo/PikiHeadAI/WaitExec.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _PIKIHEADAI_WAITEXEC_H
-#define _PIKIHEADAI_WAITEXEC_H
-
-/**
- * .obj __vt__Q210PikiHeadAI8WaitExec, global
- * .4byte __RTTI__Q210PikiHeadAI8WaitExec
- * .4byte 0
- * .4byte act__Q210PikiHeadAI8WaitExecFP10AICreature
- */
-
-namespace PikiHeadAI {
-/**
- * @brief TODO
- */
-struct WaitExec {
-	virtual void act(AICreature*); // _08
-};
-} // namespace PikiHeadAI
-
-#endif
diff --git a/unsorted_include_todo/PikiHeadAI/WaitInit.h b/unsorted_include_todo/PikiHeadAI/WaitInit.h
deleted file mode 100644
index cc6ba1be..00000000
--- a/unsorted_include_todo/PikiHeadAI/WaitInit.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _PIKIHEADAI_WAITINIT_H
-#define _PIKIHEADAI_WAITINIT_H
-
-/**
- * .obj __vt__Q210PikiHeadAI8WaitInit, global
- * .4byte __RTTI__Q210PikiHeadAI8WaitInit
- * .4byte 0
- * .4byte act__Q210PikiHeadAI8WaitInitFP10AICreature
- */
-
-namespace PikiHeadAI {
-/**
- * @brief TODO
- */
-struct WaitInit {
-	virtual void act(AICreature*); // _08
-};
-} // namespace PikiHeadAI
-
-#endif
diff --git a/unsorted_include_todo/Plant.h b/unsorted_include_todo/Plant.h
deleted file mode 100644
index cdb2b9c0..00000000
--- a/unsorted_include_todo/Plant.h
+++ /dev/null
@@ -1,274 +0,0 @@
-#ifndef _PLANT_H
-#define _PLANT_H
-
-/**
- * .obj __vt__5Plant, global
- * .4byte __RTTI__5Plant
- * .4byte 0
- * .4byte addCntCallback__12RefCountableFv
- * .4byte subCntCallback__12RefCountableFv
- * .4byte insideSafeArea__8CreatureFR8Vector3f
- * .4byte platAttachable__8CreatureFv
- * .4byte alwaysUpdatePlatform__8CreatureFv
- * .4byte doDoAI__8CreatureFv
- * .4byte setRouteTracer__8CreatureFP11RouteTracer
- * .4byte init__8CreatureFv
- * .4byte init__8CreatureFR8Vector3f
- * .4byte resetPosition__8CreatureFR8Vector3f
- * .4byte initParam__8CreatureFi
- * .4byte startAI__5PlantFi
- * .4byte getiMass__5PlantFv
- * .4byte getSize__8CreatureFv
- * .4byte getHeight__8CreatureFv
- * .4byte getCylinderHeight__8CreatureFv
- * .4byte doStore__8CreatureFP11CreatureInf
- * .4byte doRestore__8CreatureFP11CreatureInf
- * .4byte doSave__8CreatureFR18RandomAccessStream
- * .4byte doLoad__8CreatureFR18RandomAccessStream
- * .4byte getCentre__8CreatureFv
- * .4byte getCentreSize__8CreatureFv
- * .4byte getBoundingSphereCentre__8CreatureFv
- * .4byte getBoundingSphereRadius__8CreatureFv
- * .4byte getShadowPos__8CreatureFv
- * .4byte setCentre__8CreatureFR8Vector3f
- * .4byte getShadowSize__8CreatureFv
- * .4byte isVisible__8CreatureFv
- * .4byte isOrganic__8CreatureFv
- * .4byte isTerrible__8CreatureFv
- * .4byte isBuried__8CreatureFv
- * .4byte isAtari__8CreatureFv
- * .4byte isAlive__5PlantFv
- * .4byte isFixed__8CreatureFv
- * .4byte needShadow__8CreatureFv
- * .4byte needFlick__8CreatureFP8Creature
- * .4byte ignoreAtari__8CreatureFP8Creature
- * .4byte isFree__8CreatureFv
- * .4byte stimulate__8CreatureFR11Interaction
- * .4byte sendMsg__8CreatureFP3Msg
- * .4byte collisionCallback__10AICreatureFR9CollEvent
- * .4byte bounceCallback__10AICreatureFv
- * .4byte jumpCallback__8CreatureFv
- * .4byte wallCallback__8CreatureFR5PlaneP13DynCollObject
- * .4byte offwallCallback__8CreatureFP13DynCollObject
- * .4byte stickCallback__8CreatureFP8Creature
- * .4byte offstickCallback__8CreatureFP8Creature
- * .4byte stickToCallback__8CreatureFP8Creature
- * .4byte dump__8CreatureFv
- * .4byte startWaterEffect__8CreatureFv
- * .4byte finishWaterEffect__8CreatureFv
- * .4byte isRopable__8CreatureFv
- * .4byte mayIstick__8CreatureFv
- * .4byte getFormationPri__8CreatureFv
- * .4byte update__5PlantFv
- * .4byte postUpdate__8CreatureFif
- * .4byte stickUpdate__8CreatureFv
- * .4byte refresh__5PlantFR8Graphics
- * .4byte refresh2d__8CreatureFR8Graphics
- * .4byte renderAtari__8CreatureFR8Graphics
- * .4byte drawShadow__8CreatureFR8Graphics
- * .4byte demoDraw__8CreatureFR8GraphicsP8Matrix4f
- * .4byte getCatchPos__8CreatureFP8Creature
- * .4byte doAI__8CreatureFv
- * .4byte doAnimation__5PlantFv
- * .4byte doKill__5PlantFv
- * .4byte exitCourse__8CreatureFv
- * .4byte __RTTI__5Plant
- * .4byte 0xFFFFFD48
- * .4byte "@696@animationKeyUpdated__10AICreatureFR16PaniAnimKeyEvent"
- * .4byte getCurrState__10AICreatureFv
- * .4byte "setCurrState__10AICreatureFP20AState<10AICreature>"
- * .4byte playSound__10AICreatureFi
- * .4byte playEffect__10AICreatureFi
- * .4byte startMotion__5PlantFi
- * .4byte finishMotion__10AICreatureFv
- * .4byte finishMotion__10AICreatureFf
- * .4byte startMotion__10AICreatureFif
- * .4byte getCurrentMotionName__10AICreatureFv
- * .4byte getCurrentMotionCounter__10AICreatureFv
- * .4byte getMotionSpeed__10AICreatureFv
- * .4byte setMotionSpeed__5PlantFf
- * .4byte stopMotion__5PlantFv
- * .4byte animationKeyUpdated__10AICreatureFR16PaniAnimKeyEvent
- */
-
-struct RefCountable {
-	virtual void addCntCallback(); // _08 (weak)
-	virtual void subCntCallback(); // _0C (weak)
-};
-
-struct Creature {
-	virtual void _08() = 0;                            // _08
-	virtual void _0C() = 0;                            // _0C
-	virtual void insideSafeArea(Vector3f&);            // _10 (weak)
-	virtual void platAttachable();                     // _14 (weak)
-	virtual void alwaysUpdatePlatform();               // _18
-	virtual void doDoAI();                             // _1C (weak)
-	virtual void setRouteTracer(RouteTracer*);         // _20 (weak)
-	virtual void init();                               // _24
-	virtual void init(Vector3f&);                      // _28
-	virtual void resetPosition(Vector3f&);             // _2C
-	virtual void initParam(int);                       // _30 (weak)
-	virtual void startAI(int);                         // _34
-	virtual f32 getiMass();                           // _38
-	virtual void getSize();                            // _3C (weak)
-	virtual void getHeight();                          // _40 (weak)
-	virtual void getCylinderHeight();                  // _44 (weak)
-	virtual void doStore(CreatureInf*);                // _48 (weak)
-	virtual void doRestore(CreatureInf*);              // _4C (weak)
-	virtual void doSave(RandomAccessStream&);          // _50 (weak)
-	virtual void doLoad(RandomAccessStream&);          // _54 (weak)
-	virtual void getCentre();                          // _58
-	virtual f32 getCentreSize();                      // _5C
-	virtual void getBoundingSphereCentre();            // _60
-	virtual void getBoundingSphereRadius();            // _64
-	virtual void getShadowPos();                       // _68 (weak)
-	virtual void setCentre(Vector3f&);                 // _6C (weak)
-	virtual void getShadowSize();                      // _70
-	virtual void isVisible();                          // _74
-	virtual void isOrganic();                          // _78 (weak)
-	virtual void isTerrible();                         // _7C
-	virtual void isBuried();                           // _80 (weak)
-	virtual void isAtari();                            // _84 (weak)
-	virtual void isAlive();                            // _88
-	virtual void isFixed();                            // _8C (weak)
-	virtual void needShadow();                         // _90
-	virtual void needFlick(Creature*);                 // _94 (weak)
-	virtual void ignoreAtari(Creature*);               // _98 (weak)
-	virtual void isFree();                             // _9C (weak)
-	virtual void stimulate(Interaction&);              // _A0
-	virtual void sendMsg(Msg*);                        // _A4 (weak)
-	virtual void _A8() = 0;                            // _A8
-	virtual void _AC() = 0;                            // _AC
-	virtual void jumpCallback();                       // _B0 (weak)
-	virtual void wallCallback(Plane&, DynCollObject*); // _B4
-	virtual void offwallCallback(DynCollObject*);      // _B8 (weak)
-	virtual void stickCallback(Creature*);             // _BC (weak)
-	virtual void offstickCallback(Creature*);          // _C0 (weak)
-	virtual void stickToCallback(Creature*);           // _C4 (weak)
-	virtual void dump();                               // _C8 (weak)
-	virtual void startWaterEffect();                   // _CC (weak)
-	virtual void finishWaterEffect();                  // _D0 (weak)
-	virtual void isRopable();                          // _D4 (weak)
-	virtual void mayIstick();                          // _D8 (weak)
-	virtual void getFormationPri();                    // _DC (weak)
-	virtual void update();                             // _E0
-	virtual void postUpdate(int, float);               // _E4
-	virtual void stickUpdate();                        // _E8
-	virtual void refresh(Graphics&);                   // _EC
-	virtual void refresh2d(Graphics&);                 // _F0 (weak)
-	virtual void renderAtari(Graphics&);               // _F4
-	virtual void drawShadow(Graphics&);                // _F8
-	virtual void demoDraw(Graphics&, Matrix4f*);       // _FC
-	virtual void getCatchPos(Creature*);               // _100
-	virtual void doAI();                               // _104 (weak)
-	virtual void doAnimation();                        // _108
-	virtual void doKill();                             // _10C
-	virtual void exitCourse();                         // _110 (weak)
-};
-
-struct AICreature {
-	virtual void _08() = 0;                              // _08
-	virtual void _0C() = 0;                              // _0C
-	virtual void _10() = 0;                              // _10
-	virtual void _14() = 0;                              // _14
-	virtual void _18() = 0;                              // _18
-	virtual void _1C() = 0;                              // _1C
-	virtual void _20() = 0;                              // _20
-	virtual void _24() = 0;                              // _24
-	virtual void _28() = 0;                              // _28
-	virtual void _2C() = 0;                              // _2C
-	virtual void _30() = 0;                              // _30
-	virtual void startAI(int);                           // _34
-	virtual f32 getiMass();                             // _38
-	virtual void _3C() = 0;                              // _3C
-	virtual void _40() = 0;                              // _40
-	virtual void _44() = 0;                              // _44
-	virtual void _48() = 0;                              // _48
-	virtual void _4C() = 0;                              // _4C
-	virtual void _50() = 0;                              // _50
-	virtual void _54() = 0;                              // _54
-	virtual void _58() = 0;                              // _58
-	virtual void _5C() = 0;                              // _5C
-	virtual void _60() = 0;                              // _60
-	virtual void _64() = 0;                              // _64
-	virtual void _68() = 0;                              // _68
-	virtual void _6C() = 0;                              // _6C
-	virtual void _70() = 0;                              // _70
-	virtual void _74() = 0;                              // _74
-	virtual void _78() = 0;                              // _78
-	virtual void _7C() = 0;                              // _7C
-	virtual void _80() = 0;                              // _80
-	virtual void _84() = 0;                              // _84
-	virtual void isAlive();                              // _88
-	virtual void _8C() = 0;                              // _8C
-	virtual void _90() = 0;                              // _90
-	virtual void _94() = 0;                              // _94
-	virtual void _98() = 0;                              // _98
-	virtual void _9C() = 0;                              // _9C
-	virtual void _A0() = 0;                              // _A0
-	virtual void _A4() = 0;                              // _A4
-	virtual void collisionCallback(CollEvent&);          // _A8
-	virtual void bounceCallback();                       // _AC
-	virtual void _B0() = 0;                              // _B0
-	virtual void _B4() = 0;                              // _B4
-	virtual void _B8() = 0;                              // _B8
-	virtual void _BC() = 0;                              // _BC
-	virtual void _C0() = 0;                              // _C0
-	virtual void _C4() = 0;                              // _C4
-	virtual void _C8() = 0;                              // _C8
-	virtual void _CC() = 0;                              // _CC
-	virtual void _D0() = 0;                              // _D0
-	virtual void _D4() = 0;                              // _D4
-	virtual void _D8() = 0;                              // _D8
-	virtual void _DC() = 0;                              // _DC
-	virtual void update();                               // _E0
-	virtual void _E4() = 0;                              // _E4
-	virtual void _E8() = 0;                              // _E8
-	virtual void refresh(Graphics&);                     // _EC
-	virtual void _F0()  = 0;                             // _F0
-	virtual void _F4()  = 0;                             // _F4
-	virtual void _F8()  = 0;                             // _F8
-	virtual void _FC()  = 0;                             // _FC
-	virtual void _100() = 0;                             // _100
-	virtual void _104() = 0;                             // _104
-	virtual void doAnimation();                          // _108
-	virtual void doKill();                               // _10C
-	virtual void _110() = 0;                             // _110
-	virtual void _114() = 0;                             // _114
-	virtual void _118() = 0;                             // _118
-	virtual void _11C() = 0;                             // _11C
-	virtual void getCurrState();                         // _120 (weak)
-	virtual void setCurrState(AState<AICreature>*);      // _124 (weak)
-	virtual void playSound(int);                         // _128 (weak)
-	virtual void playEffect(int);                        // _12C (weak)
-	virtual void startMotion(int);                       // _130
-	virtual void finishMotion();                         // _134 (weak)
-	virtual void finishMotion(float);                    // _138 (weak)
-	virtual void startMotion(int, float);                // _13C (weak)
-	virtual void getCurrentMotionName();                 // _140 (weak)
-	virtual void getCurrentMotionCounter();              // _144 (weak)
-	virtual void getMotionSpeed();                       // _148 (weak)
-	virtual void setMotionSpeed(float);                  // _14C
-	virtual void stopMotion();                           // _150
-	virtual void animationKeyUpdated(PaniAnimKeyEvent&); // _154 (weak)
-};
-
-/**
- * @brief TODO
- */
-struct Plant : public RefCountable, public Creature, public AICreature {
-	virtual void startAI(int);          // _34
-	virtual f32 getiMass();            // _38
-	virtual void isAlive();             // _88
-	virtual void update();              // _E0
-	virtual void refresh(Graphics&);    // _EC
-	virtual void doAnimation();         // _108
-	virtual void doKill();              // _10C
-	virtual void startMotion(int);      // _130
-	virtual void setMotionSpeed(float); // _14C
-	virtual void stopMotion();          // _150
-
-	Plant();
-};
-
-#endif
diff --git a/unsorted_include_todo/PlantAI.h b/unsorted_include_todo/PlantAI.h
deleted file mode 100644
index 8debdc3c..00000000
--- a/unsorted_include_todo/PlantAI.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef _PLANTAI_H
-#define _PLANTAI_H
-
-/**
- * .obj __vt__7PlantAI, weak
- * .4byte __RTTI__7PlantAI
- * .4byte 0
- * .4byte "init__26StateMachine<10AICreature>FP10AICreature"
- * .4byte exec__8SimpleAIFP10AICreature
- * .4byte procMsg__8SimpleAIFP10AICreatureP3Msg
- * .4byte "transit__26StateMachine<10AICreature>FP10AICreaturei"
- */
-
-struct StateMachine<AICreature> {
-	virtual void init(AICreature*);         // _08 (weak)
-	virtual void _0C() = 0;                 // _0C
-	virtual void _10() = 0;                 // _10
-	virtual void transit(AICreature*, int); // _14 (weak)
-};
-
-struct SimpleAI {
-	virtual void _08() = 0;                  // _08
-	virtual void exec(AICreature*);          // _0C
-	virtual void procMsg(AICreature*, Msg*); // _10
-};
-
-/**
- * @brief TODO
- */
-struct PlantAI : public StateMachine<AICreature>, public SimpleAI {
-};
-
-#endif
diff --git a/unsorted_include_todo/PlantAI/OpponentMove.h b/unsorted_include_todo/PlantAI/OpponentMove.h
deleted file mode 100644
index 150f06c0..00000000
--- a/unsorted_include_todo/PlantAI/OpponentMove.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _PLANTAI_OPPONENTMOVE_H
-#define _PLANTAI_OPPONENTMOVE_H
-
-/**
- * .obj __vt__Q27PlantAI12OpponentMove, global
- * .4byte __RTTI__Q27PlantAI12OpponentMove
- * .4byte 0
- * .4byte getAgeNodeType__5ANodeFv
- * .4byte read__8CoreNodeFR18RandomAccessStream
- * .4byte satisfy__Q27PlantAI12OpponentMoveFP10AICreature
- */
-
-struct ANode {
-	virtual void getAgeNodeType(); // _08 (weak)
-};
-
-struct CoreNode {
-	virtual void _08() = 0;                 // _08
-	virtual void read(RandomAccessStream&); // _0C (weak)
-};
-
-namespace PlantAI {
-/**
- * @brief TODO
- */
-struct OpponentMove : public ANode, public CoreNode {
-	virtual void satisfy(AICreature*); // _10
-};
-} // namespace PlantAI
-
-#endif
diff --git a/unsorted_include_todo/PlantAI/TouchInit.h b/unsorted_include_todo/PlantAI/TouchInit.h
deleted file mode 100644
index 405a5feb..00000000
--- a/unsorted_include_todo/PlantAI/TouchInit.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _PLANTAI_TOUCHINIT_H
-#define _PLANTAI_TOUCHINIT_H
-
-/**
- * .obj __vt__Q27PlantAI9TouchInit, global
- * .4byte __RTTI__Q27PlantAI9TouchInit
- * .4byte 0
- * .4byte act__Q27PlantAI9TouchInitFP10AICreature
- */
-
-namespace PlantAI {
-/**
- * @brief TODO
- */
-struct TouchInit {
-	virtual void act(AICreature*); // _08
-};
-} // namespace PlantAI
-
-#endif
diff --git a/unsorted_include_todo/PlantAI/WaitInit.h b/unsorted_include_todo/PlantAI/WaitInit.h
deleted file mode 100644
index 1702181d..00000000
--- a/unsorted_include_todo/PlantAI/WaitInit.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _PLANTAI_WAITINIT_H
-#define _PLANTAI_WAITINIT_H
-
-/**
- * .obj __vt__Q27PlantAI8WaitInit, global
- * .4byte __RTTI__Q27PlantAI8WaitInit
- * .4byte 0
- * .4byte act__Q27PlantAI8WaitInitFP10AICreature
- */
-
-namespace PlantAI {
-/**
- * @brief TODO
- */
-struct WaitInit {
-	virtual void act(AICreature*); // _08
-};
-} // namespace PlantAI
-
-#endif
diff --git a/unsorted_include_todo/PlantMgr.h b/unsorted_include_todo/PlantMgr.h
deleted file mode 100644
index 9ebcd756..00000000
--- a/unsorted_include_todo/PlantMgr.h
+++ /dev/null
@@ -1,145 +0,0 @@
-#ifndef _PLANTMGR_H
-#define _PLANTMGR_H
-
-/**
- * .obj __vt__8PlantMgr, global
- * .4byte __RTTI__8PlantMgr
- * .4byte 0
- * .4byte getCreature__15CreatureNodeMgrFi
- * .4byte getFirst__15CreatureNodeMgrFv
- * .4byte getNext__15CreatureNodeMgrFi
- * .4byte isDone__15CreatureNodeMgrFi
- * .4byte __RTTI__8PlantMgr
- * .4byte 0xFFFFFFF8
- * .4byte getAgeNodeType__5ANodeFv
- * .4byte read__8CoreNodeFR18RandomAccessStream
- * .4byte "@8@update__9ObjectMgrFv"
- * .4byte draw__4NodeFR8Graphics
- * .4byte render__4NodeFR8Graphics
- * .4byte concat__4NodeFv
- * .4byte concat__4NodeFR3VQS
- * .4byte concat__4NodeFR3SRT
- * .4byte concat__4NodeFR8Matrix4f
- * .4byte getModelMatrix__4NodeFv
- * .4byte __dt__8PlantMgrFv
- * .4byte update__9ObjectMgrFv
- * .4byte postUpdate__9ObjectMgrFif
- * .4byte stickUpdate__9ObjectMgrFv
- * .4byte refresh__9ObjectMgrFR8Graphics
- * .4byte drawShadow__9ObjectMgrFR8GraphicsP7Texture
- * .4byte getSize__15CreatureNodeMgrFv
- * .4byte getMax__15CreatureNodeMgrFv
- * .4byte findClosest__9ObjectMgrFR8Vector3ffP9Condition
- * .4byte findClosest__9ObjectMgrFR8Vector3fP9Condition
- * .4byte search__9ObjectMgrFP9ObjectMgr
- * .4byte killAll__9ObjectMgrFv
- * .4byte createObject__8PlantMgrFv
- */
-
-struct CreatureNodeMgr {
-	virtual void getCreature(int); // _08
-	virtual void getFirst();       // _0C
-	virtual void getNext(int);     // _10
-	virtual void isDone(int);      // _14
-	virtual void _18() = 0;        // _18
-	virtual void _1C() = 0;        // _1C
-	virtual void _20() = 0;        // _20
-	virtual void _24() = 0;        // _24
-	virtual void _28() = 0;        // _28
-	virtual void _2C() = 0;        // _2C
-	virtual void _30() = 0;        // _30
-	virtual void _34() = 0;        // _34
-	virtual void _38() = 0;        // _38
-	virtual void _3C() = 0;        // _3C
-	virtual void _40() = 0;        // _40
-	virtual void _44() = 0;        // _44
-	virtual ~CreatureNodeMgr();    // _48
-	virtual void _4C() = 0;        // _4C
-	virtual void _50() = 0;        // _50
-	virtual void _54() = 0;        // _54
-	virtual void _58() = 0;        // _58
-	virtual void _5C() = 0;        // _5C
-	virtual void getSize();        // _60
-	virtual void getMax();         // _64
-};
-
-struct ANode {
-	virtual void _08() = 0;        // _08
-	virtual void _0C() = 0;        // _0C
-	virtual void _10() = 0;        // _10
-	virtual void _14() = 0;        // _14
-	virtual void _18() = 0;        // _18
-	virtual void _1C() = 0;        // _1C
-	virtual void getAgeNodeType(); // _20 (weak)
-};
-
-struct CoreNode {
-	virtual void _08() = 0;                 // _08
-	virtual void _0C() = 0;                 // _0C
-	virtual void _10() = 0;                 // _10
-	virtual void _14() = 0;                 // _14
-	virtual void _18() = 0;                 // _18
-	virtual void _1C() = 0;                 // _1C
-	virtual void _20() = 0;                 // _20
-	virtual void read(RandomAccessStream&); // _24 (weak)
-};
-
-struct Node {
-	virtual void _08() = 0;         // _08
-	virtual void _0C() = 0;         // _0C
-	virtual void _10() = 0;         // _10
-	virtual void _14() = 0;         // _14
-	virtual void _18() = 0;         // _18
-	virtual void _1C() = 0;         // _1C
-	virtual void _20() = 0;         // _20
-	virtual void _24() = 0;         // _24
-	virtual void _28() = 0;         // _28
-	virtual void draw(Graphics&);   // _2C
-	virtual void render(Graphics&); // _30
-	virtual void concat();          // _34 (weak)
-	virtual void concat(VQS&);      // _38 (weak)
-	virtual void concat(SRT&);      // _3C (weak)
-	virtual void concat(Matrix4f&); // _40 (weak)
-	virtual void getModelMatrix();  // _44 (weak)
-};
-
-struct ObjectMgr {
-	virtual void _08() = 0;                                 // _08
-	virtual void _0C() = 0;                                 // _0C
-	virtual void _10() = 0;                                 // _10
-	virtual void _14() = 0;                                 // _14
-	virtual void _18() = 0;                                 // _18
-	virtual void _1C() = 0;                                 // _1C
-	virtual void _20() = 0;                                 // _20
-	virtual void _24() = 0;                                 // _24
-	virtual void _28() = 0;                                 // _28
-	virtual void _2C() = 0;                                 // _2C
-	virtual void _30() = 0;                                 // _30
-	virtual void _34() = 0;                                 // _34
-	virtual void _38() = 0;                                 // _38
-	virtual void _3C() = 0;                                 // _3C
-	virtual void _40() = 0;                                 // _40
-	virtual void _44() = 0;                                 // _44
-	virtual ~ObjectMgr();                                   // _48
-	virtual void update();                                  // _4C
-	virtual void postUpdate(int, float);                    // _50
-	virtual void stickUpdate();                             // _54
-	virtual void refresh(Graphics&);                        // _58
-	virtual void drawShadow(Graphics&, Texture*);           // _5C
-	virtual void _60() = 0;                                 // _60
-	virtual void _64() = 0;                                 // _64
-	virtual void findClosest(Vector3f&, float, Condition*); // _68
-	virtual void findClosest(Vector3f&, Condition*);        // _6C
-	virtual void search(ObjectMgr*);                        // _70
-	virtual void killAll();                                 // _74
-};
-
-/**
- * @brief TODO
- */
-struct PlantMgr : public CreatureNodeMgr, public ANode, public CoreNode, public Node, public ObjectMgr {
-	virtual ~PlantMgr();         // _48
-	virtual void createObject(); // _78
-};
-
-#endif
diff --git a/unsorted_include_todo/PlantMgr/UseNode.h b/unsorted_include_todo/PlantMgr/UseNode.h
deleted file mode 100644
index 9dc361ec..00000000
--- a/unsorted_include_todo/PlantMgr/UseNode.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef _PLANTMGR_USENODE_H
-#define _PLANTMGR_USENODE_H
-
-/**
- * .obj __vt__Q28PlantMgr7UseNode, weak
- * .4byte __RTTI__Q28PlantMgr7UseNode
- * .4byte 0
- * .4byte getAgeNodeType__5ANodeFv
- * .4byte read__8CoreNodeFR18RandomAccessStream
- */
-
-struct ANode {
-	virtual void getAgeNodeType(); // _08 (weak)
-};
-
-struct CoreNode {
-	virtual void _08() = 0;                 // _08
-	virtual void read(RandomAccessStream&); // _0C (weak)
-};
-
-namespace PlantMgr {
-/**
- * @brief TODO
- */
-struct UseNode : public ANode, public CoreNode {
-};
-} // namespace PlantMgr
-
-#endif
diff --git a/unsorted_include_todo/SluiceAI.h b/unsorted_include_todo/SluiceAI.h
deleted file mode 100644
index dca500f6..00000000
--- a/unsorted_include_todo/SluiceAI.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef _SLUICEAI_H
-#define _SLUICEAI_H
-
-/**
- * .obj __vt__8SluiceAI, weak
- * .4byte __RTTI__8SluiceAI
- * .4byte 0
- * .4byte "init__26StateMachine<10AICreature>FP10AICreature"
- * .4byte exec__8SimpleAIFP10AICreature
- * .4byte procMsg__8SimpleAIFP10AICreatureP3Msg
- * .4byte "transit__26StateMachine<10AICreature>FP10AICreaturei"
- */
-
-struct StateMachine<AICreature> {
-	virtual void init(AICreature*);         // _08 (weak)
-	virtual void _0C() = 0;                 // _0C
-	virtual void _10() = 0;                 // _10
-	virtual void transit(AICreature*, int); // _14 (weak)
-};
-
-struct SimpleAI {
-	virtual void _08() = 0;                  // _08
-	virtual void exec(AICreature*);          // _0C
-	virtual void procMsg(AICreature*, Msg*); // _10
-};
-
-/**
- * @brief TODO
- */
-struct SluiceAI : public StateMachine<AICreature>, public SimpleAI {
-
-	SluiceAI();
-};
-
-#endif
diff --git a/unsorted_include_todo/SluiceAI/AddCount.h b/unsorted_include_todo/SluiceAI/AddCount.h
deleted file mode 100644
index bd25912d..00000000
--- a/unsorted_include_todo/SluiceAI/AddCount.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _SLUICEAI_ADDCOUNT_H
-#define _SLUICEAI_ADDCOUNT_H
-
-/**
- * .obj __vt__Q28SluiceAI8AddCount, global
- * .4byte __RTTI__Q28SluiceAI8AddCount
- * .4byte 0
- * .4byte act__Q28SluiceAI8AddCountFP10AICreature
- */
-
-namespace SluiceAI {
-/**
- * @brief TODO
- */
-struct AddCount {
-	virtual void act(AICreature*); // _08
-};
-} // namespace SluiceAI
-
-#endif
diff --git a/unsorted_include_todo/SluiceAI/ChangeInit.h b/unsorted_include_todo/SluiceAI/ChangeInit.h
deleted file mode 100644
index 755f1069..00000000
--- a/unsorted_include_todo/SluiceAI/ChangeInit.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _SLUICEAI_CHANGEINIT_H
-#define _SLUICEAI_CHANGEINIT_H
-
-/**
- * .obj __vt__Q28SluiceAI10ChangeInit, global
- * .4byte __RTTI__Q28SluiceAI10ChangeInit
- * .4byte 0
- * .4byte act__Q28SluiceAI10ChangeInitFP10AICreature
- */
-
-namespace SluiceAI {
-/**
- * @brief TODO
- */
-struct ChangeInit {
-	virtual void act(AICreature*); // _08
-};
-} // namespace SluiceAI
-
-#endif
diff --git a/unsorted_include_todo/SluiceAI/DamageInit.h b/unsorted_include_todo/SluiceAI/DamageInit.h
deleted file mode 100644
index cfbe15f5..00000000
--- a/unsorted_include_todo/SluiceAI/DamageInit.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _SLUICEAI_DAMAGEINIT_H
-#define _SLUICEAI_DAMAGEINIT_H
-
-/**
- * .obj __vt__Q28SluiceAI10DamageInit, global
- * .4byte __RTTI__Q28SluiceAI10DamageInit
- * .4byte 0
- * .4byte act__Q28SluiceAI10DamageInitFP10AICreature
- */
-
-namespace SluiceAI {
-/**
- * @brief TODO
- */
-struct DamageInit {
-	virtual void act(AICreature*); // _08
-};
-} // namespace SluiceAI
-
-#endif
diff --git a/unsorted_include_todo/SluiceAI/Init.h b/unsorted_include_todo/SluiceAI/Init.h
deleted file mode 100644
index 7312f26a..00000000
--- a/unsorted_include_todo/SluiceAI/Init.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _SLUICEAI_INIT_H
-#define _SLUICEAI_INIT_H
-
-/**
- * .obj __vt__Q28SluiceAI4Init, global
- * .4byte __RTTI__Q28SluiceAI4Init
- * .4byte 0
- * .4byte act__Q28SluiceAI4InitFP10AICreature
- */
-
-namespace SluiceAI {
-/**
- * @brief TODO
- */
-struct Init {
-	virtual void act(AICreature*); // _08
-};
-} // namespace SluiceAI
-
-#endif
diff --git a/unsorted_include_todo/SluiceAI/MotionDone.h b/unsorted_include_todo/SluiceAI/MotionDone.h
deleted file mode 100644
index 145a9125..00000000
--- a/unsorted_include_todo/SluiceAI/MotionDone.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _SLUICEAI_MOTIONDONE_H
-#define _SLUICEAI_MOTIONDONE_H
-
-/**
- * .obj __vt__Q28SluiceAI10MotionDone, global
- * .4byte __RTTI__Q28SluiceAI10MotionDone
- * .4byte 0
- * .4byte act__Q28SluiceAI10MotionDoneFP10AICreature
- */
-
-namespace SluiceAI {
-/**
- * @brief TODO
- */
-struct MotionDone {
-	virtual void act(AICreature*); // _08
-};
-} // namespace SluiceAI
-
-#endif
diff --git a/unsorted_include_todo/SluiceAI/WaitInit.h b/unsorted_include_todo/SluiceAI/WaitInit.h
deleted file mode 100644
index 821bb2b5..00000000
--- a/unsorted_include_todo/SluiceAI/WaitInit.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _SLUICEAI_WAITINIT_H
-#define _SLUICEAI_WAITINIT_H
-
-/**
- * .obj __vt__Q28SluiceAI8WaitInit, global
- * .4byte __RTTI__Q28SluiceAI8WaitInit
- * .4byte 0
- * .4byte act__Q28SluiceAI8WaitInitFP10AICreature
- */
-
-namespace SluiceAI {
-/**
- * @brief TODO
- */
-struct WaitInit {
-	virtual void act(AICreature*); // _08
-};
-} // namespace SluiceAI
-
-#endif
diff --git a/unsorted_include_todo/WaterAI.h b/unsorted_include_todo/WaterAI.h
deleted file mode 100644
index 1e67cbe4..00000000
--- a/unsorted_include_todo/WaterAI.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef _WATERAI_H
-#define _WATERAI_H
-
-/**
- * .obj __vt__7WaterAI, weak
- * .4byte __RTTI__7WaterAI
- * .4byte 0
- * .4byte "init__26StateMachine<10AICreature>FP10AICreature"
- * .4byte exec__8SimpleAIFP10AICreature
- * .4byte procMsg__8SimpleAIFP10AICreatureP3Msg
- * .4byte "transit__26StateMachine<10AICreature>FP10AICreaturei"
- */
-
-struct StateMachine<AICreature> {
-	virtual void init(AICreature*);         // _08 (weak)
-	virtual void _0C() = 0;                 // _0C
-	virtual void _10() = 0;                 // _10
-	virtual void transit(AICreature*, int); // _14 (weak)
-};
-
-struct SimpleAI {
-	virtual void _08() = 0;                  // _08
-	virtual void exec(AICreature*);          // _0C
-	virtual void procMsg(AICreature*, Msg*); // _10
-};
-
-/**
- * @brief TODO
- */
-struct WaterAI : public StateMachine<AICreature>, public SimpleAI {
-
-	WaterAI();
-};
-
-#endif
diff --git a/unsorted_include_todo/WaterAI/CollideChar.h b/unsorted_include_todo/WaterAI/CollideChar.h
deleted file mode 100644
index a0b2bf51..00000000
--- a/unsorted_include_todo/WaterAI/CollideChar.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _WATERAI_COLLIDECHAR_H
-#define _WATERAI_COLLIDECHAR_H
-
-/**
- * .obj __vt__Q27WaterAI11CollideChar, global
- * .4byte __RTTI__Q27WaterAI11CollideChar
- * .4byte 0
- * .4byte getAgeNodeType__5ANodeFv
- * .4byte read__8CoreNodeFR18RandomAccessStream
- * .4byte satisfy__Q27WaterAI11CollideCharFP10AICreature
- */
-
-struct ANode {
-	virtual void getAgeNodeType(); // _08 (weak)
-};
-
-struct CoreNode {
-	virtual void _08() = 0;                 // _08
-	virtual void read(RandomAccessStream&); // _0C (weak)
-};
-
-namespace WaterAI {
-/**
- * @brief TODO
- */
-struct CollideChar : public ANode, public CoreNode {
-	virtual void satisfy(AICreature*); // _10
-};
-} // namespace WaterAI
-
-#endif
diff --git a/unsorted_include_todo/WaterAI/Die.h b/unsorted_include_todo/WaterAI/Die.h
deleted file mode 100644
index 927dc5b8..00000000
--- a/unsorted_include_todo/WaterAI/Die.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _WATERAI_DIE_H
-#define _WATERAI_DIE_H
-
-/**
- * .obj __vt__Q27WaterAI3Die, global
- * .4byte __RTTI__Q27WaterAI3Die
- * .4byte 0
- * .4byte act__Q27WaterAI3DieFP10AICreature
- */
-
-namespace WaterAI {
-/**
- * @brief TODO
- */
-struct Die {
-	virtual void act(AICreature*); // _08
-};
-} // namespace WaterAI
-
-#endif