diff --git a/Source/Core/Common/Src/FixedSizeQueue.h b/Source/Core/Common/Src/FixedSizeQueue.h
index caeb57ecf4..b2252a09cf 100644
--- a/Source/Core/Common/Src/FixedSizeQueue.h
+++ b/Source/Core/Common/Src/FixedSizeQueue.h
@@ -83,4 +83,5 @@ public:
 	}
 };
 
-#endif  // _FIXED_SIZE_QUEUE_H
\ No newline at end of file
+#endif  // _FIXED_SIZE_QUEUE_H
+
diff --git a/Source/Core/Common/Src/Setup.h b/Source/Core/Common/Src/Setup.h
index 302fdbe9f4..d9cae94809 100644
--- a/Source/Core/Common/Src/Setup.h
+++ b/Source/Core/Common/Src/Setup.h
@@ -66,4 +66,5 @@
 
 ///////////////////////////
 
-#endif // __SETUP_h__
\ No newline at end of file
+#endif // __SETUP_h__
+
diff --git a/Source/Core/Common/Src/Thread.cpp b/Source/Core/Common/Src/Thread.cpp
index a2247a5dfe..72d56b17e1 100644
--- a/Source/Core/Common/Src/Thread.cpp
+++ b/Source/Core/Common/Src/Thread.cpp
@@ -414,7 +414,7 @@ Thread::~Thread()
 }
 
 
-void Thread::WaitForDeath(const int _Wait)
+void Thread::WaitForDeath()
 {
 	if (thread_id)
 	{
diff --git a/Source/Core/Common/Src/Thread.h b/Source/Core/Common/Src/Thread.h
index fd3c588c19..903ee878b0 100644
--- a/Source/Core/Common/Src/Thread.h
+++ b/Source/Core/Common/Src/Thread.h
@@ -37,7 +37,6 @@
 #include "Common.h"
 ///////////////////////////////////
 
-
 //////////////////////////////////////////////////////////////////////////////////////////
 // Definitions
 // ------------
@@ -89,7 +88,11 @@ public:
 
 	void SetAffinity(int mask);
 	static void SetCurrentThreadAffinity(int mask);
+#ifdef _WIN32
 	void WaitForDeath(const int _Wait = INFINITE);
+#else
+	void WaitForDeath();
+#endif
 
 private:
 
diff --git a/Source/Core/Core/Src/Boot/Boot_WiiWAD.h b/Source/Core/Core/Src/Boot/Boot_WiiWAD.h
index c8e3de4549..9054276a0d 100644
--- a/Source/Core/Core/Src/Boot/Boot_WiiWAD.h
+++ b/Source/Core/Core/Src/Boot/Boot_WiiWAD.h
@@ -32,4 +32,5 @@ struct STileMetaContent
 
 // [TODO]: this global internal stuff sux... the whole data should be inside the ES
 // but this is the easiest way atm
-extern std::vector<STileMetaContent> m_TileMetaContent;
\ No newline at end of file
+extern std::vector<STileMetaContent> m_TileMetaContent;
+
diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index e9dee8c17a..d08d78fe59 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -302,7 +302,11 @@ void Stop()
 		if (GetParent((HWND)g_pWindowHandle) == NULL)
 	#endif
 #ifndef SETUP_TIMER_WAITING // This is moved
+#ifdef _WIN32
 	g_EmuThread->WaitForDeath(5000);
+#else
+	g_EmuThread->WaitForDeath();
+#endif
 	delete g_EmuThread;  // Wait for emuthread to close.
 	g_EmuThread = 0;
 #endif
@@ -575,7 +579,11 @@ void EmuThreadEnd()
 	if (cpuThread)
 	{
 		// There is a CPU thread - join it.
+#ifdef _WIN32
 		cpuThread->WaitForDeath(5000);
+#else
+		cpuThread->WaitForDeath();
+#endif
 		delete cpuThread;
 		// Returns after game exited
 		cpuThread = NULL;
diff --git a/Source/Core/Core/Src/IPC_HLE/HW/SDInterface.cpp b/Source/Core/Core/Src/IPC_HLE/HW/SDInterface.cpp
index 3835c5aa00..ba5f7966a5 100644
--- a/Source/Core/Core/Src/IPC_HLE/HW/SDInterface.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/HW/SDInterface.cpp
@@ -40,4 +40,5 @@ void SetSourcePath(const std::string path)
 {
 	sourcePath = path;
 }
-}
\ No newline at end of file
+}
+
diff --git a/Source/Core/Core/Src/IPC_HLE/HW/SDInterface.h b/Source/Core/Core/Src/IPC_HLE/HW/SDInterface.h
index cb4b80eb48..42fe067f59 100644
--- a/Source/Core/Core/Src/IPC_HLE/HW/SDInterface.h
+++ b/Source/Core/Core/Src/IPC_HLE/HW/SDInterface.h
@@ -28,4 +28,5 @@ namespace SDInterface
 	void SetSourcePath(const std::string path);
 }
 
-#endif
\ No newline at end of file
+#endif
+
diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.h b/Source/Core/DolphinWX/Src/CheatsWindow.h
index 9f6016db9a..7d9ec29b41 100644
--- a/Source/Core/DolphinWX/Src/CheatsWindow.h
+++ b/Source/Core/DolphinWX/Src/CheatsWindow.h
@@ -127,4 +127,5 @@ class wxCheatsWindow : public wxFrame
 		void OnEvent_CheckBoxEnableLogging_StateChange(wxCommandEvent& event);
 };
 
-#endif
\ No newline at end of file
+#endif
+
diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
index d276d18c6a..7bdc1552ae 100644
--- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp
+++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
@@ -281,7 +281,6 @@ void CGameListCtrl::InsertItemInReportView(long _Index)
 			wxString::From8BitData(rISOFile.GetDescription((int)SConfig::GetInstance().m_InterfaceLanguage).c_str()), -1);
 		break;
 	}
-
 	SetItem(_Index, COLUMN_COMPANY, wxString::From8BitData(rISOFile.GetCompany().c_str()), -1);
 	
 	SetItem(_Index, COLUMN_SIZE, NiceSizeFormat(rISOFile.GetFileSize()), -1);
@@ -942,4 +941,5 @@ bool CGameListCtrl::CopySJISToString( wxString& _rDestination, const char* _src
 	//returnCode = true;
 #endif
 	return returnCode;
-}
\ No newline at end of file
+}
+
diff --git a/Source/Core/DolphinWX/Src/SDCardWindow.cpp b/Source/Core/DolphinWX/Src/SDCardWindow.cpp
index 170b8e54ae..da71d3546b 100644
--- a/Source/Core/DolphinWX/Src/SDCardWindow.cpp
+++ b/Source/Core/DolphinWX/Src/SDCardWindow.cpp
@@ -60,4 +60,5 @@ void wxSDCardWindow::OnEvent_Window_Close(wxCloseEvent& WXUNUSED(event))
 void wxSDCardWindow::OnEvent_ButtonClose_Press(wxCommandEvent& WXUNUSED(event))
 {
 	EndModal(0);
-}
\ No newline at end of file
+}
+
diff --git a/Source/Core/DolphinWX/Src/SDCardWindow.h b/Source/Core/DolphinWX/Src/SDCardWindow.h
index 3469407283..3088657067 100644
--- a/Source/Core/DolphinWX/Src/SDCardWindow.h
+++ b/Source/Core/DolphinWX/Src/SDCardWindow.h
@@ -42,4 +42,5 @@ protected:
 };
 
 
-#endif
\ No newline at end of file
+#endif
+
diff --git a/Source/Core/InputCommon/Src/Configuration.cpp b/Source/Core/InputCommon/Src/Configuration.cpp
index d60318074c..3faa4a1d2d 100644
--- a/Source/Core/InputCommon/Src/Configuration.cpp
+++ b/Source/Core/InputCommon/Src/Configuration.cpp
@@ -249,4 +249,5 @@ std::string VKToString(int keycode)
 #endif
 /////////////////////////////////////////////////////////////////////
 
-}
\ No newline at end of file
+}
+
diff --git a/Source/Core/InputCommon/Src/SDL.cpp b/Source/Core/InputCommon/Src/SDL.cpp
index cdf98ae37a..bc8402e8c5 100644
--- a/Source/Core/InputCommon/Src/SDL.cpp
+++ b/Source/Core/InputCommon/Src/SDL.cpp
@@ -363,4 +363,5 @@ void GetButton(SDL_Joystick *joy, int ControllerID, int buttons, int axes, int h
 
 
 
-} // InputCommon
\ No newline at end of file
+} // InputCommon
+
diff --git a/Source/Core/InputCommon/Src/XInput.h b/Source/Core/InputCommon/Src/XInput.h
index e50db2f87d..631f67a81e 100644
--- a/Source/Core/InputCommon/Src/XInput.h
+++ b/Source/Core/InputCommon/Src/XInput.h
@@ -42,4 +42,5 @@ bool IsConnected(int Controller);
 
 } // XInput
 
-#endif
\ No newline at end of file
+#endif
+
diff --git a/Source/Core/VideoCommon/Src/ImageWrite.h b/Source/Core/VideoCommon/Src/ImageWrite.h
index 30c4c7ceed..3cdd847321 100644
--- a/Source/Core/VideoCommon/Src/ImageWrite.h
+++ b/Source/Core/VideoCommon/Src/ImageWrite.h
@@ -24,4 +24,5 @@ bool SaveTGA(const char* filename, int width, int height, void* pdata);
 bool SaveTexture(const char* filename, u32 textarget, u32 tex, int width, int height);
 bool SaveData(const char* filename, const char* pdata);
 
-#endif  // _IMAGEWRITE_H
\ No newline at end of file
+#endif  // _IMAGEWRITE_H
+
diff --git a/Source/Core/VideoCommon/Src/NativeVertexWriter.cpp b/Source/Core/VideoCommon/Src/NativeVertexWriter.cpp
index 0384335d84..b0c65bc842 100644
--- a/Source/Core/VideoCommon/Src/NativeVertexWriter.cpp
+++ b/Source/Core/VideoCommon/Src/NativeVertexWriter.cpp
@@ -23,4 +23,5 @@ namespace VertexManager
 
 u8* s_pCurBufferPointer = NULL;
 
-}
\ No newline at end of file
+}
+
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Debugger/File.h b/Source/Plugins/Plugin_DSP_HLE/Src/Debugger/File.h
index 5582c29e37..e0e857e53a 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/Debugger/File.h
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/Debugger/File.h
@@ -37,4 +37,5 @@ void CloseConsole();
 #ifdef _WIN32
 	HWND GetConsoleHwnd(void);
 #endif
-/////////////////////////////
\ No newline at end of file
+/////////////////////////////
+
diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/Logging/UCode_AXStructs.h b/Source/Plugins/Plugin_DSP_LLE/Src/Logging/UCode_AXStructs.h
index 6b0500ad52..f4cc2d0ec6 100644
--- a/Source/Plugins/Plugin_DSP_LLE/Src/Logging/UCode_AXStructs.h
+++ b/Source/Plugins/Plugin_DSP_LLE/Src/Logging/UCode_AXStructs.h
@@ -142,4 +142,5 @@ enum {
 
 #endif
 
-#endif // win32
\ No newline at end of file
+#endif // win32
+
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/OnScreenDisplay.h b/Source/Plugins/Plugin_VideoOGL/Src/OnScreenDisplay.h
index 6e958d1807..475454ce65 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/OnScreenDisplay.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/OnScreenDisplay.h
@@ -27,4 +27,5 @@ void DrawMessages(); // draw the current messages on the screen. Only call once
 
 }  // namespace
 
-#endif
\ No newline at end of file
+#endif
+
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConversionShader.h b/Source/Plugins/Plugin_VideoOGL/Src/TextureConversionShader.h
index c547a8e8cc..0f63e5247b 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConversionShader.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConversionShader.h
@@ -35,4 +35,5 @@ void SetShaderParameters(u32 width, u32 height, u32 offsetX, u32 offsetY, float
 
 }
 
-#endif
\ No newline at end of file
+#endif
+
diff --git a/Source/Plugins/Plugin_Wiimote/Src/Config.cpp b/Source/Plugins/Plugin_Wiimote/Src/Config.cpp
index 7e8b46d2c0..c1f67faca1 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/Config.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/Config.cpp
@@ -26,6 +26,18 @@
 #include "EmuDefinitions.h" // for PadMapping
 #include "main.h"
 
+// TODO: Figure out what to do for non-Win32
+#ifndef _WIN32
+#define VK_LEFT 0
+#define VK_RIGHT 0
+#define VK_UP 0
+#define VK_DOWN 0
+#define VK_NUMPAD4 0
+#define VK_NUMPAD6 0
+#define VK_NUMPAD8 0
+#define VK_NUMPAD5 0
+#endif
+
 Config g_Config;
 
 Config::Config()
@@ -65,7 +77,6 @@ void Config::Load(bool ChangePad)
 	iniFile.Get(TmpSection.c_str(), "IRHeight", &iIRHeight, BOTTOM - TOP);
 
 	// Default controls
-	#ifdef _WIN32
 		int WmA = 65, WmB = 66,
 			Wm1 = 49, Wm2 = 50,
 			WmP = 80, WmM = 77, WmH = 72,
@@ -83,24 +94,6 @@ void Config::Load(bool ChangePad)
 			CcDl = VK_NUMPAD4, CcDu = VK_NUMPAD8, CcDr = VK_NUMPAD6, CcDd = VK_NUMPAD5, // Numpad
 			CcLl = 0x4a, CcLu = 0x49, CcLr = 0x4c, CcLd = 0x4b, // J, I, L, K
 			CcRl = 0x44, CcRu = 0x52, CcRr = 0x47, CcRd = 0x46; // D, R, G, F
-	#else
-		int WmA = 0, WmB = 0,
-			Wm1 = 0, Wm2 = 0,
-			WmP = 0, WmM = 0, WmH = 0,
-			WmL = 0, WmR = 0, WmU = 0, WmD = 0,
-			WmShake = 0,
-			WmPitchL = 0, WmPitchR = 0,
-			
-			NcZ = 0, NcC = 0, NcL = 0, NcR = 0, NcU = 0, NcD = 0,
-			NcShake = 0,
-
-			CcA = 0, CcB = 0, CcX = 0, CcY = 0, // C, Z, X, Y
-			CcP = 0, CcM = 0, CcH = 0, // O instead of P, N instead of M, U instead of H
-			CcTl = 0, CcZl = 0, CcZr = 0, CcTr = 0, // 7, 8, 9, 0
-			CcDl = 0, CcDu = 0, CcDr = 0, CcDd = 0, // Numpad
-			CcLl = 0, CcLu = 0x49, CcLr = 0, CcLd = 0, // J, I, L, K
-			CcRl = 0, CcRu = 0x52, CcRr = 0, CcRd = 0; // D, R, G, F
-	#endif
 
 	for (int i = 0; i < 1; i++)
 	{
diff --git a/Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp b/Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp
index c20c47f8a9..e95fd95593 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp
@@ -191,4 +191,5 @@ void GetJoyState(InputCommon::CONTROLLER_STATE_NEW &_PadState, InputCommon::CONT
 ////////////////////////////////////////////
 
 
-} // end of namespace WiiMoteEmu
\ No newline at end of file
+} // end of namespace WiiMoteEmu
+
diff --git a/Source/Plugins/Plugin_Wiimote/Src/Encryption.h b/Source/Plugins/Plugin_Wiimote/Src/Encryption.h
index c68ec87827..6322a57215 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/Encryption.h
+++ b/Source/Plugins/Plugin_Wiimote/Src/Encryption.h
@@ -36,4 +36,5 @@ void wiimote_decrypt(wiimote_key *key, u8 *data, int addr, u8 len);
 void wiimote_gen_key(wiimote_key *key, u8 *keydata);
 
 
-#endif
\ No newline at end of file
+#endif
+
diff --git a/Source/Plugins/Plugin_Wiimote/Src/Logging.h b/Source/Plugins/Plugin_Wiimote/Src/Logging.h
index 4dc1860a50..5c0e964419 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/Logging.h
+++ b/Source/Plugins/Plugin_Wiimote/Src/Logging.h
@@ -37,4 +37,5 @@ void ClearScreen();
 #endif
 ///////////////////////////////
 
-#endif // WIIMOTE_CONSOLE_H
\ No newline at end of file
+#endif // WIIMOTE_CONSOLE_H
+