#include "config.h"
-#include "gdk/gdkx.h"
+#include "gdkx.h"
#if GDK_WINDOWING == GDK_WINDOWING_X11
#include <X11/Xlocale.h> /* so we get the right setlocale */
#include <stdio.h>
#include <stdlib.h>
-#ifdef _MSC_VER
+#ifndef HAVE_LSTAT
+#define lstat stat
+#endif
+
+#ifdef NATIVE_WIN32
#include <io.h>
#endif