Header cleanup, NONMATCHING option

include/types.h

@@ -7,65 +7,11 @@
 extern "C" {
 #endif
 
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned int u32;
-typedef unsigned long long u64;
-
-typedef signed char s8;
-typedef signed short s16;
-typedef signed int s32;
-typedef signed long long s64;
-
-typedef volatile u8 vu8;
-typedef volatile u16 vu16;
-typedef volatile u32 vu32;
-typedef volatile u64 vu64;
-
-typedef volatile s8 vs8;
-typedef volatile s16 vs16;
-typedef volatile s32 vs32;
-typedef volatile s64 vs64;
-
-typedef float f32;
-typedef double f64;
-
-typedef volatile float vf32;
-typedef volatile double vf64;
-
-typedef s16  __OSInterrupt;
-typedef s64 OSTime;
-typedef u32 OSTick;
+#include <dolphin/types.h>
 
 // Pointer to unknown, to be determined at a later date.
 typedef void* unkptr;
 
-#ifndef NULL
-#define NULL 0
-#endif
-#ifndef nullptr
-#define nullptr 0
-#endif
-#ifndef override
-#define override
-#endif
-
-typedef int BOOL;
-#ifndef TRUE
-#define TRUE 1
-#endif
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-#ifndef ATTRIBUTE_ALIGN
-#define ATTRIBUTE_ALIGN(num) __attribute__ ((aligned (num)))
-#endif
-
-// where should these go?
-void srand(int);
-int rand();
-
 #ifdef __cplusplus
 }
 #endif