diff --git a/base_core.h b/core.h
similarity index 96%
rename from base_core.h
rename to core.h
index 3a75226..71fe76c 100644
--- a/base_core.h
+++ b/core.h
@@ -11,7 +11,6 @@
 #include <stdarg.h>
 #include <math.h>
 #include <string.h>
-#include <stdint.h>
 
 ////////////////////////////////
 //~ rjf: Codebase Keywords
@@ -136,20 +135,20 @@
 ////////////////////////////////
 //~ rjf: Base Types
 
-typedef uint8_t  U8;
-typedef uint16_t U16;
-typedef uint32_t U32;
-typedef uint64_t U64;
-typedef int8_t   S8;
-typedef int16_t  S16;
-typedef int32_t  S32;
-typedef int64_t  S64;
-typedef S8       B8;
-typedef S16      B16;
-typedef S32      B32;
-typedef S64      B64;
-typedef float    F32;
-typedef double   F64;
+typedef unsigned char       U8;
+typedef unsigned short     U16;
+typedef unsigned int       U32;
+typedef unsigned long long U64;
+typedef signed char         S8;
+typedef short              S16;
+typedef int                S32;
+typedef long long          S64;
+typedef S8                  B8;
+typedef S16                B16;
+typedef S32                B32;
+typedef S64                B64;
+typedef float              F32;
+typedef double             F64;
 typedef void VoidProc(void);
 typedef union U128 U128;
 union U128