diff --git a/Externals/SDL/src/joystick/darwin/SDL_sysjoystick.c b/Externals/SDL/src/joystick/darwin/SDL_sysjoystick.c
index 32d82f6..8592a00 100644
--- a/Externals/SDL/src/joystick/darwin/SDL_sysjoystick.c
+++ b/Externals/SDL/src/joystick/darwin/SDL_sysjoystick.c
@@ -186,7 +186,7 @@ static IOReturn HIDCreateOpenDeviceInterface (io_object_t hidDevice, recDevice *
 			plugInResult = (*ppPlugInInterface)->QueryInterface (ppPlugInInterface,
 								CFUUIDGetUUIDBytes (kIOHIDDeviceInterfaceID), (void *) &(pDevice->interface));
 			if (S_OK != plugInResult)
-				HIDReportErrorNum ("Couldn�t query HID class device interface from plugInInterface", plugInResult);
+				HIDReportErrorNum ("Couldn't query HID class device interface from plugInInterface", plugInResult);
 			(*ppPlugInInterface)->Release (ppPlugInInterface);
 		}
 		else
diff --git a/Source/Core/Common/Src/BreakPoints.cpp b/Source/Core/Common/Src/BreakPoints.cpp
index 784f5c6..1dee12f 100644
--- a/Source/Core/Common/Src/BreakPoints.cpp
+++ b/Source/Core/Common/Src/BreakPoints.cpp
@@ -42,15 +42,15 @@ BreakPoints::TBreakPointsStr BreakPoints::GetStrings() const
 	return bps;
 }
 
-void BreakPoints::AddFromStrings(const TBreakPointsStr& bps)
+void BreakPoints::AddFromStrings(const TBreakPointsStr& bpstrs)
 {
-	for (const auto& bps_i : bps)
+	for (const auto& bpstr : bpstrs)
 	{
 		TBreakPoint bp;
-		std::stringstream bpstr;
-		bpstr << std::hex << bps_i;
-		bpstr >> bp.iAddress;
-		bp.bOn = bps_i.find("n") != bps_i.npos;
+		std::stringstream ss;
+		ss << std::hex << bpstr;
+		ss >> bp.iAddress;
+		bp.bOn = bpstr.find("n") != bpstr.npos;
 		bp.bTemporary = false;
 		Add(bp);
 	}
@@ -127,21 +127,21 @@ MemChecks::TMemChecksStr MemChecks::GetStrings() const
 	return mcs;
 }
 
-void MemChecks::AddFromStrings(const TMemChecksStr& mcs)
+void MemChecks::AddFromStrings(const TMemChecksStr& mcstrs)
 {
-	for (const auto& mcs_i : mcs)
+	for (const auto& mcstr : mcstrs)
 	{
 		TMemCheck mc;
-		std::stringstream mcstr;
-		mcstr << std::hex << mcs_i;
-		mcstr >> mc.StartAddress;
-		mc.bRange	= mcs_i.find("n") != mcs_i.npos;
-		mc.OnRead	= mcs_i.find("r") != mcs_i.npos;
-		mc.OnWrite	= mcs_i.find("w") != mcs_i.npos;
-		mc.Log		= mcs_i.find("l") != mcs_i.npos;
-		mc.Break	= mcs_i.find("p") != mcs_i.npos;
+		std::stringstream ss;
+		ss << std::hex << mcstr;
+		ss >> mc.StartAddress;
+		mc.bRange	= mcstr.find("n") != mcstr.npos;
+		mc.OnRead	= mcstr.find("r") != mcstr.npos;
+		mc.OnWrite	= mcstr.find("w") != mcstr.npos;
+		mc.Log		= mcstr.find("l") != mcstr.npos;
+		mc.Break	= mcstr.find("p") != mcstr.npos;
 		if (mc.bRange)
-			mcstr >> mc.EndAddress;
+			ss >> mc.EndAddress;
 		else
 			mc.EndAddress = mc.StartAddress;
 		Add(mc);
diff --git a/Source/Core/Common/Src/CDUtils.cpp b/Source/Core/Common/Src/CDUtils.cpp
index 7dab75e..569ceb3 100644
--- a/Source/Core/Common/Src/CDUtils.cpp
+++ b/Source/Core/Common/Src/CDUtils.cpp
@@ -211,24 +211,21 @@ std::vector<std::string> cdio_get_devices ()
 // Returns true if device is a cdrom/dvd drive
 bool cdio_is_cdrom(std::string device)
 {
-#ifdef __linux__
+#ifndef _WIN32
 	// Resolve symbolic links. This allows symbolic links to valid
 	// drives to be passed from the command line with the -e flag.
 	char resolved_path[MAX_PATH];
 	char *devname = realpath(device.c_str(), resolved_path);
 	if (!devname)
 		return false;
+	device = devname;
 #endif
 
 	std::vector<std::string> devices = cdio_get_devices();
 	bool res = false;
-	for (auto& devices_i : devices)
+	for (auto& odevice : devices)
 	{
-#ifdef __linux__
-		if (strncmp(devices[i].c_str(), devname, MAX_PATH) == 0)
-#else
-		if (strncmp(devices_i.c_str(), device.c_str(), MAX_PATH) == 0)
-#endif
+		if (strncmp(odevice.c_str(), device.c_str(), MAX_PATH) == 0)
 		{
 			res = true;
 			break;
diff --git a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h
index 9cff0e8..44248fd 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h
+++ b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h
@@ -47,7 +47,6 @@ private:
 	void InitMixer();
 
 	// Declarations and definitions
-	void *m_hWnd;
 	bool m_bWii;
 
 	bool m_InitMixer;
diff --git a/Source/Core/DolphinWX/Src/Debugger/BreakpointView.cpp b/Source/Core/DolphinWX/Src/Debugger/BreakpointView.cpp
index d22ef36..c23412e 100644
--- a/Source/Core/DolphinWX/Src/Debugger/BreakpointView.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/BreakpointView.cpp
@@ -32,9 +32,8 @@ void CBreakPointView::Update()
 
 	char szBuffer[64];
 	const BreakPoints::TBreakPoints& rBreakPoints = PowerPC::breakpoints.GetBreakPoints();
-	for (auto& rBreakPoint : rBreakPoints)
+	for (const auto& rBP : rBreakPoints)
 	{
-		const TBreakPoint& rBP = rBreakPoint;
 		if (!rBP.bTemporary)
 		{
 			wxString temp;
@@ -59,10 +58,8 @@ void CBreakPointView::Update()
 	}
 
 	const MemChecks::TMemChecks& rMemChecks = PowerPC::memchecks.GetMemChecks();
-	for (auto& rMemChecks_i : rMemChecks)
+	for (const auto& rMemCheck : rMemChecks)
 	{
-		const TMemCheck& rMemCheck = rMemChecks_i;
-
 		wxString temp;
 		temp = StrToWxStr((rMemCheck.Break || rMemCheck.Log) ? "on" : " ");
 		int Item = InsertItem(0, temp);