diff --git a/source/ngc/input.cpp b/source/ngc/input.cpp
index 4634459..8a29e7a 100644
--- a/source/ngc/input.cpp
+++ b/source/ngc/input.cpp
@@ -308,7 +308,6 @@ u32 GetJoy(int pad)
     s8 gc_py = PAD_SubStickY (0);
 
     #ifdef HW_RVL
-    s8 wm_sx = WPAD_Stick (0,1,0);
     s8 wm_sy = WPAD_Stick (0,1,1);
     u32 wm_pb = WPAD_ButtonsHeld (0); // wiimote / expansion button info
     #endif
@@ -329,7 +328,6 @@ u32 GetJoy(int pad)
     #ifdef HW_RVL
     		 || (wm_pb & WPAD_BUTTON_HOME)
     		 || (wm_pb & WPAD_CLASSIC_BUTTON_HOME)
-    		 || (wm_sx < -70)
     #endif
     )
 	{
diff --git a/source/ngc/vbasupport.cpp b/source/ngc/vbasupport.cpp
index 0d3e373..8f5c4c2 100644
--- a/source/ngc/vbasupport.cpp
+++ b/source/ngc/vbasupport.cpp
@@ -15,18 +15,18 @@
 
 #include "unzip.h"
 #include "Util.h"
-#include "Flash.h"
-#include "Patch.h"
-#include "Port.h"
-#include "RTC.h"
-#include "Sound.h"
-#include "Cheats.h"
-#include "agb/GBA.h"
-#include "agb/agbprint.h"
-#include "dmg/gb.h"
-#include "dmg/gbGlobals.h"
-#include "dmg/gbCheats.h"
-#include "dmg/gbSound.h"
+#include "common/Port.h"
+#include "gba/Flash.h"
+#include "common/Patch.h"
+#include "gba/RTC.h"
+#include "gba/Sound.h"
+#include "gba/Cheats.h"
+#include "gba/GBA.h"
+#include "gba/agbprint.h"
+#include "gb/gb.h"
+#include "gb/gbGlobals.h"
+#include "gb/gbCheats.h"
+#include "gb/gbSound.h"
 
 #include "vba.h"
 #include "fileop.h"
@@ -578,7 +578,7 @@ if(sdlMotionButtons[KEY_LEFT]) {
     sensorY += 2;
     if(sensorY > 2047)
       sensorY = 2047;
-  }
+  }
  */
 }
 
diff --git a/source/ngc/vmmem.cpp b/source/ngc/vmmem.cpp
index c853b11..ee66624 100644
--- a/source/ngc/vmmem.cpp
+++ b/source/ngc/vmmem.cpp
@@ -15,10 +15,10 @@
 #include <fat.h>
 #include <sys/dir.h>
 
-#include "agb/GBA.h"
-#include "Globals.h"
+#include "gba/GBA.h"
+#include "gba/Globals.h"
 #include "Util.h"
-#include "Port.h"
+#include "common/Port.h"
 
 #include "vba.h"
 #include "fileop.h"