diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index a32c6b508e..0b81376af1 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -174,6 +174,7 @@ libgdk_3_la_LIBADD += x11/libgdk-x11.la
 endif # USE_X11
 
 if USE_QUARTZ
+libgdk_3_la_CFLAGS = -xobjective-c
 libgdk_3_la_LIBADD += quartz/libgdk-quartz.la
 endif # USE_QUARTZ
 
@@ -370,7 +371,7 @@ dist-hook: ../build/win32/vs9/gdk.vcproj ../build/win32/vs10/gdk.vcxproj ../buil
 	done >libgdk.sourcefiles
 	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/gdk.vcprojin >$@
 	rm libgdk.sourcefiles
-	
+
 ../build/win32/vs10/gdk.vcxproj: ../build/win32/vs10/gdk.vcxprojin
 	for F in $(libgdk_3_la_SOURCES); do \
 		case $$F in \
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index 47b3760a4b..698af66b10 100644
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -38,11 +38,12 @@
 #endif
 
 #ifdef GDK_WINDOWING_QUARTZ
-/* We immediately include gdkquartzdisplaymanager.h here instead of
- * gdkquartz.h so that we do not have to enable -xobjective-c for the
- * "generic" GDK source code.
+/* When the gdk_quartz_display_open function is removed We can
+ * immediately include gdkquartzdisplaymanager.h here instead of
+ * gdkprivate-quartz.h so that we won't have to enable -xobjective-c
+ * for the "generic" GDK source code.
+ * #include "quartz/gdkquartzdisplaymanager.h"
  */
-#include "quartz/gdkquartzdisplaymanager.h"
 #include "quartz/gdkprivate-quartz.h"
 #endif