diff --git a/src/debug/profile.c b/src/debug/profile.c
index 5496f8c..5359890 100644
--- a/src/debug/profile.c
+++ b/src/debug/profile.c
@@ -13,10 +13,10 @@
 OSTimer __osProfTimer;
 OSMesg __osProfTimerMsg;
 
-OSMesgQueue __osProfFlushMQ ALIGNED(8);
+OSMesgQueue __osProfFlushMQ ALIGNED(0x8);
 OSMesg __osProfFlushMesg;
 
-OSMesgQueue __osProfAckMQ ALIGNED(8);
+OSMesgQueue __osProfAckMQ ALIGNED(0x8);
 OSMesg __osProfAckMesg;
 
 u32 __osProfTimerPeriod;
diff --git a/src/error/commonerror.c b/src/error/commonerror.c
index 1f6364a..c44a774 100644
--- a/src/error/commonerror.c
+++ b/src/error/commonerror.c
@@ -10,7 +10,7 @@
 
 void __osSyncVPrintf(const char* fmt, va_list args);
 
-static u32 errorLogData[19] ALIGNED(8);
+static u32 errorLogData[19] ALIGNED(0x8);
 static OSLog errorLog = {
     OS_ERROR_MAGIC, // magic
     sizeof(errorLogData), // len
diff --git a/src/error/error.c b/src/error/error.c
index d939a06..ae75840 100644
--- a/src/error/error.c
+++ b/src/error/error.c
@@ -8,8 +8,8 @@
 void __osLogWrite(OSLog* log, s16 code, s16 numArgs, va_list argPtr);
 static void __osDefaultHandler(s16 code, s16 numArgs, ...);
 
-static u32 errorLogData[19] ALIGNED(8);
-static OSLog errorLog ALIGNED(8) = {
+static u32 errorLogData[19] ALIGNED(0x8);
+static OSLog errorLog ALIGNED(0x8) = {
     OS_ERROR_MAGIC, // magic
     sizeof(errorLogData), // len
     errorLogData, // base
diff --git a/src/flash/flashinit.c b/src/flash/flashinit.c
index 1842fdd..5be7cdd 100644
--- a/src/flash/flashinit.c
+++ b/src/flash/flashinit.c
@@ -2,10 +2,10 @@
 #include "PR/os_internal_flash.h"
 #include "PRinternal/macros.h"
 
-u32 __osFlashID[4] ALIGNED(8);
-OSIoMesg __osFlashMsg ALIGNED(8);
-OSMesgQueue __osFlashMessageQ ALIGNED(8);
-OSPiHandle __osFlashHandler ALIGNED(8);
+u32 __osFlashID[4] ALIGNED(0x8);
+OSIoMesg __osFlashMsg ALIGNED(0x8);
+OSMesgQueue __osFlashMessageQ ALIGNED(0x8);
+OSPiHandle __osFlashHandler ALIGNED(0x8);
 OSMesg __osFlashMsgBuf[1];
 s32 __osFlashVersion;
 
diff --git a/src/gt/dumpturbo.c b/src/gt/dumpturbo.c
index 5f921aa..91da2b7 100644
--- a/src/gt/dumpturbo.c
+++ b/src/gt/dumpturbo.c
@@ -29,7 +29,7 @@
 
 
 #define TX_MAX		100
-static u32	textures[TX_MAX] ALIGNED(8);
+static u32	textures[TX_MAX] ALIGNED(0x8);
 static u32	numtextures;
 
 #define UNSEG_ADDR(sa)	((u32 *) (((globp)?				   \
diff --git a/src/gu/loadtextureblockmipmap.c b/src/gu/loadtextureblockmipmap.c
index 5b72dec..3381c72 100644
--- a/src/gu/loadtextureblockmipmap.c
+++ b/src/gu/loadtextureblockmipmap.c
@@ -44,7 +44,7 @@ struct Tile
 };
 
 /* tram mipmaps */
-static struct Tile mipmap[MM_MAX_LEVEL+1] ALIGNED(8);
+static struct Tile mipmap[MM_MAX_LEVEL+1] ALIGNED(0x8);
 static struct texelSizeParams sizeParams[4] =
 					{ 16, 3, 1, 0,
 					   8, 2, 2, 1,
diff --git a/src/host/host_ptn64.c b/src/host/host_ptn64.c
index b555b93..bdd092f 100644
--- a/src/host/host_ptn64.c
+++ b/src/host/host_ptn64.c
@@ -12,7 +12,7 @@ static volatile unsigned int* ptstat = (unsigned*)0xbff08004;
 static volatile unsigned int* ptport = (unsigned*)0xbff08000;
 static volatile unsigned int* n64piok = (unsigned*)PHYS_TO_K1(PI_STATUS_REG);
 
-static OSMesgQueue waitPtQueue ALIGNED(8);
+static OSMesgQueue waitPtQueue ALIGNED(0x8);
 static OSMesg waitPtQueueBuf;
 static u32 isWaitPtQueueCreated = FALSE;
 
diff --git a/src/host/readhost.c b/src/host/readhost.c
index 6f28f73..9bc8d8a 100644
--- a/src/host/readhost.c
+++ b/src/host/readhost.c
@@ -6,7 +6,7 @@
 #include "PRinternal/macros.h"
 
 static int readHostInitialized = FALSE;
-static OSMesgQueue readHostMesgQueue ALIGNED(8);
+static OSMesgQueue readHostMesgQueue ALIGNED(0x8);
 static OSMesg readHostMesgBuf[1];
 
 u32 __osRdb_Read_Data_Buf;
diff --git a/src/host/writehost.c b/src/host/writehost.c
index 2dcbf94..1d1baf4 100644
--- a/src/host/writehost.c
+++ b/src/host/writehost.c
@@ -7,7 +7,7 @@
 #include "PRinternal/macros.h"
 
 static int writeHostInitialized = FALSE;
-static OSMesgQueue writeHostMesgQueue ALIGNED(8);
+static OSMesgQueue writeHostMesgQueue ALIGNED(0x8);
 static OSMesg writeHostMesgBuf[1];
 
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
diff --git a/src/io/cartrominit.c b/src/io/cartrominit.c
index b20d612..7f2eb11 100644
--- a/src/io/cartrominit.c
+++ b/src/io/cartrominit.c
@@ -6,7 +6,7 @@
 #include "PRinternal/piint.h"
 
 #if BUILD_VERSION >= VERSION_J
-OSPiHandle __CartRomHandle ALIGNED(8);
+OSPiHandle __CartRomHandle ALIGNED(0x8);
 OSPiHandle* osCartRomInit(void) {
     u32 value = 0;
     u32 saveMask;
@@ -65,7 +65,7 @@ OSPiHandle* osCartRomInit(void) {
 }
 #else
 
-OSPiHandle CartRomHandle ALIGNED(8);
+OSPiHandle CartRomHandle ALIGNED(0x8);
 OSPiHandle* osCartRomInit(void) {
     u32 domain = 0;
     u32 saveMask;
diff --git a/src/io/contpfs.c b/src/io/contpfs.c
index 67d6324..8574de1 100644
--- a/src/io/contpfs.c
+++ b/src/io/contpfs.c
@@ -5,7 +5,7 @@
 #include "PR/rmon.h"
 
 #if BUILD_VERSION >= VERSION_J
-__OSInode __osPfsInodeCache ALIGNED(8);
+__OSInode __osPfsInodeCache ALIGNED(0x8);
 s32 __osPfsInodeCacheChannel = -1;
 u8 __osPfsInodeCacheBank = 250;
 #endif
diff --git a/src/io/controller.c b/src/io/controller.c
index 05a29e4..fd87b16 100644
--- a/src/io/controller.c
+++ b/src/io/controller.c
@@ -8,7 +8,7 @@ u8 __osContLastCmd;
 u8 __osMaxControllers;
 
 OSTimer __osEepromTimer;
-OSMesgQueue __osEepromTimerQ ALIGNED(8);
+OSMesgQueue __osEepromTimerQ ALIGNED(0x8);
 OSMesg __osEepromTimerMsg;
 
 s32 __osContinitialized = FALSE;
diff --git a/src/io/driverominit.c b/src/io/driverominit.c
index 9ff6461..d3e1bcf 100644
--- a/src/io/driverominit.c
+++ b/src/io/driverominit.c
@@ -2,7 +2,7 @@
 #include "PR/rcp.h"
 #include "PRinternal/macros.h"
 
-OSPiHandle DriveRomHandle ALIGNED(8);
+OSPiHandle DriveRomHandle ALIGNED(0x8);
 
 OSPiHandle *osDriveRomInit(void) {
     u32 saveMask;
diff --git a/src/io/gbpakinit.c b/src/io/gbpakinit.c
index c9c12ff..e101c1e 100644
--- a/src/io/gbpakinit.c
+++ b/src/io/gbpakinit.c
@@ -4,7 +4,7 @@
 #include "PRinternal/controller_gbpak.h"
 
 OSTimer __osGbpakTimer;
-OSMesgQueue __osGbpakTimerQ ALIGNED(8);
+OSMesgQueue __osGbpakTimerQ ALIGNED(0x8);
 OSMesg __osGbpakTimerMsg;
 
 s32 osGbpakInit(OSMesgQueue* mq, OSPfs* pfs, int channel) {
diff --git a/src/io/leodiskinit.c b/src/io/leodiskinit.c
index 408e258..cd74e77 100644
--- a/src/io/leodiskinit.c
+++ b/src/io/leodiskinit.c
@@ -4,7 +4,7 @@
 #include "PR/rcp.h"
 #include "PRinternal/macros.h"
 
-OSPiHandle LeoDiskHandle ALIGNED(8);
+OSPiHandle LeoDiskHandle ALIGNED(0x8);
 OSPiHandle *__osDiskHandle;
 
 OSPiHandle *osLeoDiskInit(void) {
diff --git a/src/io/motor.c b/src/io/motor.c
index aa108b0..b859aaf 100644
--- a/src/io/motor.c
+++ b/src/io/motor.c
@@ -134,10 +134,10 @@ s32 osMotorInit(OSMesgQueue* mq, OSPfs* pfs, int channel) {
 
 #else
 
-OSPifRam _MotorStopData[MAXCONTROLLERS] ALIGNED(8);
-OSPifRam _MotorStartData[MAXCONTROLLERS] ALIGNED(8);
-u8 _motorstopbuf[32] ALIGNED(8);
-u8 _motorstartbuf[32] ALIGNED(8);
+OSPifRam _MotorStopData[MAXCONTROLLERS] ALIGNED(0x8);
+OSPifRam _MotorStartData[MAXCONTROLLERS] ALIGNED(0x8);
+u8 _motorstopbuf[32] ALIGNED(0x8);
+u8 _motorstartbuf[32] ALIGNED(0x8);
 u32 __osMotorinitialized[MAXCONTROLLERS] = {0, 0, 0, 0};
 
 s32 osMotorStop(OSPfs *pfs) {
diff --git a/src/io/piacs.c b/src/io/piacs.c
index 496b3d9..78974dd 100644
--- a/src/io/piacs.c
+++ b/src/io/piacs.c
@@ -4,7 +4,7 @@
 #define PI_Q_BUF_LEN 1
 u32 __osPiAccessQueueEnabled = 0;
 static OSMesg piAccessBuf[PI_Q_BUF_LEN];
-OSMesgQueue __osPiAccessQueue ALIGNED(8);
+OSMesgQueue __osPiAccessQueue ALIGNED(0x8);
 
 void __osPiCreateAccessQueue(void) {
     __osPiAccessQueueEnabled = 1;
diff --git a/src/io/pimgr.c b/src/io/pimgr.c
index 2a64a28..1babb10 100644
--- a/src/io/pimgr.c
+++ b/src/io/pimgr.c
@@ -4,32 +4,32 @@
 #include "PRinternal/piint.h"
 #include "PR/rdb.h"
 
-static OSThread piThread ALIGNED(8);
+static OSThread piThread ALIGNED(0x8);
 static STACK(piThreadStack, OS_PIM_STACKSIZE) ALIGNED(0x10);
 
 #ifndef _FINALROM
-static OSThread ramromThread ALIGNED(8);
+static OSThread ramromThread ALIGNED(0x8);
 static STACK(ramromThreadStack, 0x400) ALIGNED(0x10);
-static OSMesgQueue getRamromQ ALIGNED(8);
+static OSMesgQueue getRamromQ ALIGNED(0x8);
 static OSMesg getRamromBuf[1];
-static OSMesgQueue freeRamromQ ALIGNED(8);
+static OSMesgQueue freeRamromQ ALIGNED(0x8);
 static OSMesg freeRamromBuf[1];
 static void ramromMain(void*);
 #endif
 
-static OSMesgQueue piEventQueue ALIGNED(8);
+static OSMesgQueue piEventQueue ALIGNED(0x8);
 static OSMesg piEventBuf[1];
 
 OSDevMgr __osPiDevMgr = { 0 };
 OSPiHandle* __osPiTable = NULL;
 #if BUILD_VERSION >= VERSION_J
-OSPiHandle __Dom1SpeedParam ALIGNED(8);
-OSPiHandle __Dom2SpeedParam ALIGNED(8);
-OSPiHandle* __osCurrentHandle[2] ALIGNED(8) = { &__Dom1SpeedParam, &__Dom2SpeedParam };
+OSPiHandle __Dom1SpeedParam ALIGNED(0x8);
+OSPiHandle __Dom2SpeedParam ALIGNED(0x8);
+OSPiHandle* __osCurrentHandle[2] ALIGNED(0x8) = { &__Dom1SpeedParam, &__Dom2SpeedParam };
 #else
 extern OSPiHandle CartRomHandle;
 extern OSPiHandle LeoDiskHandle;
-OSPiHandle* __osCurrentHandle[2] ALIGNED(8) = { &CartRomHandle, &LeoDiskHandle };
+OSPiHandle* __osCurrentHandle[2] ALIGNED(0x8) = { &CartRomHandle, &LeoDiskHandle };
 #endif
 
 void osCreatePiManager(OSPri pri, OSMesgQueue* cmdQ, OSMesg* cmdBuf, s32 cmdMsgCnt) {
diff --git a/src/io/siacs.c b/src/io/siacs.c
index a377597..7ff12f1 100644
--- a/src/io/siacs.c
+++ b/src/io/siacs.c
@@ -2,8 +2,8 @@
 #include "PR/os_internal.h"
 
 #define SI_Q_BUF_LEN 1
-static OSMesg siAccessBuf[SI_Q_BUF_LEN] ALIGNED(8);
-OSMesgQueue __osSiAccessQueue ALIGNED(8);
+static OSMesg siAccessBuf[SI_Q_BUF_LEN] ALIGNED(0x8);
+OSMesgQueue __osSiAccessQueue ALIGNED(0x8);
 u32 __osSiAccessQueueEnabled = 0;
 
 void __osSiCreateAccessQueue(void) {
diff --git a/src/io/vi.c b/src/io/vi.c
index b5d5dbe..7023b70 100644
--- a/src/io/vi.c
+++ b/src/io/vi.c
@@ -7,7 +7,7 @@
 // TODO: this comes from a header
 #ident "$Revision: 1.17 $"
 
-static __OSViContext vi[2] ALIGNED(8) = { 0 };
+static __OSViContext vi[2] ALIGNED(0x8) = { 0 };
 __OSViContext* __osViCurr = &vi[0];
 __OSViContext* __osViNext = &vi[1];
 
diff --git a/src/io/vimgr.c b/src/io/vimgr.c
index 2de2486..f05859c 100644
--- a/src/io/vimgr.c
+++ b/src/io/vimgr.c
@@ -11,10 +11,10 @@ u32 __additional_scanline = 0;
 #endif
 static OSThread viThread;
 static STACK(viThreadStack, OS_VIM_STACKSIZE) ALIGNED(0x10);
-static OSMesgQueue viEventQueue ALIGNED(8);
-static OSMesg viEventBuf[5] ALIGNED(8);
-static OSIoMesg viRetraceMsg ALIGNED(8);
-static OSIoMesg viCounterMsg ALIGNED(8);
+static OSMesgQueue viEventQueue ALIGNED(0x8);
+static OSMesg viEventBuf[5] ALIGNED(0x8);
+static OSIoMesg viRetraceMsg ALIGNED(0x8);
+static OSIoMesg viCounterMsg ALIGNED(0x8);
 
 static void viMgrMain(void* arg);
 void osCreateViManager(OSPri pri) {
diff --git a/src/log/log.c b/src/log/log.c
index 7aa6a1c..1519c3b 100644
--- a/src/log/log.c
+++ b/src/log/log.c
@@ -11,7 +11,7 @@
 static u32 __osLogOKtoWrite = TRUE;
 static u32 __osLogInitialized = FALSE;
 
-static OSMesgQueue __osLogDoneMsgQ ALIGNED(8);
+static OSMesgQueue __osLogDoneMsgQ ALIGNED(0x8);
 static OSMesg __osLogMsgBuf;
 
 void __osLogWrite(OSLog* log, s16 code, s16 numArgs, va_list argPtr);
diff --git a/src/os/initialize_isv.c b/src/os/initialize_isv.c
index b8c9de8..035511a 100644
--- a/src/os/initialize_isv.c
+++ b/src/os/initialize_isv.c
@@ -27,7 +27,7 @@ void MonitorInitBreak(void);
 
 #define IS64_MAGIC 'IS64'
 
-__osExceptionVector ramOldVector ALIGNED(8);
+__osExceptionVector ramOldVector ALIGNED(0x8);
 u32 gISVFlag;
 u16 gISVChk;
 u32 gISVDbgPrnAdrs;
diff --git a/src/os/seteventmesg.c b/src/os/seteventmesg.c
index 41fb5f4..aa5f669 100644
--- a/src/os/seteventmesg.c
+++ b/src/os/seteventmesg.c
@@ -3,7 +3,7 @@
 #include "PR/ultraerror.h"
 #include "PRinternal/osint.h"
 
-__OSEventState __osEventStateTab[OS_NUM_EVENTS] ALIGNED(8);
+__OSEventState __osEventStateTab[OS_NUM_EVENTS] ALIGNED(0x8);
 #if BUILD_VERSION >= VERSION_J
 u32 __osPreNMI = FALSE;
 #endif
diff --git a/src/os/timerintr.c b/src/os/timerintr.c
index 0a64f7d..fe92602 100644
--- a/src/os/timerintr.c
+++ b/src/os/timerintr.c
@@ -10,7 +10,7 @@ OSTimer __osBaseTimer;
 OSTimer* __osTimerList = &__osBaseTimer;
 
 #ifndef _FINALROM
-OSMesgQueue __osProfTimerQ ALIGNED(8);
+OSMesgQueue __osProfTimerQ ALIGNED(0x8);
 OSProf* __osProfileList;
 OSProf* __osProfileListEnd;
 u32 __osProfileOverflowBin;
diff --git a/src/rmon/rmonbrk.c b/src/rmon/rmonbrk.c
index 3bd50bb..0fe4ba2 100644
--- a/src/rmon/rmonbrk.c
+++ b/src/rmon/rmonbrk.c
@@ -35,11 +35,11 @@ typedef struct {
 } BREAKINFO;
 
 /* first breakpoint is reserved for implementing single-stepping */
-static BREAKINFO breakpoints[NUM_BREAKPOINTS] ALIGNED(8);
+static BREAKINFO breakpoints[NUM_BREAKPOINTS] ALIGNED(0x8);
 /* breakpoint for alternate branch target */
 static BREAKINFO altBreak;
 
-static BREAKINFO RCPbreakpoints[NUM_BREAKPOINTS] ALIGNED(8);
+static BREAKINFO RCPbreakpoints[NUM_BREAKPOINTS] ALIGNED(0x8);
 
 u8 __rmonRcpAtBreak;
 
diff --git a/src/rmon/rmonmem.c b/src/rmon/rmonmem.c
index 443891c..3fe11c9 100644
--- a/src/rmon/rmonmem.c
+++ b/src/rmon/rmonmem.c
@@ -24,7 +24,7 @@
 #ident "$Revision: 1.4 $"
 #endif
 
-u8 __rmonUtilityBuffer[256] ALIGNED(8);
+u8 __rmonUtilityBuffer[256] ALIGNED(0x8);
 
 void __rmonWriteWordTo(u32* addr, u32 val) {
     while (__osSpRawWriteIo((u32)addr, val) != 0) {
diff --git a/src/rmon/rmonmisc.c b/src/rmon/rmonmisc.c
index b0691ab..4528cf3 100644
--- a/src/rmon/rmonmisc.c
+++ b/src/rmon/rmonmisc.c
@@ -32,12 +32,12 @@ int __rmonSetFault(KKHeader* req) {
     return TV_ERROR_NO_ERROR;
 }
 
-OSMesgQueue __rmonMQ ALIGNED(8);
-static OSThread rmonIOThread ALIGNED(8);
-static OSMesg rmonMsgs[8] ALIGNED(8);
+OSMesgQueue __rmonMQ ALIGNED(0x8);
+static OSThread rmonIOThread ALIGNED(0x8);
+static OSMesg rmonMsgs[8] ALIGNED(0x8);
 static STACK(rmonIOStack, 0x4000) ALIGNED(0x10);
-static OSMesg rmonPiMsgs[8] ALIGNED(8);
-static OSMesgQueue rmonPiMQ ALIGNED(8);
+static OSMesg rmonPiMsgs[8] ALIGNED(0x8);
+static OSMesgQueue rmonPiMQ ALIGNED(0x8);
 
 void __rmonInit(void) {
     osCreateMesgQueue(&__rmonMQ, rmonMsgs, ARRLEN(rmonMsgs));
diff --git a/src/rmon/rmonregs.c b/src/rmon/rmonregs.c
index 1dd9c68..7c56413 100644
--- a/src/rmon/rmonregs.c
+++ b/src/rmon/rmonregs.c
@@ -34,7 +34,7 @@
 
 static u32 RCPpc;
 static u32 oldIMEMvalue;
-static u32 DMEMbuffer[4] ALIGNED(8);
+static u32 DMEMbuffer[4] ALIGNED(0x8);
 
 typedef union {
     u32 everything;
diff --git a/src/rmon/rmonsio.c b/src/rmon/rmonsio.c
index 122ad9b..8b7c3fb 100644
--- a/src/rmon/rmonsio.c
+++ b/src/rmon/rmonsio.c
@@ -27,7 +27,7 @@
 #ident "$Revision: 1.4 $"
 #endif
 
-static OSMesgQueue IOmq ALIGNED(8);
+static OSMesgQueue IOmq ALIGNED(0x8);
 static OSMesg IOmsgs;
 
 void* __osRdb_DbgRead_Buf;