41 files changed, 125 insertions, 84 deletions

diff --git a/gs/base/fapi_ft.c b/gs/base/fapi_ft.c
index 3103657a7..eb8bac036 100644
--- a/gs/base/fapi_ft.c
+++ b/gs/base/fapi_ft.c
@@ -215,7 +215,7 @@ FF_open_read_stream(gs_memory_t * mem, char *fname, FT_Stream * fts)
             code =
                 file_open_stream(pfn.fname, pfn.len, "r",
                                  file_default_buffer_size, &ps, pfn.iodev,
-                                 pfn.iodev->procs.fopen, mem);
+                                 pfn.iodev->procs.gp_fopen, mem);
             if (code < 0) {
                 goto error_out;
             }
diff --git a/gs/base/gp_dvx.c b/gs/base/gp_dvx.c
index cdbb655fc..15b4b5e56 100644
--- a/gs/base/gp_dvx.c
+++ b/gs/base/gp_dvx.c
@@ -124,7 +124,7 @@ gp_open_printer(const gs_memory_t *mem,
         stdprn->_flag = _IOWRT; /* Make stdprn buffered to improve performance */
         return stdprn;
     } else
-        return fopen(fname, (binary_mode ? "wb" : "w"));
+        return gp_fopen(fname, (binary_mode ? "wb" : "w"));
 }
 
 /* Close the connection to the printer. */
diff --git a/gs/base/gp_macio.c b/gs/base/gp_macio.c
index 00be43830..ef6f3ae0c 100644
--- a/gs/base/gp_macio.c
+++ b/gs/base/gp_macio.c
@@ -14,6 +14,9 @@
 */
 
 
+/* prevent gp.h from defining fopen */
+#define fopen fopen
+
 
 #ifndef __CARBON__
 //#include "MacHeaders"
@@ -54,6 +57,7 @@
 #include <console.h>
 
 #include "gx.h"
+
 #include "gp.h"
 #include "gpmisc.h"
 #include "gxdevice.h"
diff --git a/gs/base/gp_mswin.c b/gs/base/gp_mswin.c
index cb8e1a201..00d97c882 100644
--- a/gs/base/gp_mswin.c
+++ b/gs/base/gp_mswin.c
@@ -29,6 +29,9 @@
 /* DLL version must now be used under MS-Windows */
 /* Russell Lang 16 March 1996 */
 
+/* prevent gp.h from defining fopen */
+#define fopen fopen
+
 #include "stdio_.h"
 #include "string_.h"
 #include "memory_.h"
@@ -41,6 +44,7 @@
 #include <fcntl.h>
 #include <signal.h>
 #include "gx.h"
+
 #include "gp.h"
 #include "gpcheck.h"
 #include "gpmisc.h"
diff --git a/gs/base/gp_os2.c b/gs/base/gp_os2.c
index 56eb67933..eabbdb9d0 100644
--- a/gs/base/gp_os2.c
+++ b/gs/base/gp_os2.c
@@ -17,6 +17,9 @@
 /* Common platform-specific routines for OS/2 and MS-DOS */
 /* compiled with GCC/EMX */
 
+/* prevent gp.h from defining fopen */
+#define fopen fopen
+
 #define INCL_DOS
 #define INCL_SPL
 #define INCL_SPLDOSPRINT
@@ -47,6 +50,7 @@
 #include "gsexit.h"
 #include "gsmemory.h"
 #include "gsstruct.h"
+
 #include "gp.h"
 #include "gpmisc.h"
 #include "gsutil.h"
@@ -318,7 +322,7 @@ gp_open_printer(const gs_memory_t *mem,
         pfile = popen(fname + 1, (binary_mode ? "wb" : "w"));
     else
         /* normal file or port */
-        pfile = fopen(fname, (binary_mode ? "wb" : "w"));
+        pfile = gp_fopen(fname, (binary_mode ? "wb" : "w"));
 
     if (pfile == (FILE *) NULL)
         return (FILE *) NULL;
@@ -496,7 +500,7 @@ pm_spool(const gs_memory_t *mem, char *filename, const char *queue)
         emprintf(mem, "Out of memory in pm_spool\n");
         return 1;
     }
-    if ((f = fopen(filename, "rb")) == (FILE *) NULL) {
+    if ((f = gp_fopen(filename, "rb")) == (FILE *) NULL) {
         free(buffer);
         emprintf1(mem, "Can't open temporary file %s\n", filename);
         return 1;
diff --git a/gs/base/gp_unifs.c b/gs/base/gp_unifs.c
index 0e8535b78..23d421e5d 100644
--- a/gs/base/gp_unifs.c
+++ b/gs/base/gp_unifs.c
@@ -16,10 +16,14 @@
 
 /* "Unix-like" file system platform routines for Ghostscript */
 
+/* prevent gp.h from defining fopen */
+#define fopen fopen
+
 #include "stdio_.h"             /* for FILENAME_MAX */
 #include "memory_.h"
 #include "string_.h"
 #include "gx.h"
+
 #include "gp.h"
 #include "gpmisc.h"
 #include "gsstruct.h"
diff --git a/gs/base/gp_unix.c b/gs/base/gp_unix.c
index bc8b7f619..fedd8a9bb 100644
--- a/gs/base/gp_unix.c
+++ b/gs/base/gp_unix.c
@@ -215,7 +215,7 @@ gp_open_printer(const gs_memory_t *mem,
 {
     const char *fmode = (binary_mode ? "wb" : "w");
 
-    return (strlen(fname) == 0 ? 0 : fopen(fname, fmode));
+    return (strlen(fname) == 0 ? 0 : gp_fopen(fname, fmode));
 }
 FILE *
 gp_open_printer_64(const gs_memory_t *mem,
diff --git a/gs/base/gp_unix_cache.c b/gs/base/gp_unix_cache.c
index c5a30cbd5..ada78aca1 100644
--- a/gs/base/gp_unix_cache.c
+++ b/gs/base/gp_unix_cache.c
@@ -345,7 +345,7 @@ int gp_cache_insert(int type, byte *key, int keylen, void *buffer, int buflen)
         outfn[len-1] = '\0';
     }
 
-    in = fopen(infn, "r");
+    in = gp_fopen(infn, "r");
     if (in == NULL) {
         dlprintf1("pcache: unable to open '%s'\n", infn);
         free(prefix);
@@ -353,7 +353,7 @@ int gp_cache_insert(int type, byte *key, int keylen, void *buffer, int buflen)
         free(outfn);
         return -1;
     }
-    out = fopen(outfn, "w");
+    out = gp_fopen(outfn, "w");
     if (out == NULL) {
         dlprintf1("pcache: unable to open '%s'\n", outfn);
         fclose(in);
@@ -379,7 +379,7 @@ int gp_cache_insert(int type, byte *key, int keylen, void *buffer, int buflen)
 
     /* save it to disk */
     path = gp_cache_itempath(prefix, &item);
-    file = fopen(path, "wb");
+    file = gp_fopen(path, "wb");
     free(path);
     if (file != NULL) {
         gp_cache_saveitem(file, &item);
@@ -438,7 +438,7 @@ int gp_cache_query(int type, byte* key, int keylen, void **buffer,
         outfn[len-1] = '\0';
     }
 
-    in = fopen(infn, "r");
+    in = gp_fopen(infn, "r");
     if (in == NULL) {
         dlprintf1("pcache: unable to open '%s'\n", infn);
         free(prefix);
@@ -446,7 +446,7 @@ int gp_cache_query(int type, byte* key, int keylen, void **buffer,
         free(outfn);
         return -1;
     }
-    out = fopen(outfn, "w");
+    out = gp_fopen(outfn, "w");
     if (out == NULL) {
         dlprintf1("pcache: unable to open '%s'\n", outfn);
         fclose(in);
@@ -469,7 +469,7 @@ int gp_cache_query(int type, byte* key, int keylen, void **buffer,
 
     /* look for it on the disk */
     path = gp_cache_itempath(prefix, &item);
-    file = fopen(path, "rb");
+    file = gp_fopen(path, "rb");
     free(path);
     if (file != NULL) {
         hit = gp_cache_loaditem(file, &item, alloc, userdata);
diff --git a/gs/base/gp_vms.c b/gs/base/gp_vms.c
index f7a114257..918880f2f 100644
--- a/gs/base/gp_vms.c
+++ b/gs/base/gp_vms.c
@@ -16,9 +16,13 @@
 
 /* VAX/VMS specific routines for Ghostscript */
 
+/* prevent gp.h from defining fopen */
+#define fopen fopen
+
 #include "string_.h"
 #include "memory_.h"
 #include "gx.h"
+
 #include "gp.h"
 #include "gpmisc.h"
 #include "gsstruct.h"
@@ -259,7 +263,7 @@ gp_open_scratch_file(const gs_memory_t *mem,
         return 0;               /* file name too long */
     strcat(fname, "XXXXXX");
     mktemp(fname);
-    f = fopen(fname, mode);
+    f = gp_fopen(fname, mode);
 
     if (f == NULL)
         emprintf1(mem, "**** Could not open temporary file %s\n", fname);
diff --git a/gs/base/gsdevice.c b/gs/base/gsdevice.c
index 0240f2862..10a0f5ca2 100644
--- a/gs/base/gsdevice.c
+++ b/gs/base/gsdevice.c
@@ -1030,7 +1030,7 @@ gx_device_open_output_file(const gx_device * dev, char *fname,
         strcpy(fmode, gp_fmode_wb);
         if (positionable)
             strcat(fmode, "+");
-        code = parsed.iodev->procs.fopen(parsed.iodev, parsed.fname, fmode,
+        code = parsed.iodev->procs.gp_fopen(parsed.iodev, parsed.fname, fmode,
                                          pfile, NULL, 0);
         if (code)
             emprintf1(dev->memory,
diff --git a/gs/base/gsicc_create.c b/gs/base/gsicc_create.c
index 78f379b67..67d75d233 100644
--- a/gs/base/gsicc_create.c
+++ b/gs/base/gsicc_create.c
@@ -121,6 +121,8 @@ Note: All profile data must be encoded as big-endian
 #include "string_.h"
 #include "gsmemory.h"
 #include "gx.h"
+#include <gp.h>
+
 #include "gxistate.h"
 #include "gstypes.h"
 #include "gscspace.h"
@@ -452,7 +454,7 @@ save_profile(unsigned char *buffer, char filename[], int buffer_size)
     FILE *fid;
 
     sprintf(full_file_name,"%d)Profile_%s.icc",icc_debug_index,filename);
-    fid = fopen(full_file_name,"wb");
+    fid = gp_fopen(full_file_name,"wb");
     fwrite(buffer,sizeof(unsigned char),buffer_size,fid);
     fclose(fid);
     icc_debug_index++;
diff --git a/gs/base/gsicc_lcms.c b/gs/base/gsicc_lcms.c
index 7a55c7537..e3add4a73 100644
--- a/gs/base/gsicc_lcms.c
+++ b/gs/base/gsicc_lcms.c
@@ -24,6 +24,8 @@
 #include "lcms.h"
 #include "gslibctx.h"
 #include "gserrors.h"
+#include "gp.h"
+
 
 #define DUMP_CMS_BUFFER 0
 #define DEBUG_LCMS_MEM 0
@@ -210,8 +212,8 @@ gscms_transform_color_buffer(gx_device *dev, gsicc_link_t *icclink,
         cmsDoTransform(hTransform,inputpos,outputpos,
                         input_buff_desc->plane_stride);
 #if DUMP_CMS_BUFFER
-        fid_in = fopen("CM_Input.raw","ab");
-        fid_out = fopen("CM_Output.raw","ab");
+        fid_in = gp_fopen("CM_Input.raw","ab");
+        fid_out = fp_fopen("CM_Output.raw","ab");
         fwrite((unsigned char*) inputbuffer,sizeof(unsigned char),
                                 input_buff_desc->plane_stride * 
                                 input_buff_desc->num_chan, fid_in);
@@ -230,8 +232,8 @@ gscms_transform_color_buffer(gx_device *dev, gsicc_link_t *icclink,
             outputpos += output_buff_desc->row_stride;
         }
 #if DUMP_CMS_BUFFER
-        fid_in = fopen("CM_Input.raw","ab");
-        fid_out = fopen("CM_Output.raw","ab");
+        fid_in = gp_fopen("CM_Input.raw","ab");
+        fid_out = gp_fopen("CM_Output.raw","ab");
         fwrite((unsigned char*) inputbuffer,sizeof(unsigned char),
                                 input_buff_desc->row_stride,fid_in);
         fwrite((unsigned char*) outputbuffer,sizeof(unsigned char),
diff --git a/gs/base/gsicc_lcms2.c b/gs/base/gsicc_lcms2.c
index 9a013bef2..b9dbcf9d0 100644
--- a/gs/base/gsicc_lcms2.c
+++ b/gs/base/gsicc_lcms2.c
@@ -21,6 +21,7 @@
 #include "lcms2_plugin.h"
 #include "gslibctx.h"
 #include "gserrors.h"
+#include "gp.h"
 
 #define DUMP_CMS_BUFFER 0
 #define DEBUG_LCMS_MEM 0
@@ -298,8 +299,8 @@ gscms_transform_color_buffer(gx_device *dev, gsicc_link_t *icclink,
         }
     }
 #if DUMP_CMS_BUFFER
-    fid_in = fopen("CM_Input.raw","ab");
-    fid_out = fopen("CM_Output.raw","ab");
+    fid_in = gp_fopen("CM_Input.raw","ab");
+    fid_out = gp_fopen("CM_Output.raw","ab");
     fwrite((unsigned char*) inputbuffer,sizeof(unsigned char),
                             input_buff_desc->row_stride,fid_in);
     fwrite((unsigned char*) outputbuffer,sizeof(unsigned char),
@@ -692,4 +693,4 @@ gscms_get_name2device_link(gsicc_link_t *icclink,
     if(lcms_deshandle) cmsCloseProfile(lcms_deshandle);
     if(lcms_proofhandle) cmsCloseProfile(lcms_proofhandle);
     return;
-}
\ No newline at end of file
+}
diff --git a/gs/base/gsicc_manage.c b/gs/base/gsicc_manage.c
index e3c7af701..456b593f2 100644
--- a/gs/base/gsicc_manage.c
+++ b/gs/base/gsicc_manage.c
@@ -23,6 +23,7 @@
 #include "scommon.h"
 #include "strmio.h"
 #include "gx.h"
+#include "gp.h"
 #include "gxistate.h"
 #include "gxcspace.h"
 #include "gscms.h"
@@ -2338,7 +2339,7 @@ dump_icc_buffer(int buffersize, char filename[],byte *Buffer)
     FILE *fid;
 
     sprintf(full_file_name,"%d)%s_debug.icc",global_icc_index,filename);
-    fid = fopen(full_file_name,"wb");
+    fid = gp_fopen(full_file_name,"wb");
     fwrite(Buffer,sizeof(unsigned char),buffersize,fid);
     fclose(fid);
 }
diff --git a/gs/base/gsiodev.c b/gs/base/gsiodev.c
index feb8a07fa..aea5cdc12 100644
--- a/gs/base/gsiodev.c
+++ b/gs/base/gsiodev.c
@@ -49,7 +49,7 @@ const gx_io_device gs_iodev_os =
 {
     "%os%", "FileSystem",
     {iodev_no_init, iodev_no_open_device,
-     NULL /*iodev_os_open_file */ , iodev_os_fopen, iodev_os_fclose,
+     NULL /*iodev_os_open_file */ , iodev_os_gp_fopen, iodev_os_fclose,
      os_delete, os_rename, os_status,
      os_enumerate, gp_enumerate_files_next, gp_enumerate_files_close,
      os_get_params, iodev_no_put_params
@@ -190,7 +190,7 @@ iodev_no_put_params(gx_io_device * iodev, gs_param_list * plist)
 
 /* The fopen routine is exported for %null. */
 int
-iodev_os_fopen(gx_io_device * iodev, const char *fname, const char *access,
+iodev_os_gp_fopen(gx_io_device * iodev, const char *fname, const char *access,
                FILE ** pfile, char *rfname, uint rnamelen)
 {
     errno = 0;
diff --git a/gs/base/gsiodisk.c b/gs/base/gsiodisk.c
index 1d40498ee..45162ad3b 100644
--- a/gs/base/gsiodisk.c
+++ b/gs/base/gsiodisk.c
@@ -110,7 +110,7 @@
 
 /* Function prototypes */
 static iodev_proc_init(iodev_diskn_init);
-static iodev_proc_fopen(iodev_diskn_fopen);
+static iodev_proc_gp_fopen(iodev_diskn_gp_fopen);
 static iodev_proc_delete_file(diskn_delete);
 static iodev_proc_rename_file(diskn_rename);
 static iodev_proc_file_status(diskn_status);
@@ -127,7 +127,7 @@ const gx_io_device varname = \
 { \
     diskname, "FileSystem", \
     {iodev_diskn_init, iodev_no_open_device, \
-     NULL /* no longer used */ , iodev_diskn_fopen, iodev_os_fclose, \
+     NULL /* no longer used */ , iodev_diskn_gp_fopen, iodev_os_fclose, \
      diskn_delete, diskn_rename, diskn_status, \
      iodev_no_enumerate_files, /* Only until we have a root location */ \
      diskn_enumerate_next, diskn_enumerate_close, \
@@ -198,7 +198,7 @@ iodev_diskn_init(gx_io_device * iodev, gs_memory_t * mem)
 }
 
 static int
-iodev_diskn_fopen(gx_io_device * iodev, const char *fname, const char *access,
+iodev_diskn_gp_fopen(gx_io_device * iodev, const char *fname, const char *access,
                FILE ** pfile, char *rfname, uint rnamelen)
 {
     char realname[gp_file_name_sizeof];
@@ -218,7 +218,7 @@ iodev_diskn_fopen(gx_io_device * iodev, const char *fname, const char *access,
             return_error(gs_error_undefinedfilename);
     }
 
-    return iodev_os_fopen(iodev_default(pstate->memory), realname, access, pfile, rfname, rnamelen);
+    return iodev_os_gp_fopen(iodev_default(pstate->memory), realname, access, pfile, rfname, rnamelen);
 }
 
 static int
diff --git a/gs/base/gsiomacres.c b/gs/base/gsiomacres.c
index 6da920bbe..3b59231f0 100644
--- a/gs/base/gsiomacres.c
+++ b/gs/base/gsiomacres.c
@@ -293,7 +293,7 @@ int read_datafork_resource(byte *buf, const char *fname, const uint type, const
     FILE *in;
     int i;
 
-    in = fopen(fname, "rb");
+    in = gp_fopen(fname, "rb");
     if (in == NULL) {
         if_debug1('s', "[s] couldn't open '%s'\n", fname);
         return 0;
diff --git a/gs/base/gsroprun.c b/gs/base/gsroprun.c
index dc12a1268..25a210b5b 100644
--- a/gs/base/gsroprun.c
+++ b/gs/base/gsroprun.c
@@ -19,6 +19,7 @@
 #include "stdpre.h"
 #include "gsropt.h"
 #include "arch.h"
+#include "gp.h"
 
 /* Enable the following define to use 'template'd code (code formed by
  * repeated #inclusion of a header file to generate differen versions).
@@ -59,7 +60,7 @@ static void write_usage(void)
                      depth, i&15, usage[3*i], usage[3*i+1], usage[3*i+2]);
         }
 #ifdef RECORD_BINARY
-    FILE *out = fopen("ropusage2.tmp", "wb");
+    FILE *out = gp_fopen("ropusage2.tmp", "wb");
     if (!out)
         return;
     fwrite(usage, sizeof(int), (1024<<7), out);
@@ -71,7 +72,7 @@ static void record(int rop)
 {
     if (inited == 0) {
 #ifdef RECORD_BINARY
-        FILE *in = fopen("ropusage2.tmp", "r");
+        FILE *in = gp_fopen("ropusage2.tmp", "r");
         if (!in)
             memset(usage, 0, MAX*sizeof(int));
         else {
diff --git a/gs/base/gxblend.c b/gs/base/gxblend.c
index f1cc643d3..c87f6c996 100644
--- a/gs/base/gxblend.c
+++ b/gs/base/gxblend.c
@@ -17,6 +17,7 @@
 
 #include "memory_.h"
 #include "gx.h"
+#include "gp.h"
 #include "gstparam.h"
 #include "gxblend.h"
 #include "gxcolor2.h"
@@ -1574,7 +1575,7 @@ dump_raw_buffer(int num_rows, int width, int n_chan,
     if ((n_chan == 2) || (n_chan == 3)) {
         int x;
         sprintf(full_file_name,"%02d)%s.pam",global_index,filename);
-        fid = fopen(full_file_name,"wb");
+        fid = gp_fopen(full_file_name,"wb");
         fprintf(fid, "P7\nWIDTH %d\nHEIGHT %d\nDEPTH 4\nMAXVAL 255\nTUPLTYPE GRAYSCALE_ALPHA\nENDHDR\n",
                 width, num_rows);
         for(y=0; y<num_rows; y++)
@@ -1584,7 +1585,7 @@ dump_raw_buffer(int num_rows, int width, int n_chan,
         fclose(fid);
         if (n_chan == 3) {
             sprintf(full_file_name,"%02d)%s_shape.pam",global_index,filename);
-            fid = fopen(full_file_name,"wb");
+            fid = gp_fopen(full_file_name,"wb");
             fprintf(fid, "P7\nWIDTH %d\nHEIGHT %d\nDEPTH 1\nMAXVAL 255\nTUPLTYPE GRAYSCALE\nENDHDR\n",
                     width, num_rows);
             for(y=0; y<num_rows; y++)
@@ -1596,7 +1597,7 @@ dump_raw_buffer(int num_rows, int width, int n_chan,
     if ((n_chan == 4) || (n_chan == 5) || (n_chan == 6)) {
         int x;
         sprintf(full_file_name,"%02d)%s.pam",global_index,filename);
-        fid = fopen(full_file_name,"wb");
+        fid = gp_fopen(full_file_name,"wb");
         fprintf(fid, "P7\nWIDTH %d\nHEIGHT %d\nDEPTH 4\nMAXVAL 255\nTUPLTYPE RGB_ALPHA\nENDHDR\n",
                 width, num_rows);
         for(y=0; y<num_rows; y++)
@@ -1606,7 +1607,7 @@ dump_raw_buffer(int num_rows, int width, int n_chan,
         fclose(fid);
         if (n_chan > 4) {
             sprintf(full_file_name,"%02d)%s_shape.pam",global_index,filename);
-            fid = fopen(full_file_name,"wb");
+            fid = gp_fopen(full_file_name,"wb");
             fprintf(fid, "P7\nWIDTH %d\nHEIGHT %d\nDEPTH 1\nMAXVAL 255\nTUPLTYPE GRAYSCALE\nENDHDR\n",
                     width, num_rows);
             for(y=0; y<num_rows; y++)
@@ -1616,7 +1617,7 @@ dump_raw_buffer(int num_rows, int width, int n_chan,
         }
         if (n_chan == 6) {
             sprintf(full_file_name,"%02d)%s_tags.pam",global_index,filename);
-            fid = fopen(full_file_name,"wb");
+            fid = gp_fopen(full_file_name,"wb");
             fprintf(fid, "P7\nWIDTH %d\nHEIGHT %d\nDEPTH 1\nMAXVAL 255\nTUPLTYPE GRAYSCALE\nENDHDR\n",
                     width, num_rows);
             for(y=0; y<num_rows; y++)
@@ -1629,7 +1630,7 @@ dump_raw_buffer(int num_rows, int width, int n_chan,
 #endif
     max_bands = ( n_chan < 57 ? n_chan : 56);   /* Photoshop handles at most 56 bands */
     sprintf(full_file_name,"%02d)%s_%dx%dx%d.raw",global_index,filename,width,num_rows,max_bands);
-    fid = fopen(full_file_name,"wb");
+    fid = gp_fopen(full_file_name,"wb");
 
     for (z = 0; z < max_bands; ++z) {
         /* grab pointer to the next plane */
diff --git a/gs/base/gxblend1.c b/gs/base/gxblend1.c
index 6f68e5ee1..16e2b2d33 100644
--- a/gs/base/gxblend1.c
+++ b/gs/base/gxblend1.c
@@ -17,6 +17,7 @@
 
 #include "memory_.h"
 #include "gx.h"
+#include "gp.h"
 #include "gstparam.h"
 #include "gsrect.h"
 #include "gxblend.h"
@@ -612,7 +613,7 @@ dump_planar_rgba(gs_memory_t *mem, const pdf14_buf *pbuf)
     if (buf->data == NULL)
         return 0;
 
-    file = fopen ("c:\\temp\\tmp.png", "wb");
+    file = gp_fopen ("c:\\temp\\tmp.png", "wb");
 
     if_debug0m('v', mem, "[v]pnga_output_page\n");
 
diff --git a/gs/base/gxiodev.h b/gs/base/gxiodev.h
index 1e3ffd96f..f0633bf57 100644
--- a/gs/base/gxiodev.h
+++ b/gs/base/gxiodev.h
@@ -97,7 +97,7 @@ struct gx_io_device_procs_s {
 #define iodev_proc_fopen(proc)\
   int proc(gx_io_device *iodev, const char *fname, const char *access,\
            FILE **pfile, char *rfname, uint rnamelen)
-    iodev_proc_fopen((*fopen));
+    iodev_proc_fopen((*gp_fopen));
 
 #define iodev_proc_fclose(proc)\
   int proc(gx_io_device *iodev, FILE *file)
@@ -158,7 +158,7 @@ iodev_proc_get_params(iodev_no_get_params);
 iodev_proc_put_params(iodev_no_put_params);
 /* The %os% implemention of fopen and fclose. */
 /* These are exported for pipes and for %null. */
-iodev_proc_fopen(iodev_os_fopen);
+iodev_proc_fopen(iodev_os_gp_fopen);
 iodev_proc_fclose(iodev_os_fclose);
 
 /* Get the N'th IODevice. */
diff --git a/gs/base/gxpcmap.c b/gs/base/gxpcmap.c
index 064af6c07..42adc4af5 100644
--- a/gs/base/gxpcmap.c
+++ b/gs/base/gxpcmap.c
@@ -18,6 +18,7 @@
 #include "math_.h"
 #include "memory_.h"
 #include "gx.h"
+#include "gp.h"
 #include "gserrors.h"
 #include "gsstruct.h"
 #include "gsutil.h"             /* for gs_next_ids */
@@ -1153,7 +1154,7 @@ dump_raw_pattern(int height, int width, int n_chan, int depth,
         sprintf(full_file_name,"%d)PATTERN_CHUNK_%dx%dx%d.raw",global_pat_index,
                 width,height,max_bands);
     }
-    fid = fopen(full_file_name,"wb");
+    fid = gp_fopen(full_file_name,"wb");
     if (depth >= 8) {
         /* Contone data. */
         if (is_planar) {
diff --git a/gs/base/lib.mak b/gs/base/lib.mak
index 98003062f..642678c5e 100644
--- a/gs/base/lib.mak
+++ b/gs/base/lib.mak
@@ -2232,7 +2232,7 @@ gsroprun1_h=$(GLSRC)gsroprun1.h
 gsroprun8_h=$(GLSRC)gsroprun8.h
 gsroprun24_h=$(GLSRC)gsroprun24.h
 $(GLOBJ)gsroprun.$(OBJ) : $(GLSRC)gsroprun.c $(std_h) $(stdpre_h) $(gsropt_h)\
- $(gsroprun1_h) $(gsroprun8_h) $(gsroprun24_h) $(arch_h)
+ $(gsroprun1_h) $(gsroprun8_h) $(gsroprun24_h) $(gp_h) $(arch_h)
         $(GLCC) $(GLO_)gsroprun.$(OBJ) $(C_) $(GLSRC)gsroprun.c
 
 # ---------------- Async rendering ---------------- #
@@ -2443,7 +2443,7 @@ $(GLOBJ)gxp1fill.$(OBJ) : $(GLSRC)gxp1fill.c $(AK) $(gx_h)\
 
 $(GLOBJ)gxpcmap.$(OBJ) : $(GLSRC)gxpcmap.c $(AK) $(gx_h) $(gserrors_h)\
  $(math__h) $(memory__h) $(gspath2_h) $(gxdevsop_h) $(gxp1impl_h)\
- $(gsstruct_h) $(gsutil_h)\
+ $(gsstruct_h) $(gsutil_h) $(gp_h) \
  $(gxcolor2_h) $(gxcspace_h) $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h)\
  $(gxfixed_h) $(gxmatrix_h) $(gxpcolor_h) $(gxclist_h) $(gxcldev_h)\
  $(gzstate_h) $(gdevp14_h) $(gdevmpla_h) $(MAKEDIRS)
@@ -2754,7 +2754,7 @@ $(GLOBJ)gsicc_manage.$(OBJ) : $(GLSRC)gsicc_manage.c $(AK) $(gx_h)\
  $(gxistate_h) $(gxcspace_h) $(gscms_h) $(gsicc_manage_h) $(gsicc_cache_h)\
  $(gsicc_profilecache_h) $(gserrors_h) $(string__h) $(gxclist_h) $(gxcldev_h)\
  $(gzstate_h) $(gsicc_create_h) $(gpmisc_h) $(gxdevice_h) $(std_h)\
- $(gsicc_cms_h) $(MAKEDIRS)
+ $(gsicc_cms_h) $(gp_h) $(MAKEDIRS)
         $(GLCC) $(GLO_)gsicc_manage.$(OBJ) $(C_) $(GLSRC)gsicc_manage.c
 
 $(GLOBJ)gsicc_cache.$(OBJ) : $(GLSRC)gsicc_cache.c $(AK) $(gx_h)\
@@ -2778,7 +2778,7 @@ $(GLOBJ)gsicc_lcms_0.$(OBJ) : $(GLSRC)gsicc_lcms.c\
  $(gsicc_cms_h) $(lcms_h) $(gslibctx_h) $(gserrors_h)
         $(GLLCMSCC) $(GLO_)gsicc_lcms_0.$(OBJ) $(C_) $(GLSRC)gsicc_lcms.c
 
-$(GLOBJ)gsicc_lcms.$(OBJ) : $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ)
+$(GLOBJ)gsicc_lcms.$(OBJ) : $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ) $(gp_h)
         $(CP_) $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms.$(OBJ)
 
 
@@ -2790,7 +2790,7 @@ $(GLOBJ)gsicc_lcms2_0.$(OBJ) : $(GLSRC)gsicc_lcms2.c\
  $(gsicc_cms_h) $(lcms2_h) $(gslibctx_h) $(lcms2_plugin_h) $(gserrors_h)
         $(GLLCMS2CC) $(GLO_)gsicc_lcms2_0.$(OBJ) $(C_) $(GLSRC)gsicc_lcms2.c
 
-$(GLOBJ)gsicc_lcms2.$(OBJ) : $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ)
+$(GLOBJ)gsicc_lcms2.$(OBJ) : $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(gp_h)
         $(CP_) $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms2.$(OBJ)
 
 # Note that gsicc_create requires compile with lcms to obtain icc34.h
@@ -2988,12 +2988,12 @@ $(GLOBJ)gximag3x.$(OBJ) : $(GLSRC)gximag3x.c $(AK) $(gx_h)\
 
 $(GLOBJ)gxblend.$(OBJ) : $(GLSRC)gxblend.c $(AK) $(gx_h) $(memory__h)\
  $(gstparam_h) $(gxblend_h) $(gxcolor2_h) $(gsicc_cache_h)\
- $(gsicc_manage_h) $(MAKEDIRS)
+ $(gsicc_manage_h) $(gp_h) $(MAKEDIRS)
         $(GLCC) $(GLO_)gxblend.$(OBJ) $(C_) $(GLSRC)gxblend.c
 
 $(GLOBJ)gxblend1.$(OBJ) : $(GLSRC)gxblend1.c $(AK) $(gx_h) $(memory__h)\
  $(gstparam_h) $(gsrect_h) $(gxdcconv_h) $(gxblend_h) $(gxdevcli_h)\
- $(gxistate_h) $(gdevdevn_h) $(gdevp14_h) $(vdtrace_h) $(png__h)\
+ $(gxistate_h) $(gdevdevn_h) $(gdevp14_h) $(vdtrace_h) $(png__h) $(gp_h)\
  $(MAKEDIRS)
         $(GLCC) $(GLO_)gxblend1.$(OBJ) $(C_) $(GLSRC)gxblend1.c
 
diff --git a/gs/base/mkromfs.c b/gs/base/mkromfs.c
index 624803fb9..937081790 100644
--- a/gs/base/mkromfs.c
+++ b/gs/base/mkromfs.c
@@ -64,6 +64,9 @@
  *
  */
 
+/* prevent gp.h redefining fopen */
+#define fopen fopen
+
 #include "stdpre.h"
 #include "stdint_.h"
 #include "time_.h"
diff --git a/gs/base/stdio_.h b/gs/base/stdio_.h
index 4f4e5fb9d..b372feb37 100644
--- a/gs/base/stdio_.h
+++ b/gs/base/stdio_.h
@@ -77,4 +77,8 @@ int unlink(const char *);
 int snprintf(char *buffer, size_t count, const char *format , ...);
 #endif
 
+#ifndef fopen
+#define fopen DO_NOT_USE_FOPEN
+#endif
+
 #endif /* stdio__INCLUDED */
diff --git a/gs/base/strmio.c b/gs/base/strmio.c
index 7f36a2ac1..ead91c5bc 100644
--- a/gs/base/strmio.c
+++ b/gs/base/strmio.c
@@ -59,7 +59,7 @@ sfopen(const char *path, const char *mode, gs_memory_t *mem)
     open_file = pfn.iodev->procs.open_file;
     if (open_file == 0)
         code = file_open_stream(pfn.fname, pfn.len, mode, 2048, &s,
-                                pfn.iodev, pfn.iodev->procs.fopen, mem);
+                                pfn.iodev, pfn.iodev->procs.gp_fopen, mem);
     else
         code = open_file(pfn.iodev, pfn.fname, pfn.len, mode, &s, mem);
     if (code < 0)
diff --git a/gs/contrib/japanese/dviprlib.c b/gs/contrib/japanese/dviprlib.c
index d7ccd93db..6b5963936 100644
--- a/gs/contrib/japanese/dviprlib.c
+++ b/gs/contrib/japanese/dviprlib.c
@@ -52,7 +52,7 @@ dviprt_readcfg(char *ifname,dviprt_cfg_t *pcfg,uchar *pcodebuf,int codebuf_s,
   info.fname = ifname;
   info.line_no = -1;
   if (ifname) {
-    info.file = fopen(ifname,gp_fmode_rb);
+    info.file = gp_fopen(ifname,gp_fmode_rb);
     if (info.file == NULL) {
       dviprt_printcfgerror(&info,"Cannot open.\n",-1);
       return CFG_ERROR_FILE_OPEN;
@@ -496,7 +496,7 @@ dviprt_readsrc(char *fname,dviprt_cfg_t *pcfg,uchar *pcodebuf,int codebuf_s,
   info.line_no = -1;
   info.fname = fname;
   if (fname) {
-    info.file = fopen(fname,"r");
+    info.file = gp_fopen(fname,"r");
     if (info.file == NULL) {
       dviprt_printcfgerror(&info,"Cannot open.\n",-1);
       return CFG_ERROR_FILE_OPEN;
diff --git a/gs/contrib/japanese/gdevdmpr.c b/gs/contrib/japanese/gdevdmpr.c
index 71c5c0f4c..6e86afa5c 100644
--- a/gs/contrib/japanese/gdevdmpr.c
+++ b/gs/contrib/japanese/gdevdmpr.c
@@ -853,7 +853,7 @@ gdev_dmprt_dviprt_lib_fopen(const char *fnamebase,char *fname)
       strcpy(fname,env);
       strcat(fname, gp_file_name_concat_string(env,strlen(env)));
       strcat(fname,fnamebase);
-      fp = fopen(fname,gp_fmode_rb);
+      fp = gp_fopen(fname,gp_fmode_rb);
     }
   }
   return fp;
diff --git a/gs/contrib/pcl3/eprn/eprnparm.c b/gs/contrib/pcl3/eprn/eprnparm.c
index ac249ebbc..0412900fc 100644
--- a/gs/contrib/pcl3/eprn/eprnparm.c
+++ b/gs/contrib/pcl3/eprn/eprnparm.c
@@ -63,6 +63,7 @@ static const char
 
 /* Special headers */
 #include "gdeveprn.h"
+#include "gp.h"
 
 /*****************************************************************************/
 
@@ -377,7 +378,7 @@ static int eprn_read_media_data(eprn_Eprn *eprn, gs_memory_t *memory)
   eprn_PageDescription *list = NULL;
 
   /* Open the file */
-  if ((f = fopen(eprn->media_file, "r")) == NULL) {
+  if ((f = gp_fopen(eprn->media_file, "r")) == NULL) {
     eprintf5("%s" ERRPREF "Error opening the media configuration file\n"
       "%s    `%s'\n%s  for reading: %s.\n",
       epref, epref, eprn->media_file, epref, strerror(errno));
diff --git a/gs/contrib/pscolor/test.c b/gs/contrib/pscolor/test.c
index 182d08ce9..26a1369cb 100644
--- a/gs/contrib/pscolor/test.c
+++ b/gs/contrib/pscolor/test.c
@@ -23,6 +23,7 @@
 #include "iref.h"
 #include "iminst.h"
 #include "imain.h"
+#include "gp.h"
 
 #include "gsdll.h"   /* old DLL public interface */
 
@@ -56,7 +57,7 @@ gsdll_stdin(void *instance, char *buf, int len)
     fprintf(temp_fd,"%s",buf);
         fflush(temp_fd);
         fclose(temp_fd);
-        read_fd=fopen("temp.ps","rb");
+        read_fd=gp_fopen("temp.ps","rb");
 //    fprintf(stderr, "Seitenende %d %d %s\n",hlen,strlen(buf),buf);
         while( (c=fgetc(read_fd)) != EOF)
         {
@@ -65,7 +66,7 @@ gsdll_stdin(void *instance, char *buf, int len)
  //   fprintf(stderr, "Seitenende ende %d %d %s\n",hlen,strlen(buf),buf);
         fflush(choose);
         fclose(read_fd);
-        temp_fd=fopen("temp.ps","wb");
+        temp_fd=gp_fopen("temp.ps","wb");
     return (strlen(buf));
     } else if(eof!=0){
 //    fprintf(stderr, "Mittendrin %s\n",buf);
@@ -74,7 +75,7 @@ gsdll_stdin(void *instance, char *buf, int len)
     return (strlen(buf));
     } else {
     fprintf(stderr, "Dateiende\n");
-        read_fd=fopen("temp.ps","rb");
+        read_fd=gp_fopen("temp.ps","rb");
         while( (c=fgetc(read_fd)) != EOF)
         {
                 fputc(c,choose);
@@ -82,7 +83,7 @@ gsdll_stdin(void *instance, char *buf, int len)
         fflush(choose);
         fclose(read_fd);
         fclose(temp_fd);
-        temp_fd=fopen("temp.ps","wb");
+        temp_fd=gp_fopen("temp.ps","wb");
     return 0;
         }
 }
@@ -249,7 +250,7 @@ out:
         choose=black_fd;
         }
 /*
-        read_fd=fopen("temp.ps","rb");
+        read_fd=gp_fopen("temp.ps","rb");
         while( (c=fgetc(read_fd)) != EOF)
         {
                 fputc(c,choose);
@@ -257,7 +258,7 @@ out:
         fflush(choose);
         fclose(read_fd);
         fclose(temp_fd);
-        temp_fd=fopen("temp.ps","wb");
+        temp_fd=gp_fopen("temp.ps","wb");
 */
     return 0;
 }
@@ -318,9 +319,9 @@ int main(int argc, char *argv[])
     gsapi_set_stdio(minst, gsdll_stdin, gsdll_stdout, gsdll_stderr);
     gsapi_set_display_callback(minst, &display);
 
-        color_fd=fopen("color.ps","wb");
-        black_fd=fopen("black.ps","wb");
-        temp_fd=fopen("temp.ps","wb");
+        color_fd=gp_fopen("color.ps","wb");
+        black_fd=gp_fopen("black.ps","wb");
+        temp_fd=gp_fopen("temp.ps","wb");
         choose=black_fd;
 
     code = gsapi_init_with_args(minst, gsargc, gsargv);
diff --git a/gs/devices/vector/gdevtxtw.c b/gs/devices/vector/gdevtxtw.c
index b20b8d18e..ac53c7ca6 100644
--- a/gs/devices/vector/gdevtxtw.c
+++ b/gs/devices/vector/gdevtxtw.c
@@ -270,7 +270,7 @@ txtwrite_open_device(gx_device * dev)
     tdev->PageData.y_ordered_list = NULL;
     tdev->file = NULL;
 #ifdef TRACE_TXTWRITE
-    tdev->DebugFile = fopen("/temp/txtw_dbg.txt", "wb+");
+    tdev->DebugFile = gp_fopen("/temp/txtw_dbg.txt", "wb+");
 #endif
     return 0;
 }
diff --git a/gs/psi/apitest.c b/gs/psi/apitest.c
index e60df8c53..c63147ac4 100644
--- a/gs/psi/apitest.c
+++ b/gs/psi/apitest.c
@@ -1,6 +1,7 @@
 #include <pthread.h>
 #include "ierrors.h"
 #include "iapi.h"
+#include <gp.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -56,9 +57,9 @@ static void *gs_main(void *arg)
     my_stdio stdio;
 
     snprintf(text, sizeof(text), "stdout.%d", threadnum);
-    stdio.stdout = fopen(text, "w");
+    stdio.stdout = gp_fopen(text, "w");
     snprintf(text, sizeof(text), "stderr.%d", threadnum);
-    stdio.stderr = fopen(text, "w");
+    stdio.stderr = gp_fopen(text, "w");
 
     gsargv = malloc(sizeof(*gsargv)*my_argc);
     if (!gsargv)
diff --git a/gs/psi/gserver.c b/gs/psi/gserver.c
index 87e2c02ff..5652c3217 100644
--- a/gs/psi/gserver.c
+++ b/gs/psi/gserver.c
@@ -25,6 +25,7 @@
 #include "ostack.h"
 #include "store.h"
 #include "gspaint.h"            /* for gs_erasepage */
+#include "gp.h"
 
 /*
  * This file provides a very simple procedural interface to the Ghostscript
@@ -125,7 +126,7 @@ main(int argc, char *argv[])
     int errlen;
     static const char *fnames[] =
     {"golfer.eps", 0};
-    FILE *cin = fopen("stdin.tmp", "w+");
+    FILE *cin = gp_fopen("stdin.tmp", "w+");
     int sout = open("stdout.tmp", O_WRONLY | O_CREAT | O_TRUNC,
                     S_IREAD | S_IWRITE);
     int serr = open("stderr.tmp", O_WRONLY | O_CREAT | O_TRUNC,
diff --git a/gs/psi/int.mak b/gs/psi/int.mak
index 1a601b77a..ef378bc70 100644
--- a/gs/psi/int.mak
+++ b/gs/psi/int.mak
@@ -1827,7 +1827,7 @@ $(PSOBJ)gs.$(OBJ) : $(PSSRC)gs.c $(GH)\
 
 $(PSOBJ)apitest.$(OBJ) : $(PSSRC)apitest.c $(GH)\
  $(ierrors_h) $(iapi_h) $(imain_h) $(imainarg_h) $(iminst_h) $(gsmalloc_h)\
- $(locale__h)
+ $(locale__h) $(gp_h)
         $(PSCC) $(PSO_)apitest.$(OBJ) $(C_) $(PSSRC)apitest.c
 
 $(PSOBJ)iapi.$(OBJ) : $(PSSRC)iapi.c $(AK)\
diff --git a/gs/psi/zfile.c b/gs/psi/zfile.c
index bdf99eafa..a27a4be16 100644
--- a/gs/psi/zfile.c
+++ b/gs/psi/zfile.c
@@ -864,7 +864,7 @@ iodev_os_open_file(gx_io_device * iodev, const char *fname, uint len,
 {
     return file_open_stream(fname, len, file_access,
                             file_default_buffer_size, ps,
-                            iodev, iodev->procs.fopen, mem);
+                            iodev, iodev->procs.gp_fopen, mem);
 }
 
 /* Make a t_file reference to a stream. */
diff --git a/gs/psi/ziodev2.c b/gs/psi/ziodev2.c
index 3d9f2fb70..8ed18fca1 100644
--- a/gs/psi/ziodev2.c
+++ b/gs/psi/ziodev2.c
@@ -35,7 +35,7 @@ const gx_io_device gs_iodev_null = {
     "%null%", "Special",
     {
         iodev_no_init, null_open, iodev_no_open_file,
-        iodev_os_fopen, iodev_os_fclose,
+        iodev_os_gp_fopen, iodev_os_fclose,
         iodev_no_delete_file, iodev_no_rename_file, iodev_no_file_status,
         iodev_no_enumerate_files, NULL, NULL,
         iodev_no_get_params, iodev_no_put_params
@@ -51,7 +51,7 @@ null_open(gx_io_device * iodev, const char *access, stream ** ps,
     return file_open_stream(gp_null_file_name,
                             strlen(gp_null_file_name),
                             access, 256 /* arbitrary */ , ps,
-                            iodev, iodev->procs.fopen, mem);
+                            iodev, iodev->procs.gp_fopen, mem);
 }
 
 /* ------ Operators ------ */
diff --git a/pl/pjparse.c b/pl/pjparse.c
index 4a5e76bfa..e0da1d3ab 100644
--- a/pl/pjparse.c
+++ b/pl/pjparse.c
@@ -519,7 +519,7 @@ pjl_warn_exists(const gs_memory_t *mem, char *fname)
 {
     FILE *fpdownload;
     /* issue a warning if the file exists */
-    if ( (fpdownload = fopen(fname, gp_fmode_rb) ) != NULL ) {
+    if ( (fpdownload = gp_fopen(fname, gp_fmode_rb) ) != NULL ) {
         fclose(fpdownload);
         dmprintf1(mem, "warning file exists overwriting %s\n", fname);
     }
@@ -541,7 +541,7 @@ pjl_setup_file_for_writing(pjl_parser_state_t *pst, char *pathname, int size, bo
         strcpy(fmode, gp_fmode_wb);
         if (append)
             strcat(fmode, "+");
-        if ( (fp = fopen(fname, gp_fmode_wb)) == NULL) {
+        if ( (fp = gp_fopen(fname, gp_fmode_wb)) == NULL) {
             dmprintf(pst->mem, "warning file open for writing failed\n" );
             return NULL;
         }
@@ -883,7 +883,7 @@ get_fp(pjl_parser_state_t *pst, char *name)
         if ( result[0] == '\0' )
             return 0;
     }
-    return fopen(result, gp_fmode_rb);
+    return gp_fopen(result, gp_fmode_rb);
 }
 
 /* scan for a named resoource in the pcl sandbox 0: or 1: and return
diff --git a/pl/plmain.c b/pl/plmain.c
index 0ba3c5b7a..98eb0b4ad 100644
--- a/pl/plmain.c
+++ b/pl/plmain.c
@@ -878,7 +878,7 @@ pl_top_create_device(pl_main_instance_t *pti, int index, bool is_default)
 /* Process the options on the command line. */
 static FILE *
 pl_main_arg_fopen(const char *fname, void *ignore_data)
-{       return fopen(fname, "r");
+{       return gp_fopen(fname, "r");
 }
 
 static void
@@ -1432,7 +1432,7 @@ pl_main_cursor_open(const gs_memory_t *mem,
         if (fname[0] == '-' && fname[1] == 0)
             cursor->strm = mem->gs_lib_ctx->fstdin;
         else
-            cursor->strm = fopen(fname, "rb");
+            cursor->strm = gp_fopen(fname, "rb");
         if (!cursor->strm)
           return gs_error_ioerror;
 
diff --git a/svg/svg.mak b/svg/svg.mak
index 2461d8d1b..77e61965e 100644
--- a/svg/svg.mak
+++ b/svg/svg.mak
@@ -67,7 +67,7 @@ $(SVGOBJ)svgxml.$(OBJ): $(SVGSRC)svgxml.c $(SVGINCLUDES)
         $(SVGCCC) $(SVGSRC)svgxml.c $(SVGO_)svgxml.$(OBJ)
 
 
-$(SVG_TOP_OBJ): $(SVGSRC)svgtop.c $(pltop_h) $(SVGGEN)pconf.h $(SVGINCLUDES)
+$(SVG_TOP_OBJ): $(SVGSRC)svgtop.c $(pltop_h) $(SVGGEN)pconf.h $(gp_h) $(SVGINCLUDES)
         $(CP_) $(SVGGEN)pconf.h $(SVGGEN)pconfig.h
         $(SVGCCC) $(SVGSRC)svgtop.c $(SVGO_)svgtop.$(OBJ)
 
diff --git a/svg/svgtop.c b/svg/svgtop.c
index 8b42cd781..9796f892f 100644
--- a/svg/svgtop.c
+++ b/svg/svgtop.c
@@ -25,7 +25,7 @@
 #include "gxdevice.h" /* so we can include gxht.h below */
 #include "gxht.h" /* gsht1.h is incomplete, we need storage size of gs_halftone */
 #include "gsht1.h"
-
+#include "gp.h"
 static int svg_install_halftone(svg_context_t *ctx, gx_device *pdevice);
 
 #define SVG_PARSER_MIN_INPUT_SIZE 8192
@@ -248,7 +248,7 @@ svg_imp_process_file(pl_interp_instance_t *pinstance, char *filename)
 
     dmprintf1(ctx->memory, "svg_imp_process_file %s\n", filename);
 
-    file = fopen(filename, "rb");
+    file = gp_fopen(filename, "rb");
     if (!file)
         return gs_error_ioerror;
 
diff --git a/xps/xpszip.c b/xps/xpszip.c
index b67046d92..aeaaa9daf 100644
--- a/xps/xpszip.c
+++ b/xps/xpszip.c
@@ -20,7 +20,7 @@
 
 static int isfile(char *path)
 {
-    FILE *file = fopen(path, "rb");
+    FILE *file = gp_fopen(path, "rb");
     if (file)
     {
         fclose(file);
@@ -354,7 +354,7 @@ xps_read_dir_part(xps_context_t *ctx, char *name)
     xps_strlcat(buf, name, sizeof buf);
 
     /* All in one piece */
-    file = fopen(buf, "rb");
+    file = gp_fopen(buf, "rb");
     if (file)
     {
         fseek(file, 0, SEEK_END);
@@ -372,11 +372,11 @@ xps_read_dir_part(xps_context_t *ctx, char *name)
     while (1)
     {
         sprintf(buf, "%s%s/[%d].piece", ctx->directory, name, count);
-        file = fopen(buf, "rb");
+        file = gp_fopen(buf, "rb");
         if (!file)
         {
             sprintf(buf, "%s%s/[%d].last.piece", ctx->directory, name, count);
-            file = fopen(buf, "rb");
+            file = gp_fopen(buf, "rb");
         }
         if (!file)
             break;
@@ -397,7 +397,7 @@ xps_read_dir_part(xps_context_t *ctx, char *name)
                 sprintf(buf, "%s%s/[%d].piece", ctx->directory, name, i);
             else
                 sprintf(buf, "%s%s/[%d].last.piece", ctx->directory, name, i);
-            file = fopen(buf, "rb");
+            file = gp_fopen(buf, "rb");
             n = fread(part->data + offset, 1, size - offset, file);
             offset += n;
             fclose(file);
@@ -471,7 +471,7 @@ xps_process_file(xps_context_t *ctx, char *filename)
     int code;
     char *p;
 
-    ctx->file = fopen(filename, "rb");
+    ctx->file = gp_fopen(filename, "rb");
     if (!ctx->file)
         return gs_throw1(-1, "cannot open file: '%s'", filename);