diff --git a/src/main_0207B848.c b/lib/NitroSDK/src/os_system.c
similarity index 96%
rename from src/main_0207B848.c
rename to lib/NitroSDK/src/os_system.c
index 4ded6aa2..88a33eb2 100644
--- a/src/main_0207B848.c
+++ b/lib/NitroSDK/src/os_system.c
@@ -1,4 +1,4 @@
-#include "main_0207B848.h"
+#include <nitro.h>
 
 asm u8 ClearIrqFlag()
 {
diff --git a/lib/include/nitro.h b/lib/include/nitro.h
index e7652f75..1462f82d 100644
--- a/lib/include/nitro.h
+++ b/lib/include/nitro.h
@@ -2,5 +2,6 @@
 #define NITRO_H_
 
 #include <nitro/types.h>
+#include <nitro/os.h>
 
 #endif //NITRO_H_
diff --git a/lib/include/nitro/os.h b/lib/include/nitro/os.h
new file mode 100644
index 00000000..dfb30aca
--- /dev/null
+++ b/lib/include/nitro/os.h
@@ -0,0 +1,47 @@
+#ifndef NITRO_OS_H_
+#define NITRO_OS_H_
+
+//#include <nitro/os/context.h>
+#include <nitro/os/system.h>
+//#include <nitro/os/systemWork.h>
+//#include <nitro/os/thread.h>
+//#include <nitro/os/mutex.h>
+//#include <nitro/os/interrupt.h>
+//#include <nitro/os/systemCall.h>
+//#include <nitro/os/spinLock.h>
+//#include <nitro/os/printf.h>
+//#include <nitro/os/init.h>
+//#include <nitro/os/exception.h>
+//#include <nitro/os/valarm.h>
+//#include <nitro/os/emulator.h>
+//#include <nitro/os/tick.h>
+//#include <nitro/os/alarm.h>
+//#include <nitro/os/ownerInfo.h>
+//#include <nitro/os/context.h>
+//#include <nitro/os/system.h>
+//#include <nitro/os/systemWork.h>
+//#include <nitro/os/thread.h>
+//#include <nitro/os/mutex.h>
+//#include <nitro/os/interrupt.h>
+//#include <nitro/os/systemCall.h>
+//#include <nitro/os/spinLock.h>
+//#include <nitro/os/printf.h>
+//#include <nitro/os/init.h>
+//#include <nitro/os/exception.h>
+//#include <nitro/os/valarm.h>
+//#include <nitro/os/emulator.h>
+//#include <nitro/os/tick.h>
+//#include <nitro/os/alarm.h>
+//#include <nitro/os/common/entropy.h>
+//#include <nitro/os/irqHandler.h>
+
+//#ifdef SDK_ARM9
+//#include <nitro/os/cache.h>
+//#include <nitro/os/protectionRegion.h>
+//#include <nitro/os/protectionUnit.h>
+//#include <nitro/os/tcm.h>
+//#include <nitro/os/ARM9/vramExclusive.h>
+//#endif //SDK_ARM9
+
+#endif //NITRO_OS_H_
+
diff --git a/include/main_0207B848.h b/lib/include/nitro/os/system.h
similarity index 94%
rename from include/main_0207B848.h
rename to lib/include/nitro/os/system.h
index 54f69900..49797c95 100644
--- a/include/main_0207B848.h
+++ b/lib/include/nitro/os/system.h
@@ -1,5 +1,5 @@
-#ifndef PMDSKY_MAIN_0207B848_H
-#define PMDSKY_MAIN_0207B848_H
+#ifndef NITRO_OS_SYSTEM_H_
+#define NITRO_OS_SYSTEM_H_
 
 // Enables processor interrupts by clearing the i flag in the program status register (cpsr).
 // return: Old value of cpsr & 0x80 (0x80 if interrupts were disabled, 0x0 if they were already enabled)
@@ -26,4 +26,4 @@ u8 GetIrqFlag();
 // return: cpsr & 0x1f (the cpsr mode bits M4-M0)
 u8 GetProcessorMode();
 
-#endif //PMDSKY_MAIN_0207B848_H
+#endif //NITRO_OS_SYSTEM_H_
diff --git a/main.lsf b/main.lsf
index 52c38656..83f3aeb6 100644
--- a/main.lsf
+++ b/main.lsf
@@ -248,7 +248,7 @@ Static main
     Object lib/NitroSDK/asm/os_tick.o
     Object lib/NitroSDK/asm/os_alarm.o
     Object lib/NitroSDK/asm/os_valarm.o
-	Object src/main_0207B848.o
+	Object lib/NitroSDK/src/os_system.o
 	Object asm/main_0207B854.o
 	Object src/main_0207B860.o
 	Object asm/main_0207B87C.o
diff --git a/src/main_02000C6C.c b/src/main_02000C6C.c
index a36b16c6..da6d8f00 100644
--- a/src/main_02000C6C.c
+++ b/src/main_02000C6C.c
@@ -1,5 +1,5 @@
 #include "main_02000C6C.h"
-#include "nitro/types.h"
+#include <nitro.h>
 
 extern u32 _02092448;
 extern u32 _02092460;
@@ -33,7 +33,6 @@ extern void sub_0207F3BC(u32);
 extern void sub_02008DAC();
 extern void sub_020833F8(u32);
 extern void sub_020845D8(void (*));
-extern void ClearIrqFlag(u32, u32);
 extern void Debug_Init();
 extern void Debug_Print0(u32*, u32, u32);
 extern void InitMemAllocTableVeneer();
diff --git a/src/main_0207BC20.c b/src/main_0207BC20.c
index 39f7232b..5e9c83b9 100644
--- a/src/main_0207BC20.c
+++ b/src/main_0207BC20.c
@@ -1,5 +1,5 @@
 #include "main_0207BC20.h"
-#include "main_0207B848.h"
+#include <nitro.h>
 
 void WaitForever2(void)
 {