diff --git a/Makefile b/Makefile
index c556aa4efc..25951fb4cf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,90 +1,91 @@
-CSC     = gmcs
-CSFLAGS  = -nologo -warn:4 -debug:+ -debug:full -optimize- -codepage:utf8 -unsafe
-DEFINE  = DEBUG;TRACE
-
-PROGRAMS	=	fileformats gl game ra cnc aftermath server seqed
-
-COMMON_LIBS	:= System.dll System.Core.dll System.Drawing.dll System.Xml.dll
-
-fileformats_SRCS	:=	$(shell find OpenRa.FileFormats/ -iname '*.cs')
-fileformats_TARGET	:=	OpenRa.FileFormats.dll
-fileformats_KIND	:=	library
-fileformats_LIBS	:=	$(COMMON_LIBS)
-
-gl_SRCS				:= $(shell find OpenRa.Gl/ -iname '*.cs')
-gl_TARGET			:= OpenRa.Gl.dll
-gl_KIND				:= library
-gl_DEPS				:= $(fileformats_TARGET) \
-						thirdparty/Tao/Tao.Glfw.dll 
-gl_LIBS				:= $(COMMON_LIBS) System.Windows.Forms.dll \
-						thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll \
-						$(gl_DEPS) 
+CSC     = gmcs
+CSFLAGS  = -nologo -warn:4 -debug:+ -debug:full -optimize- -codepage:utf8 -unsafe
+DEFINE  = DEBUG;TRACE
+PROGRAMS	=fileformats gl game ra cnc aftermath server seqed
 
-
-game_SRCS			:=	$(shell find OpenRa.Game/ -iname '*.cs')
-game_TARGET			:= OpenRa.Game.exe
-game_KIND			:= winexe
-game_DEPS			:= $(fileformats_TARGET) 
-game_LIBS			:= $(COMMON_LIBS) System.Windows.Forms.dll $(game_DEPS) \
-						thirdparty/Tao/Tao.OpenAl.dll
-
-game_FLAGS			:= -win32icon:OpenRa.Game/OpenRa.ico
+COMMON_LIBS	= System.dll System.Core.dll System.Drawing.dll System.Xml.dll
 
-ra_SRCS				:=	$(shell find OpenRa.Mods.RA/ -iname '*.cs')
-ra_TARGET			:=	mods/ra/OpenRa.Mods.RA.dll
-ra_KIND				:=	library
-ra_DEPS				:= $(fileformats_TARGET) $(game_TARGET)
-ra_LIBS				:= $(COMMON_LIBS) $(ra_DEPS)
+fileformats_SRCS	=	$(shell find OpenRa.FileFormats/ -iname '*.cs')
+fileformats_TARGET	=	OpenRa.FileFormats.dll
+fileformats_KIND	=	library
+fileformats_LIBS	=	$(COMMON_LIBS)
 
-cnc_SRCS			:=	$(shell find OpenRa.Mods.Cnc/ -iname '*.cs')
-cnc_TARGET			:=	mods/cnc/OpenRa.Mods.Cnc.dll
-cnc_KIND			:=	library
-cnc_DEPS			:= $(fileformats_TARGET) $(game_TARGET)
-cnc_LIBS			:= $(COMMON_LIBS) $(cnc_DEPS)
+gl_SRCS				= $(shell find OpenRa.Gl/ -iname '*.cs')
+gl_TARGET			= OpenRa.Gl.dll
+gl_KIND				= library
+gl_DEPS				= $(fileformats_TARGET) $(game_TARGET) \
+						thirdparty/Tao/Tao.Glfw.dll 
+gl_LIBS				= $(COMMON_LIBS) System.Windows.Forms.dll \
+						thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll \
+						$(gl_DEPS) $(game_TARGET)
 
-aftermath_SRCS		:=	$(shell find OpenRa.Mods.Aftermath/ -iname '*.cs')
-aftermath_TARGET	:=	mods/cnc/OpenRa.Mods.Aftermath.dll
-aftermath_KIND		:=	library
-aftermath_DEPS		:= $(fileformats_TARGET) $(game_TARGET)
-aftermath_LIBS		:= $(COMMON_LIBS) $(aftermath_DEPS)
+game_SRCS			=	$(shell find OpenRa.Game/ -iname '*.cs')
+game_TARGET			= OpenRa.Game.exe
+game_KIND			= winexe
+game_DEPS			= $(fileformats_TARGET) 
+game_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll $(game_DEPS) \
+						thirdparty/Tao/Tao.OpenAl.dll
+game_FLAGS			= -win32icon:OpenRa.Game/OpenRa.ico
 
-server_SRCS			:= $(shell find OpenRA.Server/ -iname '*.cs')
-server_TARGET		:= OpenRA.Server.exe
-server_KIND			:= winexe
-server_DEPS			:= $(fileformats_TARGET)
-server_LIBS			:= $(COMMON_LIBS) $(server_DEPS)
+ra_SRCS				=	$(shell find OpenRa.Mods.RA/ -iname '*.cs')
+ra_TARGET			=	mods/ra/OpenRa.Mods.RA.dll
+ra_KIND				=	library
+ra_DEPS				= $(fileformats_TARGET) $(game_TARGET)
+ra_LIBS				= $(COMMON_LIBS) $(ra_DEPS)
 
-seqed_SRCS			:= $(shell find SequenceEditor/ -iname '*.cs')
-seqed_TARGET		:= SequenceEditor.exe
-seqed_KIND			:= winexe
-seqed_DEPS			:= $(fileformats_TARGET)
-seqed_LIBS			:= $(COMMON_LIBS) System.Windows.Forms.dll $(seqed_DEPS)
+cnc_SRCS			=	$(shell find OpenRa.Mods.Cnc/ -iname '*.cs')
+cnc_TARGET			=	mods/cnc/OpenRa.Mods.Cnc.dll
+cnc_KIND			=	library
+cnc_DEPS			= $(fileformats_TARGET) $(game_TARGET)
+cnc_LIBS			= $(COMMON_LIBS) $(cnc_DEPS)
 
-# -platform:x86
-
-define BUILD_ASSEMBLY
-$$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS)
-	@echo CSC $$(@)
-	@$(CSC) $$($(1)_LIBS:%=-r:%) \
-		-out:$$(@) $(CSFLAGS) $$($(1)_FLAGS) \
-		-define:"$(DEFINE)" \
-		-t:"$$($(1)_KIND)" \
-		$$($(1)_SRCS)
-endef
-
-$(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
-
-.SUFFIXES:
-.PHONY: clean all default mods server seqed
-
-clean: 
+aftermath_SRCS		=	$(shell find OpenRa.Mods.Aftermath/ -iname '*.cs')
+aftermath_TARGET	=	mods/cnc/OpenRa.Mods.Aftermath.dll
+aftermath_KIND		=	library
+aftermath_DEPS		= $(fileformats_TARGET) $(game_TARGET)
+aftermath_LIBS		= $(COMMON_LIBS) $(aftermath_DEPS)
+
+server_SRCS			= $(shell find OpenRA.Server/ -iname '*.cs')
+server_TARGET		= OpenRA.Server.exe
+server_KIND			= winexe
+server_DEPS			= $(fileformats_TARGET)
+server_LIBS			= $(COMMON_LIBS) $(server_DEPS)
+
+seqed_SRCS			= $(shell find SequenceEditor/ -iname '*.cs')
+seqed_TARGET		= SequenceEditor.exe
+seqed_KIND			= winexe
+seqed_DEPS			= $(fileformats_TARGET)
+seqed_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll $(seqed_DEPS)
+
+# -platform:x86
+
+
+
+define BUILD_ASSEMBLY
+
+$$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS)
+	@echo CSC $$(@)
+	@$(CSC) $$($(1)_LIBS:%=-r:%) \
+		-out:$$(@) $(CSFLAGS) $$($(1)_FLAGS) \
+		-define:"$(DEFINE)" \
+		-t:"$$($(1)_KIND)" \
+		$$($(1)_SRCS)
+endef
+
+
+$(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
+
+
+.SUFFIXES:
+.PHONY: clean all default mods server seqed
+
+
+clean: 
 	@-rm *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb
 
 mods: $(ra_TARGET) $(cnc_TARGET) $(aftermath_TARGET)
-
 server: $(server_TARGET)
 seqed: $(seqed_TARGET)
-all: clean server default mods seqed
+all: $(fileformats_TARGET) $(gl_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET) $(aftermath_TARGET) $(server_TARGET) $(seqed_TARGET)
 
 .DEFAULT: all
-
diff --git a/OpenRa.FileFormats/Graphics/IGraphicsDevice.cs b/OpenRa.FileFormats/Graphics/IGraphicsDevice.cs
index c469ffdfea..470cc8aca0 100755
--- a/OpenRa.FileFormats/Graphics/IGraphicsDevice.cs
+++ b/OpenRa.FileFormats/Graphics/IGraphicsDevice.cs
@@ -22,7 +22,7 @@ namespace OpenRa.FileFormats.Graphics
 
 	public interface IGraphicsDevice
 	{
-		IVertexBuffer<Vertex> CreateVertexBuffer<Vertex>( int length );
+		IVertexBuffer<Vertex> CreateVertexBuffer( int length );
 		IIndexBuffer CreateIndexBuffer( int length );
 		ITexture CreateTexture( Bitmap bitmap );
 
diff --git a/OpenRa.Game/Graphics/LineRenderer.cs b/OpenRa.Game/Graphics/LineRenderer.cs
index 2be4f0d9a3..7df2e4274c 100644
--- a/OpenRa.Game/Graphics/LineRenderer.cs
+++ b/OpenRa.Game/Graphics/LineRenderer.cs
@@ -39,7 +39,7 @@ namespace OpenRa.Graphics
 		public LineRenderer( Renderer renderer )
 		{
 			this.renderer = renderer;
-			vertexBuffer = renderer.Device.CreateVertexBuffer<Vertex>(vertices.Length );
+			vertexBuffer = renderer.Device.CreateVertexBuffer(vertices.Length );
 			indexBuffer = renderer.Device.CreateIndexBuffer( indices.Length );
 		}
 
diff --git a/OpenRa.Game/Graphics/SpriteRenderer.cs b/OpenRa.Game/Graphics/SpriteRenderer.cs
index 4550f52753..7a03c207d6 100644
--- a/OpenRa.Game/Graphics/SpriteRenderer.cs
+++ b/OpenRa.Game/Graphics/SpriteRenderer.cs
@@ -42,7 +42,7 @@ namespace OpenRa.Graphics
 			this.renderer = renderer;
 			this.shader = shader;
 
-			vertexBuffer = renderer.Device.CreateVertexBuffer<Vertex>( vertices.Length );
+			vertexBuffer = renderer.Device.CreateVertexBuffer( vertices.Length );
 			indexBuffer = renderer.Device.CreateIndexBuffer( indices.Length );
 		}
 
diff --git a/OpenRa.Game/Graphics/TerrainRenderer.cs b/OpenRa.Game/Graphics/TerrainRenderer.cs
index bce0114ecd..c78098b0a6 100644
--- a/OpenRa.Game/Graphics/TerrainRenderer.cs
+++ b/OpenRa.Game/Graphics/TerrainRenderer.cs
@@ -62,7 +62,7 @@ namespace OpenRa.Graphics
 
 			terrainSheet = tileMapping[map.MapTiles[map.XOffset, map.YOffset]].sheet;
 
-			vertexBuffer = renderer.Device.CreateVertexBuffer<Vertex>( vertices.Length );
+			vertexBuffer = renderer.Device.CreateVertexBuffer( vertices.Length );
 			vertexBuffer.SetData( vertices );
 
 			indexBuffer = renderer.Device.CreateIndexBuffer( indices.Length );
diff --git a/OpenRa.Gl/GraphicsDevice.cs b/OpenRa.Gl/GraphicsDevice.cs
index cd74b27cce..8c4ab95029 100644
--- a/OpenRa.Gl/GraphicsDevice.cs
+++ b/OpenRa.Gl/GraphicsDevice.cs
@@ -28,7 +28,7 @@ using Tao.Cg;
 using Tao.OpenGl;
 using OpenRa.FileFormats.Graphics;
 using Tao.Glfw;
-using OpenRa;
+
 
 [assembly: Renderer( typeof( OpenRa.GlRenderer.GraphicsDevice ))]
 
@@ -68,7 +68,7 @@ namespace OpenRa.GlRenderer
 						: button == Glfw.GLFW_MOUSE_BUTTON_2 ? MouseButtons.Right
 						: button == Glfw.GLFW_MOUSE_BUTTON_3 ? MouseButtons.Middle
 						: 0;
-					Game.DispatchMouseInput( action == Glfw.GLFW_PRESS ? MouseInputEvent.Down : MouseInputEvent.Up,
+					OpenRa.Game.DispatchMouseInput( action == Glfw.GLFW_PRESS ? MouseInputEvent.Down : MouseInputEvent.Up,
 						new MouseEventArgs( b, action == Glfw.GLFW_PRESS ? 1 : 0, mouseX, mouseY, 0 ), 0 );
 
 					if (action == Glfw.GLFW_PRESS) lastButtonBits |= b;
@@ -82,11 +82,11 @@ namespace OpenRa.GlRenderer
 					mouseX = x;
 					mouseY = y;
 					if (initDone)
-						Game.DispatchMouseInput(MouseInputEvent.Move, new MouseEventArgs(lastButtonBits, 0, x, y, 0), 0);
+						OpenRa.Game.DispatchMouseInput(MouseInputEvent.Move, new MouseEventArgs(lastButtonBits, 0, x, y, 0), 0);
 				});
 			Glfw.glfwSetWindowCloseCallback( windowCloseCallback = () =>
 				{
-					Game.Exit();
+					OpenRa.Game.Exit();
 					Glfw.glfwIconifyWindow();
 					return Gl.GL_TRUE;
 				} );
@@ -189,7 +189,7 @@ namespace OpenRa.GlRenderer
 
 		#region IGraphicsDevice Members
 
-		public IVertexBuffer<Vertex> CreateVertexBuffer<Vertex>( int size )
+		public IVertexBuffer<Vertex> CreateVertexBuffer( int size )
 		{
 			return new VertexBuffer<Vertex>( this, size );
 		}