4 files changed, 9 insertions, 8 deletions
diff --git a/WWW/Library/Implementation/HTAnchor.c b/WWW/Library/Implementation/HTAnchor.c
index 2ce3042c..49ef2090 100644
--- a/WWW/Library/Implementation/HTAnchor.c
+++ b/WWW/Library/Implementation/HTAnchor.c
@@ -28,7 +28,9 @@
 
 #define FREE(x) if (x) {free(x); x = NULL;}
 
+#ifdef EXP_CHARTRANS
 extern LYUCcharset LYCharSet_UC[];
+#endif
 
 #ifdef NOT_DEFINED
 /*
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index 2b8b61b8..a09d169d 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -26,7 +26,7 @@
 #endif /* !VMS */
 
 #ifdef DOSPATH
-#define GOT_READ_DIR
+#define HAVE_READDIR
 #include <dirent.h>
 #define USE_DIRENT
 #include "HTDOS.h"
@@ -440,7 +440,7 @@ PRIVATE void free_suffixes NOARGS
 **
 **  If a README file exists, then it is inserted into the document here.
 */
-#ifdef GOT_READ_DIR
+#ifdef HAVE_READDIR
 PRIVATE void do_readme ARGS2(HTStructured *, target, CONST char *, localname)
 { 
     FILE * fp;
@@ -485,7 +485,7 @@ Bug removed thanks to joe@athena.mit.edu */
 	fclose(fp);
     } 
 }
-#endif /* GOT_READ_DIR */
+#endif /* HAVE_READDIR */
 
 /*	Make the cache file name for a W3 document.
 **	-------------------------------------------
@@ -1614,7 +1614,7 @@ PUBLIC int HTLoadFile ARGS4(
 	char * localname = HTLocalName(addr);
 	struct stat dir_info;
 	
-#ifdef GOT_READ_DIR
+#ifdef HAVE_READDIR
         /*
 	**  Multiformat handling.
 	**
@@ -2034,7 +2034,7 @@ forget_multi:
 	
 /* End of directory reading section
 */
-#endif /* GOT_READ_DIR */
+#endif /* HAVE_READDIR */
 open_file:
 	{
 	    FILE * fp = fopen(localname, "r");
diff --git a/WWW/Library/Implementation/tcp.h b/WWW/Library/Implementation/tcp.h
index f51dfc72..0533c9c1 100644
--- a/WWW/Library/Implementation/tcp.h
+++ b/WWW/Library/Implementation/tcp.h
@@ -71,7 +71,6 @@ typedef struct sockaddr_in SockA;  /* See netinet/in.h */
 # include <dirent.h>
 # define D_NAMLEN(dirent) strlen((dirent)->d_name)
 # define STRUCT_DIRENT struct dirent
-# define GOT_READ_DIR 1    /* if directory reading functions are available */
 #else
 # define D_NAMLEN(dirent) (dirent)->d_namlen
 # define STRUCT_DIRENT struct direct
@@ -566,7 +565,7 @@ typedef int pid_t;
 
 /* FIXME: remove after completing configure-script */
 #ifdef unix                    /* if this is to compile on a UNIX machine */
-#define GOT_READ_DIR 1    /* if directory reading functions are available */
+#define HAVE_READDIR 1    /* if directory reading functions are available */
 #ifdef USE_DIRENT             /* sys v version */
 #include <dirent.h>
 #define direct dirent
diff --git a/WWW/Library/unix/makefile.in b/WWW/Library/unix/makefile.in
index ea576adc..1875b7a3 100644
--- a/WWW/Library/unix/makefile.in
+++ b/WWW/Library/unix/makefile.in
@@ -17,7 +17,7 @@ VPATH		= $(srcdir)
 LYFLAGS		= # FIXME: set in parent makefile
 
 CC		= @CC@
-CPPOPTS		= @DEFS@ @CPPFLAGS@ $(LYFLAGS)
+CPPOPTS		= @DEFS@ @CPPFLAGS@ $(LYFLAGS) -I../../.. -I../../../src
 CFLAGS		= $(CPPOPTS) @CFLAGS@
 
 # Directory for installed binary: