--- a/src/ntheap.h	Mon Aug 13 11:32:27 2007 +0200
+++ b/src/ntheap.h	Mon Aug 13 11:33:38 2007 +0200
@@ -23,8 +23,8 @@
 /* Adapted for XEmacs by David Hobley <david@spook-le0.cia.com.au> */
 /* Synced with FSF Emacs 19.34.6 by Marc Paquette <marcpa@cam.org> */
 
-#ifndef NTHEAP_H_
-#define NTHEAP_H_
+#ifndef INCLUDED_ntheap_h_
+#define INCLUDED_ntheap_h_
 
 #include <windows.h>
 
@@ -54,13 +54,6 @@
 #define UNINIT_PTR ((void *) 0xF0A0F0A0)
 #define UNINIT_LONG (0xF0A0F0A0L)
 
-enum {
-  OS_WIN95 = 1,
-  OS_NT
-};
-
-extern int os_subtype;
-
 /* Emulation of Unix sbrk().  */
 extern void *sbrk (unsigned long size);
 
@@ -107,4 +100,4 @@
 int open_output_file (file_data *p_file, CONST char *name, unsigned long size);
 void close_file_data (file_data *p_file);
 
-#endif /* NTHEAP_H_ */
+#endif /* INCLUDED_ntheap_h_ */