--- a/src/ntheap.h	Mon Aug 13 11:19:22 2007 +0200
+++ b/src/ntheap.h	Mon Aug 13 11:20:41 2007 +0200
@@ -23,10 +23,10 @@
 /* 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 INCLUDED_ntheap_h_
-#define INCLUDED_ntheap_h_
+#ifndef NTHEAP_H_
+#define NTHEAP_H_
 
-#include "syswindows.h"
+#include <windows.h>
 
 /*
  * Heap related stuff.
@@ -51,9 +51,16 @@
 
 /* To prevent zero-initialized variables from being placed into the bss
    section, use non-zero values to represent an uninitialized state.  */
-#define UNINIT_PTR ((unsigned char*) 0xF0A0F0A0)
+#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);
 
@@ -76,4 +83,28 @@
 extern unsigned char *round_to_next (unsigned char *address, 
 				     unsigned long align);
 
-#endif /* INCLUDED_ntheap_h_ */
+/* ----------------------------------------------------------------- */
+/* Useful routines for manipulating memory-mapped files. */
+
+typedef struct file_data {
+    char          *name;
+    unsigned long  size;
+    HANDLE         file;
+    HANDLE         file_mapping;
+    unsigned char *file_base;
+} file_data;
+
+#define OFFSET_TO_RVA(var,section) \
+	  (section->VirtualAddress + ((DWORD)(var) - section->PointerToRawData))
+
+#define RVA_TO_OFFSET(var,section) \
+	  (section->PointerToRawData + ((DWORD)(var) - section->VirtualAddress))
+
+#define RVA_TO_PTR(var,section,filedata) \
+	  ((void *)(RVA_TO_OFFSET(var,section) + (filedata).file_base))
+
+int open_input_file (file_data *p_file, CONST char *name);
+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_ */