git » fp-git.git » commit 05b7daa

diff --git a/PR/src/Makefile b/PR/src/Makefile
index edb41f8..620f01d 100644
--- a/PR/src/Makefile
+++ b/PR/src/Makefile
@@ -113,27 +113,27 @@ $(XMLFILE): xml/resources.xml
 	$(MAKEDIR) bin
 	$(COPY) xml/resources.xml $(XMLFILE)
 
-.import.o: lib/actions/import.c include/bmp.h include/common.h include/dat.h include/disk.h include/import.h include/memory.h include/mid.h include/pal.h include/plv.h include/wav.h
+.import.o: lib/actions/import.c include/autodetect.h include/bmp.h include/common.h include/dat.h include/disk.h include/idlist.h include/import.h include/memory.h include/mid.h include/pal.h include/plv.h include/resources.h include/wav.h
 	$(INFO) Compiling import module...
 	$(CC) $(OPTIONS) -c lib/actions/import.c -o $@
 
-.classify.o: lib/actions/classify.c include/classify.h include/common.h include/dat.h include/disk.h include/memory.h include/resources.h
+.classify.o: lib/actions/classify.c include/autodetect.h include/classify.h include/common.h include/dat.h include/disk.h include/memory.h
 	$(INFO) Compiling classification module...
 	$(CC) $(OPTIONS) -c lib/actions/classify.c -o $@
 
-.export.o: lib/actions/export.c include/bmp.h include/common.h include/dat.h include/disk.h include/export.h include/memory.h include/mid.h include/pal.h include/plv.h include/reslist.h include/wav.h
+.export.o: lib/actions/export.c include/autodetect.h include/bmp.h include/common.h include/dat.h include/disk.h include/export.h include/idlist.h include/memory.h include/mid.h include/pal.h include/plv.h include/reslist.h include/resources.h include/wav.h
 	$(INFO) Compiling export module...
 	$(CC) $(OPTIONS) -c lib/actions/export.c -o $@
 
-.autodetect.o: lib/layers/autodetect.c include/common.h include/compress.h include/disk.h include/memory.h include/resources.h include/xmlsearch.h
+.autodetect.o: lib/layers/autodetect.c include/autodetect.h
 	$(INFO) Compiling resource autodetection module...
 	$(CC) $(OPTIONS) -c lib/layers/autodetect.c -o $@
 
-.idlist.o: lib/layers/idlist.c include/common.h include/compress.h include/disk.h include/memory.h include/resources.h include/xmlsearch.h
+.idlist.o: lib/layers/idlist.c include/disk.h include/idlist.h include/memory.h
 	$(INFO) Compiling id list layer...
 	$(CC) $(OPTIONS) -c lib/layers/idlist.c -o $@
 
-.disk.o: lib/layers/disk.c include/common.h include/direntwin.h include/disk.h include/memory.h include/xmlparse.h
+.disk.o: lib/layers/disk.c include/common.h include/direntwin.h include/disk.h include/memory.h
 	$(INFO) Compiling disk access library...
 	$(CC) $(OPTIONS) -c lib/layers/disk.c -o $@
 
@@ -173,27 +173,27 @@ $(XMLFILE): xml/resources.xml
 	$(INFO) Compiling RLE uncompression module...
 	$(CC) $(OPTIONS) -c lib/compression/rle_uncompress.c -o $@
 
-.pr.o: lib/pr.c include/classify.h include/common.h include/compress.h include/disk.h include/export.h include/import.h include/memory.h
+.pr.o: lib/pr.c include/classify.h include/common.h include/disk.h include/export.h include/idlist.h include/import.h include/memory.h include/resources.h
 	$(INFO) Compiling main library primitives for both modes...
 	$(CC) $(OPTIONS) -c lib/pr.c -o $@
 	
-.main.o: console/main.c include/common.h include/compress.h include/disk.h include/filedir.h include/getopt.h include/memory.h include/xmlparse.h
+.main.o: console/main.c include/common.h include/compress.h include/disk.h include/filedir.h include/getopt.h include/memory.h include/parse.h
 	$(INFO) Compiling command parsing module for standard mode...
 	$(CC) $(OPTIONS) -c console/main.c -o $@
 
-.filedir.o: console/filedir.c include/disk.h include/memory.h include/xmlsearch.h
+.filedir.o: console/filedir.c include/disk.h include/memory.h include/search.h
 	$(INFO) Compiling directory and recursive file reading module for standard mode...
 	$(CC) $(OPTIONS) -c console/filedir.c -o $@
 
-.resources.o: lib/xml/resources.c include/common.h include/compress.h include/disk.h include/memory.h include/resources.h include/xmlsearch.h
+.resources.o: lib/xml/resources.c include/common.h include/disk.h include/resources.h include/search.h
 	$(INFO) Compiling XML resource reading module...
 	$(CC) $(OPTIONS) -c lib/xml/resources.c -o $@
 
-.parse.o: lib/xml/parse.c include/common.h include/disk.h include/memory.h include/xmlparse.h
+.parse.o: lib/xml/parse.c include/common.h include/disk.h include/memory.h include/parse.h
 	$(INFO) Compiling XML parsing module...
 	$(CC) $(OPTIONS) -c lib/xml/parse.c -o $@
 
-.search.o: lib/xml/search.c include/common.h include/memory.h include/reslist.h include/xmlparse.h include/xmlsearch.h
+.search.o: lib/xml/search.c include/common.h include/memory.h include/parse.h include/reslist.h include/search.h
 	$(INFO) Compiling XML search features...
 	$(CC) $(OPTIONS) -c lib/xml/search.c -o $@
 
@@ -201,15 +201,15 @@ $(XMLFILE): xml/resources.xml
 	$(INFO) Compiling bitmap files support \(bmp\)...
 	$(CC) $(OPTIONS) -c lib/formats/bmp.c -o $@
 
-.mid.o: lib/formats/mid.c include/common.h include/dat.h include/disk.h include/memory.h include/mid.h
+.mid.o: lib/formats/mid.c include/common.h include/dat.h include/disk.h include/mid.h
 	$(INFO) Compiling MIDI audio files support \(mid\)...
 	$(CC) $(OPTIONS) -c lib/formats/mid.c -o $@
 
-.plv.o: lib/formats/plv.c include/dat.h include/disk.h include/memory.h include/plv.h
+.plv.o: lib/formats/plv.c include/dat.h include/disk.h include/plv.h
 	$(INFO) Compiling prince level files support \(plv\)...
 	$(CC) $(OPTIONS) -c lib/formats/plv.c -o $@
 
-.pal.o: lib/formats/pal.c include/dat.h include/disk.h include/memory.h include/pal.h include/resources.h
+.pal.o: lib/formats/pal.c include/dat.h include/disk.h include/pal.h
 	$(INFO) Compiling JASC palette support \(pal\)...
 	$(CC) $(OPTIONS) -c lib/formats/pal.c -o $@
 
diff --git a/PR/src/console/filedir.c b/PR/src/console/filedir.c
index f3c10f6..159afc2 100644
--- a/PR/src/console/filedir.c
+++ b/PR/src/console/filedir.c
@@ -31,7 +31,7 @@ filedir.c: Princed Resources : read command line file arguments and generate a f
   DO NOT remove this copyright notice
 */
 
-#include "xmlsearch.h" /* tTag */
+#include "search.h" /* tTag */
 #include "memory.h" /* malloc, strallocandcopy */
 #include <string.h> /* strcat */
 #include "disk.h"
diff --git a/PR/src/console/main.c b/PR/src/console/main.c
index c9a1d22..239aea5 100644
--- a/PR/src/console/main.c
+++ b/PR/src/console/main.c
@@ -41,7 +41,7 @@ main.c: PR console program parsing routine
 #include "filedir.h"
 #include "disk.h" /* MAX_FILENAME_SIZE */
 #include "compress.h" /* setCompressionLevel */
-#include "xmlparse.h" /* free parsed cache */
+#include "parse.h" /* free parsed cache */
 
 FILE* outputStream;
 
diff --git a/PR/src/include/autodetect.h b/PR/src/include/autodetect.h
index 86388bd..2a4de01 100644
--- a/PR/src/include/autodetect.h
+++ b/PR/src/include/autodetect.h
@@ -19,7 +19,7 @@
 */
 
 /*
-resources.h: Princed Resources : Resource Handler headers
+autodetect.h: Princed Resources : Resource autodetection headers
 \xaf\xaf\xaf\xaf\xaf\xaf\xaf\xaf\xaf\xaf\xaf
  Copyright 2003 Princed Development Team
   Created: 24 Aug 2003
@@ -31,75 +31,13 @@ resources.h: Princed Resources : Resource Handler headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _RESOURCES_H_
-#define _RESOURCES_H_
-
-/* XML generation defines */
-
-#define RES_XML_UNKNOWN_PATH  "%s/unknown/%s/"
-#define RES_XML_UNKNOWN_FILES "%s%03d.%s"
-#define RES_XML_UNKNOWN_START "<?xml version=\"1.0\" ?>\n<resources version=\"generated\">\n <folder name=\"unknown\" path=\"%s\" file=\"%s\" palette=\"%d\" paletteindex=\"%s\">\n"
-#define RES_XML_UNKNOWN_ITEM  "  <item value=\"%d\" index=\"%s\" path=\""RES_XML_UNKNOWN_FILES"\" itemtype=\"%s\">Unknown %s %d</item>\n"
-#define RES_XML_UNKNOWN_END   " </folder>\n</resources>\n"
-
-/* File extensions */
-
-#define RES_FILE_EXTENSIONS   {"raw","plv","bmp","wav","mid","bin","pal","pcs"}
+#ifndef _AUTODETECT_H_
+#define _AUTODETECT_H_
 
 /* Includes */
-#include <stdio.h>
-#include "xmlparse.h"
-#include "reslist.h"
-
-/* Id list for partial manipulation */
-typedef enum {eString,eId,eIdValue}tResLocationType;
-
-typedef struct {
-  tResLocationType type;
-  union {
-    char*        text;
-    tResourceId  id;
-  } field;
-}tResIdListItem;
-
-typedef struct {
-	int             count;
-	tResIdListItem* list;
-}tResIdList;
-
-void parseGivenPath(char* path);
-int  partialListActive();
-int isInThePartialList(const char* vFile, tResourceId id);
-void freePartialList();
+#include "reslist.h" /* tResourceType */
 
 /* Verify  header */
 tResourceType verifyHeader(const unsigned char* array, int size);
 
-/*
-	Headers may be:
-	 01 Levels
-	 02 Bitmaps
-	 03 Waves
-	 04 Midis
-	 05 Binary
-	 06 Palette
-	 07 Internal Speaker Sounds
-*/
-
-/* Resources extras */
-void getFileName(char* vFileext,const char* vDirExt,const tResource* r,const char* vFiledat, const char* vDatFileName,int optionflag,const char* backupExtension);
-void getUpperFolder(char* aux, char* vFiledat);
-
-const char* getExtDesc(int type);
-
-/* parse xml file */
-int parseFile(const char* vFile, const char* datFile, tResourceList *r);
-
-/* In case there are unknown resources it closes the unknown XML output */
-void endUnknownXml();
-
-/* Search files for the Import feature */
-int importDir(const char* directory, const char* vResFile, int pOption, const char* backupExtension,const char* vDirectory,FILE* output);
-int isntADatFile(const char* testFile, const char* vResFile);
-
 #endif
diff --git a/PR/src/include/disk.h b/PR/src/include/disk.h
index c97cb39..a20f7b4 100644
--- a/PR/src/include/disk.h
+++ b/PR/src/include/disk.h
@@ -68,7 +68,6 @@ int  makebase      (const char* p);
 const char* repairFolders(const char* a);
 const char* getFileNameFromPath(const char* path);
 whatIs isDir(const char *nombre);
-/*#define mRemoveFile(a) remove(repairFolders(a))*/
 
 #ifdef DISK_DIR_SCANING
 int recurseDirectory(const char* path,int recursive, void* pass, void (*function)(const char*,void*));
diff --git a/PR/src/include/export.h b/PR/src/include/export.h
index 9394b7e..f39b26e 100644
--- a/PR/src/include/export.h
+++ b/PR/src/include/export.h
@@ -34,7 +34,7 @@ export.h: Princed Resources : DAT Extractor headers
 #ifndef _EXPORT_H_
 #define _EXPORT_H_
 
-#include "resources.h"
+#include "reslist.h"
 
 int extract(const char* vFiledat,const char* vDirExt, tResourceList* r, int task, const char* vDatFileName, const char* vDatAuthor,const char* backupExtension);
 
diff --git a/PR/src/include/filedir.h b/PR/src/include/filedir.h
index e876c4e..bdfa69c 100644
--- a/PR/src/include/filedir.h
+++ b/PR/src/include/filedir.h
@@ -19,7 +19,7 @@
 */
 
 /*
-xmlparse.h: Princed Resources : xml handling functions header file
+filedir.h: Princed Resources : xml handling functions header file
 \xaf\xaf\xaf\xaf\xaf
  Copyright 2003 Princed Development Team
   Created: 23 Oct 2003
diff --git a/PR/src/include/idlist.h b/PR/src/include/idlist.h
index 86388bd..6020875 100644
--- a/PR/src/include/idlist.h
+++ b/PR/src/include/idlist.h
@@ -19,8 +19,8 @@
 */
 
 /*
-resources.h: Princed Resources : Resource Handler headers
-\xaf\xaf\xaf\xaf\xaf\xaf\xaf\xaf\xaf\xaf\xaf
+idlist.h: Princed Resources : Resource id list headers
+\xaf\xaf\xaf\xaf\xaf\xaf\xaf\xaf
  Copyright 2003 Princed Development Team
   Created: 24 Aug 2003
 
@@ -31,24 +31,10 @@ resources.h: Princed Resources : Resource Handler headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _RESOURCES_H_
-#define _RESOURCES_H_
-
-/* XML generation defines */
-
-#define RES_XML_UNKNOWN_PATH  "%s/unknown/%s/"
-#define RES_XML_UNKNOWN_FILES "%s%03d.%s"
-#define RES_XML_UNKNOWN_START "<?xml version=\"1.0\" ?>\n<resources version=\"generated\">\n <folder name=\"unknown\" path=\"%s\" file=\"%s\" palette=\"%d\" paletteindex=\"%s\">\n"
-#define RES_XML_UNKNOWN_ITEM  "  <item value=\"%d\" index=\"%s\" path=\""RES_XML_UNKNOWN_FILES"\" itemtype=\"%s\">Unknown %s %d</item>\n"
-#define RES_XML_UNKNOWN_END   " </folder>\n</resources>\n"
-
-/* File extensions */
-
-#define RES_FILE_EXTENSIONS   {"raw","plv","bmp","wav","mid","bin","pal","pcs"}
+#ifndef _IDLIST_H_
+#define _IDLIST_H_
 
 /* Includes */
-#include <stdio.h>
-#include "xmlparse.h"
 #include "reslist.h"
 
 /* Id list for partial manipulation */
@@ -72,34 +58,4 @@ int  partialListActive();
 int isInThePartialList(const char* vFile, tResourceId id);
 void freePartialList();
 
-/* Verify  header */
-tResourceType verifyHeader(const unsigned char* array, int size);
-
-/*
-	Headers may be:
-	 01 Levels
-	 02 Bitmaps
-	 03 Waves
-	 04 Midis
-	 05 Binary
-	 06 Palette
-	 07 Internal Speaker Sounds
-*/
-
-/* Resources extras */
-void getFileName(char* vFileext,const char* vDirExt,const tResource* r,const char* vFiledat, const char* vDatFileName,int optionflag,const char* backupExtension);
-void getUpperFolder(char* aux, char* vFiledat);
-
-const char* getExtDesc(int type);
-
-/* parse xml file */
-int parseFile(const char* vFile, const char* datFile, tResourceList *r);
-
-/* In case there are unknown resources it closes the unknown XML output */
-void endUnknownXml();
-
-/* Search files for the Import feature */
-int importDir(const char* directory, const char* vResFile, int pOption, const char* backupExtension,const char* vDirectory,FILE* output);
-int isntADatFile(const char* testFile, const char* vResFile);
-
 #endif
diff --git a/PR/src/include/import.h b/PR/src/include/import.h
index 54d8803..f964092 100644
--- a/PR/src/include/import.h
+++ b/PR/src/include/import.h
@@ -34,8 +34,7 @@ import.h: Princed Resources : DAT Compiler headers
 #ifndef _IMPORT_H_
 #define _IMPORT_H_
 
-#include <stdio.h>
-#include "resources.h"
+#include "reslist.h"
 
 int compile(const char* vFiledat, const char* vDirExt, tResourceList* r, int optionflag, const char* vDatFileName,const char* backupExtension);
 
diff --git a/PR/src/include/parse.h b/PR/src/include/parse.h
index 1de78b5..fe6cb9c 100644
--- a/PR/src/include/parse.h
+++ b/PR/src/include/parse.h
@@ -19,7 +19,7 @@
 */
 
 /*
-xmlparse.h: Princed Resources : xml handling functions headers
+parse.h: Princed Resources : xml handling functions headers
 \xaf\xaf\xaf\xaf\xaf
  Copyright 2003 Princed Development Team
   Created: 23 Oct 2003
diff --git a/PR/src/include/search.h b/PR/src/include/search.h
index b1aad4f..fbead18 100644
--- a/PR/src/include/search.h
+++ b/PR/src/include/search.h
@@ -19,7 +19,7 @@
 */
 
 /*
-xmlparse.h: Princed Resources : xml handling functions header file
+search.h: Princed Resources : xml handling functions header file
 \xaf\xaf\xaf\xaf\xaf
  Copyright 2003 Princed Development Team
   Created: 23 Oct 2003
@@ -40,7 +40,7 @@ xmlparse.h: Princed Resources : xml handling functions header file
 
 /* Includes */
 #include "common.h" /* tTag */
-#include "xmlparse.h"
+#include "parse.h"
 #include "reslist.h"
 
 /****************************************************************\
diff --git a/PR/src/include/tree.h b/PR/src/include/tree.h
index 86388bd..8cd44ab 100644
--- a/PR/src/include/tree.h
+++ b/PR/src/include/tree.h
@@ -48,44 +48,9 @@ resources.h: Princed Resources : Resource Handler headers
 
 /* Includes */
 #include <stdio.h>
-#include "xmlparse.h"
+#include "parse.h"
 #include "reslist.h"
 
-/* Id list for partial manipulation */
-typedef enum {eString,eId,eIdValue}tResLocationType;
-
-typedef struct {
-  tResLocationType type;
-  union {
-    char*        text;
-    tResourceId  id;
-  } field;
-}tResIdListItem;
-
-typedef struct {
-	int             count;
-	tResIdListItem* list;
-}tResIdList;
-
-void parseGivenPath(char* path);
-int  partialListActive();
-int isInThePartialList(const char* vFile, tResourceId id);
-void freePartialList();
-
-/* Verify  header */
-tResourceType verifyHeader(const unsigned char* array, int size);
-
-/*
-	Headers may be:
-	 01 Levels
-	 02 Bitmaps
-	 03 Waves
-	 04 Midis
-	 05 Binary
-	 06 Palette
-	 07 Internal Speaker Sounds
-*/
-
 /* Resources extras */
 void getFileName(char* vFileext,const char* vDirExt,const tResource* r,const char* vFiledat, const char* vDatFileName,int optionflag,const char* backupExtension);
 void getUpperFolder(char* aux, char* vFiledat);
diff --git a/PR/src/include/unknown.h b/PR/src/include/unknown.h
index 86388bd..8cd44ab 100644
--- a/PR/src/include/unknown.h
+++ b/PR/src/include/unknown.h
@@ -48,44 +48,9 @@ resources.h: Princed Resources : Resource Handler headers
 
 /* Includes */
 #include <stdio.h>
-#include "xmlparse.h"
+#include "parse.h"
 #include "reslist.h"
 
-/* Id list for partial manipulation */
-typedef enum {eString,eId,eIdValue}tResLocationType;
-
-typedef struct {
-  tResLocationType type;
-  union {
-    char*        text;
-    tResourceId  id;
-  } field;
-}tResIdListItem;
-
-typedef struct {
-	int             count;
-	tResIdListItem* list;
-}tResIdList;
-
-void parseGivenPath(char* path);
-int  partialListActive();
-int isInThePartialList(const char* vFile, tResourceId id);
-void freePartialList();
-
-/* Verify  header */
-tResourceType verifyHeader(const unsigned char* array, int size);
-
-/*
-	Headers may be:
-	 01 Levels
-	 02 Bitmaps
-	 03 Waves
-	 04 Midis
-	 05 Binary
-	 06 Palette
-	 07 Internal Speaker Sounds
-*/
-
 /* Resources extras */
 void getFileName(char* vFileext,const char* vDirExt,const tResource* r,const char* vFiledat, const char* vDatFileName,int optionflag,const char* backupExtension);
 void getUpperFolder(char* aux, char* vFiledat);
diff --git a/PR/src/lib/actions/classify.c b/PR/src/lib/actions/classify.c
index 2a5e221..4835d1f 100644
--- a/PR/src/lib/actions/classify.c
+++ b/PR/src/lib/actions/classify.c
@@ -34,10 +34,10 @@ tasks.c: Princed Resources : Classify a DAT file
 #include <stdio.h>
 #include "classify.h"
 #include "memory.h"
-#include "resources.h"
 #include "dat.h"
 #include "disk.h" /* mLoadFileArray */
 #include "common.h"
+#include "autodetect.h"
 
 /***************************************************************\
 |                    Get the type of a DAT file                 |
diff --git a/PR/src/lib/actions/export.c b/PR/src/lib/actions/export.c
index e05b276..b04fa4b 100644
--- a/PR/src/lib/actions/export.c
+++ b/PR/src/lib/actions/export.c
@@ -38,10 +38,14 @@ export.c: Princed Resources : DAT Extractor
 #include "common.h"
 
 #include "export.h"
+
+#include "autodetect.h"
 #include "dat.h"
 #include "disk.h"
+#include "idlist.h"
 #include "memory.h"
 #include "reslist.h" /* resIdcmp, resourceList primitives for the palette */
+#include "resources.h"
 
 #include "bmp.h"
 #include "wav.h"
diff --git a/PR/src/lib/actions/import.c b/PR/src/lib/actions/import.c
index e987b68..8ece8bc 100644
--- a/PR/src/lib/actions/import.c
+++ b/PR/src/lib/actions/import.c
@@ -39,9 +39,12 @@ import.c: Princed Resources : DAT Compiler
 #include "common.h"
 #include "import.h"
 
+#include "autodetect.h"
 #include "dat.h"
-#include "memory.h"
 #include "disk.h"
+#include "idlist.h"
+#include "memory.h"
+#include "resources.h"
 
 #include "bmp.h"
 #include "mid.h"
diff --git a/PR/src/lib/layers/autodetect.c b/PR/src/lib/layers/autodetect.c
index a59ab26..63ce928 100644
--- a/PR/src/lib/layers/autodetect.c
+++ b/PR/src/lib/layers/autodetect.c
@@ -35,8 +35,7 @@ autodetect.c: Princed Resources : Autodetect resource types
 |                  I M P L E M E N T A T I O N                  |
 \***************************************************************/
 
-/* Includes */
-#include "reslist.h" /* tResourceType */
+#include "autodetect.h"
 
 /***************************************************************\
 |                       Item Type Detector                      |
diff --git a/PR/src/lib/layers/idlist.c b/PR/src/lib/layers/idlist.c
index e4f0ae3..bfef546 100644
--- a/PR/src/lib/layers/idlist.c
+++ b/PR/src/lib/layers/idlist.c
@@ -39,7 +39,7 @@ idlist.c: Princed Resources : Partial Id list
 #include <stdio.h>
 #include "disk.h"
 #include "memory.h"
-#include "resources.h"
+#include "idlist.h"
 
 /***************************************************************\
 |                Partial Resource List Functions                |
diff --git a/PR/src/lib/pr.c b/PR/src/lib/pr.c
index 8352b66..4fc8abf 100644
--- a/PR/src/lib/pr.c
+++ b/PR/src/lib/pr.c
@@ -53,14 +53,14 @@ pr.c: Main source file for Princed Resources library
 
 #include "common.h"
 
-#include "compress.h"
-
 #include "export.h"
 #include "import.h"
 #include "classify.h"
 
-#include "memory.h"    /* getMemory, free */
 #include "disk.h"      /* getFileNameFromPath */
+#include "idlist.h"
+#include "memory.h"    /* getMemory, free */
+#include "resources.h"
 
 /***************************************************************\
 |                      Main working functions                   |
diff --git a/PR/src/lib/xml/parse.c b/PR/src/lib/xml/parse.c
index a447f64..e318156 100644
--- a/PR/src/lib/xml/parse.c
+++ b/PR/src/lib/xml/parse.c
@@ -36,7 +36,7 @@ parse.c: Princed Resources : xml parsing functions
 \***************************************************************/
 
 /* Includes */
-#include "xmlparse.h"
+#include "parse.h"
 #include "disk.h"
 #include "memory.h"
 #include "common.h"
diff --git a/PR/src/lib/xml/search.c b/PR/src/lib/xml/search.c
index d387af9..2c4830a 100644
--- a/PR/src/lib/xml/search.c
+++ b/PR/src/lib/xml/search.c
@@ -38,9 +38,9 @@ search.c: Princed Resources : specific xml handling functions
 
 /* Includes */
 #include "common.h"
-#include "xmlparse.h"
+#include "parse.h"
 #include "reslist.h" /* only to add to the list */
-#include "xmlsearch.h"
+#include "search.h"
 #include "memory.h"
 #include <string.h>
 
diff --git a/PR/src/lib/xml/tree.c b/PR/src/lib/xml/tree.c
index 72e15fa..2b47d5a 100644
--- a/PR/src/lib/xml/tree.c
+++ b/PR/src/lib/xml/tree.c
@@ -40,7 +40,7 @@ resources.c: Princed Resources : Resource Handler
 #include "common.h"
 #include "disk.h"
 #include "resources.h"
-#include "xmlsearch.h"
+#include "search.h"
 
 /***************************************************************\
 |            Filtering xml structure to tResourceList           |
diff --git a/PR/src/lib/xml/unknown.c b/PR/src/lib/xml/unknown.c
index 72e15fa..2b47d5a 100644
--- a/PR/src/lib/xml/unknown.c
+++ b/PR/src/lib/xml/unknown.c
@@ -40,7 +40,7 @@ resources.c: Princed Resources : Resource Handler
 #include "common.h"
 #include "disk.h"
 #include "resources.h"
-#include "xmlsearch.h"
+#include "search.h"
 
 /***************************************************************\
 |            Filtering xml structure to tResourceList           |