diff --git a/include/PR/bbfs.h b/include/PR/bbfs.h
index b470326b..b8e9f657 100644
--- a/include/PR/bbfs.h
+++ b/include/PR/bbfs.h
@@ -7,19 +7,6 @@
 #define BB_INODE16_NAMELEN	11	/* maximum name length */
 #define BB_INODE16_NUM      409
 
-#define BBFS_ERR_NO_CARD    (-1)    /* card not present */
-#define BBFS_ERR_FAIL       (-2)    /* operation failed */
-#define BBFS_ERR_INVALID    (-3)    /* invalid parameters */
-#define BBFS_ERR_CHANGED    (-4)    /* card changed */
-#define BBFS_ERR_UNINIT     (-5)    /* fs uninitialized */
-#define BBFS_ERR_EXISTS     (-6)    /* file exists */
-#define BBFS_ERR_SPACE      (-7)    /* no space */
-#define BBFS_ERR_ENTRY      (-8)    /* no entry */
-
-/* Used for saving auxilliary game state data */
-#define BBFS_ERR_STATE          (-9)   /* invalid state */
-#define BBFS_ERR_STATE_LIMIT   (-10)   /* state limit reached */
-
 typedef u16 BbFatEntry;
 
 typedef struct {
diff --git a/include/PR/bbfs_export.h b/include/PR/bbfs_export.h
new file mode 100644
index 00000000..ec95b784
--- /dev/null
+++ b/include/PR/bbfs_export.h
@@ -0,0 +1,14 @@
+/*---------------------------------------------------------------------*
+        Copyright (C) 2002 - 2004 BroadOn Communications.
+ *---------------------------------------------------------------------*/
+
+#ifndef __bb_fs_h__
+#define __bb_fs_h__
+
+#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS)
+
+#define BB_FL_BLOCK_SIZE	16384
+#define BB_INODE16_NAMELEN	11	/* maximum name length */
+
+#endif
+#endif
diff --git a/include/PR/bbskapi_export.h b/include/PR/bbskapi_export.h
new file mode 100644
index 00000000..5afb622f
--- /dev/null
+++ b/include/PR/bbskapi_export.h
@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------*
+        Copyright (C) 2002 - 2004 BroadOn Communications.
+ *---------------------------------------------------------------------*/
+
+#ifndef __BB_SK_API_HDR__
+#define __BB_SK_API_HDR__
+
+#if defined(_LANGUAGE_C)
+    
+typedef u32  BbId;                 /* 32-bit Player identity */
+typedef u32  BbContentId;          /* 32-bit content identity */
+
+/* get the bbid */
+int skGetId(BbId *id);
+extern int skExit(void);
+
+#endif /* _LANGUAGE_C */
+
+#endif
diff --git a/include/PR/os_bb.h b/include/PR/os_bb.h
new file mode 100644
index 00000000..e69de29b
diff --git a/include/PR/os_bb_export.h b/include/PR/os_bb_export.h
new file mode 100644
index 00000000..49eae36b
--- /dev/null
+++ b/include/PR/os_bb_export.h
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------*
+        Copyright (C) 2002 - 2004 BroadOn Communications.
+ *---------------------------------------------------------------------*/
+
+#ifndef _OS_BB_H_
+#define	_OS_BB_H_
+
+#ifdef _LANGUAGE_C_PLUS_PLUS
+extern "C" {
+#endif
+
+#include <PR/ultratypes.h>
+
+#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS)
+
+/**************************************************************************
+ *
+ * Function prototypes
+ *
+ */
+extern void osBbRtcGet(u8* year, u8* month, u8* day, u8* dow, u8* hour, u8* min,
+	               u8* sec);
+
+#endif  /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */
+
+#ifdef _LANGUAGE_C_PLUS_PLUS
+}
+#endif
+
+#endif /* !_OS_BB_H_ */
diff --git a/include/PR/os_bbcard.h b/include/PR/os_bbcard.h
index 3911aa6b..6e85364d 100644
--- a/include/PR/os_bbcard.h
+++ b/include/PR/os_bbcard.h
@@ -1,8 +1,62 @@
 #ifndef _os_bb_card_h_
 #define _os_bb_card_h_
 
+#ifdef _LANGUAGE_C_PLUS_PLUS
+extern "C" {
+#endif
+
 #include <PR/ultratypes.h>
 
+#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS)
+
+/**************************************************************************
+ *
+ * Type definitions
+ *
+ */
+
+
+#endif /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */
+
+/**************************************************************************
+ *
+ * Global definitions
+ *
+ */
+
+
+#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS)
+
+/**************************************************************************
+ *
+ * Macro definitions
+ *
+ */
+
+#define BBCARD_ERR_NO_CARD	(-1)	/* no card present */
+#define BBCARD_ERR_FAIL		(-2)	/* operation failed */
+#define BBCARD_ERR_INVALID	(-3)	/* invalid parameters */
+#define BBCARD_ERR_CHANGED	(-4)	/* card changed */
+
+/**************************************************************************
+ *
+ * Extern variables
+ *
+ */
+
+
+/**************************************************************************
+ *
+ * Function prototypes
+ *
+ */
+
+extern void osBbCardInit(void);
+extern s32  osBbCardProbe(u32 dev);
+extern s32  osBbCardUnhappy(void);
+extern u32  osBbCardBlocks(u32 dev);
+extern s32  osBbCardStatus(u32 dev, u8 *status);
+extern s32  osBbCardReadId(u32 dev, u32 *mfg, u32* type);
 extern s32  osBbCardEraseBlock(u32 dev, u16 block);
 extern s32  osBbCardEraseBlocks(u32 dev, const u16 block[], u32 n);
 extern s32  osBbCardReadBlock(u32 dev, u16 block, void* addr, void* spare);
@@ -11,4 +65,8 @@ extern s32  osBbCardWriteBlock(u32 dev, u16 block, const void* addr,
 extern s32  osBbCardWriteBlocks(u32 dev, const u16 block[], u32 n,
 	                        const void* addr, const void* spare);
 
+#endif  /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */
+#ifdef _LANGUAGE_C_PLUS_PLUS
+}
+#endif
 #endif
diff --git a/include/PR/os_bbexec.h b/include/PR/os_bbexec.h
new file mode 100644
index 00000000..e69de29b
diff --git a/include/PR/os_bbexec_export.h b/include/PR/os_bbexec_export.h
new file mode 100644
index 00000000..bc0fed79
--- /dev/null
+++ b/include/PR/os_bbexec_export.h
@@ -0,0 +1,26 @@
+#ifndef __os_bb_exec_h__
+#define __os_bb_exec_h__
+
+#ifdef _LANGUAGE_C_PLUS_PLUS
+extern "C" {
+#endif
+
+#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS)
+
+#define BB_MAX_AUXDATA               16
+
+extern s32 osBbGameCommitState();
+extern s32 osBbAuxDataInit(void* buf, u32 len);
+extern s32 osBbAuxDataSave(u8 id, const void* buf, u32 len);
+extern s32 osBbAuxDataLoad(u8 id, void* buf, u32 len);
+extern s32 osBbAuxDataDelete(u8 id);
+extern s32 osBbAuxDataSize(u8 id);
+extern s32 osBbAuxDataIds(u8 ids[BB_MAX_AUXDATA]);
+
+#endif  /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */
+
+#ifdef _LANGUAGE_C_PLUS_PLUS
+}
+#endif
+
+#endif  /* __os_bb_exec_h__ */
diff --git a/include/PR/os_bbfs.h b/include/PR/os_bbfs.h
new file mode 100644
index 00000000..e69de29b
diff --git a/include/PR/os_bbfs_export.h b/include/PR/os_bbfs_export.h
new file mode 100644
index 00000000..1b7f22af
--- /dev/null
+++ b/include/PR/os_bbfs_export.h
@@ -0,0 +1,41 @@
+#ifndef __os_bb_fs_h__
+#define __os_bb_fs_h__
+
+#ifdef _LANGUAGE_C_PLUS_PLUS
+extern "C" {
+#endif
+
+/**************************************************************************
+ *
+ * Global definitions
+ *
+ */
+
+
+#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS)
+
+/**************************************************************************
+ *
+ * Macro definitions
+ *
+ */
+
+#define BBFS_ERR_NO_CARD	(-1)	/* card not present */
+#define BBFS_ERR_FAIL		(-2)	/* operation failed */
+#define BBFS_ERR_INVALID	(-3)	/* invalid parameters */
+#define BBFS_ERR_CHANGED	(-4)    /* card changed */
+#define BBFS_ERR_UNINIT		(-5)	/* fs uninitialized */
+#define BBFS_ERR_EXISTS		(-6)	/* file exists */
+#define BBFS_ERR_SPACE		(-7)	/* no space */
+#define BBFS_ERR_ENTRY		(-8)	/* no entry */
+
+/* Used for saving auxilliary game state data */
+#define BBFS_ERR_STATE          (-9)   /* invalid state */
+#define BBFS_ERR_STATE_LIMIT   (-10)   /* state limit reached */
+
+#endif
+
+#ifdef _LANGUAGE_C_PLUS_PLUS
+}
+#endif
+#endif /*__os_bb_fs_h__*/
diff --git a/include/PR/os_usb.h b/include/PR/os_usb.h
new file mode 100644
index 00000000..f2961844
--- /dev/null
+++ b/include/PR/os_usb.h
@@ -0,0 +1,172 @@
+/*====================================================================
+ * os_usb.h
+ *
+ * Copyright 2003, BroadOn Communications Corp.
+ * All Rights Reserved.
+ *
+ * This is UNPUBLISHED PROPRIETARY SOURCE CODE of BroadOn Communications
+ * Corp.; the contents of this file may not be disclosed to third
+ * parties, copied or duplicated in any form, in whole or in part,
+ * without the prior written permission of BroadOn Communications.
+ *
+ * RESTRICTED RIGHTS LEGEND:
+ * Use, duplication or disclosure by the Government is subject to
+ * restrictions as set forth in subdivision (c)(1)(ii) of the Rights
+ * in Technical Data and Computer Software clause at DFARS
+ * 252.227-7013, and/or in similar or successor clauses in the FAR,
+ * DOD or NASA FAR Supplement. Unpublished - rights reserved under the
+ * Copyright Laws of the United States.
+ *====================================================================*/
+
+/*---------------------------------------------------------------------*
+        Copyright (C) 2003 BroadOn Communications Corp
+        
+        $RCSfile: os_usb.h,v $
+        $Revision: 1.12 $
+        $Date: 2004/09/03 03:52:47 $
+ *---------------------------------------------------------------------*/
+
+#ifndef _OS_USB_H_
+#define	_OS_USB_H_
+
+#ifdef _LANGUAGE_C_PLUS_PLUS
+extern "C" {
+#endif
+
+#include <PR/ultratypes.h>
+
+#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS)
+
+/**************************************************************************
+ *
+ * Type definitions
+ *
+ */
+
+/*
+ * Structure to describe USB device
+ */
+typedef struct OSBbUsbInfo_s {
+	u8      ua_type;        /* controller mode (host or device) */
+	u8      ua_class;       /* device class */
+	u8      ua_subclass;    /* subclass */
+	u8      ua_protocol;    /* protocol */
+	u16     ua_vendor;      /* vendor */
+	u16     ua_product;     /* product */
+	u8      ua_cfg;         /* configuration */
+	u8      ua_ifc;         /* interface */
+	u8      ua_ep;          /* endpoint */
+	u8      ua_speed;       /* LS/FS/HS */
+	u8      ua_mode;        /* R, W or R/W */
+	u8      ua_blksize;     /* block size */
+	u8      ua_support;     /* have driver */
+	u8	ua_state;       /* device state (attached?) */
+	u8	*ua_mfr_str;	/* manufacturer string */
+	u8	*ua_prod_str;	/* product description string */
+	u8	*ua_driver_name; /* driver name */
+} OSBbUsbInfo;
+
+/*
+ * Handle for USB device
+ */
+typedef void *OSBbUsbHandle;
+
+#endif /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */
+
+/**************************************************************************
+ *
+ * Global definitions
+ *
+ */
+
+/*
+ * USB Controller Modes
+ */
+#define OS_USB_TYPE_DISABLED	0
+#define OS_USB_TYPE_HOST	1
+#define OS_USB_TYPE_DEVICE	2
+#define OS_USB_TYPE_EITHER	(OS_USB_TYPE_HOST|OS_USB_HOST_DEVICE)
+
+/*
+ * USB Device States
+ */
+#define OS_USB_STATE_NULL	0
+#define OS_USB_STATE_ATTACHED	1
+
+/*
+ * USB Device Classes
+ */
+#define OS_USB_DEV_GENERIC	0
+#define OS_USB_DEV_SERIAL	1
+#define OS_USB_DEV_MODEM	2
+#define OS_USB_DEV_MSD		3
+
+/*
+ * USB Device Speeds
+ */
+#define OS_USB_LOW_SPEED	0	/* LS (1Mb/s) */
+#define OS_USB_FULL_SPEED	1	/* FS (12Mb/s) */
+#define OS_USB_HIGH_SPEED	2	/* HS (480Mb/s) */
+
+/*
+ * USB Device Access Modes
+ */
+#define OS_USB_MODE_READ	1	/* Read only */
+#define OS_USB_MODE_WRITE	2	/* Write only */
+#define OS_USB_MODE_RW		3	/* R/W = READ | WRITE */
+
+
+/*
+ * USB subsystem parameters
+ */
+#define OS_USB_MAX_CONTROLLERS  2
+#define OS_USB_QUEUE_SIZE  128
+
+/*
+ * Error codes
+ */
+#define OS_USB_ERROR_BASE	201
+#define EUSBRINVAL		OS_USB_ERROR_BASE+0
+#define EUSBAGAIN		OS_USB_ERROR_BASE+1
+#define EUSBBUSY		OS_USB_ERROR_BASE+2
+#define EUSBNXIO		OS_USB_ERROR_BASE+3
+
+#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS)
+
+/**************************************************************************
+ *
+ * Macro definitions
+ *	
+ */
+
+/**************************************************************************
+ *
+ * Extern variables
+ *
+ */
+
+
+/**************************************************************************
+ *
+ * Function prototypes
+ *
+ */
+
+/* USB interface */
+extern s32	osBbUsbInit(void);
+extern s32	osBbUsbSetCtlrModes(s32, u32);
+extern u32	osBbUsbGetResetCount(s32);
+extern s32	osBbUsbDevQuery(s32, OSBbUsbInfo *, s32);
+extern s32	osBbUsbDevGetHandle(s32, OSBbUsbInfo *, OSBbUsbHandle *);
+extern s32	osBbUsbDevFreeHandle(OSBbUsbHandle);
+extern s32	osBbUsbDevRead(OSBbUsbHandle, u8 *, s32, u64);
+extern s32	osBbUsbDevWrite(OSBbUsbHandle, u8 *, s32, u64);
+
+
+#endif  /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */
+
+#ifdef _LANGUAGE_C_PLUS_PLUS
+}
+#endif
+
+#endif /* !_OS_USB_H_ */
diff --git a/src/bb/card/carderase.c b/src/bb/card/carderase.c
index 1ea65671..fe815489 100644
--- a/src/bb/card/carderase.c
+++ b/src/bb/card/carderase.c
@@ -1,4 +1,5 @@
 #include "PR/os_internal.h"
+#include "PR/os_bbcard.h"
 #include "bcp.h"
 
 void __osBbCardRelAccess(void);
@@ -48,15 +49,15 @@ s32 osBbCardEraseBlock(u32 dev, u16 block) {
     erase_block(dev, block);
     rv = __osBbCardWaitEvent();
     if ((rv < 0) || __osBbCardStatus(dev, &tmp, 0) != 0) {
-        rv = -4;
+        rv = BBCARD_ERR_CHANGED;
     } else if (tmp != 0xC0) {
-        rv = -2;
+        rv = BBCARD_ERR_FAIL;
     }
     __osBbCardRelAccess();
     return rv;
 }
 
-s32 osBbCardEraseBlocks(u32 dev, u16* block, u32 n) {
+s32 osBbCardEraseBlocks(u32 dev, const u16 block[], u32 n) {
     u32 i = 0;
     s32 rv;
     u8 tmp;
@@ -80,7 +81,7 @@ s32 osBbCardEraseBlocks(u32 dev, u16* block, u32 n) {
             plane |= p;
             j++;
         }
-    
+
         erase_blocks(dev, &block[i], j - i);
 
         rv = __osBbCardWaitEvent();
@@ -91,9 +92,9 @@ s32 osBbCardEraseBlocks(u32 dev, u16* block, u32 n) {
     }
 
     if (__osBbCardStatus(dev, &tmp, 0) != 0) {
-        rv = -4;
+        rv = BBCARD_ERR_CHANGED;
     } else if (tmp != 0xC0) {
-        rv = -2;
+        rv =BBCARD_ERR_FAIL;
     }
 err:
     __osBbCardRelAccess();
diff --git a/src/bb/card/cardid.c b/src/bb/card/cardid.c
index d156dae7..d17cd423 100644
--- a/src/bb/card/cardid.c
+++ b/src/bb/card/cardid.c
@@ -1,4 +1,5 @@
 #include "PR/os_internal.h"
+#include "PR/os_bbcard.h"
 #include "PR/bcp.h"
 
 s32 __osBbCardGetAccess(void);
diff --git a/src/bb/card/cardinit.c b/src/bb/card/cardinit.c
index 484e4cc9..4f62528e 100644
--- a/src/bb/card/cardinit.c
+++ b/src/bb/card/cardinit.c
@@ -1,4 +1,5 @@
 #include "PR/os_internal.h"
+#include "PR/os_bbcard.h"
 #include "PR/bcp.h"
 
 u8 __osBbCardChange = TRUE;
@@ -51,9 +52,9 @@ s32 __osBbCardGetAccess(void) {
         __osBbCardRelAccess();
 
         if (!__osBbCardPresent()) {
-            return -1;
+            return BBCARD_ERR_NO_CARD;
         }
-        return -4;
+        return BBCARD_ERR_CHANGED;
     }
     return 0;
 }
diff --git a/src/bb/card/cardmgr.c b/src/bb/card/cardmgr.c
index 049e75e2..43e29e63 100644
--- a/src/bb/card/cardmgr.c
+++ b/src/bb/card/cardmgr.c
@@ -1,4 +1,5 @@
 #include "PR/os_internal.h"
+#include "PR/os_bbcard.h"
 #include "macros.h"
 
 #ident "$Revision: 1.1 $"
@@ -51,8 +52,8 @@ s32 __osBbCardWaitEvent(void) {
             osSyncPrintf("md interrupt\n");
 #endif
             __osBbCardChange = TRUE;
-            return -4;
+            return BBCARD_ERR_CHANGED;
         default:
-            return -2;
+            return BBCARD_ERR_FAIL;
     }
 }
diff --git a/src/bb/card/cardprobe.c b/src/bb/card/cardprobe.c
index c2895048..6e2798c7 100644
--- a/src/bb/card/cardprobe.c
+++ b/src/bb/card/cardprobe.c
@@ -1,4 +1,5 @@
 #include "PR/os_internal.h"
+#include "PR/os_bbcard.h"
 #include "PR/bcp.h"
 
 s32 __osBbCardFlushEvent(void);
@@ -22,7 +23,7 @@ s32 osBbCardProbe(u32 dev) {
     IO_WRITE(PI_10000_REG(0), 0);
     IO_WRITE(PI_48_REG, (dev << 0xC) | 0x90700001);
 
-    rv = -1;
+    rv = BBCARD_ERR_NO_CARD;
 
     for (count = 0; count < 1000; count++) {
         if (!(IO_READ(PI_48_REG) & 0x80000000)) {
diff --git a/src/bb/card/cardread.c b/src/bb/card/cardread.c
index 20898dc5..7fa7c978 100644
--- a/src/bb/card/cardread.c
+++ b/src/bb/card/cardread.c
@@ -1,4 +1,5 @@
 #include "PR/os_internal.h"
+#include "PR/os_bbcard.h"
 #include "bcp.h"
 
 void __osBbCardDmaCopy(u32 which, void* addr, u32 dir);
diff --git a/src/bb/card/cardstatus.c b/src/bb/card/cardstatus.c
index f3f0a2cb..a5f7bf34 100644
--- a/src/bb/card/cardstatus.c
+++ b/src/bb/card/cardstatus.c
@@ -1,4 +1,5 @@
 #include "PR/os_internal.h"
+#include "PR/os_bbcard.h"
 #include "PR/bcp.h"
 
 s32 __osBbCardWaitEvent(void);
@@ -65,7 +66,7 @@ s32 osBbCardClearChange(void) {
 
 u32 osBbCardBlocks(u32 dev) {
     s32 rv;
-    
+
     rv = __osBbCardGetAccess();
     if (rv < 0) {
         return rv;
diff --git a/src/bb/card/cardwrite.c b/src/bb/card/cardwrite.c
index c0fe0aa8..153a7d5d 100644
--- a/src/bb/card/cardwrite.c
+++ b/src/bb/card/cardwrite.c
@@ -1,4 +1,5 @@
 #include "PR/os_internal.h"
+#include "PR/os_bbcard.h"
 #include "bcp.h"
 
 void __osBbCardDmaCopy(u32 which, void* addr, u32 dir);
@@ -54,7 +55,7 @@ static void write_dummy(u32 dev) {
     } while (IO_READ(PI_48_REG) & 0x80000000);
 }
 
-s32 osBbCardWriteBlock(u32 dev, u16 block, void* addr, void* spare) {
+s32 osBbCardWriteBlock(u32 dev, u16 block, const void* addr, const void* spare) {
     u32 i;
     u32 b = 0;
     s32 rv;
@@ -62,7 +63,7 @@ s32 osBbCardWriteBlock(u32 dev, u16 block, void* addr, void* spare) {
 
 #ifdef _DEBUG
     if (((u32)addr & 0xF) != 0) {
-        return -3;
+        return BBCARD_ERR_INVALID;
     }
 #endif
 
@@ -108,7 +109,7 @@ s32 osBbCardWriteBlock(u32 dev, u16 block, void* addr, void* spare) {
 #ifdef _DEBUG
             osSyncPrintf("block %d write failed 0x%x\n", block, tmp);
 #endif
-            rv = -2;
+            rv = BBCARD_ERR_FAIL;
             goto err;
         }
         b ^= 1;
@@ -119,7 +120,7 @@ s32 osBbCardWriteBlock(u32 dev, u16 block, void* addr, void* spare) {
     return rv;
 }
 
-s32 osBbCardWriteBlocks(u32 dev, u16* block, u32 n, void* addr, void* spare) {
+s32 osBbCardWriteBlocks(u32 dev, const u16 block[], u32 n, const void* addr, const void* spare) {
     u32 i;
     u32 j;
     u32 b = 0;
@@ -128,7 +129,7 @@ s32 osBbCardWriteBlocks(u32 dev, u16* block, u32 n, void* addr, void* spare) {
 
 #ifdef _DEBUG
     if (((u32)addr & 0xF) != 0) {
-        return -3;
+        return BBCARD_ERR_INVALID;
     }
 #endif
 
@@ -197,11 +198,11 @@ s32 osBbCardWriteBlocks(u32 dev, u16* block, u32 n, void* addr, void* spare) {
             }
 
             if (__osBbCardStatus(dev, &tmp, 0) != 0) {
-                rv = -4;
+                rv = BBCARD_ERR_CHANGED;
                 goto err;
             }
             if (tmp != 0xC0) {
-                rv = -2;
+                rv = BBCARD_ERR_FAIL;
                 goto err;
             }
         }
diff --git a/src/bb/fs/fsclose.c b/src/bb/fs/fsclose.c
index 52cc9ae0..58862348 100644
--- a/src/bb/fs/fsclose.c
+++ b/src/bb/fs/fsclose.c
@@ -1,4 +1,5 @@
 #include "PR/os_internal.h"
+#include "PR/os_bbfs_export.h"
 #include "PR/bbfs.h"
 
 s32 osBbFClose(s32 fd) {
diff --git a/src/bb/fs/fsdelete.c b/src/bb/fs/fsdelete.c
index b9563ae4..7c7935a9 100644
--- a/src/bb/fs/fsdelete.c
+++ b/src/bb/fs/fsdelete.c
@@ -1,4 +1,5 @@
 #include "PR/os_internal.h"
+#include "PR/os_bbfs_export.h"
 #include "PR/bbfs.h"
 
 s32 osBbFDelete(const char* name) {
diff --git a/src/bb/fs/fsread.c b/src/bb/fs/fsread.c
index 5dfa9eb8..fefe9768 100644
--- a/src/bb/fs/fsread.c
+++ b/src/bb/fs/fsread.c
@@ -1,4 +1,5 @@
 #include "PR/os_internal.h"
+#include "PR/os_bbfs_export.h"
 #include "PR/bbfs.h"
 
 s32 osBbFRead(s32 fd, u32 off, void* buf, u32 len) {
diff --git a/src/bb/fs/fsrename.c b/src/bb/fs/fsrename.c
index 553f4c6b..2cf09c8f 100644
--- a/src/bb/fs/fsrename.c
+++ b/src/bb/fs/fsrename.c
@@ -1,4 +1,5 @@
 #include "PR/os_internal.h"
+#include "PR/os_bbfs_export.h"
 #include "PR/bbfs.h"
 
 s32 osBbFRename(const char* old, const char* new) {
diff --git a/src/bb/fs/fsstat.c b/src/bb/fs/fsstat.c
index 76a89f43..7b8c2733 100644
--- a/src/bb/fs/fsstat.c
+++ b/src/bb/fs/fsstat.c
@@ -1,4 +1,5 @@
 #include "PR/os_internal.h"
+#include "os_bbfs_export.h"
 #include "PR/bbfs.h"
 
 s32 osBbFStat(s32 fd, OSBbStatBuf* sb, u16* blockList, u32 listLen) {
diff --git a/src/bb/fs/fswrite.c b/src/bb/fs/fswrite.c
index 5e80e6fa..cc93976a 100644
--- a/src/bb/fs/fswrite.c
+++ b/src/bb/fs/fswrite.c
@@ -1,4 +1,5 @@
 #include "PR/os_internal.h"
+#include "PR/os_bbfs_export.h"
 #include "PR/bbfs.h"
 #include "PR/os_bbcard.h"
 
diff --git a/src/bb/misc/rtc.c b/src/bb/misc/rtc.c
index 62d309ff..f9bfce1d 100644
--- a/src/bb/misc/rtc.c
+++ b/src/bb/misc/rtc.c
@@ -1,4 +1,5 @@
 #include "PR/os_internal.h"
+#include "PR/os_bb_export.h"
 #include "bcp.h"
 #include "macros.h"
 
diff --git a/src/bb/misc/state.c b/src/bb/misc/state.c
index 1e361649..083578e5 100644
--- a/src/bb/misc/state.c
+++ b/src/bb/misc/state.c
@@ -1,4 +1,5 @@
 #include "PR/os_internal.h"
+#include "PR/os_bbexec_export.h"
 #include "PR/bcp.h"
 #include "memory.h"
 #include "macros.h"
diff --git a/src/bb/usb/usb.h b/src/bb/usb/usb.h
index 72914bf3..21c96c46 100644
--- a/src/bb/usb/usb.h
+++ b/src/bb/usb/usb.h
@@ -1,6 +1,8 @@
 #ifndef USB_H_
 #define USB_H_
 
+#include "PR/os_usb.h"
+
 typedef char* char_ptr;
 typedef unsigned char uchar;
 typedef unsigned char* uchar_ptr;
@@ -29,28 +31,6 @@ typedef struct _usb_ctlr_state_s /* size=0x8 */ {
     /* 0x0004 */ int ucs_mask;
 } _usb_ctlr_state_t;
 
-typedef struct OSBbUsbInfo_s /* size=0x1C */ {
-    /* 0x0000 */ u8 ua_type;
-    /* 0x0001 */ u8 ua_class;
-    /* 0x0002 */ u8 ua_subclass;
-    /* 0x0003 */ u8 ua_protocol;
-    /* 0x0004 */ u16 ua_vendor;
-    /* 0x0006 */ u16 ua_product;
-    /* 0x0008 */ u8 ua_cfg;
-    /* 0x0009 */ u8 ua_ifc;
-    /* 0x000A */ u8 ua_ep;
-    /* 0x000B */ u8 ua_speed;
-    /* 0x000C */ u8 ua_mode;
-    /* 0x000D */ u8 ua_blksize;
-    /* 0x000E */ u8 ua_support;
-    /* 0x000F */ u8 ua_state;
-    /* 0x0010 */ u8* ua_mfr_str;
-    /* 0x0014 */ u8* ua_prod_str;
-    /* 0x0018 */ u8* ua_driver_name;
-} OSBbUsbInfo;
-
-typedef void* OSBbUsbHandle;
-
 typedef struct __OSBbUsbMesg_s /* size=0x28 */ {
     /* 0x0000 */ u8 um_type;
     /* 0x0008 */ union /* size=0x18 */ {
diff --git a/src/bb/usb/usbhw.c b/src/bb/usb/usbhw.c
index cd00a841..b71b9d8c 100644
--- a/src/bb/usb/usbhw.c
+++ b/src/bb/usb/usbhw.c
@@ -144,7 +144,7 @@ static void __usbOtgStateChange(s32 which) {
     }
 }
 
-s32 osBbUsbGetResetCount(s32 which) {
+u32 osBbUsbGetResetCount(s32 which) {
     return __Usb_Reset_Count[which];
 }