--- Daodan/src/Oni/Oni.h	2014/04/05 10:19:11	992
+++ Daodan/src/Oni/Oni.h	2021/10/24 02:50:48	1163
@@ -8,7 +8,14 @@
 
 #define ONICALL __fastcall
 
+typedef struct {
+	short x;
+	short y;
+} IMtPoint;
 
+// The following headers were written when Daodan used -fpack-struct, and
+// should be rewritten
+#pragma pack(push, 1)
 #include "stdtypes.h"
 #include "BFW_Motoko_Draw.h"
 #include "BFW_ScriptLang.h"
@@ -16,6 +23,9 @@
 #include "GameState.h"
 #include "GL.h"
 #include "OBJt.h"
+#pragma pack(pop)
+
+#include "Input.h"
 
 #define DDmAssert(expr) assert(expr);