diff --git a/configure.py b/configure.py
index eaeece2e..2332ce0f 100755
--- a/configure.py
+++ b/configure.py
@@ -40,7 +40,7 @@ LIBS = [
             ["MetroidPrime/main", False],
             "MetroidPrime/IRenderer",
             "MetroidPrime/Cameras/CCameraManager",
-            ["MetroidPrime/CControlMapper", False],
+            ["MetroidPrime/CControlMapper", True],
             "MetroidPrime/Cameras/CFirstPersonCamera",
             ["MetroidPrime/CObjectList", True],
             "MetroidPrime/Player/CPlayer",
diff --git a/src/MetroidPrime/CControlMapper.cpp b/src/MetroidPrime/CControlMapper.cpp
index 7917a4a3..e1175768 100644
--- a/src/MetroidPrime/CControlMapper.cpp
+++ b/src/MetroidPrime/CControlMapper.cpp
@@ -32,7 +32,6 @@ const FAnalogInput ControlMapper::gAnalogInputs[] = {
     &CFinalInput::AL,
     &CFinalInput::AR,
     &CFinalInput::AStart,
-    nullptr,
 };
 
 const FDigitalInput ControlMapper::gDigitalInputs[] = {
@@ -59,7 +58,6 @@ const FDigitalInput ControlMapper::gDigitalInputs[] = {
     &CFinalInput::DL,
     &CFinalInput::DR,
     &CFinalInput::DStart,
-    nullptr,
 };
 
 const FDigitalInput ControlMapper::gPressInputs[] = {
@@ -86,7 +84,6 @@ const FDigitalInput ControlMapper::gPressInputs[] = {
     &CFinalInput::PL,
     &CFinalInput::PR,
     &CFinalInput::PStart,
-    nullptr,
 };
 
 const char* ControlMapper::GetDescriptionForFunction(EFunctionList function) {