diff --git a/Debug.cpp b/Debug.cpp
index 87f3b371..8a4726ae 100644
--- a/Debug.cpp
+++ b/Debug.cpp
@@ -238,7 +238,7 @@ void EndDump()
 	fclose( dumpFile );
 }
 
-void DebugRSPState( DWORD pci, DWORD pc, DWORD cmd, DWORD w0, DWORD w1 )
+void DebugRSPState( u32 pci, u32 pc, u32 cmd, u32 w0, u32 w1 )
 {
 	Debug.rsp.pci = pci;
 	Debug.rsp.pc = pc;
@@ -247,7 +247,7 @@ void DebugRSPState( DWORD pci, DWORD pc, DWORD cmd, DWORD w0, DWORD w1 )
 	Debug.rsp.w1 = w1;
 }
 
-void DebugMsg( WORD type, LPCSTR format, ... )
+void DebugMsg( u16 type, const char * format, ... )
 {
 	char text[256];
 
diff --git a/Debug.h b/Debug.h
index eaec3392..c4fa27df 100644
--- a/Debug.h
+++ b/Debug.h
@@ -1,11 +1,7 @@
 #if !defined( DEBUG_H ) && defined( _DEBUG )
 #define DEBUG_H
 
-#ifndef __LINUX__
-# include <windows.h>
-#else
-# include "winlnxdefs.h"
-#endif
+#include "Types.h"
 #include <stdio.h>
 
 #define		DEBUG_LOW		0x1000
@@ -26,11 +22,11 @@
 
 struct DebugInfo
 {
-	WORD show, level;
-	BOOL detail, paused, step;
+	u16 show, level;
+	u8 detail, paused, step;
 	struct
 	{
-		DWORD pci, pc, cmd, w0, w1;
+		u32 pci, pc, cmd, w0, w1;
 	} rsp;
 };
 
@@ -38,8 +34,8 @@ extern DebugInfo Debug;
 
 void OpenDebugDlg();
 void CloseDebugDlg();
-void DebugRSPState( DWORD pci, DWORD pc, DWORD cmd, DWORD w0, DWORD w1 );
-void DebugMsg( WORD type, LPCSTR format, ... );
+void DebugRSPState( u32 pci, u32 pc, u32 cmd, u32 w0, u32 w1 );
+void DebugMsg( u16 type, const char * format, ... );
 void StartDump( char *filename );
 void EndDump();
 
diff --git a/DepthBuffer.h b/DepthBuffer.h
index a074f385..bfa083f7 100644
--- a/DepthBuffer.h
+++ b/DepthBuffer.h
@@ -2,6 +2,7 @@
 #define DEPTHBUFFER_H
 
 #include "Types.h"
+#include "Textures.h"
 
 struct DepthBuffer
 {
diff --git a/FrameBuffer.cpp b/FrameBuffer.cpp
index 0bb1eeb6..155c3029 100644
--- a/FrameBuffer.cpp
+++ b/FrameBuffer.cpp
@@ -7,6 +7,7 @@
 #include "OpenGL.h"
 #include "FrameBuffer.h"
 #include "DepthBuffer.h"
+#include "N64.h"
 #include "RSP.h"
 #include "RDP.h"
 #include "gDP.h"
diff --git a/GBI.cpp b/GBI.cpp
index 11449af2..8d8681b7 100644
--- a/GBI.cpp
+++ b/GBI.cpp
@@ -1,6 +1,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include "convert.h"
+#include "N64.h"
 #include "GLideN64.h"
 #include "GBI.h"
 #include "RDP.h"
diff --git a/GLSLCombiner.cpp b/GLSLCombiner.cpp
index 61c04a17..ded2b2cd 100644
--- a/GLSLCombiner.cpp
+++ b/GLSLCombiner.cpp
@@ -15,6 +15,7 @@
 #include "GLSLCombiner.h"
 #include "Shaders.h"
 #include "Noise_shader.h"
+#include "FrameBuffer.h"
 #include "DepthBuffer.h"
 
 static GLuint  g_vertex_shader_object;
diff --git a/OpenGL.cpp b/OpenGL.cpp
index 457aa34d..5455f028 100644
--- a/OpenGL.cpp
+++ b/OpenGL.cpp
@@ -9,6 +9,7 @@
 #include "gDP.h"
 #include "Textures.h"
 #include "Combiner.h"
+#include "FrameBuffer.h"
 #include "VI.h"
 
 GLInfo OGL;
diff --git a/RDP.cpp b/RDP.cpp
index 14b6d793..3a2e50e5 100644
--- a/RDP.cpp
+++ b/RDP.cpp
@@ -2,7 +2,6 @@
 #include "RSP.h"
 #include "GBI.h"
 #include "gDP.h"
-#include "Types.h"
 #include "Debug.h"
 
 void RDP_Unknown( u32 w0, u32 w1 )
diff --git a/RSP.h b/RSP.h
index 3f5832cc..c4a84e3a 100644
--- a/RSP.h
+++ b/RSP.h
@@ -1,16 +1,6 @@
 #ifndef RSP_H
 #define RSP_H
 
-#ifndef __LINUX__
-#include <windows.h>
-#else
-#include "winlnxdefs.h"
-#include <SDL/SDL.h>
-#include  <SDL/SDL_thread.h>
-#endif
-#include "N64.h"
-#include "GBI.h"
-#include "gSP.h"
 #include "Types.h"
 
 typedef struct
diff --git a/gDP.h b/gDP.h
index b355eb99..d055d035 100644
--- a/gDP.h
+++ b/gDP.h
@@ -2,7 +2,6 @@
 #define GDP_H
 
 #include "Types.h"
-#include "FrameBuffer.h"
 
 #define CHANGED_RENDERMODE		0x001
 #define CHANGED_CYCLETYPE		0x002
@@ -59,6 +58,7 @@ struct gDPCombine
 	};
 };
 
+struct FrameBuffer;
 struct gDPTile
 {
 	u32 format, size, line, tmem, palette;
diff --git a/gSP.cpp b/gSP.cpp
index 628d5e24..f4928cc1 100644
--- a/gSP.cpp
+++ b/gSP.cpp
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <math.h>
+#include "N64.h"
 #include "GLideN64.h"
 #include "Debug.h"
 #include "Types.h"
@@ -14,6 +15,7 @@
 #include "convert.h"
 #include "S2DEX.h"
 #include "VI.h"
+#include "FrameBuffer.h"
 #include "DepthBuffer.h"
 #ifndef __LINUX__
 # include "Resource.h"