diff --git a/gdk/quartz/GdkQuartzWindow.c b/gdk/quartz/GdkQuartzNSWindow.c
similarity index 99%
rename from gdk/quartz/GdkQuartzWindow.c
rename to gdk/quartz/GdkQuartzNSWindow.c
index 67db8bbf28..ee21797383 100644
--- a/gdk/quartz/GdkQuartzWindow.c
+++ b/gdk/quartz/GdkQuartzNSWindow.c
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import "GdkQuartzWindow.h"
+#import "GdkQuartzNSWindow.h"
 #include "gdkquartzwindow.h"
 #include "gdkdnd-quartz.h"
 #include "gdkprivate-quartz.h"
diff --git a/gdk/quartz/GdkQuartzWindow.h b/gdk/quartz/GdkQuartzNSWindow.h
similarity index 98%
rename from gdk/quartz/GdkQuartzWindow.h
rename to gdk/quartz/GdkQuartzNSWindow.h
index 0c7e6a26f7..676c48a9e6 100644
--- a/gdk/quartz/GdkQuartzWindow.h
+++ b/gdk/quartz/GdkQuartzNSWindow.h
@@ -1,4 +1,4 @@
-/* GdkQuartzWindow.h
+/* GdkQuartzNSWindow.h
  *
  * Copyright (C) 2005-2007 Imendio AB
  *
diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am
index 33197e9d6f..9b2135326e 100644
--- a/gdk/quartz/Makefile.am
+++ b/gdk/quartz/Makefile.am
@@ -20,8 +20,8 @@ noinst_LTLIBRARIES = libgdk-quartz.la
 libgdk_quartz_la_SOURCES =    	\
 	GdkQuartzView.c		\
 	GdkQuartzView.h		\
-	GdkQuartzWindow.c	\
-	GdkQuartzWindow.h	\
+	GdkQuartzNSWindow.c	\
+	GdkQuartzNSWindow.h	\
 	gdkcursor-quartz.c	\
 	gdkdevice-core-quartz.c	\
 	gdkdevicemanager-core-quartz.c	\
diff --git a/gdk/quartz/gdkwindow-quartz.h b/gdk/quartz/gdkwindow-quartz.h
index f55bbb33e9..f89c20cfba 100644
--- a/gdk/quartz/gdkwindow-quartz.h
+++ b/gdk/quartz/gdkwindow-quartz.h
@@ -22,7 +22,7 @@
 #define __GDK_WINDOW_QUARTZ_H__
 
 #import <gdk/quartz/GdkQuartzView.h>
-#import <gdk/quartz/GdkQuartzWindow.h>
+#import <gdk/quartz/GdkQuartzNSWindow.h>
 #include "gdk/gdkwindowimpl.h"
 
 G_BEGIN_DECLS