diff --git a/Windows/EmuThread.cpp b/Windows/EmuThread.cpp
index 898a0f5d09..459bb5ce34 100644
--- a/Windows/EmuThread.cpp
+++ b/Windows/EmuThread.cpp
@@ -152,15 +152,10 @@ bool CreateGraphicsBackend(std::string *error_message, GraphicsContext **ctx) {
 }
 
 void MainThreadFunc() {
-	if (useEmuThread) {
-		// We'll start up a separate thread we'll call Emu
-		SetCurrentThreadName("Render");
-	} else {
-		// This is both Emu and Render.
-		SetCurrentThreadName("Emu");
-	}
+	// We'll start up a separate thread we'll call Emu
+	SetCurrentThreadName(useEmuThread ? "Render" : "Emu");
 
-	host = new WindowsHost(MainWindow::GetHInstance(), MainWindow::GetHWND(), MainWindow::GetDisplayHWND());
+	host = new WindowsHost();
 	System_SetWindowTitle("");
 
 	// We convert command line arguments to UTF-8 immediately.
diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp
index 1783eab47f..339f62e158 100644
--- a/Windows/WindowsHost.cpp
+++ b/Windows/WindowsHost.cpp
@@ -44,12 +44,14 @@
 #include "Core/Config.h"
 #include "Core/ConfigValues.h"
 #include "Core/CoreParameter.h"
+#include "Core/HLE/Plugins.h"
 #include "Core/System.h"
 #include "Core/Debugger/SymbolMap.h"
 #include "Core/Instance.h"
 
+#include "UI/OnScreenDisplay.h"
+
 #include "Windows/EmuThread.h"
-#include "Windows/WindowsAudio.h"
 #include "Windows/WindowsHost.h"
 #include "Windows/MainWindow.h"
 
@@ -63,8 +65,6 @@
 #include "Windows/XinputDevice.h"
 
 #include "Windows/main.h"
-#include "UI/OnScreenDisplay.h"
-#include <Core/HLE/Plugins.h>
 
 float g_mouseDeltaX = 0;
 float g_mouseDeltaY = 0;
@@ -73,11 +73,7 @@ static BOOL PostDialogMessage(Dialog *dialog, UINT message, WPARAM wParam = 0, L
 	return PostMessage(dialog->GetDlgHandle(), message, wParam, lParam);
 }
 
-WindowsHost::WindowsHost(HINSTANCE hInstance, HWND mainWindow, HWND displayWindow)
-	: hInstance_(hInstance),
-		displayWindow_(displayWindow),
-		mainWindow_(mainWindow)
-{
+WindowsHost::WindowsHost() {
 	g_mouseDeltaX = 0;
 	g_mouseDeltaY = 0;
 
@@ -109,9 +105,6 @@ void WindowsHost::UpdateConsolePosition() {
 	}
 }
 
-// UGLY!
-extern WindowsAudioBackend *winAudioBackend;
-
 void WindowsHost::PollControllers() {
 	static int checkCounter = 0;
 	static const int CHECK_FREQUENCY = 71;
diff --git a/Windows/WindowsHost.h b/Windows/WindowsHost.h
index 2aeba43996..e93af1e28a 100644
--- a/Windows/WindowsHost.h
+++ b/Windows/WindowsHost.h
@@ -26,7 +26,7 @@ extern float g_mouseDeltaY;
 
 class WindowsHost : public Host {
 public:
-	WindowsHost(HINSTANCE hInstance, HWND mainWindow, HWND displayWindow);
+	WindowsHost();
 
 	~WindowsHost() {
 		UpdateConsolePosition();
@@ -48,9 +48,6 @@ private:
 	void SetConsolePosition();
 	void UpdateConsolePosition();
 
-	HINSTANCE hInstance_;
-	HWND displayWindow_;
-	HWND mainWindow_;
 	size_t numDinputDevices_ = 0;
 
 	std::list<std::unique_ptr<InputDevice>> input;