diff --git a/include/PR/os_time.h b/include/PR/os_time.h
index 31702c0bb2..d0da9b8a9b 100644
--- a/include/PR/os_time.h
+++ b/include/PR/os_time.h
@@ -18,7 +18,7 @@ typedef struct OSTimer_s {
 
 OSTime osGetTime(void);
 void osSetTime(OSTime ticks);
-s32 osSetTimer(OSTimer* t, OSTime value, OSTime interval, OSMesgQueue* mq, OSMesg msg);
+s32 osSetTimer(OSTimer* t, OSTime countdown, OSTime interval, OSMesgQueue* mq, OSMesg msg);
 s32 osStopTimer(OSTimer* t);
 
 
diff --git a/src/boot/fault.c b/src/boot/fault.c
index 84d7c164f4..0ee4faed75 100644
--- a/src/boot/fault.c
+++ b/src/boot/fault.c
@@ -55,7 +55,6 @@
 FaultMgr* sFaultInstance;
 f32 sFaultTimeTotal; // read but not set anywhere
 
-
 // data
 const char* sCpuExceptions[] = {
     "Interrupt",
diff --git a/src/libultra/flash/osFlash.c b/src/libultra/flash/osFlash.c
index 86765260ae..b8a2fdb2ba 100644
--- a/src/libultra/flash/osFlash.c
+++ b/src/libultra/flash/osFlash.c
@@ -1,6 +1,7 @@
 #include "ultra64.h"
 #include "PR/os_internal_flash.h"
 #include "alignment.h"
+#include "macros.h"
 
 u32 __osFlashID[4] ALIGNED(8);
 OSIoMesg __osFlashMsg ALIGNED(8);
diff --git a/src/libultra/gu/lookat.c b/src/libultra/gu/lookat.c
index af960eaf0e..692bb089a5 100644
--- a/src/libultra/gu/lookat.c
+++ b/src/libultra/gu/lookat.c
@@ -1,4 +1,5 @@
 #include "ultra64.h"
+#include "macros.h"
 
 void guLookAtF(f32 mf[4][4], f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp) {
     f32 length;
diff --git a/src/libultra/gu/lookathil.c b/src/libultra/gu/lookathil.c
index cae56b0cf2..ef8b443db3 100644
--- a/src/libultra/gu/lookathil.c
+++ b/src/libultra/gu/lookathil.c
@@ -1,4 +1,5 @@
 #include "ultra64.h"
+#include "macros.h"
 
 void guLookAtHiliteF(f32 mf[4][4], LookAt* l, Hilite* h, f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt,
                      f32 xUp, f32 yUp, f32 zUp, f32 xl1, f32 yl1, f32 zl1, /* light 1 direction */
diff --git a/src/libultra/io/devmgr.c b/src/libultra/io/devmgr.c
index 93947e57b5..6d14f90c95 100644
--- a/src/libultra/io/devmgr.c
+++ b/src/libultra/io/devmgr.c
@@ -49,7 +49,8 @@ void __osDevMgrMain(void* arg) {
                 __osEPiRawWriteIo(ioMesg->piHandle, LEO_BM_CTL, transfer->bmCtlShadow);
                 __osEPiRawReadIo(ioMesg->piHandle, LEO_STATUS, &status);
                 if (status & LEO_STATUS_MECHANIC_INTERRUPT) {
-                    __osEPiRawWriteIo(ioMesg->piHandle, LEO_BM_CTL, transfer->bmCtlShadow | LEO_BM_CTL_CLR_MECHANIC_INTR);
+                    __osEPiRawWriteIo(ioMesg->piHandle, LEO_BM_CTL,
+                                      transfer->bmCtlShadow | LEO_BM_CTL_CLR_MECHANIC_INTR);
                 }
                 block->errStatus = 4;
                 IO_WRITE(PI_STATUS_REG, PI_CLR_INTR);
diff --git a/src/libultra/vimodes/vimodempallan1.c b/src/libultra/vimodes/vimodempallan1.c
index 017abe066e..7e611fe9b7 100644
--- a/src/libultra/vimodes/vimodempallan1.c
+++ b/src/libultra/vimodes/vimodempallan1.c
@@ -8,14 +8,14 @@ OSViMode osViModeMpalLan1 = {
         // comRegs
         VI_CTRL_TYPE_16 | VI_CTRL_GAMMA_DITHER_ON | VI_CTRL_GAMMA_ON | VI_CTRL_DIVOT_ON | VI_CTRL_ANTIALIAS_MODE_1 |
             VI_CTRL_PIXEL_ADV_3, // ctrl
-        WIDTH(320),           // width
-        BURST(57, 30, 5, 70), // burst
-        VSYNC(525),           // vSync
-        HSYNC(3089, 4),       // hSync
-        LEAP(3097, 3098),     // leap
-        HSTART(108, 748),     // hStart
-        SCALE(2, 0),          // xScale
-        VCURRENT(0),          // vCurrent
+        WIDTH(320),              // width
+        BURST(57, 30, 5, 70),    // burst
+        VSYNC(525),              // vSync
+        HSYNC(3089, 4),          // hSync
+        LEAP(3097, 3098),        // leap
+        HSTART(108, 748),        // hStart
+        SCALE(2, 0),             // xScale
+        VCURRENT(0),             // vCurrent
     },
     { // fldRegs
       {
diff --git a/src/libultra/vimodes/vimodentschpf1.c b/src/libultra/vimodes/vimodentschpf1.c
index 434352d82e..ce7c7d8a71 100644
--- a/src/libultra/vimodes/vimodentschpf1.c
+++ b/src/libultra/vimodes/vimodentschpf1.c
@@ -8,14 +8,14 @@ OSViMode osViModeNtscHpf1 = {
         // comRegs
         VI_CTRL_TYPE_16 | VI_CTRL_GAMMA_DITHER_ON | VI_CTRL_GAMMA_ON | VI_CTRL_SERRATE_ON | VI_CTRL_ANTIALIAS_MODE_2 |
             VI_CTRL_PIXEL_ADV_3, // ctrl
-        WIDTH(640),           // width
-        BURST(57, 34, 5, 62), // 0x3E52239, // burst
-        VSYNC(524),           // vSync
-        HSYNC(3093, 0),       // hSync
-        LEAP(3093, 3093),     // leap
-        HSTART(108, 748),     // 0x6C02EC,  // hStart
-        SCALE(1, 0),          // xScale
-        VCURRENT(0),          // vCurrent
+        WIDTH(640),              // width
+        BURST(57, 34, 5, 62),    // 0x3E52239, // burst
+        VSYNC(524),              // vSync
+        HSYNC(3093, 0),          // hSync
+        LEAP(3093, 3093),        // leap
+        HSTART(108, 748),        // 0x6C02EC,  // hStart
+        SCALE(1, 0),             // xScale
+        VCURRENT(0),             // vCurrent
     },
     { // fldRegs
       {
diff --git a/src/libultra/vimodes/vimodentsclan1.c b/src/libultra/vimodes/vimodentsclan1.c
index 09e306de7f..76dd9135f9 100644
--- a/src/libultra/vimodes/vimodentsclan1.c
+++ b/src/libultra/vimodes/vimodentsclan1.c
@@ -8,14 +8,14 @@ OSViMode osViModeNtscLan1 = {
         // comRegs
         VI_CTRL_TYPE_16 | VI_CTRL_GAMMA_DITHER_ON | VI_CTRL_GAMMA_ON | VI_CTRL_DIVOT_ON | VI_CTRL_ANTIALIAS_MODE_1 |
             VI_CTRL_PIXEL_ADV_3, // ctrl
-        WIDTH(320),           // width
-        BURST(57, 34, 5, 62), // burst
-        VSYNC(525),           // vSync
-        HSYNC(3093, 0),       // hSync
-        LEAP(3093, 3093),     // leap
-        HSTART(108, 748),     // hStart
-        SCALE(2, 0),          // xScale
-        VCURRENT(0),          // vCurrent
+        WIDTH(320),              // width
+        BURST(57, 34, 5, 62),    // burst
+        VSYNC(525),              // vSync
+        HSYNC(3093, 0),          // hSync
+        LEAP(3093, 3093),        // leap
+        HSTART(108, 748),        // hStart
+        SCALE(2, 0),             // xScale
+        VCURRENT(0),             // vCurrent
     },
     { // fldRegs
       {
diff --git a/src/libultra/vimodes/vimodepallan1.c b/src/libultra/vimodes/vimodepallan1.c
index 080de0c77f..933f9c00c5 100644
--- a/src/libultra/vimodes/vimodepallan1.c
+++ b/src/libultra/vimodes/vimodepallan1.c
@@ -8,14 +8,14 @@ OSViMode osViModePalLan1 = {
         // comRegs
         VI_CTRL_TYPE_16 | VI_CTRL_GAMMA_DITHER_ON | VI_CTRL_GAMMA_ON | VI_CTRL_DIVOT_ON | VI_CTRL_ANTIALIAS_MODE_1 |
             VI_CTRL_PIXEL_ADV_3, // ctrl
-        WIDTH(320),           // width
-        BURST(58, 30, 4, 69), // burst
-        VSYNC(625),           // vSync
-        HSYNC(3177, 23),      // hSync
-        LEAP(3183, 3181),     // leap
-        HSTART(128, 768),     // hStart
-        SCALE(2, 0),          // xScale
-        VCURRENT(0),          // vCurrent
+        WIDTH(320),              // width
+        BURST(58, 30, 4, 69),    // burst
+        VSYNC(625),              // vSync
+        HSYNC(3177, 23),         // hSync
+        LEAP(3183, 3181),        // leap
+        HSTART(128, 768),        // hStart
+        SCALE(2, 0),             // xScale
+        VCURRENT(0),             // vCurrent
     },
     { // fldRegs
       {