diff --git a/include/coreinit/condition.h b/include/coreinit/condition.h
index 9e5d28a..482e23f 100644
--- a/include/coreinit/condition.h
+++ b/include/coreinit/condition.h
@@ -6,9 +6,8 @@
 extern "C" {
 #endif
 
-struct OSMutex;
-
 typedef struct OSCondition OSCondition;
+typedef struct OSMutex OSMutex;
 
 #define OS_CONDITION_TAG 0x634E6456u
 
diff --git a/include/coreinit/mutex.h b/include/coreinit/mutex.h
index ff7c32a..a7de275 100644
--- a/include/coreinit/mutex.h
+++ b/include/coreinit/mutex.h
@@ -6,7 +6,7 @@
 extern "C" {
 #endif
 
-struct OSThread;
+typedef struct OSThread;
 
 typedef struct OSCondition OSCondition;
 typedef struct OSMutex OSMutex;
diff --git a/include/coreinit/threadqueue.h b/include/coreinit/threadqueue.h
index 98c52f4..02e7053 100644
--- a/include/coreinit/threadqueue.h
+++ b/include/coreinit/threadqueue.h
@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-struct OSThread;
+typedef struct OSThread OSThread;
 
 typedef struct OSThreadLink OSThreadLink;
 typedef struct OSThreadQueue OSThreadQueue;