diff --git a/include/PR/os_pi.h b/include/PR/os_pi.h
index 0c7459784..eca4eae88 100644
--- a/include/PR/os_pi.h
+++ b/include/PR/os_pi.h
@@ -37,7 +37,7 @@ extern "C" {
 #include <PR/ultratypes.h>
 #include "os_thread.h"
 #include "os_message.h"
-
+#include <stdint.h>
 
 #if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS)
 
@@ -198,7 +198,7 @@ extern u32 		osPiGetStatus(void);
 extern s32		osPiGetDeviceType(void);
 extern s32		osPiWriteIo(u32, u32);
 extern s32		osPiReadIo(u32, u32 *);
-extern s32		osPiStartDma(OSIoMesg *, s32, s32, u32, void *, u32,
+extern s32		osPiStartDma(OSIoMesg *, s32, s32, uintptr_t, void *, u32,
 				     OSMesgQueue *);
 extern void		osCreatePiManager(OSPri, OSMesgQueue *, OSMesg *, s32);
 
diff --git a/port/include/preprocess.h b/port/include/preprocess.h
index 36b19d9f5..6c0fd609b 100644
--- a/port/include/preprocess.h
+++ b/port/include/preprocess.h
@@ -14,13 +14,14 @@ void preprocessALCMidiHdr(u8 *data, u32 size);
 u8* preprocessSequences(u8 *data, u32 size, u32 *outSize);
 u8* preprocessTexturesList(u8 *data, u32 size, u32 *outSize);
 
-void preprocessBgSection1(u8* data, u32 size);
+void preprocessBgSection1(u8* data, u32 size, u32 ofs);
 void preprocessBgSection2(u8 *data, u32 size);
 void preprocessBgSection3(u8* data, u32 size);
 void preprocessBgSection1Header(u8 *data, u32 size);
 void preprocessBgSection2Header(u8 *data, u32 size);
 void preprocessBgSection3Header(u8 *data, u32 size);
 void preprocessBgLights(u8 *data, u32 ofs);
+u32 preprocessBgRoom(u8* data, u32 size, u32 room_ofs);
 
 u8 *preprocessLangFile(u8 *data, u32 size, u32 *outSize);
 u8 *preprocessPadsFile(u8 *data, u32 size, u32 *outSize);
diff --git a/port/src/preprocess/filebg.c b/port/src/preprocess/filebg.c
index b592e1e18..33dc5f156 100644
--- a/port/src/preprocess/filebg.c
+++ b/port/src/preprocess/filebg.c
@@ -515,7 +515,7 @@ static u32 convertSection1(u8 *dst, u8 *src, u32 ofs)
 	return dstpos;
 }
 
-static void convert_section2_texturenums(u8 *dst, u32 *dstpos, u8 *src, u32 *srcpos, u32 srclen)
+static void convertSection2TextureNums(u8 *dst, u32 *dstpos, u8 *src, u32 *srcpos, u32 srclen)
 {
 	u16 *src_ids = (u16 *) &src[*srcpos];
 	u16 *dst_ids = (u16 *) &dst[*dstpos];
@@ -529,7 +529,7 @@ static void convert_section2_texturenums(u8 *dst, u32 *dstpos, u8 *src, u32 *src
 	*dstpos += srclen;
 }
 
-static void convert_section3_bboxes(u8 *dst, u32 *dstpos, u8 *src, u32 *srcpos)
+static void convertSection3Bboxes(u8 *dst, u32 *dstpos, u8 *src, u32 *srcpos)
 {
 	s16 *src_bboxes = (s16 *) &src[*srcpos];
 	s16 *dst_bboxes = (s16 *) &dst[*dstpos];
@@ -547,26 +547,6 @@ static void convert_section3_bboxes(u8 *dst, u32 *dstpos, u8 *src, u32 *srcpos)
 	*dstpos += sizeof(s16) * 6 * (m_NumRooms - 1);
 }
 
-static void convert_section3_allocsizes(u8 *dst, u32 *dstpos, u8 *src, u32 *srcpos)
-{
-	u16 *dst_sizes = (u16 *) &dst[*dstpos];
-
-	for (int i = 0; i < m_NumRooms; i++) {
-		dst_sizes[i] = (m_AllocSizes[i] - 0x100) / 0x10;
-	}
-
-	*srcpos += sizeof(u16) * (m_NumRooms - 1);
-	*dstpos += sizeof(u16) * (m_NumRooms - 1);
-}
-
-static void convert_section3_lightcounts(u8 *dst, u32 *dstpos, u8 *src, u32 *srcpos)
-{
-	memcpy(&dst[*dstpos], &src[*srcpos], m_NumRooms);
-
-	*srcpos += (m_NumRooms - 1);
-	*dstpos += (m_NumRooms - 1);
-}
-
 void preprocessBgSection1(u8 *data, u32 size, u32 ofs)
 {
 	u8 *dst = sysMemZeroAlloc(size);
diff --git a/src/lib/ultra/io/pidma.c b/src/lib/ultra/io/pidma.c
index 75d758d1b..1fc7b61d7 100644
--- a/src/lib/ultra/io/pidma.c
+++ b/src/lib/ultra/io/pidma.c
@@ -1,7 +1,7 @@
 #include <os_internal.h>
 #include "piint.h"
 
-s32 osPiStartDma(OSIoMesg *mb, s32 priority, s32 direction, u32 devAddr, void *dramAddr, u32 size, OSMesgQueue *mq)
+s32 osPiStartDma(OSIoMesg *mb, s32 priority, s32 direction, uintptr_t devAddr, void *dramAddr, u32 size, OSMesgQueue *mq)
 {
 	register s32 ret;