diff --git a/SConstruct b/SConstruct
index 5d4df8b0c9..c18222a317 100644
--- a/SConstruct
+++ b/SConstruct
@@ -67,7 +67,7 @@ dirs = [
     'Source/Plugins/Plugin_DSP_NULL/Src',
     'Source/Plugins/Plugin_PadSimple/Src',
     'Source/Plugins/Plugin_nJoy_SDL/Src',
-#    'Source/Plugins/Plugin_nJoy_Testing/Src',
+    'Source/Plugins/Plugin_nJoy_Testing/Src',
     'Source/Plugins/Plugin_Wiimote/Src',
     'Source/Core/DolphinWX/Src',
     'Source/Core/DebuggerWX/Src',
diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
index b18493ad6e..b88e5d0951 100644
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@@ -132,12 +132,6 @@ inline u32 _rotr(u32 x, int shift) {
 }
 
 #define LONG int
-#ifdef __LINUX__
-typedef union _LARGE_INTEGER
-{
-	long long QuadPart;
-} LARGE_INTEGER;
-#endif
 
 #ifndef __forceinline
 #define __forceinline inline
diff --git a/Source/Core/Core/Src/ActionReplay.cpp b/Source/Core/Core/Src/ActionReplay.cpp
index 5b4542298f..487761c0f5 100644
--- a/Source/Core/Core/Src/ActionReplay.cpp
+++ b/Source/Core/Core/Src/ActionReplay.cpp
@@ -196,12 +196,12 @@ void LogInfo(const char *format, ...)
 void RunAllActive()
 {
 	if (Core::GetStartupParameter().bEnableCheats) {
-		for (std::vector<ARCode>::iterator iter = activeCodes.begin(); iter != activeCodes.end(); ++iter) 
+		for (std::vector<ARCode>::iterator i = activeCodes.begin(); i != activeCodes.end(); ++i) 
 		{
-			if (iter->active)
+			if (i->active)
 			{
-				if (!RunCode(*iter))
-					iter->active = false;
+				if (!RunCode(*i))
+					i->active = false;
 				LogInfo("\n");
 			}
 		}
diff --git a/Source/Core/Core/Src/MemTools.cpp b/Source/Core/Core/Src/MemTools.cpp
index ed2eb788ca..960962ce2a 100644
--- a/Source/Core/Core/Src/MemTools.cpp
+++ b/Source/Core/Core/Src/MemTools.cpp
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <signal.h>
 #include <sys/ucontext.h>   // Look in here for the context definition.
-#ifdef __LINUX__
+#ifdef __linux__
 #define CREG_RAX(ctx) (ctx)->gregs[REG_RAX]
 #define CREG_RIP(ctx) (ctx)->gregs[REG_RIP]
 #define CREG_EAX(ctx) (ctx)->gregs[REG_EAX]
diff --git a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp
index f2c2ac96e6..e524b1f657 100644
--- a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp
+++ b/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp
@@ -288,9 +288,7 @@ void FixUpInternalBranches(CodeOp *code, int begin, int end)
 // IMPORTANT - CURRENTLY ASSUMES THAT A IS A COMPARE
 bool CanSwapAdjacentOps(const CodeOp &a, const CodeOp &b)
 {
-	const GekkoOPInfo *a_info = GetOpInfo(a.inst);
 	const GekkoOPInfo *b_info = GetOpInfo(b.inst);
-	int a_flags = a_info->flags;
 	int b_flags = b_info->flags;
 	if (b_flags & (FL_SET_CRx | FL_ENDBLOCK | FL_TIMER | FL_EVIL))
 		return false;
@@ -324,21 +322,20 @@ bool CanSwapAdjacentOps(const CodeOp &a, const CodeOp &b)
 	// That is, check that none of b's outputs matches any of a's inputs,
 	// and that none of a's outputs matches any of b's inputs.
 	// The latter does not apply if a is a cmp, of course, but doesn't hurt to check.
-	bool no_swap = false;
 	for (int j = 0; j < 3; j++)
 	{
 		int regInA = a.regsIn[j];
 		int regInB = b.regsIn[j];
-		if (regInA >= 0 &&
-			b.regsOut[0] == regInA ||
-			b.regsOut[1] == regInA)
+		if (regInA >= 0 && 
+		    (b.regsOut[0] == regInA ||
+		     b.regsOut[1] == regInA))
 		{
 			// reg collision! don't swap
 			return false;
 		}
 		if (regInB >= 0 &&
-			a.regsOut[0] == regInB ||
-			a.regsOut[1] == regInB)
+		    (a.regsOut[0] == regInB ||
+		     a.regsOut[1] == regInB))
 		{
 			// reg collision! don't swap
 			return false;
diff --git a/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp b/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp
index 676c2599a3..77529add7f 100644
--- a/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp
+++ b/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp
@@ -85,6 +85,6 @@ void CARCodeAddEdit::UpdateTextCtrl(ActionReplay::ARCode arCode)
 {
 	EditCheatCode->Clear();
 
-	for (int i = 0; i < arCode.ops.size(); i++)
+	for (u32 i = 0; i < arCode.ops.size(); i++)
 		EditCheatCode->AppendText(wxString::Format(wxT("%08X %08X\n"), arCode.ops.at(i).cmd_addr, arCode.ops.at(i).value));
 }