diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 973838087c..de082bdaa7 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -276,6 +276,8 @@ struct _GdkWindowObject
   cairo_surface_t *cairo_surface;
 };
 
+#define GDK_WINDOW_TYPE(d) (((GdkWindowObject*)(GDK_WINDOW (d)))->window_type)
+#define GDK_WINDOW_DESTROYED(d) (((GdkWindowObject*)(GDK_WINDOW (d)))->destroyed)
 
 extern GdkEventFunc   _gdk_event_func;    /* Callback for events */
 extern gpointer       _gdk_event_data;
diff --git a/gdk/gdkprivate.h b/gdk/gdkprivate.h
index 031fe9ae7f..65038627a1 100644
--- a/gdk/gdkprivate.h
+++ b/gdk/gdkprivate.h
@@ -34,8 +34,10 @@ G_BEGIN_DECLS
 #define GDK_PARENT_RELATIVE_BG ((GdkPixmap *)1L)
 #define GDK_NO_BG ((GdkPixmap *)2L)
 
-#define GDK_WINDOW_TYPE(d) (((GdkWindowObject*)(GDK_WINDOW (d)))->window_type)
-#define GDK_WINDOW_DESTROYED(d) (((GdkWindowObject*)(GDK_WINDOW (d)))->destroyed)
+#ifndef GDK_COMPILATION
+#define GDK_WINDOW_TYPE(d) (gdk_window_get_window_type (GDK_WINDOW (d)))
+#define GDK_WINDOW_DESTROYED(d) (gdk_window_is_destroyed (GDK_WINDOW (d)))
+#endif
 
 void gdk_window_destroy_notify	     (GdkWindow *window);