diff --git a/pcsx2/R5900OpcodeImpl.cpp b/pcsx2/R5900OpcodeImpl.cpp
index 3c9ed76f28..8ad29c5cee 100644
--- a/pcsx2/R5900OpcodeImpl.cpp
+++ b/pcsx2/R5900OpcodeImpl.cpp
@@ -732,7 +732,6 @@ void MOVN() {
 * Format:  OP                                            *
 *********************************************************/
 
-#include "Sifcmd.h"
 /*
 int __Deci2Call(int call, u32 *addr);
 */
@@ -821,6 +820,8 @@ int __Deci2Call(int call, u32 *addr)
 	return 0;
 }
 
+// This function is the only one that uses Sifcmd.h in Pcsx2.
+#include "Sifcmd.h"
 
 void SYSCALL()
 {
@@ -841,7 +842,8 @@ void SYSCALL()
 			__Deci2Call( cpuRegs.GPR.n.a0.UL[0], (u32*)PSM(cpuRegs.GPR.n.a1.UL[0]) );
 	}
 
-	if (call == 0x77)
+	// The only thing this code is used for is the one log message, so don't execute it if we aren't logging bios messages.
+	if (macTrace.EE.Bios() && (call == 0x77))
 	{
 		t_sif_dma_transfer *dmat;
 		//struct t_sif_cmd_header	*hdr;
diff --git a/pcsx2/Sif.cpp b/pcsx2/Sif.cpp
index d2c9d7f1b5..004d0714ed 100644
--- a/pcsx2/Sif.cpp
+++ b/pcsx2/Sif.cpp
@@ -20,11 +20,8 @@
 #include "IopCommon.h"
 
 #include "Sif.h"
-#include "Sifcmd.h"
 
-DMACh *sif0ch;
-DMACh *sif1ch;
-DMACh *sif2ch;
+DMACh *sif0ch, *sif1ch, *sif2ch;
 
 static _sif0 sif0;
 static _sif1 sif1;
diff --git a/pcsx2/Sif.h b/pcsx2/Sif.h
index cd5b665baa..0ef66898e9 100644
--- a/pcsx2/Sif.h
+++ b/pcsx2/Sif.h
@@ -52,9 +52,7 @@ struct _sif1
 	s32 counter;
 	struct sifData sifData;
 };
-extern DMACh *sif0ch;
-extern DMACh *sif1ch;
-extern DMACh *sif2ch;
+extern DMACh *sif0ch, *sif1ch, *sif2ch;
 
 extern void sifInit();
 extern void SIF0Dma();
diff --git a/plugins/zerospu2/Targets/dsound51.h b/plugins/zerospu2/Targets/dsound51.h
index f402c92a85..cf7ca8aca2 100644
--- a/plugins/zerospu2/Targets/dsound51.h
+++ b/plugins/zerospu2/Targets/dsound51.h
@@ -1,21 +1,21 @@
-/*  ZeroSPU2
- *  Copyright (C) 2006-2010 zerofrog
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
- 
+/*  ZeroSPU2
+ *  Copyright (C) 2006-2010 zerofrog
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
 #ifndef DSOUND51_H_INCLUDED
 #define DSOUND51_H_INCLUDED
 
@@ -30,17 +30,17 @@
 // use DirectSound for the sound
 #include <dsound.h>
 
-extern int DSSetupSound();
-extern void DSRemoveSound();
-extern int DSSoundGetBytesBuffered();
+extern int DSSetupSound();
+extern void DSRemoveSound();
+extern int DSSoundGetBytesBuffered();
 extern void DSSoundFeedVoiceData(unsigned char* pSound,long lBytes);
 
-static SoundCallbacks DSCmds =
-{
-	(intFunction)DSSetupSound,
-	(voidFunction)DSRemoveSound,
-	(intFunction)DSSoundGetBytesBuffered,
-	(soundFeedFunction)DSSoundFeedVoiceData
+static SoundCallbacks DSCmds =
+{
+	(intFunction)DSSetupSound,
+	(voidFunction)DSRemoveSound,
+	(intFunction)DSSoundGetBytesBuffered,
+	(soundFeedFunction)DSSoundFeedVoiceData
 };
 
 #endif
\ No newline at end of file