WIP Compilation

23 files changed, 50 insertions, 52 deletions

diff --git a/src/os/_Printf.c b/src/os/_Printf.c
index 0442e5fcc..cd57ceb60 100644
--- a/src/os/_Printf.c
+++ b/src/os/_Printf.c
@@ -47,7 +47,7 @@ s32 _Printf(char *(*prout)(char *, const char *, size_t), char *dst, const char
     u8 sp4c[0x20]; // probably a buffer?
     s32 sp48, sp44, sp40, sp3c, sp38, sp34, sp30, sp2c, sp28, sp24;
     sp78.size = 0;
-    while (TRUE) {
+    while (true) {
         fmt_ptr = (u8 *) fmt;
 #ifdef VERSION_SH
         // new version: don't point fmt_ptr beyond NUL character
diff --git a/src/os/__osDevMgrMain.c b/src/os/__osDevMgrMain.c
index 62f2c6ffd..10e074d29 100644
--- a/src/os/__osDevMgrMain.c
+++ b/src/os/__osDevMgrMain.c
@@ -22,7 +22,7 @@ void __osDevMgrMain(void *args) {
     mb = NULL;
     ret = 0;
     sp34 = (OSMgrArgs *) args;
-    while (TRUE) {
+    while (true) {
         osRecvMesg(sp34->cmdQueue, (OSMesg) &mb, OS_MESG_BLOCK);
         if (mb->piHandle != NULL && mb->piHandle->type == 2
             && (mb->piHandle->transferInfo.cmdType == 0
@@ -41,7 +41,7 @@ void __osDevMgrMain(void *args) {
             osRecvMesg(sp34->accessQueue, &dummy, OS_MESG_BLOCK);
             __osResetGlobalIntMask(0x00100401); // remove magic constant!
             __osEPiRawWriteIo(mb->piHandle, 0x05000510, (sp24->bmCtlShadow | 0x80000000));
-            while (TRUE) {
+            while (true) {
                 osRecvMesg(sp34->eventQueue, &em, OS_MESG_BLOCK);
                 sp30 = osSendMesg(mb->hdr.retQueue, mb, OS_MESG_NOBLOCK);
                 if (sp2c != 1 || mb->piHandle->transferInfo.errStatus != 0) {
diff --git a/src/os/__osLeoInterrupt.c b/src/os/__osLeoInterrupt.c
index e77c5af6d..99b4e532a 100644
--- a/src/os/__osLeoInterrupt.c
+++ b/src/os/__osLeoInterrupt.c
@@ -1,4 +1,4 @@
-#include "ultra64.h"
+#include <libultraship.h>
 #include "osint.h"
 #include "piint.h"
 #include "libultra_internal.h"
diff --git a/src/os/contpfs.c b/src/os/contpfs.c
index 1ff0fc7f9..b6d191e2b 100644
--- a/src/os/contpfs.c
+++ b/src/os/contpfs.c
@@ -57,7 +57,7 @@ s32 __osRepairPackId(OSPfs *pfs, __OSPackId *badid, __OSPackId *newid)
         pfs->activebank = j;
         ERRCK(__osPfsSelectBank(pfs))
         //! @todo fix magic number
-        ERRCK(__osContRamRead(pfs->queue, pfs->channel, 0, (u8*)&temp)); 
+        ERRCK(__osContRamRead(pfs->queue, pfs->channel, 0, (u8*)&temp));
         temp[0] = j | 0x80;
         for (i = 1; i < ARRLEN(temp); i++)
         {
@@ -65,7 +65,7 @@ s32 __osRepairPackId(OSPfs *pfs, __OSPackId *badid, __OSPackId *newid)
             temp[i] = ~temp[i];
         }
 
-        ERRCK(__osContRamWrite(pfs->queue, pfs->channel, 0, (u8*)temp, FALSE)); //oddr 0, don't force
+        ERRCK(__osContRamWrite(pfs->queue, pfs->channel, 0, (u8*)temp, false)); //oddr 0, don't force
         ERRCK(__osContRamRead(pfs->queue, pfs->channel, 0, (u8*)&comp));
 
         for (i = 0; i < ARRLEN(temp); i++)
@@ -82,7 +82,7 @@ s32 __osRepairPackId(OSPfs *pfs, __OSPackId *badid, __OSPackId *newid)
             ERRCK(__osContRamRead(pfs->queue, pfs->channel, 0, (u8*)temp));
             if (temp[0] != 128)
                 //! @todo remove magic constant
-                break; 
+                break;
         }
         j++;
     }
@@ -102,7 +102,7 @@ s32 __osRepairPackId(OSPfs *pfs, __OSPackId *badid, __OSPackId *newid)
     index[3] = 6;
     for (i = 0; i < ARRLEN(index); i++)
     {
-        ERRCK(__osContRamWrite(pfs->queue, pfs->channel, index[i], (u8*)newid, TRUE));
+        ERRCK(__osContRamWrite(pfs->queue, pfs->channel, index[i], (u8*)newid, true));
     }
     ERRCK(__osContRamRead(pfs->queue, pfs->channel, 1, (u8*)temp));
     for (i = 0; i < ARRLEN(temp); i++)
@@ -142,7 +142,7 @@ s32 __osCheckPackId(OSPfs *pfs, __OSPackId *temp)
     {
         if (j != i)
         {
-            ERRCK(__osContRamWrite(pfs->queue, pfs->channel, index[j], (u8*)temp, TRUE));
+            ERRCK(__osContRamWrite(pfs->queue, pfs->channel, index[j], (u8*)temp, true));
         }
     }
     return 0;
@@ -176,7 +176,7 @@ s32 __osGetId(OSPfs *pfs)
         }
     }
     //! @todo remove magic constant
-    if ((id->deviceid & 1) == 0) 
+    if ((id->deviceid & 1) == 0)
     {
         ERRCK(__osRepairPackId(pfs, id, &newid));
         id = &newid;
@@ -190,7 +190,7 @@ s32 __osGetId(OSPfs *pfs)
     pfs->version = id->version;
     pfs->banks = id->banks;
     //! @todo loads of magic constants..
-    pfs->inode_start_page = pfs->banks * 2 + 3; 
+    pfs->inode_start_page = pfs->banks * 2 + 3;
     pfs->dir_size = 16;
     pfs->inode_table = 8;
     pfs->minode_table = pfs->banks * PFS_ONE_PAGE + 8;
@@ -247,11 +247,11 @@ s32 __osPfsRWInode(OSPfs *pfs, __OSInode *inode, u8 flag, u8 bank)
     for (j = 0; j < 8; j++)
     {
         //! @todo don't like this =/ //maybe &inode->inode_table[j*PFS_ONE_PAGE].ipage or something
-        addr = ((u8 *)inode->inode_page + j * 32); 
+        addr = ((u8 *)inode->inode_page + j * 32);
         if (flag == PFS_WRITE)
         {
-            ret = __osContRamWrite(pfs->queue, pfs->channel, pfs->inode_table + bank * 8 + j, addr, FALSE);
-            ret = __osContRamWrite(pfs->queue, pfs->channel, pfs->minode_table + bank * 8 + j, addr, FALSE);
+            ret = __osContRamWrite(pfs->queue, pfs->channel, pfs->inode_table + bank * 8 + j, addr, false);
+            ret = __osContRamWrite(pfs->queue, pfs->channel, pfs->minode_table + bank * 8 + j, addr, false);
         }
         else
         {
@@ -275,7 +275,7 @@ s32 __osPfsRWInode(OSPfs *pfs, __OSInode *inode, u8 flag, u8 bank)
             for (j = 0; j < PFS_ONE_PAGE; j++)
             {
                 addr = ((u8 *)inode->inode_page + j * 32);
-                ret = __osContRamWrite(pfs->queue, pfs->channel, pfs->inode_table + bank * PFS_ONE_PAGE + j, addr, FALSE);
+                ret = __osContRamWrite(pfs->queue, pfs->channel, pfs->inode_table + bank * PFS_ONE_PAGE + j, addr, false);
             }
         }
         else
@@ -283,7 +283,7 @@ s32 __osPfsRWInode(OSPfs *pfs, __OSInode *inode, u8 flag, u8 bank)
             for (j = 0; j < PFS_ONE_PAGE; j++)
             {
                 addr = ((u8 *)inode->inode_page + j * 32);
-                ret = __osContRamWrite(pfs->queue, pfs->channel, pfs->minode_table + bank * PFS_ONE_PAGE + j, addr, FALSE);
+                ret = __osContRamWrite(pfs->queue, pfs->channel, pfs->minode_table + bank * PFS_ONE_PAGE + j, addr, false);
             }
         }
     }
@@ -300,6 +300,6 @@ s32 __osPfsSelectBank(OSPfs *pfs)
     {
         temp[i] = pfs->activebank;
     }
-    ret = __osContRamWrite(pfs->queue, pfs->channel, 1024, (u8*)temp, FALSE);
+    ret = __osContRamWrite(pfs->queue, pfs->channel, 1024, (u8*)temp, false);
     return ret;
 }
diff --git a/src/os/controller.h b/src/os/controller.h
index 541fafdc6..92af3d4bd 100644
--- a/src/os/controller.h
+++ b/src/os/controller.h
@@ -1,7 +1,7 @@
 #ifndef _CONTROLLER_H
 #define _CONTROLLER_H
 #include "PR/os_internal.h"
-#include "PR/os.h"
+#include <libultraship.h>
 #include "PR/rcp.h"
 
 //should go somewhere else but
diff --git a/src/os/guLookAtRef.c b/src/os/guLookAtRef.c
index 4e65a49a3..1b5174760 100644
--- a/src/os/guLookAtRef.c
+++ b/src/os/guLookAtRef.c
@@ -19,7 +19,7 @@
  **************************************************************************/
 
 /* Minor modifications */
-#include <ultra64.h>
+#include <libultraship.h>
 #define FTOFRAC8(x) ((int) MIN(((x) * (128.0)), 127.0) & 0xff)
 
 void guLookAtReflectF(float mf[4][4], LookAt *l, float xEye, float yEye, float zEye, float xAt,
diff --git a/src/os/guMtxCatF.c b/src/os/guMtxCatF.c
index 94e0d10f3..96c01c2b6 100755
--- a/src/os/guMtxCatF.c
+++ b/src/os/guMtxCatF.c
@@ -30,7 +30,7 @@
  *
  */
 
-#include <PR/gu.h>
+#include <libultraship.h>
 
 void guMtxCatF(float mf[4][4], float nf[4][4], float res[4][4])
 {
@@ -60,4 +60,3 @@ void guMtxXFMF(float mf[4][4], float x, float y, float z, float *ox, float *oy,
         *oy = mf[0][1]*x + mf[1][1]*y + mf[2][1]*z + mf[3][1];
         *oz = mf[0][2]*x + mf[1][2]*y + mf[2][2]*z + mf[3][2];
 }
-
diff --git a/src/os/guMtxCatL.c b/src/os/guMtxCatL.c
index 82fd4c597..f7b22d482 100755
--- a/src/os/guMtxCatL.c
+++ b/src/os/guMtxCatL.c
@@ -30,8 +30,7 @@
  *
  */
 
-#include "libultra_internal.h"
-#include <PR/gu.h>
+#include <libultraship.h>
 
 void guMtxXFMF(Mtx *, float, float, float, float *, float *, float *);
 void guMtxCatF(float mf[4][4], float nf[4][4], float res[4][4]);
diff --git a/src/os/libaudio_internal.h b/src/os/libaudio_internal.h
index ea63322c1..74868ac4e 100644
--- a/src/os/libaudio_internal.h
+++ b/src/os/libaudio_internal.h
@@ -1,6 +1,6 @@
 #ifndef _LIBAUDIO_INTERNAL_H_
 #define _LIBAUDIO_INTERNAL_H_
-#include <ultra64.h>
+#include <libultraship.h>
 #define AL_BANK_VERSION 0x4231 /* 'B1' */
 
 typedef u8 ALPan;
diff --git a/src/os/libultra_internal.h b/src/os/libultra_internal.h
index 5a6027f75..dafdbd8a9 100644
--- a/src/os/libultra_internal.h
+++ b/src/os/libultra_internal.h
@@ -1,6 +1,6 @@
 #ifndef _LIBULTRA_INTERNAL_H_
 #define _LIBULTRA_INTERNAL_H_
-#include <ultra64.h>
+#include <libultraship.h>
 #include <PR/os_thread.h>
 #include "macros.h"
 
diff --git a/src/os/osCartRomInit.c b/src/os/osCartRomInit.c
index b1b6599c7..389e69ea0 100644
--- a/src/os/osCartRomInit.c
+++ b/src/os/osCartRomInit.c
@@ -5,7 +5,7 @@
 #include "PR/R4300.h"
 #include "PR/rcp.h"
 #include "PR/os_pi.h"
-#include "PR/os.h"
+#include <libultraship.h>
 
 OSPiHandle CartRomHandle;
 
diff --git a/src/os/osCreatePiManager.c b/src/os/osCreatePiManager.c
index 68c491eb6..c65201934 100644
--- a/src/os/osCreatePiManager.c
+++ b/src/os/osCreatePiManager.c
@@ -3,7 +3,7 @@
 #define OS_PI_MGR_MESG_BUFF_SIZE 1
 
 //! @todo In libreultra this is in an include
-#ifdef VERSION_SH 
+#ifdef VERSION_SH
 extern OSPiHandle *CartRomHandle;
 extern OSPiHandle *LeoDiskHandle;
 #endif
@@ -39,7 +39,7 @@ void osCreatePiManager(OSPri pri, OSMesgQueue *cmdQ, OSMesg *cmdBuf, s32 cmdMsgC
             osSetThreadPri(NULL, pri);
         }
         int_disabled = __osDisableInt();
-        __osPiDevMgr.initialized = TRUE;
+        __osPiDevMgr.initialized = true;
         __osPiDevMgr.mgrThread = &piMgrThread;
         __osPiDevMgr.cmdQueue = cmdQ;
         __osPiDevMgr.eventQueue = &__osPiMesgQueue;
diff --git a/src/os/osCreateViManager.c b/src/os/osCreateViManager.c
index a90b3eab5..950f43d81 100644
--- a/src/os/osCreateViManager.c
+++ b/src/os/osCreateViManager.c
@@ -41,7 +41,7 @@ void osCreateViManager(OSPri pri) {
             osSetThreadPri(NULL, pri);
         }
         int_disabled = __osDisableInt();
-        viMgrMainArgs.initialized = TRUE;
+        viMgrMainArgs.initialized = true;
         viMgrMainArgs.mgrThread = &viMgrThread;
         viMgrMainArgs.cmdQueue = &__osViMesgQueue;
         viMgrMainArgs.eventQueue = &__osViMesgQueue;
@@ -67,7 +67,7 @@ void viMgrMain(void *vargs) {
     u32 sp28; // always 0
     u32 sp24; // time related
     mesg = NULL;
-    sp28 = FALSE;
+    sp28 = false;
     context = __osViGetCurrentContext();
 
     if ((retrace = context->retraceCount) == 0) {
@@ -76,7 +76,7 @@ void viMgrMain(void *vargs) {
 
     args = (OSMgrArgs *) vargs;
 
-    while (TRUE) {
+    while (true) {
         osRecvMesg(args->eventQueue, &mesg, OS_MESG_BLOCK);
         switch (*(u16 *) mesg) {
             case 13:
diff --git a/src/os/osInitialize.c b/src/os/osInitialize.c
index 921c969ae..292cbbc1c 100644
--- a/src/os/osInitialize.c
+++ b/src/os/osInitialize.c
@@ -33,7 +33,7 @@ void osInitialize(void) {
     UNUSED u32 eu_sp34;
     UNUSED u32 eu_sp30;
     UNUSED u32 sp2c;
-    D_80194040 = TRUE;
+    D_80194040 = true;
     __osSetSR(__osGetSR() | 0x20000000);
     __osSetFpcCsr(0x01000800);
     while (__osSiRawReadIo(PIF_ADDR_START, &sp34)) {
diff --git a/src/os/osPfsAllocateFile.c b/src/os/osPfsAllocateFile.c
index 655c57cd0..b2614955e 100644
--- a/src/os/osPfsAllocateFile.c
+++ b/src/os/osPfsAllocateFile.c
@@ -29,7 +29,7 @@ s32 osPfsAllocateFile(OSPfs *pfs, u16 company_code, u32 game_code, u8 *game_name
         return PFS_ERR_INVALID;
 
     file_size_in_pages = (file_size_in_bytes + 255) / (BLOCKSIZE * PFS_ONE_PAGE);
-    if ((pfs->status & PFS_INITIALIZED) == FALSE)
+    if ((pfs->status & PFS_INITIALIZED) == false)
         return PFS_ERR_INVALID;
 
     PFS_CHECK_ID;
@@ -99,7 +99,7 @@ s32 osPfsAllocateFile(OSPfs *pfs, u16 company_code, u32 game_code, u8 *game_name
             dir.game_name[j] = *game_name++;
         for (j = 0; j < ARRLEN(dir.ext_name); j++)
             dir.ext_name[j] = *ext_name++;
-        ERRCK(__osContRamWrite(pfs->queue, pfs->channel, *file_no + pfs->dir_table, (u8*)&dir, FALSE));
+        ERRCK(__osContRamWrite(pfs->queue, pfs->channel, *file_no + pfs->dir_table, (u8*)&dir, false));
         return ret;
     }
     return PFS_ERR_INVALID;
@@ -171,7 +171,7 @@ static s32 __osClearPage(OSPfs *pfs, int page_no, u8 *data, u8 bank)
     ERRCK(__osPfsSelectBank(pfs));
     for (i = 0; i < PFS_ONE_PAGE; i++)
     {
-        ret = __osContRamWrite(pfs->queue, pfs->channel, page_no * PFS_ONE_PAGE + i, data, FALSE);
+        ret = __osContRamWrite(pfs->queue, pfs->channel, page_no * PFS_ONE_PAGE + i, data, false);
         if (ret != 0)
             break;
     }
diff --git a/src/os/osPfsChecker.c b/src/os/osPfsChecker.c
index 18457216e..78bd44bb9 100644
--- a/src/os/osPfsChecker.c
+++ b/src/os/osPfsChecker.c
@@ -59,7 +59,7 @@ s32 osPfsChecker(OSPfs *pfs)
             tmp_dir.status = DIR_STATUS_EMPTY;
             tmp_dir.data_sum = 0;
             SET_ACTIVEBANK_TO_ZERO;
-            ERRCK(__osContRamWrite(pfs->queue, pfs->channel, pfs->dir_table + j, (u8*)&tmp_dir, FALSE));
+            ERRCK(__osContRamWrite(pfs->queue, pfs->channel, pfs->dir_table + j, (u8*)&tmp_dir, false));
             fixed++;
         }
         else
@@ -73,7 +73,7 @@ s32 osPfsChecker(OSPfs *pfs)
             tmp_dir.data_sum = 0;
 
             SET_ACTIVEBANK_TO_ZERO;
-            ERRCK(__osContRamWrite(pfs->queue, pfs->channel, pfs->dir_table + j, (u8*)&tmp_dir, FALSE));
+            ERRCK(__osContRamWrite(pfs->queue, pfs->channel, pfs->dir_table + j, (u8*)&tmp_dir, false));
             fixed++;
         }
     }
diff --git a/src/os/osPfsDeleteFile.c b/src/os/osPfsDeleteFile.c
index 7ea124f8b..c7ec885b4 100644
--- a/src/os/osPfsDeleteFile.c
+++ b/src/os/osPfsDeleteFile.c
@@ -32,7 +32,7 @@ s32 osPfsDeleteFile(OSPfs *pfs, u16 company_code, u32 game_code, u8 *game_name,
     {
         ERRCK(__osPfsRWInode(pfs, &inode, OS_READ, bank));
         //! @todo magic constant
-        ERRCK(__osPfsReleasePages(pfs, &inode, startpage, &sum, bank, &last_page, 1)); 
+        ERRCK(__osPfsReleasePages(pfs, &inode, startpage, &sum, bank, &last_page, 1));
         ERRCK(__osPfsRWInode(pfs, &inode, OS_WRITE, bank));
         if (last_page.ipage == 1)
             break;
@@ -56,7 +56,7 @@ s32 osPfsDeleteFile(OSPfs *pfs, u16 company_code, u32 game_code, u8 *game_name,
         dir.ext_name[k] = 0;
     }
     dir.status = DIR_STATUS_EMPTY;
-    ret = __osContRamWrite(pfs->queue, pfs->channel, pfs->dir_table + file_no, (u8*)&dir, FALSE);
+    ret = __osContRamWrite(pfs->queue, pfs->channel, pfs->dir_table + file_no, (u8*)&dir, false);
 
     return ret;
 }
@@ -86,7 +86,7 @@ s32 __osPfsReleasePages(OSPfs *pfs, __OSInode *inode, u8 start_page, u16 *sum, u
         return PFS_ERR_INCONSISTENT;
     *last_page = next_page;
     //! @todo magic number
-    if (flag == 1) 
+    if (flag == 1)
         inode->inode_page[start_page].ipage = 3;
 
     ERRCK(__osBlockSum(pfs, start_page, sum, bank));
diff --git a/src/os/osPfsIsPlug.c b/src/os/osPfsIsPlug.c
index 11580732b..4df1bf328 100644
--- a/src/os/osPfsIsPlug.c
+++ b/src/os/osPfsIsPlug.c
@@ -17,7 +17,7 @@ s32 osPfsIsPlug(OSMesgQueue *queue, u8 *pattern) {
     bits = 0;
     crc_error_cnt = 3;
     __osSiGetAccess();
-    while (TRUE) {
+    while (true) {
         __osPfsRequestData(CONT_CMD_REQUEST_STATUS);
         ret = __osSiRawStartDma(OS_WRITE, &__osPfsPifRam);
         osRecvMesg(queue, &dummy, OS_MESG_BLOCK);
diff --git a/src/os/osPfsNumFiles.c b/src/os/osPfsNumFiles.c
index 09d0eba6f..1bcebaca2 100755
--- a/src/os/osPfsNumFiles.c
+++ b/src/os/osPfsNumFiles.c
@@ -1,5 +1,5 @@
 #include "libultra_internal.h"
-#include "PR/os.h"
+#include <libultraship.h>
 #include "controller.h"
 
 s32 osPfsNumFiles(OSPfs *pfs, s32 *max_files, s32 *files_used)
diff --git a/src/os/osPfsReadWriteFile.c b/src/os/osPfsReadWriteFile.c
index b972147a2..a910a681d 100644
--- a/src/os/osPfsReadWriteFile.c
+++ b/src/os/osPfsReadWriteFile.c
@@ -82,7 +82,7 @@ s32 osPfsReadWriteFile(OSPfs *pfs, s32 file_no, u8 flag, int offset, int size_in
         if (flag == OS_READ)
             ret = __osContRamRead(pfs->queue, pfs->channel, blockno, buffer);
         else
-            ret = __osContRamWrite(pfs->queue, pfs->channel, blockno, buffer, FALSE);
+            ret = __osContRamWrite(pfs->queue, pfs->channel, blockno, buffer, false);
         if (ret != 0)
             return ret;
         buffer += BLOCKSIZE;
@@ -94,7 +94,7 @@ s32 osPfsReadWriteFile(OSPfs *pfs, s32 file_no, u8 flag, int offset, int size_in
         dir.status |= DIR_STATUS_OCCUPIED;
         pfs->activebank = 0;
         ERRCK(__osPfsSelectBank(pfs));
-        ERRCK(__osContRamWrite(pfs->queue, pfs->channel, pfs->dir_table + file_no, (u8*)&dir, FALSE));
+        ERRCK(__osContRamWrite(pfs->queue, pfs->channel, pfs->dir_table + file_no, (u8*)&dir, false));
     }
     return 0;
 
diff --git a/src/os/osPfsSearchFile.c b/src/os/osPfsSearchFile.c
index efd994698..b78171294 100755
--- a/src/os/osPfsSearchFile.c
+++ b/src/os/osPfsSearchFile.c
@@ -15,14 +15,14 @@ s32 osPfsFindFile(OSPfs *pfs, u16 company_code, u32 game_code, u8 *game_name, u8
         ERRCK(__osContRamRead(pfs->queue, pfs->channel, pfs->dir_table + j, (u8*)&dir));
         if ((dir.company_code == company_code) && dir.game_code == game_code)
         {
-            fail = FALSE;
+            fail = false;
             if (game_name != NULL)
             {
                 for (i = 0; i < ARRLEN(dir.game_name); i++)
                 {
                     if (dir.game_name[i] != game_name[i])
                     {
-                        fail = TRUE;
+                        fail = true;
                         break;
                     }
                 }
@@ -34,7 +34,7 @@ s32 osPfsFindFile(OSPfs *pfs, u16 company_code, u32 game_code, u8 *game_name, u8
                 {
                     if (dir.ext_name[i] != ext_name[i])
                     {
-                        fail = TRUE;
+                        fail = true;
                         break;
                     }
                 }
diff --git a/src/os/osTimer.c b/src/os/osTimer.c
index b14139a94..21d6ee19a 100644
--- a/src/os/osTimer.c
+++ b/src/os/osTimer.c
@@ -26,7 +26,7 @@ void __osTimerInterrupt(void) {
     if (__osTimerList->next == __osTimerList) {
         return;
     }
-    while (TRUE) {
+    while (true) {
         sp24 = __osTimerList->next;
         if (sp24 == __osTimerList) {
             __osSetCompare(0);
diff --git a/src/os/piint.h b/src/os/piint.h
index 39278eed9..8b2a479a2 100644
--- a/src/os/piint.h
+++ b/src/os/piint.h
@@ -3,7 +3,7 @@
 #include "PR/os_internal.h"
 #include "PR/rcp.h"
 #include "PR/os_pi.h"
-#include "PR/os.h"
+#include <libultraship.h>
 
 //https://github.com/LuigiBlood/64dd/wiki/Memory-Map
 
@@ -84,11 +84,11 @@
 #define LEO_BM_CTL_SECTOR_SHIFT 16
 
 //! @todo name
-#define LEO_CMD_TYPE_0 0 
+#define LEO_CMD_TYPE_0 0
 //! @todo name
-#define LEO_CMD_TYPE_1 1 
+#define LEO_CMD_TYPE_1 1
 //! @todo name
-#define LEO_CMD_TYPE_2 2 
+#define LEO_CMD_TYPE_2 2
 
 #define LEO_ERROR_GOOD 0
 #define LEO_ERROR_3 3