diff --git a/Source/Core/Core/Core.vcproj b/Source/Core/Core/Core.vcproj
index 7f147ca31a..c005d8c2cb 100644
--- a/Source/Core/Core/Core.vcproj
+++ b/Source/Core/Core/Core.vcproj
@@ -827,7 +827,7 @@
 					>
 				</File>
 				<File
-					RelativePath=".\Src\HW\StreamADPCM.H"
+					RelativePath=".\Src\HW\StreamADPCM.h"
 					>
 				</File>
 			</Filter>
diff --git a/Source/Core/Core/Src/HW/AudioInterface.h b/Source/Core/Core/Src/HW/AudioInterface.h
index b1bf86a75f..1a0a871056 100644
--- a/Source/Core/Core/Src/HW/AudioInterface.h
+++ b/Source/Core/Core/Src/HW/AudioInterface.h
@@ -33,7 +33,7 @@ void DoState(PointerWrap &p);
 
 void Update();
 
-// Calls by DSP plugin
+// Called by DSP plugin
 u32 Callback_GetStreaming(short* _pDestBuffer, u32 _numSamples);
 
 void Read32(u32& _uReturnValue, const u32 _iAddress);
diff --git a/Source/Core/Core/Src/HW/DSP.cpp b/Source/Core/Core/Src/HW/DSP.cpp
index 7c5fa24b8e..5b261e4c3c 100644
--- a/Source/Core/Core/Src/HW/DSP.cpp
+++ b/Source/Core/Core/Src/HW/DSP.cpp
@@ -230,87 +230,78 @@ void Shutdown()
 
 void Read16(u16& _uReturnValue, const u32 _iAddress)
 {
-	// WTF is this check about? DSP is at 5000    TODO remove
-	if ((_iAddress & 0x6C00) != 0x6c00)
+	switch (_iAddress & 0xFFFF)
 	{
-		switch (_iAddress & 0xFFFF)
-		{
 		// AI_REGS 0x5000+
-		case DSP_MAIL_TO_DSP_HI:
-			_uReturnValue = dsp_plugin->DSP_ReadMailboxHigh(true);
-			break;
+	case DSP_MAIL_TO_DSP_HI:
+		_uReturnValue = dsp_plugin->DSP_ReadMailboxHigh(true);
+		break;
 
-		case DSP_MAIL_TO_DSP_LO:
-			_uReturnValue = dsp_plugin->DSP_ReadMailboxLow(true);
-			break;
+	case DSP_MAIL_TO_DSP_LO:
+		_uReturnValue = dsp_plugin->DSP_ReadMailboxLow(true);
+		break;
 
-		case DSP_MAIL_FROM_DSP_HI:
-			_uReturnValue = dsp_plugin->DSP_ReadMailboxHigh(false);
-			break;
+	case DSP_MAIL_FROM_DSP_HI:
+		_uReturnValue = dsp_plugin->DSP_ReadMailboxHigh(false);
+		break;
 
-		case DSP_MAIL_FROM_DSP_LO:
-			_uReturnValue = dsp_plugin->DSP_ReadMailboxLow(false);
-			break;
+	case DSP_MAIL_FROM_DSP_LO:
+		_uReturnValue = dsp_plugin->DSP_ReadMailboxLow(false);
+		break;
 
-		case DSP_CONTROL:
-			_uReturnValue = (g_dspState.DSPControl.Hex & ~DSP_CONTROL_MASK) |
-							(dsp_plugin->DSP_ReadControlRegister() & DSP_CONTROL_MASK);
-			break;
+	case DSP_CONTROL:
+		_uReturnValue = (g_dspState.DSPControl.Hex & ~DSP_CONTROL_MASK) |
+			(dsp_plugin->DSP_ReadControlRegister() & DSP_CONTROL_MASK);
+		break;
 
 		// AR_REGS 0x501x+
-		case 0x5012:
-			_uReturnValue = g_AR_MODE;
-			break;
+	case 0x5012:
+		_uReturnValue = g_AR_MODE;
+		break;
 
-		case 0x5016:		// ready flag?
-			_uReturnValue = g_AR_READY_FLAG;			
-			break;
+	case 0x5016:		// ready flag?
+		_uReturnValue = g_AR_READY_FLAG;			
+		break;
 
-		case 0x501a:
-			_uReturnValue = 0x000;
-			break;
+	case 0x501a:
+		_uReturnValue = 0x000;
+		break;
 
-		case AR_DMA_MMADDR_H: _uReturnValue = g_arDMA.MMAddr >> 16; return;
-		case AR_DMA_MMADDR_L: _uReturnValue = g_arDMA.MMAddr & 0xFFFF; return;
-		case AR_DMA_ARADDR_H: _uReturnValue = g_arDMA.ARAddr >> 16; return;
-		case AR_DMA_ARADDR_L: _uReturnValue = g_arDMA.ARAddr & 0xFFFF; return;
-		case AR_DMA_CNT_H:    _uReturnValue = g_arDMA.Cnt.Hex >> 16; return;
-		case AR_DMA_CNT_L:    _uReturnValue = g_arDMA.Cnt.Hex & 0xFFFF; return;
+	case AR_DMA_MMADDR_H: _uReturnValue = g_arDMA.MMAddr >> 16; return;
+	case AR_DMA_MMADDR_L: _uReturnValue = g_arDMA.MMAddr & 0xFFFF; return;
+	case AR_DMA_ARADDR_H: _uReturnValue = g_arDMA.ARAddr >> 16; return;
+	case AR_DMA_ARADDR_L: _uReturnValue = g_arDMA.ARAddr & 0xFFFF; return;
+	case AR_DMA_CNT_H:    _uReturnValue = g_arDMA.Cnt.Hex >> 16; return;
+	case AR_DMA_CNT_L:    _uReturnValue = g_arDMA.Cnt.Hex & 0xFFFF; return;
 
 		// DMA_REGS 0x5030+
-		case AUDIO_DMA_BYTES_LEFT:
-			// Hmm. Would be stupid to ask for bytes left. Assume it wants
-			// blocks left.
-			_uReturnValue = g_audioDMA.BlocksLeft;
-			break;
+	case AUDIO_DMA_BYTES_LEFT:
+		// Hmm. Would be stupid to ask for bytes left. Assume it wants
+		// blocks left.
+		_uReturnValue = g_audioDMA.BlocksLeft;
+		break;
 
-		case AUDIO_DMA_START_LO:
-			_uReturnValue = g_audioDMA.SourceAddress & 0xFFFF;
-			break;
+	case AUDIO_DMA_START_LO:
+		_uReturnValue = g_audioDMA.SourceAddress & 0xFFFF;
+		break;
 
-		case AUDIO_DMA_START_HI:
-			_uReturnValue = g_audioDMA.SourceAddress >> 16;
-			break;
+	case AUDIO_DMA_START_HI:
+		_uReturnValue = g_audioDMA.SourceAddress >> 16;
+		break;
 
-		case AUDIO_DMA_CONTROL_LEN:
-			_uReturnValue = g_audioDMA.AudioDMAControl.Hex;
-			break;
+	case AUDIO_DMA_CONTROL_LEN:
+		_uReturnValue = g_audioDMA.AudioDMAControl.Hex;
+		break;
 
-		default:
-			_dbg_assert_(DSPINTERFACE,0);
-			break;
-		}
-		if (_iAddress != 0xCC005004)
-		{
-			DEBUG_LOG(DSPINTERFACE, "DSPInterface(r16) 0x%08x (%02x)  (%08x)", _iAddress, _uReturnValue, PowerPC::ppcState.pc);
-		}
-		return;
-	}
-	else
-	{
+	default:
 		_dbg_assert_(DSPINTERFACE,0);
+		break;
+	}
+
+	if (_iAddress != (0xCC000000 + DSP_MAIL_FROM_DSP_HI))
+	{
+		DEBUG_LOG(DSPINTERFACE, "DSPInterface(r16) 0x%08x (%02x)  (%08x)", _iAddress, _uReturnValue, PowerPC::ppcState.pc);
 	}
-	_uReturnValue = 0x000;
 }
 
 void Write16(const u16 _Value, const u32 _Address)
diff --git a/Source/Core/Core/Src/HW/StreamADPCM.H b/Source/Core/Core/Src/HW/StreamADPCM.h
similarity index 93%
rename from Source/Core/Core/Src/HW/StreamADPCM.H
rename to Source/Core/Core/Src/HW/StreamADPCM.h
index 5b4bed7537..e902ae69c2 100644
--- a/Source/Core/Core/Src/HW/StreamADPCM.H
+++ b/Source/Core/Core/Src/HW/StreamADPCM.h
@@ -1,16 +1,16 @@
-// Adapted from in_cube by hcs & destop
-
-#ifndef _STREAMADPCM_H
-#define _STREAMADPCM_H
-
-#include "Common.h"
-
-class NGCADPCM
-{
-public:
-	static void InitFilter();
-	static void DecodeBlock(short *pcm, const u8 *adpcm);
-};
-
-#endif
-
+// Adapted from in_cube by hcs & destop
+
+#ifndef _STREAMADPCM_H
+#define _STREAMADPCM_H
+
+#include "Common.h"
+
+class NGCADPCM
+{
+public:
+	static void InitFilter();
+	static void DecodeBlock(short *pcm, const u8 *adpcm);
+};
+
+#endif
+