diff --git a/elements b/elements
new file mode 100644
index 000000000..709998168
--- /dev/null
+++ b/elements
@@ -0,0 +1,7 @@
+#include "ElementClasses.h"
+	std::vector<Element> GetElements()
+	{
+		std::vector<Element> elements;
+		return elements;
+	}
+	
\ No newline at end of file
diff --git a/src/game/Brush.cpp b/src/game/Brush.cpp
index e52febb22..5341f60f6 100644
--- a/src/game/Brush.cpp
+++ b/src/game/Brush.cpp
@@ -16,6 +16,7 @@ void Brush::RenderRect(Renderer * ren, ui::Point position1, ui::Point position2)
 		position1.X += width;
 		width *= -1;
 	}
+	
 	ren->xor_line(position1.X, position1.Y, position1.X+width, position1.Y);
 	ren->xor_line(position1.X, position1.Y+height, position1.X+width, position1.Y+height);
 	ren->xor_line(position1.X+width, position1.Y+1, position1.X+width, position1.Y+height-1);
@@ -39,4 +40,4 @@ void Brush::RenderPoint(Renderer * ren, ui::Point position)
 void Brush::RenderFill(Renderer * ren, ui::Point position)
 {
 
-}
\ No newline at end of file
+}
diff --git a/src/graphics/OpenGLGraphics.cpp b/src/graphics/OpenGLGraphics.cpp
index b6dbe7f07..4167305e3 100644
--- a/src/graphics/OpenGLGraphics.cpp
+++ b/src/graphics/OpenGLGraphics.cpp
@@ -1,14 +1,15 @@
 #include "Graphics.h"
 #include "font.h"
 #include <pthread.h>
+#ifdef GetUserName
 #undef GetUserName //God dammit microsoft!
-
+#endif
 #ifdef OGLI
 
 static pthread_mutex_t gMutex = PTHREAD_MUTEX_INITIALIZER;
 
 Graphics::Graphics():
-sdl_scale(1)
+	sdl_scale(1)
 {
 	if(gMutex == PTHREAD_MUTEX_INITIALIZER)
 		pthread_mutex_init (&gMutex, NULL);
diff --git a/src/graphics/Renderer.cpp b/src/graphics/Renderer.cpp
index 6c1a31ba4..c0e045573 100644
--- a/src/graphics/Renderer.cpp
+++ b/src/graphics/Renderer.cpp
@@ -31,9 +31,6 @@ extern "C"
 #define VIDYRES YRES
 #endif
 
-#ifdef OGLR
-#define drawrect(args) g->drawrect(args)
-#endif
 
 void Renderer::RenderBegin()
 {
diff --git a/src/graphics/Renderer.h b/src/graphics/Renderer.h
index cc7debeb6..606dbc840 100644
--- a/src/graphics/Renderer.h
+++ b/src/graphics/Renderer.h
@@ -85,7 +85,7 @@ public:
 	void checkShader(GLuint shader, char * shname);
 	void checkProgram(GLuint program, char * progname);
 	void loadShaders();
-#else
+#endif
 	pixel * vid;
 	pixel * persistentVid;
 	pixel * warpVid;
@@ -111,7 +111,6 @@ public:
 	void gradientrect(int x, int y, int width, int height, int r, int g, int b, int a, int r2, int g2, int b2, int a2);
 
 	void draw_image(pixel *img, int x, int y, int w, int h, int a);
-#endif
 
 	VideoBuffer DumpFrame();
 
diff --git a/tools b/tools
new file mode 100644
index 000000000..84fae896e
--- /dev/null
+++ b/tools
@@ -0,0 +1,7 @@
+#include "ToolClasses.h"
+		std::vector<SimTool*> GetTools()
+		{
+		std::vector<SimTool*> tools;
+			return tools;
+		}
+		
\ No newline at end of file