diff --git a/libultraship/libultraship/ControlDeck.h b/libultraship/libultraship/ControlDeck.h
index 58c258ca8..15cba08e9 100644
--- a/libultraship/libultraship/ControlDeck.h
+++ b/libultraship/libultraship/ControlDeck.h
@@ -2,7 +2,6 @@
 
 #include "Controller.h"
 #include <vector>
-#include <string>
 
 namespace Ship {
 
diff --git a/libultraship/libultraship/InputEditor.h b/libultraship/libultraship/InputEditor.h
index 39bddd51d..81b1997ec 100644
--- a/libultraship/libultraship/InputEditor.h
+++ b/libultraship/libultraship/InputEditor.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <string>
-
 #include "Lib/ImGui/imgui.h"
 
 namespace Ship {
diff --git a/libultraship/libultraship/VirtualController.h b/libultraship/libultraship/VirtualController.h
index 017373e55..825d7df59 100644
--- a/libultraship/libultraship/VirtualController.h
+++ b/libultraship/libultraship/VirtualController.h
@@ -4,32 +4,34 @@
 
 #include "Controller.h"
 
-class VirtualController final : public Ship::Controller {
-public:
-	VirtualController(const std::string& CUID, const std::string& KeyName, bool Connected) {
-		GUID = CUID;
-		isConnected = Connected;
-		ButtonName = KeyName;
-	}
+namespace Ship {
+	class VirtualController final : public Controller {
+	public:
+		VirtualController(const std::string& CUID, const std::string& KeyName, bool Connected) {
+			GUID = CUID;
+			isConnected = Connected;
+			ButtonName = KeyName;
+		}
 
-	std::map<std::vector<std::string>, int32_t> ReadButtonPress();
-	void ReadFromSource(int32_t slot) override {}
-	const char* GetControllerName() override { return GUID.c_str(); }
-	const char* GetButtonName(int slot, int n64Button) override { return ButtonName.c_str(); }
-	void WriteToSource(int32_t slot, ControllerCallback* controller) override { }
-	bool Connected() const override { return isConnected; }
-	bool CanRumble() const override { return false; }
-	bool CanGyro()   const override { return false; }
+		std::map<std::vector<std::string>, int32_t> ReadButtonPress();
+		void ReadFromSource(int32_t slot) override {}
+		const char* GetControllerName() override { return GUID.c_str(); }
+		const char* GetButtonName(int slot, int n64Button) override { return ButtonName.c_str(); }
+		void WriteToSource(int32_t slot, ControllerCallback* controller) override { }
+		bool Connected() const override { return isConnected; }
+		bool CanRumble() const override { return false; }
+		bool CanGyro()   const override { return false; }
 
-	void ClearRawPress() override {}
-	int32_t ReadRawPress() override { return -1; }
-	bool HasPadConf() const { return true; }
-	std::optional<std::string> GetPadConfSection() { return "Unk"; }
-	void CreateDefaultBinding(int32_t slot) override {}
-protected:
-	std::string ButtonName;
-	bool isConnected = false;
-	std::string GetControllerType() { return "Unk"; }
-	std::string GetConfSection() { return "Unk"; }
-	std::string GetBindingConfSection() { return "Unk"; }
-};
+		void ClearRawPress() override {}
+		int32_t ReadRawPress() override { return -1; }
+		bool HasPadConf() const { return true; }
+		std::optional<std::string> GetPadConfSection() { return "Unk"; }
+		void CreateDefaultBinding(int32_t slot) override {}
+	protected:
+		std::string ButtonName;
+		bool isConnected = false;
+		std::string GetControllerType() { return "Unk"; }
+		std::string GetConfSection() { return "Unk"; }
+		std::string GetBindingConfSection() { return "Unk"; }
+	};
+}
\ No newline at end of file