diff --git a/code/ui/ui_shared.cpp b/code/ui/ui_shared.cpp
index 23e486f..d26436f 100644
--- a/code/ui/ui_shared.cpp
+++ b/code/ui/ui_shared.cpp
@@ -32,7 +32,7 @@ void		Menus_ShowItems(const char *menuName);
 qboolean	ParseRect(const char **p, rectDef_t *r);
 const char	*String_Alloc(const char *p);
 void		ToWindowCoords(float *x, float *y, windowDef_t *window);
-void		Window_Paint(Window *w, float fadeAmount, float fadeClamp, float fadeCycle);
+void		Window_Paint(qWindow *w, float fadeAmount, float fadeClamp, float fadeCycle);
 int			Item_ListBox_ThumbDrawPosition(itemDef_t *item);
 int			Item_ListBox_ThumbPosition(itemDef_t *item);
 qboolean Rect_ContainsPoint(rectDef_t *rect, float x, float y) ;
@@ -167,7 +167,7 @@ Initializes a window structure ( windowDef_t ) with defaults
  
 ==================
 */
-void Window_Init(Window *w) 
+void Window_Init(qWindow *w) 
 {
 	memset(w, 0, sizeof(windowDef_t));
 	w->borderSize = 1;
@@ -6166,7 +6166,7 @@ void GradientBar_Paint(rectDef_t *rect, vec4_t color)
 Window_Paint
 =================
 */
-void Window_Paint(Window *w, float fadeAmount, float fadeClamp, float fadeCycle) 
+void Window_Paint(qWindow *w, float fadeAmount, float fadeClamp, float fadeCycle) 
 {
   //float bordersize = 0;
   vec4_t color;
diff --git a/code/ui/ui_shared.h b/code/ui/ui_shared.h
index 3b98408..072789b 100644
--- a/code/ui/ui_shared.h
+++ b/code/ui/ui_shared.h
@@ -280,7 +280,7 @@ typedef struct {
 	qhandle_t	background;					// background asset  
 } windowDef_t;
 
-typedef windowDef_t Window;
+typedef windowDef_t qWindow;
 
 typedef struct {
 	vec4_t		color;						//
@@ -308,7 +308,7 @@ typedef struct modelDef_s {
 } modelDef_t;
 
 typedef struct itemDef_s {
-	Window		window;						// common positional, border, style, layout info
+	qWindow		window;						// common positional, border, style, layout info
 	UIRectangle	textRect;					// rectangle the text ( if any ) consumes     
 	int			type;						// text, button, radiobutton, checkbox, textfield, listbox, combo
 	int			alignment;					// left center right
@@ -350,7 +350,7 @@ typedef struct itemDef_s {
 } itemDef_t;
 
 typedef struct {
-	Window window;
+	qWindow window;
 	const char  *font;						// font
 	qboolean	fullScreen;					// covers entire screen 
 	int			itemCount;					// number of items;