diff --git a/SerialPrograms/Source/CommonTools/Async/SuperControlSession.cpp b/SerialPrograms/Source/CommonTools/Async/SuperControlSession.cpp
index 8bda255535..0d6e7f30aa 100644
--- a/SerialPrograms/Source/CommonTools/Async/SuperControlSession.cpp
+++ b/SerialPrograms/Source/CommonTools/Async/SuperControlSession.cpp
@@ -8,12 +8,14 @@
 
 #include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
 #include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h"
+#include "Controllers/StandardHid/StandardHid_Keyboard.h"
 
 namespace PokemonAutomation{
 
 
 template class SuperControlSession<NintendoSwitch::ProController>;
 template class SuperControlSession<NintendoSwitch::JoyconController>;
+template class SuperControlSession<StandardHid::Keyboard>;
 
 
 }
diff --git a/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp
index 926306cbb0..02fd548c76 100644
--- a/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp
+++ b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp
@@ -6,10 +6,8 @@
 
 #include "Common/Cpp/Containers/Pimpl.tpp"
 #include "CommonTools/Async/InterruptableCommands.tpp"
-#include "CommonTools/Async/SuperControlSession.tpp"
 #include "ControllerInput/ControllerInput.h"
 #include "ControllerInput/Keyboard/KeyboardInput_State.h"
-#include "ControllerInput/Keyboard/KeyboardInput_KeyMappings.h"
 #include "Controllers/ControllerState.h"
 #include "StandardHid_Keyboard.h"
 
@@ -21,7 +19,6 @@ namespace PokemonAutomation{
 
 //  Instantiate some template helper classes.
 template class AsyncCommandSession<StandardHid::Keyboard>;
-template class SuperControlSession<StandardHid::Keyboard>;
 
 namespace StandardHid{