--- Daodan/src/Daodan.h	2013/08/11 22:31:16	894
+++ Daodan/src/Daodan.h	2014/04/05 10:19:11	992
@@ -5,24 +5,7 @@
 #include <assert.h>
 #include "stdint.h"
 
-#define ONICALL __fastcall
-#define UUmType(t) typedef struct t t;
-
-#define DDmAssert(expr) assert(expr);
-
-typedef unsigned char UUtBool;
-#define UUcTrue  ((UUtBool) 1)
-#define UUcFalse ((UUtBool) 0)
-
-typedef unsigned short UUtError;
-#define UUcError_None ((UUtError) 0)
-
-typedef unsigned char UUtUns8;
-typedef unsigned short UUtUns16;
-typedef unsigned int UUtUns32;
-typedef char UUtInt8;
-typedef short UUtInt16;
-typedef int UUtInt32;
+#include "Oni/Oni.h"
 
 extern HMODULE DDrDLLModule;
 extern HMODULE DDrONiModule;