diff --git a/Source/Core/Common/Logging/ConsoleListener.h b/Source/Core/Common/Logging/ConsoleListener.h
index d67d37ef2e..5c3f5c84bd 100644
--- a/Source/Core/Common/Logging/ConsoleListener.h
+++ b/Source/Core/Common/Logging/ConsoleListener.h
@@ -31,7 +31,7 @@ public:
 
 private:
 #ifdef _WIN32
-	HWND GetHwnd(void);
+	HWND GetHwnd();
 	HANDLE hConsole;
 #endif
 	bool bUseColor;
diff --git a/Source/Core/Core/Debugger/Dump.cpp b/Source/Core/Core/Debugger/Dump.cpp
index e6c54435e0..eca1fc3ee2 100644
--- a/Source/Core/Core/Debugger/Dump.cpp
+++ b/Source/Core/Core/Debugger/Dump.cpp
@@ -24,7 +24,7 @@ CDump::CDump(const std::string& filename) :
 	}
 }
 
-CDump::~CDump(void)
+CDump::~CDump()
 {
 	if (m_pData != nullptr)
 	{
@@ -33,7 +33,7 @@ CDump::~CDump(void)
 	}
 }
 
-int CDump::GetNumberOfSteps(void)
+int CDump::GetNumberOfSteps()
 {
 	return (int)(m_size / STRUCTUR_SIZE);
 }
diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
index c545699e87..03085bce3a 100644
--- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
@@ -617,7 +617,7 @@ void Initialize(bool wait)
 }
 
 // called on emulation shutdown
-void Stop(void)
+void Stop()
 {
 	for (auto& wiimote : g_wiimotes)
 		if (wiimote && wiimote->IsConnected())
@@ -625,7 +625,7 @@ void Stop(void)
 }
 
 // called when the dolphin app exits
-void Shutdown(void)
+void Shutdown()
 {
 	g_wiimote_scanner.StopScanning();
 
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h
index 7f740c5c24..7cf6996a59 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h
@@ -239,7 +239,7 @@ public:
 		}
 	}
 
-	u32 CalculateNwc24ConfigChecksum(void)
+	u32 CalculateNwc24ConfigChecksum()
 	{
 		u32* ptr = (u32*)&config;
 		u32 sum = 0;
@@ -250,7 +250,7 @@ public:
 		return sum;
 	}
 
-	s32 CheckNwc24Config(void)
+	s32 CheckNwc24Config()
 	{
 		if (Magic() != 0x57634366) /* 'WcCf' magic */
 		{
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp
index f362abfa0e..18a3ab68fc 100644
--- a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp
@@ -85,7 +85,7 @@ static void Trace(UGeckoInstruction& instCode)
 	DEBUG_LOG(POWERPC, "INTER PC: %08x SRR0: %08x SRR1: %08x CRval: %016lx FPSCR: %08x MSR: %08x LR: %08x %s %08x %s", PC, SRR0, SRR1, (unsigned long) PowerPC::ppcState.cr_val[0], PowerPC::ppcState.fpscr, PowerPC::ppcState.msr, PowerPC::ppcState.spr[8], regs.c_str(), instCode.hex, ppc_inst.c_str());
 }
 
-int Interpreter::SingleStepInner(void)
+int Interpreter::SingleStepInner()
 {
 	static UGeckoInstruction instCode;
 	u32 function = HLE::GetFunctionIndex(PC);
diff --git a/Source/Core/DiscIO/NANDContentLoader.cpp b/Source/Core/DiscIO/NANDContentLoader.cpp
index dbd1fc0ead..b874d82c49 100644
--- a/Source/Core/DiscIO/NANDContentLoader.cpp
+++ b/Source/Core/DiscIO/NANDContentLoader.cpp
@@ -99,7 +99,7 @@ public:
 	virtual ~CNANDContentLoader();
 
 	bool IsValid() const override { return m_Valid; }
-	void RemoveTitle(void) const override;
+	void RemoveTitle() const override;
 	u64 GetTitleID() const override  { return m_TitleID; }
 	u16 GetIosVersion() const override { return m_IosVersion; }
 	u32 GetBootIndex() const override  { return m_BootIndex; }
diff --git a/Source/Core/DolphinWX/Debugger/DSPRegisterView.h b/Source/Core/DolphinWX/Debugger/DSPRegisterView.h
index d1aba57190..d8bb2a9e73 100644
--- a/Source/Core/DolphinWX/Debugger/DSPRegisterView.h
+++ b/Source/Core/DolphinWX/Debugger/DSPRegisterView.h
@@ -30,9 +30,9 @@ public:
 		memset(m_CachedRegHasChanged, 0, sizeof(m_CachedRegHasChanged));
 	}
 
-	int GetNumberCols(void) override {return 2;}
-	int GetNumberRows(void) override {return 32;}
-	bool IsEmptyCell(int row, int col) override {return false;}
+	int GetNumberCols() override { return 2; }
+	int GetNumberRows() override { return 32; }
+	bool IsEmptyCell(int row, int col) override { return false; }
 	wxString GetValue(int row, int col) override;
 	void SetValue(int row, int col, const wxString &) override;
 	wxGridCellAttr *GetAttr(int, int, wxGridCellAttr::wxAttrKind) override;
diff --git a/Source/Core/DolphinWX/Debugger/RegisterView.h b/Source/Core/DolphinWX/Debugger/RegisterView.h
index d29c180273..dd97caa329 100644
--- a/Source/Core/DolphinWX/Debugger/RegisterView.h
+++ b/Source/Core/DolphinWX/Debugger/RegisterView.h
@@ -45,11 +45,11 @@ public:
 		memset(m_CachedSpecialRegHasChanged, 0, sizeof(m_CachedSpecialRegHasChanged));
 		memset(m_CachedFRegHasChanged, 0, sizeof(m_CachedFRegHasChanged));
 	}
-    int GetNumberCols(void) override {return 5;}
-    int GetNumberRows(void) override {return 32 + NUM_SPECIALS;}
-	bool IsEmptyCell(int row, int col) override {return row > 31 && col > 2;}
-    wxString GetValue(int row, int col) override;
-    void SetValue(int row, int col, const wxString &) override;
+	int GetNumberCols() override { return 5; }
+	int GetNumberRows() override { return 32 + NUM_SPECIALS; }
+	bool IsEmptyCell(int row, int col) override { return row > 31 && col > 2; }
+	wxString GetValue(int row, int col) override;
+	void SetValue(int row, int col, const wxString &) override;
 	wxGridCellAttr *GetAttr(int, int, wxGridCellAttr::wxAttrKind) override;
 	void UpdateCachedRegs();
 
diff --git a/Source/Core/DolphinWX/GLInterface/X11_Util.h b/Source/Core/DolphinWX/GLInterface/X11_Util.h
index 6913dd2f4c..1facad52aa 100644
--- a/Source/Core/DolphinWX/GLInterface/X11_Util.h
+++ b/Source/Core/DolphinWX/GLInterface/X11_Util.h
@@ -19,7 +19,7 @@ private:
 public:
 	void Initialize(Display *dpy);
 	Window CreateXWindow(Window parent, XVisualInfo *vi);
-	void DestroyXWindow(void);
+	void DestroyXWindow();
 
 	Display *dpy;
 	Window win;
diff --git a/Source/Core/DolphinWX/HotkeyDlg.cpp b/Source/Core/DolphinWX/HotkeyDlg.cpp
index 7176e4e6e9..11ee42901f 100644
--- a/Source/Core/DolphinWX/HotkeyDlg.cpp
+++ b/Source/Core/DolphinWX/HotkeyDlg.cpp
@@ -62,7 +62,7 @@ void HotkeyConfigDialog::SaveButtonMapping(int Id, int Key, int Modkey)
 	SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id] = Modkey;
 }
 
-void HotkeyConfigDialog::EndGetButtons(void)
+void HotkeyConfigDialog::EndGetButtons()
 {
 	wxTheApp->Unbind(wxEVT_KEY_DOWN, &HotkeyConfigDialog::OnKeyDown, this);
 	m_ButtonMappingTimer->Stop();
@@ -194,7 +194,7 @@ void HotkeyConfigDialog::OnButtonClick(wxCommandEvent& event)
 
 #define HOTKEY_NUM_COLUMNS 2
 
-void HotkeyConfigDialog::CreateHotkeyGUIControls(void)
+void HotkeyConfigDialog::CreateHotkeyGUIControls()
 {
 	const wxString pageNames[] =
 	{
diff --git a/Source/Core/DolphinWX/HotkeyDlg.h b/Source/Core/DolphinWX/HotkeyDlg.h
index 1105865d7b..7b34c049e0 100644
--- a/Source/Core/DolphinWX/HotkeyDlg.h
+++ b/Source/Core/DolphinWX/HotkeyDlg.h
@@ -49,12 +49,12 @@ class HotkeyConfigDialog : public wxDialog
 		void OnButtonClick(wxCommandEvent& event);
 		void OnKeyDown(wxKeyEvent& event);
 		void SaveButtonMapping(int Id, int Key, int Modkey);
-		void CreateHotkeyGUIControls(void);
+		void CreateHotkeyGUIControls();
 
 		void SetButtonText(int id, const wxString &keystr, const wxString &modkeystr = wxString());
 
 		void DoGetButtons(int id);
-		void EndGetButtons(void);
+		void EndGetButtons();
 
 		int GetButtonWaitingID, GetButtonWaitingTimer, g_Pressed, g_Modkey;
 };
diff --git a/Source/Core/VideoBackends/Software/RasterFont.h b/Source/Core/VideoBackends/Software/RasterFont.h
index e922c4bb3f..20c9467e31 100644
--- a/Source/Core/VideoBackends/Software/RasterFont.h
+++ b/Source/Core/VideoBackends/Software/RasterFont.h
@@ -8,7 +8,7 @@ class RasterFont
 {
 public:
 	RasterFont();
-	~RasterFont(void);
+	~RasterFont();
 	static int debug;
 
 	// and the happy helper functions
diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp
index 7cbc278029..1cb76857bb 100644
--- a/Source/Core/VideoBackends/Software/SWmain.cpp
+++ b/Source/Core/VideoBackends/Software/SWmain.cpp
@@ -356,7 +356,7 @@ void VideoSoftware::Video_GatherPipeBursted()
 	SWCommandProcessor::GatherPipeBursted();
 }
 
-bool VideoSoftware::Video_IsPossibleWaitingSetDrawDone(void)
+bool VideoSoftware::Video_IsPossibleWaitingSetDrawDone()
 {
 	return false;
 }
diff --git a/Source/Core/VideoCommon/PixelEngine.h b/Source/Core/VideoCommon/PixelEngine.h
index 815f870ae5..28df0ddb6e 100644
--- a/Source/Core/VideoCommon/PixelEngine.h
+++ b/Source/Core/VideoCommon/PixelEngine.h
@@ -60,7 +60,7 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base);
 
 // gfx backend support
 void SetToken(const u16 _token, const int _bSetTokenAcknowledge);
-void SetFinish(void);
+void SetFinish();
 UPEAlphaReadReg GetAlphaReadMode();
 
 // Bounding box functionality. Paper Mario (both) are a couple of the few games that use it.
diff --git a/Source/Core/VideoCommon/VertexLoader_Normal.cpp b/Source/Core/VideoCommon/VertexLoader_Normal.cpp
index 5cc366fdce..7eb900db3a 100644
--- a/Source/Core/VideoCommon/VertexLoader_Normal.cpp
+++ b/Source/Core/VideoCommon/VertexLoader_Normal.cpp
@@ -110,7 +110,7 @@ struct Normal_Index_Indices3
 
 }
 
-void VertexLoader_Normal::Init(void)
+void VertexLoader_Normal::Init()
 {
 	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT] [FORMAT_UBYTE]  = Normal_Direct<u8, 1>();
 	m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT] [FORMAT_BYTE]   = Normal_Direct<s8, 1>();
diff --git a/Source/Core/VideoCommon/VertexLoader_Normal.h b/Source/Core/VideoCommon/VertexLoader_Normal.h
index 5cbe6232bb..b9c025f27d 100644
--- a/Source/Core/VideoCommon/VertexLoader_Normal.h
+++ b/Source/Core/VideoCommon/VertexLoader_Normal.h
@@ -11,7 +11,7 @@ class VertexLoader_Normal
 public:
 
 	// Init
-	static void Init(void);
+	static void Init();
 
 	// GetSize
 	static unsigned int GetSize(unsigned int _type, unsigned int _format,
diff --git a/Source/Core/VideoCommon/VertexLoader_Position.cpp b/Source/Core/VideoCommon/VertexLoader_Position.cpp
index 9554adccd5..966ea023ef 100644
--- a/Source/Core/VideoCommon/VertexLoader_Position.cpp
+++ b/Source/Core/VideoCommon/VertexLoader_Position.cpp
@@ -165,7 +165,7 @@ static int tableReadPositionVertexSize[4][8][2] = {
 };
 
 
-void VertexLoader_Position::Init(void)
+void VertexLoader_Position::Init()
 {
 
 #if _M_SSE >= 0x301
diff --git a/Source/Core/VideoCommon/VertexLoader_Position.h b/Source/Core/VideoCommon/VertexLoader_Position.h
index a6bbf7c662..88ec06bc2e 100644
--- a/Source/Core/VideoCommon/VertexLoader_Position.h
+++ b/Source/Core/VideoCommon/VertexLoader_Position.h
@@ -8,7 +8,7 @@ class VertexLoader_Position {
 public:
 
 	// Init
-	static void Init(void);
+	static void Init();
 
 	// GetSize
 	static unsigned int GetSize(unsigned int _type, unsigned int _format, unsigned int _elements);
diff --git a/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp b/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp
index 5b47b4f3ab..5b7e50f2ec 100644
--- a/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp
+++ b/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp
@@ -173,7 +173,7 @@ static int tableReadTexCoordVertexSize[4][8][2] = {
 	},
 };
 
-void VertexLoader_TextCoord::Init(void)
+void VertexLoader_TextCoord::Init()
 {
 
 #if _M_SSE >= 0x301
diff --git a/Source/Core/VideoCommon/VertexLoader_TextCoord.h b/Source/Core/VideoCommon/VertexLoader_TextCoord.h
index 30550b9626..64dcfc9ee6 100644
--- a/Source/Core/VideoCommon/VertexLoader_TextCoord.h
+++ b/Source/Core/VideoCommon/VertexLoader_TextCoord.h
@@ -11,7 +11,7 @@ class VertexLoader_TextCoord
 public:
 
 	// Init
-	static void Init(void);
+	static void Init();
 
 	// GetSize
 	static unsigned int GetSize(unsigned int _type, unsigned int _format, unsigned int _elements);