1 files changed, 6 insertions, 19 deletions
diff --git a/arm9/lib/include/OS_message.h b/arm9/lib/include/OS_message.h
index 2dc26d50..b9c570db 100644
--- a/arm9/lib/include/OS_message.h
+++ b/arm9/lib/include/OS_message.h
@@ -1,23 +1,10 @@
-#ifndef POKEDIAMOND_OS_MESSAGE_H
-#define POKEDIAMOND_OS_MESSAGE_H
+#ifndef POKEDIAMOND_ARM9_OS_MESSAGE_H
+#define POKEDIAMOND_ARM9_OS_MESSAGE_H
 
-#include "nitro/types.h"
 #include "OS_thread.h"
-
-typedef void *OSMessage;
-
-typedef struct OSMessageQueue
-{
-    OSThreadQueue queueSend;
-    OSThreadQueue queueReceive;
-    OSMessage *msgArray;
-    s32 msgCount;
-    s32 firstIndex;
-    s32 usedCount;
-} OSMessageQueue;
-
-#define  OS_MESSAGE_NOBLOCK   0
-#define  OS_MESSAGE_BLOCK     1
+#include "OS_context.h"
+#include "nitro/types.h"
+#include "nitro/OS_message_shared.h"
 
 void OS_InitMessageQueue(OSMessageQueue *mq, OSMessage *msgArray, s32 msgCount);
 BOOL OS_SendMessage(OSMessageQueue *mq, OSMessage msg, s32 flags);
@@ -25,4 +12,4 @@ BOOL OS_ReceiveMessage(OSMessageQueue *mq, OSMessage *msg, s32 flags);
 BOOL OS_JamMessage(OSMessageQueue *mq, OSMessage msg, s32 flags);
 BOOL OS_ReadMessage(OSMessageQueue *mq, OSMessage *msg, s32 flags);
 
-#endif //POKEDIAMOND_OS_MESSAGE_H
+#endif //POKEDIAMOND_ARM9_OS_MESSAGE_H