diff --git a/include/coreinit/event.h b/include/coreinit/event.h
index e2eb182..b435c62 100644
--- a/include/coreinit/event.h
+++ b/include/coreinit/event.h
@@ -8,8 +8,7 @@ extern "C" {
 #endif
 
 typedef struct OSEvent OSEvent;
-
-typedef enum OSEventMode OSEventMode;
+typedef uint32_t OSEventMode;
 
 enum OSEventMode
 {
diff --git a/include/coreinit/exception.h b/include/coreinit/exception.h
index da9d9e4..21900c6 100644
--- a/include/coreinit/exception.h
+++ b/include/coreinit/exception.h
@@ -5,8 +5,7 @@
 extern "C" {
 #endif
 
-typedef enum OSExceptionType OSExceptionType;
-
+typedef uint32_t OSExceptionType;
 typedef BOOL (*OSExceptionCallbackFn)(OSContext *context);
 
 enum OSExceptionType
diff --git a/include/coreinit/memexpandedheap.h b/include/coreinit/memexpandedheap.h
index afbf542..305074d 100644
--- a/include/coreinit/memexpandedheap.h
+++ b/include/coreinit/memexpandedheap.h
@@ -7,8 +7,8 @@ extern "C" {
 
 typedef struct MEMExpandedHeap MEMExpandedHeap;
 
-typedef enum MEMExpHeapMode MEMExpHeapMode;
-typedef enum MEMExpHeapDirection MEMExpHeapDirection;
+typedef uint32_t MEMExpHeapMode;
+typedef uint32_t MEMExpHeapDirection;
 
 struct MEMExpandedHeap
 {
diff --git a/include/coreinit/thread.h b/include/coreinit/thread.h
index cd7df42..4b91d3e 100644
--- a/include/coreinit/thread.h
+++ b/include/coreinit/thread.h
@@ -13,9 +13,9 @@ typedef struct OSFastMutexQueue OSFastMutexQueue;
 typedef struct OSMutex OSMutex;
 typedef struct OSThread OSThread;
 
-typedef enum OSThreadState OSThreadState;
-typedef enum OSThreadRequest OSThreadRequest;
-typedef enum OSThreadAttributes OSThreadAttributes;
+typedef uint8_t OSThreadState;
+typedef uint32_t OSThreadRequest;
+typedef uint8_t OSThreadAttributes;
 
 typedef int32_t (*OSThreadEntryPointFn)(int32_t argc, char *arv);
 typedef void (*OSThreadCleanupCallbackFn)(OSThread *thread, void *stack);