diff --git a/Source/Core/Common/IniFile.cpp b/Source/Core/Common/IniFile.cpp
index 5fb5ce1e38..f830fd6b45 100644
--- a/Source/Core/Common/IniFile.cpp
+++ b/Source/Core/Common/IniFile.cpp
@@ -114,7 +114,7 @@ bool IniFile::Section::Get(const std::string& key, std::string* value, const std
 		return false;
 }
 
-bool IniFile::Section::Get(const std::string& key, std::vector<std::string>& out)
+bool IniFile::Section::Get(const std::string& key, std::vector<std::string>* out)
 {
 	std::string temp;
 	bool retval = Get(key, &temp);
@@ -132,7 +132,7 @@ bool IniFile::Section::Get(const std::string& key, std::vector<std::string>& out
 		size_t subEnd = temp.find_first_of(",", subStart);
 		if (subStart != subEnd)
 			// take from first char until next ,
-			out.push_back(StripSpaces(temp.substr(subStart, subEnd - subStart)));
+			out->push_back(StripSpaces(temp.substr(subStart, subEnd - subStart)));
 		// Find the next non , char
 		subStart = temp.find_first_not_of(",", subEnd);
 	}
@@ -273,23 +273,25 @@ bool IniFile::DeleteKey(const std::string& sectionName, const std::string& key)
 }
 
 // Return a list of all keys in a section
-bool IniFile::GetKeys(const std::string& sectionName, std::vector<std::string>& keys) const
+bool IniFile::GetKeys(const std::string& sectionName, std::vector<std::string>* keys) const
 {
 	const Section* section = GetSection(sectionName);
 	if (!section)
+	{
 		return false;
-	keys = section->keys_order;
+	}
+	*keys = section->keys_order;
 	return true;
 }
 
 // Return a list of all lines in a section
-bool IniFile::GetLines(const std::string& sectionName, std::vector<std::string>& lines, const bool remove_comments) const
+bool IniFile::GetLines(const std::string& sectionName, std::vector<std::string>* lines, const bool remove_comments) const
 {
 	const Section* section = GetSection(sectionName);
 	if (!section)
 		return false;
 
-	lines.clear();
+	lines->clear();
 	for (std::string line : section->lines)
 	{
 		line = StripSpaces(line);
@@ -308,7 +310,7 @@ bool IniFile::GetLines(const std::string& sectionName, std::vector<std::string>&
 			}
 		}
 
-		lines.push_back(line);
+		lines->push_back(line);
 	}
 
 	return true;
@@ -426,7 +428,7 @@ bool IniFile::Save(const std::string& filename)
 	return File::RenameSync(temp, filename);
 }
 
-bool IniFile::Get(const std::string& sectionName, const std::string& key, std::vector<std::string>& values)
+bool IniFile::Get(const std::string& sectionName, const std::string& key, std::vector<std::string>* values)
 {
 	Section *section = GetSection(sectionName);
 	if (!section)
diff --git a/Source/Core/Common/IniFile.h b/Source/Core/Common/IniFile.h
index 7db66e45cb..36fe292373 100644
--- a/Source/Core/Common/IniFile.h
+++ b/Source/Core/Common/IniFile.h
@@ -66,7 +66,7 @@ public:
 		bool Get(const std::string& key, bool* value, bool defaultValue = false);
 		bool Get(const std::string& key, float* value, float defaultValue = false);
 		bool Get(const std::string& key, double* value, double defaultValue = false);
-		bool Get(const std::string& key, std::vector<std::string>& values);
+		bool Get(const std::string& key, std::vector<std::string>* values);
 
 		bool operator < (const Section& other) const {
 			return name < other.name;
@@ -116,7 +116,7 @@ public:
 	bool Get(const std::string& sectionName, const std::string& key, int* value, int defaultValue = 0);
 	bool Get(const std::string& sectionName, const std::string& key, u32* value, u32 defaultValue = 0);
 	bool Get(const std::string& sectionName, const std::string& key, bool* value, bool defaultValue = false);
-	bool Get(const std::string& sectionName, const std::string& key, std::vector<std::string>& values);
+	bool Get(const std::string& sectionName, const std::string& key, std::vector<std::string>* values);
 	bool Get(const std::string& sectionName, const std::string& key, std::string* value, const std::string& defaultValue = NULL_STRING);
 
 	template<typename T> bool GetIfExists(const std::string& sectionName, const std::string& key, T value)
@@ -126,10 +126,10 @@ public:
 		return false;
 	}
 
-	bool GetKeys(const std::string& sectionName, std::vector<std::string>& keys) const;
+	bool GetKeys(const std::string& sectionName, std::vector<std::string>* keys) const;
 
-	void SetLines(const std::string& sectionName, const std::vector<std::string> &lines);
-	bool GetLines(const std::string& sectionName, std::vector<std::string>& lines, const bool remove_comments = true) const;
+	void SetLines(const std::string& sectionName, const std::vector<std::string>& lines);
+	bool GetLines(const std::string& sectionName, std::vector<std::string>* lines, const bool remove_comments = true) const;
 
 	bool DeleteKey(const std::string& sectionName, const std::string& key);
 	bool DeleteSection(const std::string& sectionName);
diff --git a/Source/Core/Core/ActionReplay.cpp b/Source/Core/Core/ActionReplay.cpp
index 849f62cbac..f5ddafc81a 100644
--- a/Source/Core/Core/ActionReplay.cpp
+++ b/Source/Core/Core/ActionReplay.cpp
@@ -123,8 +123,8 @@ void LoadCodes(const IniFile& globalIni, const IniFile& localIni, bool forceLoad
 
 	std::vector<std::string> enabledLines;
 	std::set<std::string> enabledNames;
-	localIni.GetLines("ActionReplay_Enabled", enabledLines);
-	for (auto& line : enabledLines)
+	localIni.GetLines("ActionReplay_Enabled", &enabledLines);
+	for (const std::string& line : enabledLines)
 	{
 		if (line.size() != 0 && line[0] == '$')
 		{
@@ -140,12 +140,14 @@ void LoadCodes(const IniFile& globalIni, const IniFile& localIni, bool forceLoad
 		std::vector<std::string> encryptedLines;
 		ARCode currentCode;
 
-		ini->GetLines("ActionReplay", lines);
+		ini->GetLines("ActionReplay", &lines);
 
-		for (std::string line : lines)
+		for (const std::string& line : lines)
 		{
 			if (line.empty())
+			{
 				continue;
+			}
 
 			std::vector<std::string> pieces;
 
diff --git a/Source/Core/Core/GeckoCodeConfig.cpp b/Source/Core/Core/GeckoCodeConfig.cpp
index 6d41d2b3fa..c2a3f11393 100644
--- a/Source/Core/Core/GeckoCodeConfig.cpp
+++ b/Source/Core/Core/GeckoCodeConfig.cpp
@@ -20,7 +20,7 @@ void LoadCodes(const IniFile& globalIni, const IniFile& localIni, std::vector<Ge
 	for (const IniFile* ini : inis)
 	{
 		std::vector<std::string> lines;
-		ini->GetLines("Gecko", lines, false);
+		ini->GetLines("Gecko", &lines, false);
 
 		GeckoCode gcode;
 
@@ -72,19 +72,25 @@ void LoadCodes(const IniFile& globalIni, const IniFile& localIni, std::vector<Ge
 
 		// add the last code
 		if (gcode.name.size())
+		{
 			gcodes.push_back(gcode);
+		}
 
-		ini->GetLines("Gecko_Enabled", lines, false);
+		ini->GetLines("Gecko_Enabled", &lines, false);
 
-		for (auto line : lines)
+		for (const std::string& line : lines)
 		{
 			if (line.size() == 0 || line[0] != '$')
+			{
 				continue;
+			}
 			std::string name = line.substr(1);
-			for (auto& ogcode : gcodes)
+			for (GeckoCode& ogcode : gcodes)
 			{
 				if (ogcode.name == name)
+				{
 					ogcode.enabled = true;
+				}
 			}
 		}
 	}
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp
index d306c111c3..0bd5b65f83 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp
@@ -130,7 +130,7 @@ void Nunchuk::GetState(u8* const data, const bool focus)
 		{
 			u8 mask;
 			float x, y;
-			m_udpWrap->inst->getNunchuck(x, y, mask);
+			m_udpWrap->inst->getNunchuck(&x, &y, &mask);
 			// buttons
 			if (mask & UDPWM_NC)
 				ncdata->bt &= ~WiimoteEmu::Nunchuk::BUTTON_C;
@@ -146,7 +146,7 @@ void Nunchuk::GetState(u8* const data, const bool focus)
 		if (m_udpWrap->updNunAccel)
 		{
 			float x, y, z;
-			m_udpWrap->inst->getNunchuckAccel(x, y, z);
+			m_udpWrap->inst->getNunchuckAccel(&x, &y, &z);
 			accel.x = x;
 			accel.y = y;
 			accel.z = z;
diff --git a/Source/Core/Core/HW/WiimoteEmu/UDPTLayer.h b/Source/Core/Core/HW/WiimoteEmu/UDPTLayer.h
index 7a827d48a5..003cc90395 100644
--- a/Source/Core/Core/HW/WiimoteEmu/UDPTLayer.h
+++ b/Source/Core/Core/HW/WiimoteEmu/UDPTLayer.h
@@ -34,7 +34,7 @@ namespace UDPTLayer
 		if (!(m->inst)) return;
 		if (!(m->updAccel)) return;
 		float x, y, z;
-		m->inst->getAccel(x, y, z);
+		m->inst->getAccel(&x, &y, &z);
 		data->x = x;
 		data->y = y;
 		data->z = z;
@@ -46,7 +46,7 @@ namespace UDPTLayer
 		if (!(m->updIR)) return;
 		if ((*x >= -0.999) && (*x <= 0.999) && (*y >= -0.999) && (*y <= 0.999)) return; //the received values are used ONLY when the normal pointer is offscreen
 		float _x, _y;
-		m->inst->getIR(_x, _y);
+		m->inst->getIR(&_x, &_y);
 		*x = _x * 2 - 1;
 		*y = -(_y * 2 - 1);
 		*z = 0;
diff --git a/Source/Core/Core/PatchEngine.cpp b/Source/Core/Core/PatchEngine.cpp
index bc00053963..dd9fe7de8e 100644
--- a/Source/Core/Core/PatchEngine.cpp
+++ b/Source/Core/Core/PatchEngine.cpp
@@ -53,7 +53,7 @@ void LoadPatchSection(const std::string& section, std::vector<Patch>& patches, I
 	std::string enabledSectionName = section + "_Enabled";
 	std::vector<std::string> enabledLines;
 	std::set<std::string> enabledNames;
-	localIni.GetLines(enabledSectionName, enabledLines);
+	localIni.GetLines(enabledSectionName, &enabledLines);
 	for (const std::string& line : enabledLines)
 	{
 		if (line.size() != 0 && line[0] == '$')
@@ -69,7 +69,7 @@ void LoadPatchSection(const std::string& section, std::vector<Patch>& patches, I
 	{
 		std::vector<std::string> lines;
 		Patch currentPatch;
-		ini->GetLines(section, lines);
+		ini->GetLines(section, &lines);
 
 		for (std::string& line : lines)
 		{
@@ -80,7 +80,9 @@ void LoadPatchSection(const std::string& section, std::vector<Patch>& patches, I
 			{
 				// Take care of the previous code
 				if (currentPatch.name.size())
+				{
 					patches.push_back(currentPatch);
+				}
 				currentPatch.entries.clear();
 
 				// Set active and name
@@ -93,7 +95,9 @@ void LoadPatchSection(const std::string& section, std::vector<Patch>& patches, I
 				std::string::size_type loc = line.find_first_of('=', 0);
 
 				if (loc != std::string::npos)
+				{
 					line[loc] = ':';
+				}
 
 				std::vector<std::string> items;
 				SplitString(line, ':', items);
@@ -108,33 +112,41 @@ void LoadPatchSection(const std::string& section, std::vector<Patch>& patches, I
 					pE.type = PatchType(std::find(PatchTypeStrings, PatchTypeStrings + 3, items[1]) - PatchTypeStrings);
 					success &= (pE.type != (PatchType)3);
 					if (success)
+					{
 						currentPatch.entries.push_back(pE);
+					}
 				}
 			}
 		}
 
 		if (currentPatch.name.size() && currentPatch.entries.size())
+		{
 			patches.push_back(currentPatch);
+		}
 	}
 }
 
-static void LoadDiscList(const char *section, std::vector<std::string> &_discList, IniFile &ini)
+static void LoadDiscList(const std::string& section, IniFile& ini)
 {
 	std::vector<std::string> lines;
-	if (!ini.GetLines(section, lines))
+	if (!ini.GetLines(section, &lines))
+	{
 		return;
+	}
 
 	for (const std::string& line : lines)
 	{
 		if (!line.empty())
-			_discList.push_back(line);
+		{
+			discList.push_back(line);
+		}
 	}
 }
 
-static void LoadSpeedhacks(const char *section, std::map<u32, int> &hacks, IniFile &ini)
+static void LoadSpeedhacks(const std::string& section, IniFile& ini)
 {
 	std::vector<std::string> keys;
-	ini.GetKeys(section, keys);
+	ini.GetKeys(section, &keys);
 	for (const std::string& key : keys)
 	{
 		std::string value;
@@ -146,7 +158,8 @@ static void LoadSpeedhacks(const char *section, std::map<u32, int> &hacks, IniFi
 			bool success = true;
 			success &= TryParse(key, &address);
 			success &= TryParse(value, &cycles);
-			if (success) {
+			if (success)
+			{
 				speedHacks[address] = (int)cycles;
 			}
 		}
@@ -176,8 +189,8 @@ void LoadPatches()
 	Gecko::LoadCodes(globalIni, localIni, gcodes);
 	Gecko::SetActiveCodes(gcodes);
 
-	LoadSpeedhacks("Speedhacks", speedHacks, merged);
-	LoadDiscList("DiscList", discList, merged);
+	LoadSpeedhacks("Speedhacks", merged);
+	LoadDiscList("DiscList", merged);
 }
 
 void ApplyPatches(const std::vector<Patch> &patches)
diff --git a/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp b/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp
index b650ac2655..1fa0183cdb 100644
--- a/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp
+++ b/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp
@@ -112,7 +112,7 @@ CBreakPointWindow::CBreakPointWindow(CCodeWindow* _pCodeWindow, wxWindow* parent
 	m_BreakPointListView = new CBreakPointView(this, wxID_ANY);
 
 	m_mgr.AddPane(new CBreakPointBar(this, wxID_ANY), wxAuiPaneInfo().ToolbarPane().Top().
-			LeftDockable(false).RightDockable(false).BottomDockable(false).Floatable(false));
+	              LeftDockable(false).RightDockable(false).BottomDockable(false).Floatable(false));
 	m_mgr.AddPane(m_BreakPointListView, wxAuiPaneInfo().CenterPane());
 	m_mgr.Update();
 }
@@ -195,12 +195,19 @@ void CBreakPointWindow::LoadAll(wxCommandEvent& WXUNUSED(event))
 	MemChecks::TMemChecksStr newmcs;
 
 	if (!ini.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX)))
+	{
 		return;
+	}
 
-	if (ini.GetLines("BreakPoints", newbps, false))
+	if (ini.GetLines("BreakPoints", &newbps, false))
+	{
 		PowerPC::breakpoints.AddFromStrings(newbps);
-	if (ini.GetLines("MemoryChecks", newmcs, false))
+	}
+
+	if (ini.GetLines("MemoryChecks", &newmcs, false))
+	{
 		PowerPC::memchecks.AddFromStrings(newmcs);
+	}
 
 	NotifyUpdate();
 }
diff --git a/Source/Core/DolphinWX/FrameAui.cpp b/Source/Core/DolphinWX/FrameAui.cpp
index 10aa258fe6..22356dcf73 100644
--- a/Source/Core/DolphinWX/FrameAui.cpp
+++ b/Source/Core/DolphinWX/FrameAui.cpp
@@ -851,7 +851,9 @@ void CFrame::LoadIniPerspectives()
 
 		// Don't save a blank perspective
 		if (Tmp.Name.empty())
+		{
 			continue;
+		}
 
 		_Section = StringFromFormat("P - %s", Tmp.Name.c_str());
 		ini.Get(_Section, "Perspective", &_Perspective,
diff --git a/Source/Core/InputCommon/UDPWiimote.cpp b/Source/Core/InputCommon/UDPWiimote.cpp
index b4bccdb9f4..00023d66c3 100644
--- a/Source/Core/InputCommon/UDPWiimote.cpp
+++ b/Source/Core/InputCommon/UDPWiimote.cpp
@@ -65,9 +65,9 @@ struct UDPWiimote::_d
 int UDPWiimote::noinst = 0;
 
 UDPWiimote::UDPWiimote(const std::string& _port, const std::string& name, int _index) :
-	port(_port), displayName(name),
-	d(new _d) ,x(0), y(0), z(1.0f), naX(0), naY(0), naZ(-1.0f), nunX(0), nunY(0),
-	pointerX(1001.0f / 2), pointerY(0), nunMask(0), mask(0), index(_index), int_port(atoi(_port.c_str()))
+	port(_port), displayName(name),	d(new _d),
+	waX(0), waY(0), waZ(1), naX(0), naY(0), naZ(-1), nunX(0), nunY(0),
+	pointerX(1001.0f / 2), pointerY(0), nunMask(0), wiimoteMask(0), index(_index), int_port(atoi(_port.c_str()))
 {
 
 	static bool sranded=false;
@@ -275,9 +275,9 @@ int UDPWiimote::pharsePacket(u8 * bf, size_t size)
 		ux=(double)((s32)ntohl(*p)); p++;
 		uy=(double)((s32)ntohl(*p)); p++;
 		uz=(double)((s32)ntohl(*p)); p++;
-		x=ux/1048576; //packet accel data
-		y=uy/1048576;
-		z=uz/1048576;
+		waX=ux/1048576; //packet accel data
+		waY=uy/1048576;
+		waZ=uz/1048576;
 	}
 
 	if (bf[2] & BUTT_FLAG)
@@ -285,7 +285,7 @@ int UDPWiimote::pharsePacket(u8 * bf, size_t size)
 		if ((size-(((u8*)p)-bf)) < 4)
 			return -1;
 
-		mask=ntohl(*p); p++;
+		wiimoteMask = ntohl(*p); p++;
 	}
 
 	if (bf[2] & IR_FLAG)
@@ -388,43 +388,43 @@ void UDPWiimote::broadcastPresence()
 	broadcastIPv6(bf,7+slen);
 }
 
-void UDPWiimote::getAccel(float &_x, float &_y, float &_z)
+void UDPWiimote::getAccel(float* x, float* y, float* z)
 {
 	std::lock_guard<std::mutex> lk(d->mutex);
-	_x=(float)x;
-	_y=(float)y;
-	_z=(float)z;
+	*x = (float)waX;
+	*y = (float)waY;
+	*z = (float)waZ;
 }
 
 u32 UDPWiimote::getButtons()
 {
 	u32 msk;
 	std::lock_guard<std::mutex> lk(d->mutex);
-	msk=mask;
+	msk = wiimoteMask;
 	return msk;
 }
 
-void UDPWiimote::getIR(float& _x, float& _y)
+void UDPWiimote::getIR(float* x, float* y)
 {
 	std::lock_guard<std::mutex> lk(d->mutex);
-	_x=(float)pointerX;
-	_y=(float)pointerY;
+	*x = (float)pointerX;
+	*y = (float)pointerY;
 }
 
-void UDPWiimote::getNunchuck(float &_x, float &_y, u8 &_mask)
+void UDPWiimote::getNunchuck(float* x, float* y, u8* mask)
 {
 	std::lock_guard<std::mutex> lk(d->mutex);
-	_x=(float)nunX;
-	_y=(float)nunY;
-	_mask=nunMask;
+	*x = (float)nunX;
+	*y = (float)nunY;
+	*mask = nunMask;
 }
 
-void UDPWiimote::getNunchuckAccel(float& _x, float& _y, float& _z)
+void UDPWiimote::getNunchuckAccel(float* x, float* y, float* z)
 {
 	std::lock_guard<std::mutex> lk(d->mutex);
-	_x = (float)naX;
-	_y = (float)naY;
-	_z = (float)naZ;
+	*x = (float)naX;
+	*y = (float)naY;
+	*z = (float)naZ;
 }
 
 const std::string& UDPWiimote::getPort()
diff --git a/Source/Core/InputCommon/UDPWiimote.h b/Source/Core/InputCommon/UDPWiimote.h
index 806aa610e2..5dd2c500ca 100644
--- a/Source/Core/InputCommon/UDPWiimote.h
+++ b/Source/Core/InputCommon/UDPWiimote.h
@@ -27,12 +27,15 @@ class UDPWiimote
 public:
 	UDPWiimote(const std::string& port, const std::string& name, int index);
 	virtual ~UDPWiimote();
-	void getAccel(float& x, float& y, float& z);
+	void getAccel(float* x, float* y, float* z);
 	u32 getButtons();
-	void getNunchuck(float& x, float& y, u8& mask);
-	void getIR(float& x, float& y);
-	void getNunchuckAccel(float& x, float& y, float& z);
-	int getErrNo() { return err; }
+	void getNunchuck(float* x, float* y, u8* mask);
+	void getIR(float* x, float* y);
+	void getNunchuckAccel(float* x, float* y, float* z);
+	int getErrNo()
+	{
+		return err;
+	}
 	const std::string& getPort();
 	void changeName(const std::string& name);
 
@@ -42,12 +45,12 @@ private:
 	int pharsePacket(u8* data, size_t size);
 	struct _d; //using pimpl because Winsock2.h doesn't have include guards -_-
 	_d* d;
-	double x,y,z;
-	double naX,naY,naZ;
-	double nunX,nunY;
-	double pointerX,pointerY;
+	double waX, waY, waZ;
+	double naX, naY, naZ;
+	double nunX, nunY;
+	double pointerX, pointerY;
 	u8 nunMask;
-	u32 mask;
+	u32 wiimoteMask;
 	u16 bcastMagic;
 	int err;
 	int index;