diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f1ad0fb67..f7afb60cee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -469,7 +469,7 @@ if(NOT ANDROID)
 	if(ENCODE_FRAMEDUMPS)
 		check_libav()
 		if(LIBAV_FOUND)
-			LIST(APPEND LIBS ${LIBAV_LIBRARIES})
+			LIST(APPEND LIBS ${LIBAV_LDFLAGS})
 		endif()
 
 	endif()
@@ -781,7 +781,7 @@ if(NOT DISABLE_WX AND NOT ANDROID)
 			message(FATAL_ERROR "wxWidgets in Externals is not compatible with your platform")
 		endif()
 
-		include_directories(
+		include_directories(SYSTEM
 			Externals/wxWidgets3
 			Externals/wxWidgets3/include)
 		add_subdirectory(Externals/wxWidgets3)
diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp
index 07b803b677..ab5e220764 100644
--- a/Source/Core/DolphinWX/ControllerConfigDiag.cpp
+++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp
@@ -43,7 +43,7 @@ wxDEFINE_EVENT(wxEVT_ADAPTER_UPDATE, wxCommandEvent);
 ControllerConfigDiag::ControllerConfigDiag(wxWindow* const parent)
 	: wxDialog(parent, wxID_ANY, _("Dolphin Controller Configuration"))
 {
-	m_gc_pad_type_strs = {
+	m_gc_pad_type_strs = {{
 		_("None"),
 		_("Standard Controller"),
 		_("Steering Wheel"),
@@ -52,7 +52,7 @@ ControllerConfigDiag::ControllerConfigDiag(wxWindow* const parent)
 		_("GBA"),
 		_("Keyboard"),
 		_("AM-Baseboard")
-	};
+	}};
 
 	wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);
 
diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp
index 64912416d8..b852460d66 100644
--- a/Source/Core/DolphinWX/Main.cpp
+++ b/Source/Core/DolphinWX/Main.cpp
@@ -276,12 +276,14 @@ bool DolphinApp::OnInit()
 	return true;
 }
 
+#ifdef __APPLE__
 void DolphinApp::MacOpenFile(const wxString &fileName)
 {
 	FileToLoad = fileName;
 	LoadFile = true;
 	main_frame->BootGame(WxStrToStr(FileToLoad));
 }
+#endif
 
 void DolphinApp::AfterInit()
 {
diff --git a/Source/Core/DolphinWX/Main.h b/Source/Core/DolphinWX/Main.h
index ade8f81287..a28b3e94f9 100644
--- a/Source/Core/DolphinWX/Main.h
+++ b/Source/Core/DolphinWX/Main.h
@@ -23,7 +23,9 @@ private:
 	void OnFatalException() override;
 	bool Initialize(int& c, wxChar **v) override;
 	void InitLanguageSupport();
-	void MacOpenFile(const wxString &fileName);
+#ifdef __APPLE__
+	void MacOpenFile(const wxString &fileName) override;
+#endif
 
 	bool BatchMode;
 	bool LoadFile;
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h
index 973bd1fefd..4be67a503c 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h
@@ -57,9 +57,9 @@ public:
 
 	Keyboard(IOHIDDeviceRef device, std::string name, int index, void *window);
 
-	std::string GetName() const;
-	std::string GetSource() const;
-	int GetId() const;
+	std::string GetName() const override;
+	std::string GetSource() const override;
+	int GetId() const override;
 
 private:
 	struct