diff --git a/source/gui/CGUI.cpp b/source/gui/CGUI.cpp
index f0f969786c..590057ce7e 100755
--- a/source/gui/CGUI.cpp
+++ b/source/gui/CGUI.cpp
@@ -29,10 +29,8 @@ gee@pyro.nu
 #include <stdarg.h>
 
 // namespaces used
-//XERCES_CPP_NAMESPACE_USE
 using namespace std;
 
-#include "sysdep/ia32.h"
 #include "ps/CLogger.h"
 #define XERO_TIME
 
diff --git a/source/gui/IGUIObject.h b/source/gui/IGUIObject.h
index 1f17def36a..4c681d1f3f 100755
--- a/source/gui/IGUIObject.h
+++ b/source/gui/IGUIObject.h
@@ -135,7 +135,7 @@ class IGUIObject
 	friend class IGUIScrollBar;
 
 	// Allow getProperty to access things like GetParent()
-	friend JSI_IGUIObject::getProperty(JSContext* cx, JSObject* obj, jsval id, jsval* vp);
+	friend JSBool JSI_IGUIObject::getProperty(JSContext* cx, JSObject* obj, jsval id, jsval* vp);
 
 public:
 	IGUIObject();
diff --git a/source/gui/scripting/JSInterface_IGUIObject.cpp b/source/gui/scripting/JSInterface_IGUIObject.cpp
index edb3cbaa56..237a6cfb44 100755
--- a/source/gui/scripting/JSInterface_IGUIObject.cpp
+++ b/source/gui/scripting/JSInterface_IGUIObject.cpp
@@ -1,4 +1,4 @@
-// $Id: JSInterface_IGUIObject.cpp,v 1.1 2004/07/08 15:19:45 philip Exp $
+// $Id: JSInterface_IGUIObject.cpp,v 1.2 2004/07/10 21:23:06 philip Exp $
 
 #include "precompiled.h"
 
@@ -244,7 +244,7 @@ JSBool JSI_IGUIObject::setProperty(JSContext* cx, JSObject* obj, jsval id, jsval
 						jsval t; int32 s;
 						#define PROP(x) JS_GetProperty(cx, obj, #x, &t); \
 										JS_ValueToInt32(cx, t, &s); \
-										area.pixel.##x = s
+										area.pixel.x = s
 						PROP(left); PROP(top); PROP(right); PROP(bottom);
 						#undef PROP
 
@@ -270,7 +270,7 @@ JSBool JSI_IGUIObject::setProperty(JSContext* cx, JSObject* obj, jsval id, jsval
 						jsval t; double s;
 						#define PROP(x) JS_GetProperty(cx, obj, #x, &t); \
 										JS_ValueToNumber(cx, t, &s); \
-										colour.##x = (float)s
+										colour.x = (float)s
 						PROP(r); PROP(g); PROP(b); PROP(a);
 						#undef PROP
 
diff --git a/source/gui/scripting/JSInterface_IGUIObject.h b/source/gui/scripting/JSInterface_IGUIObject.h
index 002606c0cd..c9e3525f33 100755
--- a/source/gui/scripting/JSInterface_IGUIObject.h
+++ b/source/gui/scripting/JSInterface_IGUIObject.h
@@ -1,4 +1,4 @@
-// $Id: JSInterface_IGUIObject.h,v 1.1 2004/07/08 15:19:45 philip Exp $
+// $Id: JSInterface_IGUIObject.h,v 1.2 2004/07/10 21:23:06 philip Exp $
 
 #include "scripting/ScriptingHost.h"
 #include "gui/GUI.h"
@@ -22,4 +22,4 @@ namespace JSI_IGUIObject
 	void x();
 }
 
-#endif
\ No newline at end of file
+#endif