# define MYSWAP
#endif
-#if !defined(PERL_FOR_X2P) && !defined(WIN32)
+/* Cannot include embed.h here on Win32 as win32.h has not
+ yet been included and defines some config variables e.g. HAVE_INTERP_INTERN
+ */
+#if !defined(PERL_FOR_X2P) && !(defined(WIN32)||defined(VMS))
# include "embed.h"
#endif
#else
# if defined(VMS)
# include "vmsish.h"
+# include "embed.h"
# else
# if defined(PLAN9)
# include "./plan9/plan9ish.h"
#endif /* NETWARE */
#endif /* USE_5005THREADS || USE_ITHREADS */
-#ifdef WIN32
+#if defined(WIN32)
# include "win32.h"
#endif
#endif
#if defined(WIN32)
+/* Now all the config stuff is setup we can include embed.h */
# include "embed.h"
#endif