--- Daodan/src/Daodan.h	2013/03/07 17:26:13	692
+++ Daodan/src/Daodan.h	2015/03/23 23:29:19	1017
@@ -2,14 +2,14 @@
 #define DAODAN_H
 
 #include <windows.h>
+#include <assert.h>
 #include "stdint.h"
 
-#define ONICALL __fastcall
+#include "Oni/Oni.h"
+
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
 
 extern HMODULE DDrDLLModule;
 extern HMODULE DDrONiModule;
 
-extern bool opt_border;
-extern bool opt_topmost;
-
 #endif