diff --git a/lib/src/os/osMotor.c b/lib/src/os/osMotor.c
index 4056ed14..7e1cbaa1 100644
--- a/lib/src/os/osMotor.c
+++ b/lib/src/os/osMotor.c
@@ -11,10 +11,10 @@
 
 static void _MakeMotorData(int channel, u16 address, u8 *buffer, OSPifRam *mdata);
 //TODO: These should really be declared here instead of somewhere else
-extern OSPifRam _MotorStopData[MAXCONTROLLERS];
-extern OSPifRam _MotorStartData[MAXCONTROLLERS];
-extern u8 _motorstopbuf[BLOCKSIZE];
-extern u8 _motorstartbuf[BLOCKSIZE];
+OSPifRam _MotorStopData[MAXCONTROLLERS];
+OSPifRam _MotorStartData[MAXCONTROLLERS];
+u8 _motorstopbuf[BLOCKSIZE];
+u8 _motorstartbuf[BLOCKSIZE];
 s32 osMotorStop(OSPfs *pfs) {
     int i;
     s32 ret;
diff --git a/src/memory.c b/src/memory.c
index 68d29efa..9c6b06f9 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -39,10 +39,6 @@ s32 D_801235C4;
 FreeQueueSlot gFreeQueue[256];
 s32 gFreeQueueCount;
 s32 gFreeQueueState;
-OSPifRam _MotorStopData[MAXCONTROLLERS];
-OSPifRam _MotorStartData[MAXCONTROLLERS];
-u8 _motorstopbuf[BLOCKSIZE];
-u8 _motorstartbuf[BLOCKSIZE];
 
 extern MemoryPoolSlot gMainMemoryPool;