diff --git a/CHANGES b/CHANGES
index c766b1af..563563af 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,19 @@
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2004-04-27 (2.8.6dev.2)
+* modify CF_NCURSES_LIBS to only look for -lmytinfo when building with ncurses.
+  This works around FreeBSD's broken linker semantics when configuring for
+  ncursesw -TD
+* update CF_GNUTLS macro to look for -lgnutls-openssl as well as the older
+  -lgnutls-extra library -TD
+* fix a spurious match of <openssl/ssl.h> when --with-ssl=path option provides
+  enough information to ensure that the test would be incorrect -TD
+* update config.guess (2004-02-16), config.sub (2004-02-23)
+* fixes to src/chrtrans/makefile.in, e.g., for building PDCurses version,
+  broken by dev.1 changes for cross-compiling -TD
+* remove macros such as ARGS1, NOPARM which supported K&R compilers -TD
+
 2004-04-19 (2.8.6dev.1)
 * correct ifdef in LYgetattrs() to ensure that getattrs() is used only if the
   configure script actually found it (report/patch by Paul Gilmartin).
diff --git a/WWW/Library/Implementation/HTAABrow.c b/WWW/Library/Implementation/HTAABrow.c
index 5c711b8a..bc738e7a 100644
--- a/WWW/Library/Implementation/HTAABrow.c
+++ b/WWW/Library/Implementation/HTAABrow.c
@@ -107,36 +107,36 @@ typedef struct {
 /*
 **  To free off all globals. - FM
 */
-PRIVATE void free_HTAAGlobals NOPARAMS;
-PRIVATE BOOL free_HTAAGlobalsSet = FALSE;
-PRIVATE char *HTAA_composeAuthResult = NULL;
-PRIVATE char *compose_auth_stringResult = NULL;	/* Uuencoded presentation */
+static void free_HTAAGlobals (void);
+static BOOL free_HTAAGlobalsSet = FALSE;
+static char *HTAA_composeAuthResult = NULL;
+static char *compose_auth_stringResult = NULL;	/* Uuencoded presentation */
 
 /*
 **  Module-wide global variables
 */
-PRIVATE HTList *server_table	= NULL;	/* Browser's info about servers	     */
-PRIVATE char *secret_key	= NULL;	/* Browser's latest secret key       */
-PRIVATE HTAASetup *current_setup= NULL;	/* The server setup we are currently */
+static HTList *server_table	= NULL;	/* Browser's info about servers	     */
+static char *secret_key	= NULL;	/* Browser's latest secret key       */
+static HTAASetup *current_setup= NULL;	/* The server setup we are currently */
 					/* talking to			     */
-PRIVATE char *current_hostname	= NULL;	/* The server's name and portnumber  */
-PRIVATE int current_portnumber	= 80;	/* where we are currently trying to  */
+static char *current_hostname	= NULL;	/* The server's name and portnumber  */
+static int current_portnumber	= 80;	/* where we are currently trying to  */
 					/* connect.			     */
-PRIVATE char *current_docname	= NULL; /* The document's name we are	     */
+static char *current_docname	= NULL; /* The document's name we are	     */
 					/* trying to access.		     */
-PRIVATE char *HTAAForwardAuth	= NULL;	/* Authorization: line to forward    */
+static char *HTAAForwardAuth	= NULL;	/* Authorization: line to forward    */
 					/* (used by gateway httpds)	     */
-PRIVATE HTAASetup *proxy_setup	= NULL;	/* Same as above, but for Proxy -AJL */
-PRIVATE char *proxy_hostname	= NULL;
-PRIVATE char *proxy_docname	= NULL;
-PRIVATE int proxy_portnumber	= 80;
+static HTAASetup *proxy_setup	= NULL;	/* Same as above, but for Proxy -AJL */
+static char *proxy_hostname	= NULL;
+static char *proxy_docname	= NULL;
+static int proxy_portnumber	= 80;
 
 
 /*** HTAAForwardAuth for enabling gateway-httpds to forward Authorization ***/
 
-PUBLIC void HTAAForwardAuth_set ARGS2(
-	CONST char *,	scheme_name,
-	CONST char *,	scheme_specifics)
+void HTAAForwardAuth_set (
+	const char *	scheme_name,
+	const char *	scheme_specifics)
 {
     int len = 20 + (scheme_name      ? strlen(scheme_name)      : 0)
 		 + (scheme_specifics ? strlen(scheme_specifics) : 0);
@@ -155,7 +155,7 @@ PUBLIC void HTAAForwardAuth_set ARGS2(
     }
 }
 
-PUBLIC void HTAAForwardAuth_reset NOARGS
+void HTAAForwardAuth_reset (void)
 {
     FREE(HTAAForwardAuth);
 }
@@ -163,9 +163,9 @@ PUBLIC void HTAAForwardAuth_reset NOARGS
 
 /**************************** HTAAServer ***********************************/
 
-PRIVATE void HTAASetup_delete PARAMS((HTAASetup * killme));	/* Forward */
+static void HTAASetup_delete (HTAASetup * killme);	/* Forward */
 
-/* PRIVATE						HTAAServer_new()
+/* static						HTAAServer_new()
 **		ALLOCATE A NEW NODE TO HOLD SERVER INFO
 **		AND ADD IT TO THE LIST OF SERVERS
 ** ON ENTRY:
@@ -181,10 +181,10 @@ PRIVATE void HTAASetup_delete PARAMS((HTAASetup * killme));	/* Forward */
 **			the function HTAAServer_delete(), which also
 **			frees the node itself.
 */
-PRIVATE HTAAServer *HTAAServer_new ARGS3(
-	CONST char*,	hostname,
-	int,		portnumber,
-	BOOL,		IsProxy)
+static HTAAServer *HTAAServer_new (
+	const char*	hostname,
+	int		portnumber,
+	BOOL		IsProxy)
 {
     HTAAServer *server;
 
@@ -209,7 +209,7 @@ PRIVATE HTAAServer *HTAAServer_new ARGS3(
 }
 
 
-/* PRIVATE						HTAAServer_delete()
+/* static						HTAAServer_delete()
 **
 **	DELETE THE ENTRY FOR THE SERVER FROM THE HOST TABLE,
 **	AND FREE THE MEMORY USED BY IT.
@@ -220,8 +220,8 @@ PRIVATE HTAAServer *HTAAServer_new ARGS3(
 ** ON EXIT:
 **	returns		nothing.
 */
-PRIVATE void HTAAServer_delete ARGS1(
-	HTAAServer *,	killme)
+static void HTAAServer_delete (
+	HTAAServer *	killme)
 {
     int n, i;
     HTAASetup *setup;
@@ -259,7 +259,7 @@ PRIVATE void HTAAServer_delete ARGS1(
     }
 }
 
-/* PRIVATE						HTAAServer_lookup()
+/* static						HTAAServer_lookup()
 **		LOOK UP SERVER BY HOSTNAME AND PORTNUMBER
 ** ON ENTRY:
 **	hostname	obvious.
@@ -273,10 +273,10 @@ PRIVATE void HTAAServer_delete ARGS1(
 **			representing the looked-up server.
 **			NULL, if not found.
 */
-PRIVATE HTAAServer *HTAAServer_lookup ARGS3(
-	CONST char *,	hostname,
-	int,		portnumber,
-	BOOL,		IsProxy)
+static HTAAServer *HTAAServer_lookup (
+	const char *	hostname,
+	int		portnumber,
+	BOOL		IsProxy)
 {
     if (hostname) {
 	HTList *cur = server_table;
@@ -298,7 +298,7 @@ PRIVATE HTAAServer *HTAAServer_lookup ARGS3(
 
 /*************************** HTAASetup *******************************/
 
-/* PRIVATE						HTAASetup_lookup()
+/* static						HTAASetup_lookup()
 **	FIGURE OUT WHICH AUTHENTICATION SETUP THE SERVER
 **	IS USING FOR A GIVEN FILE ON A GIVEN HOST AND PORT
 **
@@ -320,11 +320,11 @@ PRIVATE HTAAServer *HTAAServer_lookup ARGS3(
 **			document tree.
 **
 */
-PRIVATE HTAASetup *HTAASetup_lookup ARGS4(
-	CONST char *,	hostname,
-	int,		portnumber,
-	CONST char *,	docname,
-	BOOL,		IsProxy)
+static HTAASetup *HTAASetup_lookup (
+	const char *	hostname,
+	int		portnumber,
+	const char *	docname,
+	BOOL		IsProxy)
 {
     HTAAServer *server;
     HTAASetup *setup;
@@ -366,7 +366,7 @@ PRIVATE HTAASetup *HTAASetup_lookup ARGS4(
     return NULL;	/* NULL in parameters, or not found */
 }
 
-/* PRIVATE						HTAASetup_new()
+/* static						HTAASetup_new()
 **			CREATE A NEW SETUP NODE
 ** ON ENTRY:
 **	server		is a pointer to a HTAAServer structure
@@ -385,11 +385,11 @@ PRIVATE HTAASetup *HTAASetup_lookup ARGS4(
 **	returns		a new HTAASetup node, and also adds it as
 **			part of the HTAAServer given as parameter.
 */
-PRIVATE HTAASetup *HTAASetup_new ARGS4(
-	HTAAServer *,	server,
-	char *,		template,
-	HTList *,	valid_schemes,
-	HTAssocList **,	scheme_specifics)
+static HTAASetup *HTAASetup_new (
+	HTAAServer *	server,
+	char *		template,
+	HTList *	valid_schemes,
+	HTAssocList **	scheme_specifics)
 {
     HTAASetup *setup;
 
@@ -412,7 +412,7 @@ PRIVATE HTAASetup *HTAASetup_new ARGS4(
     return setup;
 }
 
-/* PRIVATE						HTAASetup_delete()
+/* static						HTAASetup_delete()
 **			FREE A HTAASetup STRUCTURE
 ** ON ENTRY:
 **	killme		is a pointer to the structure to free().
@@ -420,8 +420,8 @@ PRIVATE HTAASetup *HTAASetup_new ARGS4(
 ** ON EXIT:
 **	returns		nothing.
 */
-PRIVATE void HTAASetup_delete ARGS1(
-	HTAASetup *,	killme)
+static void HTAASetup_delete (
+	HTAASetup *	killme)
 {
     int scheme;
 
@@ -439,7 +439,7 @@ PRIVATE void HTAASetup_delete ARGS1(
     }
 }
 
-/* PRIVATE					HTAASetup_updateSpecifics()
+/* static					HTAASetup_updateSpecifics()
 *		COPY SCHEME SPECIFIC PARAMETERS
 **		TO HTAASetup STRUCTURE
 ** ON ENTRY:
@@ -452,9 +452,9 @@ PRIVATE void HTAASetup_delete ARGS1(
 ** ON EXIT:
 **	returns		nothing.
 */
-PRIVATE void HTAASetup_updateSpecifics ARGS2(
-	HTAASetup *,	setup,
-	HTAssocList **,	specifics)
+static void HTAASetup_updateSpecifics (
+	HTAASetup *	setup,
+	HTAssocList **	specifics)
 {
     int scheme;
 
@@ -473,7 +473,7 @@ PRIVATE void HTAASetup_updateSpecifics ARGS2(
 
 /*************************** HTAARealm **********************************/
 
-/* PRIVATE						HTAARealm_lookup()
+/* static						HTAARealm_lookup()
 **		LOOKUP HTAARealm STRUCTURE BY REALM NAME
 ** ON ENTRY:
 **	realm_table	a list of realm objects.
@@ -482,9 +482,9 @@ PRIVATE void HTAASetup_updateSpecifics ARGS2(
 ** ON EXIT:
 **	returns		the realm.  NULL, if not found.
 */
-PRIVATE HTAARealm *HTAARealm_lookup ARGS2(
-	HTList *,	realm_table,
-	CONST char *,	realmname)
+static HTAARealm *HTAARealm_lookup (
+	HTList *	realm_table,
+	const char *	realmname)
 {
     if (realm_table && realmname) {
 	HTList *cur = realm_table;
@@ -498,7 +498,7 @@ PRIVATE HTAARealm *HTAARealm_lookup ARGS2(
     return NULL;	/* No table, NULL param, or not found */
 }
 
-/* PRIVATE						HTAARealm_new()
+/* static						HTAARealm_new()
 **		CREATE A NODE CONTAINING USERNAME AND
 **		PASSWORD USED FOR THE GIVEN REALM.
 **		IF REALM ALREADY EXISTS, CHANGE
@@ -513,11 +513,11 @@ PRIVATE HTAARealm *HTAARealm_lookup ARGS2(
 ** ON EXIT:
 **	returns		the created realm.
 */
-PRIVATE HTAARealm *HTAARealm_new ARGS4(
-	HTList *,	realm_table,
-	CONST char *,	realmname,
-	CONST char *,	username,
-	CONST char *,	password)
+static HTAARealm *HTAARealm_new (
+	HTList *	realm_table,
+	const char *	realmname,
+	const char *	username,
+	const char *	password)
 {
     HTAARealm *realm;
 
@@ -544,7 +544,7 @@ PRIVATE HTAARealm *HTAARealm_new ARGS4(
 
 /***************** Basic and Pubkey Authentication ************************/
 
-/* PRIVATE						compose_auth_string()
+/* static						compose_auth_string()
 **
 **		COMPOSE Basic OR Pubkey AUTHENTICATION STRING;
 **		PROMPTS FOR USERNAME AND PASSWORD IF NEEDED
@@ -565,10 +565,10 @@ PRIVATE HTAARealm *HTAARealm_new ARGS4(
 **	returned by AA package needs to (or should) be freed.
 **
 */
-PRIVATE char *compose_auth_string ARGS3(
-	HTAAScheme,	scheme,
-	HTAASetup *,	setup,
-	BOOL,		IsProxy)
+static char *compose_auth_string (
+	HTAAScheme	scheme,
+	HTAASetup *	setup,
+	BOOL		IsProxy)
 {
     char *cleartext = NULL;	/* Cleartext presentation */
     char *ciphertext = NULL;	/* Encrypted presentation */
@@ -733,7 +733,7 @@ PRIVATE char *compose_auth_string ARGS3(
     return compose_auth_stringResult;
 }
 
-/* BROWSER PRIVATE					HTAA_selectScheme()
+/* BROWSER static					HTAA_selectScheme()
 **		SELECT THE AUTHENTICATION SCHEME TO USE
 ** ON ENTRY:
 **	setup	is the server setup structure which can
@@ -751,8 +751,8 @@ PRIVATE char *compose_auth_string ARGS3(
 ** ON EXIT:
 **	returns	the authentication scheme to use.
 */
-PRIVATE HTAAScheme HTAA_selectScheme ARGS1(
-	HTAASetup *,	setup)
+static HTAAScheme HTAA_selectScheme (
+	HTAASetup *	setup)
 {
     HTAAScheme scheme;
 
@@ -773,7 +773,7 @@ PRIVATE HTAAScheme HTAA_selectScheme ARGS1(
 **  Revision History:
 **	06-19-96	created - FM
 */
-PRIVATE void free_HTAAGlobals NOARGS
+static void free_HTAAGlobals (void)
 {
     HTAAServer * server;
     int n, i;
@@ -821,11 +821,11 @@ PRIVATE void free_HTAAGlobals NOARGS
 **
 **		As usual, this string is automatically freed.
 */
-PUBLIC char *HTAA_composeAuth ARGS4(
-	CONST char *,	hostname,
-	CONST int,	portnumber,
-	CONST char *,	docname,
-	BOOL,		IsProxy)
+char *HTAA_composeAuth (
+	const char *	hostname,
+	const int	portnumber,
+	const char *	docname,
+	BOOL		IsProxy)
 {
     char *auth_string;
     BOOL retry;
@@ -1048,11 +1048,11 @@ PUBLIC char *HTAA_composeAuth ARGS4(
 **				  field (in function HTAA_composeAuth()).
 **			NO, otherwise.
 */
-PUBLIC BOOL HTAA_shouldRetryWithAuth ARGS4(
-	char *,		start_of_headers,
-	int,		length,
-	int,		soc,
-	BOOL,		IsProxy)
+BOOL HTAA_shouldRetryWithAuth (
+	char *		start_of_headers,
+	int		length,
+	int		soc,
+	BOOL		IsProxy)
 {
     HTAAScheme scheme;
     char *line = NULL;
@@ -1270,7 +1270,7 @@ PUBLIC BOOL HTAA_shouldRetryWithAuth ARGS4(
 **  the terminal for a period of time, but does not want
 **  to end the current session.  - FM
 */
-PUBLIC void HTClearHTTPAuthInfo NOARGS
+void HTClearHTTPAuthInfo (void)
 {
     /*
     **  Need code to check cached documents against the
diff --git a/WWW/Library/Implementation/HTAABrow.h b/WWW/Library/Implementation/HTAABrow.h
index 4ebbcf3b..e16019e2 100644
--- a/WWW/Library/Implementation/HTAABrow.h
+++ b/WWW/Library/Implementation/HTAABrow.h
@@ -69,11 +69,11 @@ Routines for Browser Side Recording of AA Info
 **
 **              As usual, this string is automatically freed.
 */
-extern char *HTAA_composeAuth PARAMS((
-	CONST char *	hostname,
-	CONST int	portnumber,
-	CONST char *	docname,
-	BOOL		IsProxy));
+extern char *HTAA_composeAuth (
+	const char *	hostname,
+	const int	portnumber,
+	const char *	docname,
+	BOOL		IsProxy);
 
 
 /* BROWSER PUBLIC                               HTAA_shouldRetryWithAuth()
@@ -103,17 +103,17 @@ extern char *HTAA_composeAuth PARAMS((
 **                                field (in function HTAA_composeAuth()).
 **                      NO, otherwise.
 */
-extern BOOL HTAA_shouldRetryWithAuth PARAMS((
+extern BOOL HTAA_shouldRetryWithAuth (
 	char *		start_of_headers,
 	int		length,
 	int		soc,
-	BOOL		IsProxy));
+	BOOL		IsProxy);
 
 /*
 **  Function to allow clearing of all Authorization info
 **  via a browser command. - FM
 */
-extern void HTClearHTTPAuthInfo NOPARAMS;
+extern void HTClearHTTPAuthInfo (void);
 
 /*
 
@@ -126,9 +126,9 @@ Enabling Gateway httpds to Forward Authorization
 
  */
 
-extern void HTAAForwardAuth_set PARAMS((
-	CONST char *	scheme_name,
-	CONST char *	scheme_specifics));
-extern void HTAAForwardAuth_reset NOPARAMS;
+extern void HTAAForwardAuth_set (
+	const char *	scheme_name,
+	const char *	scheme_specifics);
+extern void HTAAForwardAuth_reset (void);
 
 #endif  /* NOT HTAABROW_H */
diff --git a/WWW/Library/Implementation/HTAAProt.c b/WWW/Library/Implementation/HTAAProt.c
index 5a4e493e..516b4885 100644
--- a/WWW/Library/Implementation/HTAAProt.c
+++ b/WWW/Library/Implementation/HTAAProt.c
@@ -44,20 +44,20 @@ typedef struct {
     HTAAProt *	prot;
 } HTAAProtCache;
 
-PRIVATE HTList *  prot_cache	= NULL;	/* Protection setup cache.	*/
-PRIVATE HTAAProt *default_prot	= NULL;	/* Default protection.		*/
-PRIVATE HTAAProt *current_prot	= NULL;	/* Current protection mode	*/
+static HTList *  prot_cache	= NULL;	/* Protection setup cache.	*/
+static HTAAProt *default_prot	= NULL;	/* Default protection.		*/
+static HTAAProt *current_prot	= NULL;	/* Current protection mode	*/
 					/* which is set up by callbacks */
 					/* from the rule system when	*/
 					/* a "protect" rule is matched. */
 
 #ifndef NOUSERS
-/* PRIVATE							isNumber()
+/* static							isNumber()
 **		DOES A CHARACTER STRING REPRESENT A NUMBER
 */
-PRIVATE BOOL isNumber ARGS1(CONST char *, s)
+static BOOL isNumber (const char * s)
 {
-    CONST char *cur = s;
+    const char *cur = s;
 
     if (isEmpty(s)) return NO;
 
@@ -84,7 +84,7 @@ PRIVATE BOOL isNumber ARGS1(CONST char *, s)
 **	returns	the user name
 **		Default is "" (nobody).
 */
-PUBLIC char * HTAA_getUidName NOARGS
+char * HTAA_getUidName (void)
 {
     if (current_prot && current_prot->uid_name
 		  && (0 != strcmp(current_prot->uid_name,"nobody")) )
@@ -101,7 +101,7 @@ PUBLIC char * HTAA_getUidName NOARGS
 ** ON EXIT:
 **	returns	the filename
 */
-PUBLIC char * HTAA_getFileName NOARGS
+char * HTAA_getFileName (void)
 {
     if (current_prot && current_prot->filename)
        return(current_prot->filename);
@@ -120,7 +120,7 @@ PUBLIC char * HTAA_getFileName NOARGS
 **	returns	the uid number to give to setuid() system call.
 **		Default is 65534 (nobody).
 */
-PUBLIC int HTAA_getUid NOARGS
+int HTAA_getUid (void)
 {
     int uid;
 
@@ -159,7 +159,7 @@ PUBLIC int HTAA_getUid NOARGS
 **	returns	the uid number to give to setgid() system call.
 **		Default is 65534 (nogroup).
 */
-PUBLIC int HTAA_getGid NOARGS
+int HTAA_getGid (void)
 {
     int gid;
 
@@ -190,7 +190,7 @@ PUBLIC int HTAA_getGid NOARGS
 #endif /* not VMS */
 
 
-/* PRIVATE							HTAA_setIds()
+/* static							HTAA_setIds()
 **		SET UID AND GID (AS NAMES OR NUMBERS)
 **		TO HTAAProt STRUCTURE
 ** ON ENTRY:
@@ -201,8 +201,8 @@ PUBLIC int HTAA_getGid NOARGS
 ** ON EXIT:
 **	returns		nothing.
 */
-PRIVATE void HTAA_setIds ARGS2(HTAAProt *,	prot,
-			       CONST char *,	ids)
+static void HTAA_setIds (HTAAProt *	prot,
+			       const char *	ids)
 {
     if (ids) {
 	char *local_copy = NULL;
@@ -227,7 +227,7 @@ PRIVATE void HTAA_setIds ARGS2(HTAAProt *,	prot,
 }
 
 
-/* PRIVATE						HTAA_parseProtFile()
+/* static						HTAA_parseProtFile()
 **		PARSE A PROTECTION SETUP FILE AND
 **		PUT THE RESULT IN A HTAAProt STRUCTURE
 ** ON ENTRY:
@@ -237,8 +237,8 @@ PRIVATE void HTAA_setIds ARGS2(HTAAProt *,	prot,
 ** ON EXIT:
 **	returns		nothing.
 */
-PRIVATE void HTAA_parseProtFile ARGS2(HTAAProt *, prot,
-				      FILE *,	  fp)
+static void HTAA_parseProtFile (HTAAProt * prot,
+				      FILE *	  fp)
 {
     if (prot && fp) {
 	LexItem lex_item;
@@ -335,7 +335,7 @@ PRIVATE void HTAA_parseProtFile ARGS2(HTAAProt *, prot,
 }
 
 
-/* PRIVATE						HTAAProt_new()
+/* static						HTAAProt_new()
 **		ALLOCATE A NEW HTAAProt STRUCTURE AND
 **		INITIALIZE IT FROM PROTECTION SETUP FILE
 ** ON ENTRY:
@@ -361,9 +361,9 @@ PRIVATE void HTAA_parseProtFile ARGS2(HTAAProt *, prot,
 **			in cache), only sets uid_name and gid
 **			fields, and returns that.
 */
-PRIVATE HTAAProt *HTAAProt_new ARGS3(CONST char *,	cur_docname,
-				     CONST char *,	prot_filename,
-				     CONST char *,	ids)
+static HTAAProt *HTAAProt_new (const char *	cur_docname,
+				     const char *	prot_filename,
+				     const char *	ids)
 {
     HTList *cur = prot_cache;
     HTAAProtCache *cache_item = NULL;
@@ -439,9 +439,9 @@ PRIVATE HTAAProt *HTAAProt_new ARGS3(CONST char *,	cur_docname,
 **	returns		nothing.
 **			Sets the module-wide variable default_prot.
 */
-PUBLIC void HTAA_setDefaultProtection ARGS3(CONST char *,	cur_docname,
-					    CONST char *,	prot_filename,
-					    CONST char *,	ids)
+void HTAA_setDefaultProtection (const char *	cur_docname,
+					    const char *	prot_filename,
+					    const char *	ids)
 {
     default_prot = NULL;	/* Not free()'d because this is in cache */
 
@@ -474,9 +474,9 @@ PUBLIC void HTAA_setDefaultProtection ARGS3(CONST char *,	cur_docname,
 **	returns		nothing.
 **			Sets the module-wide variable current_prot.
 */
-PUBLIC void HTAA_setCurrentProtection ARGS3(CONST char *,	cur_docname,
-					    CONST char *,	prot_filename,
-					    CONST char *,	ids)
+void HTAA_setCurrentProtection (const char *	cur_docname,
+					    const char *	prot_filename,
+					    const char *	ids)
 {
     current_prot = NULL;	/* Not free()'d because this is in cache */
 
@@ -514,7 +514,7 @@ PUBLIC void HTAA_setCurrentProtection ARGS3(CONST char *,	cur_docname,
 **		protection setup of the HTTranslate()'d file.
 **		This must not be free()'d.
 */
-PUBLIC HTAAProt *HTAA_getCurrentProtection NOARGS
+HTAAProt *HTAA_getCurrentProtection (void)
 {
     return current_prot;
 }
@@ -543,7 +543,7 @@ PUBLIC HTAAProt *HTAA_getCurrentProtection NOARGS
 **	the file is in fact protected and sets the current
 **	protection mode to default.
 */
-PUBLIC HTAAProt *HTAA_getDefaultProtection NOARGS
+HTAAProt *HTAA_getDefaultProtection (void)
 {
     if (!current_prot) {
 	current_prot = default_prot;
@@ -564,7 +564,7 @@ PUBLIC HTAAProt *HTAA_getDefaultProtection NOARGS
 **	returns	nothing.
 **		Frees the memory used by protection information.
 */
-PUBLIC void HTAA_clearProtections NOARGS
+void HTAA_clearProtections (void)
 {
     current_prot = NULL;	/* These are not freed because	*/
     default_prot = NULL;	/* they are actually in cache.	*/
@@ -576,13 +576,13 @@ typedef struct {
 	} USER_DATA;
 
 #ifndef NOUSERS
-PRIVATE HTList *known_grp = NULL;
-PRIVATE HTList *known_pwd = NULL;
-PRIVATE BOOL uidgid_cache_inited = NO;
+static HTList *known_grp = NULL;
+static HTList *known_pwd = NULL;
+static BOOL uidgid_cache_inited = NO;
 #endif
 
 #ifdef LY_FIND_LEAKS
-PRIVATE void clear_uidgid_cache NOARGS
+static void clear_uidgid_cache (void)
 {
 #ifndef NOUSERS
     USER_DATA *data;
@@ -605,7 +605,7 @@ PRIVATE void clear_uidgid_cache NOARGS
 #endif /* LY_FIND_LEAKS */
 
 #ifndef NOUSERS
-PRIVATE void save_gid_info ARGS2(char *, name, int, user)
+static void save_gid_info (char * name, int user)
 {
     USER_DATA *data = typecalloc(USER_DATA);
     if (!data)
@@ -626,7 +626,7 @@ PRIVATE void save_gid_info ARGS2(char *, name, int, user)
 #endif /* NOUSERS */
 
 #ifndef NOUSERS
-PRIVATE void save_uid_info ARGS2(char *, name, int, user)
+static void save_uid_info (char * name, int user)
 {
     USER_DATA *data = typecalloc(USER_DATA);
     if (!data)
@@ -654,7 +654,7 @@ PRIVATE void save_uid_info ARGS2(char *, name, int, user)
 ** ON EXIT:
 **      returns the user name, or an empty string if not found.
 */
-PUBLIC char * HTAA_UidToName ARGS1(int, uid)
+char * HTAA_UidToName (int uid)
 {
 #ifndef NOUSERS
     struct passwd *pw;
@@ -687,7 +687,7 @@ PUBLIC char * HTAA_UidToName ARGS1(int, uid)
 ** ON EXIT:
 **      returns the user id, or NONESUCH if not found.
 */
-PUBLIC int HTAA_NameToUid ARGS1(char *, name)
+int HTAA_NameToUid (char * name)
 {
 #ifndef NOUSERS
     struct passwd *pw;
@@ -719,7 +719,7 @@ PUBLIC int HTAA_NameToUid ARGS1(char *, name)
 ** ON EXIT:
 **      returns the group name, or an empty string if not found.
 */
-PUBLIC char * HTAA_GidToName ARGS1(int, gid)
+char * HTAA_GidToName (int gid)
 {
 #ifndef NOUSERS
     struct group *gr;
@@ -752,7 +752,7 @@ PUBLIC char * HTAA_GidToName ARGS1(int, gid)
 ** ON EXIT:
 **      returns the group id, or NONESUCH if not found.
 */
-PUBLIC int HTAA_NameToGid ARGS1(char *, name)
+int HTAA_NameToGid (char * name)
 {
 #ifndef NOUSERS
     struct group *gr;
diff --git a/WWW/Library/Implementation/HTAAProt.h b/WWW/Library/Implementation/HTAAProt.h
index c9b20b2a..afcf8dc8 100644
--- a/WWW/Library/Implementation/HTAAProt.h
+++ b/WWW/Library/Implementation/HTAAProt.h
@@ -59,9 +59,9 @@ Callbacks for rule system
 **      returns         nothing.
 **                      Sets the module-wide variable default_prot.
 */
-extern void HTAA_setDefaultProtection PARAMS((CONST char *      cur_docname,
-                                              CONST char *      prot_filename,
-                                              CONST char *      eff_ids));
+extern void HTAA_setDefaultProtection (const char *      cur_docname,
+                                              const char *      prot_filename,
+                                              const char *      eff_ids);
 
 
 
@@ -84,9 +84,9 @@ extern void HTAA_setDefaultProtection PARAMS((CONST char *      cur_docname,
 **      returns         nothing.
 **                      Sets the module-wide variable current_prot.
 */
-extern void HTAA_setCurrentProtection PARAMS((CONST char *      cur_docname,
-                                              CONST char *      prot_filename,
-                                              CONST char *      eff_ids));
+extern void HTAA_setCurrentProtection (const char *      cur_docname,
+                                              const char *      prot_filename,
+                                              const char *      eff_ids);
 
 
 /* SERVER INTERNAL                                      HTAA_clearProtections()
@@ -100,7 +100,7 @@ extern void HTAA_setCurrentProtection PARAMS((CONST char *      cur_docname,
 **      returns nothing.
 **              Frees the memory used by protection information.
 */
-extern void HTAA_clearProtections NOPARAMS;
+extern void HTAA_clearProtections (void);
 /*
 
 Getting Protection Settings
@@ -128,7 +128,7 @@ Getting Protection Settings
 **              protection setup of the HTTranslate()'d file.
 **              This must not be free()'d.
 */
-extern HTAAProt *HTAA_getCurrentProtection NOPARAMS;
+extern HTAAProt *HTAA_getCurrentProtection (void);
 
 
 
@@ -150,7 +150,7 @@ extern HTAAProt *HTAA_getCurrentProtection NOPARAMS;
 **              protection settings).
 **              This must not be free()'d.
 */
-extern HTAAProt *HTAA_getDefaultProtection NOPARAMS;
+extern HTAAProt *HTAA_getDefaultProtection (void);
 /*
 
 Get User and Group IDs to Which Set to
@@ -167,7 +167,7 @@ Get User and Group IDs to Which Set to
 **      returns the uid number to give to setuid() system call.
 **              Default is 65534 (nobody).
 */
-extern int HTAA_getUid NOPARAMS;
+extern int HTAA_getUid (void);
 
 
 /* PUBLIC                                                       HTAA_getGid()
@@ -179,7 +179,7 @@ extern int HTAA_getUid NOPARAMS;
 **      returns the uid number to give to setgid() system call.
 **              Default is 65534 (nogroup).
 */
-extern int HTAA_getGid NOPARAMS;
+extern int HTAA_getGid (void);
 #endif /* not VMS */
 /*
 
@@ -197,7 +197,7 @@ extern int HTAA_getGid NOPARAMS;
 **      returns the user name
 **              Default is "" (nobody).
 */
-extern char * HTAA_getUidName NOPARAMS;
+extern char * HTAA_getUidName (void);
 
 /* PUBLIC                                                       HTAA_getFileName
 **              GET THE FILENAME (VMS ONLY)
@@ -207,7 +207,7 @@ extern char * HTAA_getUidName NOPARAMS;
 ** ON EXIT:
 **      returns the filename
 */
-extern char * HTAA_getFileName NOPARAMS;
+extern char * HTAA_getFileName (void);
 #endif /* VMS */
 
 /* PUBLIC                                                       HTAA_UidToName
@@ -218,7 +218,7 @@ extern char * HTAA_getFileName NOPARAMS;
 ** ON EXIT:
 **      returns the user name
 */
-extern char * HTAA_UidToName PARAMS((int uid));
+extern char * HTAA_UidToName (int uid);
 /* PUBLIC                                                       HTAA_NameToUid
 **              GET THE USER ID
 ** ON ENTRY:
@@ -227,7 +227,7 @@ extern char * HTAA_UidToName PARAMS((int uid));
 ** ON EXIT:
 **      returns the user id
 */
-extern int HTAA_NameToUid PARAMS((char *name));
+extern int HTAA_NameToUid (char *name);
 /* PUBLIC                                                       HTAA_GidToName
 **              GET THE GROUP NAME
 ** ON ENTRY:
@@ -236,7 +236,7 @@ extern int HTAA_NameToUid PARAMS((char *name));
 ** ON EXIT:
 **      returns the group name
 */
-extern char * HTAA_GidToName PARAMS((int gid));
+extern char * HTAA_GidToName (int gid);
 /* PUBLIC                                                       HTAA_NameToGid
 **              GET THE GROUP ID
 ** ON ENTRY:
@@ -245,6 +245,6 @@ extern char * HTAA_GidToName PARAMS((int gid));
 ** ON EXIT:
 **      returns the group id
 */
-extern int HTAA_NameToGid PARAMS((char *name));
+extern int HTAA_NameToGid (char *name);
 
 #endif /* not HTAAPROT_H */
diff --git a/WWW/Library/Implementation/HTAAUtil.c b/WWW/Library/Implementation/HTAAUtil.c
index fd7d24aa..3a4d1166 100644
--- a/WWW/Library/Implementation/HTAAUtil.c
+++ b/WWW/Library/Implementation/HTAAUtil.c
@@ -63,7 +63,7 @@
 ** ON EXIT:
 **	returns		the enumerated constant for that scheme.
 */
-PUBLIC HTAAScheme HTAAScheme_enum ARGS1(CONST char*, name)
+HTAAScheme HTAAScheme_enum (const char* name)
 {
     char *upcased = NULL;
 
@@ -105,7 +105,7 @@ PUBLIC HTAAScheme HTAAScheme_enum ARGS1(CONST char*, name)
 **	returns		the name of the scheme, i.e.
 **			"None", "Basic", "Pubkey", ...
 */
-PUBLIC char *HTAAScheme_name ARGS1(HTAAScheme, scheme)
+char *HTAAScheme_name (HTAAScheme scheme)
 {
     switch (scheme) {
 	case HTAA_NONE:
@@ -135,7 +135,7 @@ PUBLIC char *HTAAScheme_name ARGS1(HTAAScheme, scheme)
 **	returns		HTAAMethod enumerated value corresponding
 **			to the given name.
 */
-PUBLIC HTAAMethod HTAAMethod_enum ARGS1(CONST char *, name)
+HTAAMethod HTAAMethod_enum (const char * name)
 {
     if (!name)
 	return METHOD_UNKNOWN;
@@ -159,7 +159,7 @@ PUBLIC HTAAMethod HTAAMethod_enum ARGS1(CONST char *, name)
 **	returns		the name of the scheme, i.e.
 **			"GET", "PUT", ...
 */
-PUBLIC char *HTAAMethod_name ARGS1(HTAAMethod, method)
+char *HTAAMethod_name (HTAAMethod method)
 {
     switch (method) {
       case METHOD_GET:
@@ -184,8 +184,8 @@ PUBLIC char *HTAAMethod_name ARGS1(HTAAMethod, method)
 **	returns		YES, if method was found.
 **			NO, if not found.
 */
-PUBLIC BOOL HTAAMethod_inList ARGS2(HTAAMethod, method,
-				    HTList *,	list)
+BOOL HTAAMethod_inList (HTAAMethod method,
+				    HTList *	list)
 {
     HTList *cur = list;
     char *item;
@@ -222,11 +222,11 @@ PUBLIC BOOL HTAAMethod_inList ARGS2(HTAAMethod, method,
 **	returns		YES, if filename matches the template.
 **			NO, otherwise.
 */
-PUBLIC BOOL HTAA_templateMatch ARGS2(CONST char *, template,
-				     CONST char *, filename)
+BOOL HTAA_templateMatch (const char * template,
+				     const char * filename)
 {
-    CONST char *p = template;
-    CONST char *q = filename;
+    const char *p = template;
+    const char *q = filename;
     int m;
 
     for (; *p  &&  *q  &&  *p == *q; p++, q++)	/* Find first mismatch */
@@ -273,11 +273,11 @@ PUBLIC BOOL HTAA_templateMatch ARGS2(CONST char *, template,
 **	returns		YES, if filename matches the template.
 **			NO, otherwise.
 */
-PUBLIC BOOL HTAA_templateCaseMatch ARGS2(CONST char *, template,
-					 CONST char *, filename)
+BOOL HTAA_templateCaseMatch (const char * template,
+					 const char * filename)
 {
-    CONST char *p = template;
-    CONST char *q = filename;
+    const char *p = template;
+    const char *q = filename;
     int m;
 
     /* Find first mismatch */
@@ -322,7 +322,7 @@ PUBLIC BOOL HTAA_templateCaseMatch ARGS2(CONST char *, template,
 **				being a comment marker here,
 **				there really isn't any space.
 */
-PUBLIC char *HTAA_makeProtectionTemplate ARGS1(CONST char *, docname)
+char *HTAA_makeProtectionTemplate (const char * docname)
 {
     char *template = NULL;
     char *slash = NULL;
@@ -384,7 +384,7 @@ PUBLIC char *HTAA_makeProtectionTemplate ARGS1(CONST char *, docname)
 **		the number of order number of that item. E.g.
 **		"1" for the first, etc.
 */
-PUBLIC HTAssocList *HTAA_parseArgList ARGS1(char *, str)
+HTAssocList *HTAA_parseArgList (char * str)
 {
     HTAssocList *assoc_list = HTAssocList_new();
     char *cur = NULL;
@@ -448,14 +448,14 @@ PUBLIC HTAssocList *HTAA_parseArgList ARGS1(char *, str)
 
 #define BUFFER_SIZE	1024
 
-PRIVATE size_t buffer_length;
-PRIVATE char *buffer = 0;
-PRIVATE char *start_pointer;
-PRIVATE char *end_pointer;
-PRIVATE int in_soc = -1;
+static size_t buffer_length;
+static char *buffer = 0;
+static char *start_pointer;
+static char *end_pointer;
+static int in_soc = -1;
 
 #ifdef LY_FIND_LEAKS
-PRIVATE void FreeHTAAUtil NOARGS
+static void FreeHTAAUtil (void)
 {
     FREE(buffer);
 }
@@ -480,9 +480,9 @@ PRIVATE void FreeHTAAUtil NOARGS
 **			will use this buffer first and then
 **			proceed to read from socket.
 */
-PUBLIC void HTAA_setupReader ARGS3(char *,	start_of_headers,
-				   int,		length,
-				   int,		soc)
+void HTAA_setupReader (char *	start_of_headers,
+				   int		length,
+				   int		soc)
 {
     if (!start_of_headers)
 	length = 0;	       /* initialize length (is this reached at all?) */
@@ -536,7 +536,7 @@ PUBLIC void HTAA_setupReader ARGS3(char *,	start_of_headers,
 **	Field-Name: Blaa-Blaa This-Is-A-Continuation-Line Here-Is_Another
 **
 */
-PUBLIC char *HTAA_getUnfoldedLine NOARGS
+char *HTAA_getUnfoldedLine (void)
 {
     char *line = NULL;
     char *cur;
diff --git a/WWW/Library/Implementation/HTAAUtil.h b/WWW/Library/Implementation/HTAAUtil.h
index 46cbe3f2..ff798af0 100644
--- a/WWW/Library/Implementation/HTAAUtil.h
+++ b/WWW/Library/Implementation/HTAAUtil.h
@@ -91,7 +91,7 @@ Authentication Schemes
 ** ON EXIT:
 **      returns         the enumerated constant for that scheme.
 */
-PUBLIC HTAAScheme HTAAScheme_enum PARAMS((CONST char* name));
+extern HTAAScheme HTAAScheme_enum (const char* name);
 
 
 /* PUBLIC                                               HTAAScheme_name()
@@ -104,7 +104,7 @@ PUBLIC HTAAScheme HTAAScheme_enum PARAMS((CONST char* name));
 **      returns         the name of the scheme, i.e.
 **                      "none", "basic", "pubkey", ...
 */
-PUBLIC char *HTAAScheme_name PARAMS((HTAAScheme scheme));
+extern char *HTAAScheme_name (HTAAScheme scheme);
 
 /*
 
@@ -121,7 +121,7 @@ Methods
 **      returns         HTAAMethod enumerated value corresponding
 **                      to the given name.
 */
-PUBLIC HTAAMethod HTAAMethod_enum PARAMS((CONST char * name));
+extern HTAAMethod HTAAMethod_enum (const char * name);
 
 
 /* PUBLIC                                               HTAAMethod_name()
@@ -134,7 +134,7 @@ PUBLIC HTAAMethod HTAAMethod_enum PARAMS((CONST char * name));
 **      returns         the name of the scheme, i.e.
 **                      "GET", "PUT", ...
 */
-PUBLIC char *HTAAMethod_name PARAMS((HTAAMethod method));
+extern char *HTAAMethod_name (HTAAMethod method);
 
 
 /* PUBLIC                                               HTAAMethod_inList()
@@ -147,8 +147,8 @@ PUBLIC char *HTAAMethod_name PARAMS((HTAAMethod method));
 **      returns         YES, if method was found.
 **                      NO, if not found.
 */
-PUBLIC BOOL HTAAMethod_inList PARAMS((HTAAMethod        method,
-                                     HTList *           list));
+extern BOOL HTAAMethod_inList (HTAAMethod        method,
+                                     HTList *           list);
 /*
 
 Match Template Against Filename
@@ -177,8 +177,8 @@ Match Template Against Filename
 **      returns         YES, if filename matches the template.
 **                      NO, otherwise.
 */
-PUBLIC BOOL HTAA_templateMatch PARAMS((CONST char * template,
-                                       CONST char * filename));
+extern BOOL HTAA_templateMatch (const char * template,
+                                       const char * filename);
 
 
 /* PUBLIC                                               HTAA_templateCaseMatch()
@@ -203,8 +203,8 @@ PUBLIC BOOL HTAA_templateMatch PARAMS((CONST char * template,
 **      returns         YES, if filename matches the template.
 **                      NO, otherwise.
 */
-PUBLIC BOOL HTAA_templateCaseMatch PARAMS((CONST char * template,
-                                         CONST char * filename));
+extern BOOL HTAA_templateCaseMatch (const char * template,
+                                         const char * filename);
 
 
 /* PUBLIC                                       HTAA_makeProtectionTemplate()
@@ -226,7 +226,7 @@ PUBLIC BOOL HTAA_templateCaseMatch PARAMS((CONST char * template,
 **                              being a comment marker here,
 **                              there really isn't any space.
 */
-PUBLIC char *HTAA_makeProtectionTemplate PARAMS((CONST char * docname));
+extern char *HTAA_makeProtectionTemplate (const char * docname);
 /*
 
 MIME Argument List Parser
@@ -260,7 +260,7 @@ MIME Argument List Parser
 **              the number of order number of that item. E.g.
 **              "1" for the first, etc.
 */
-PUBLIC HTList *HTAA_parseArgList PARAMS((char * str));
+extern HTList *HTAA_parseArgList (char * str);
 
 /*
 
@@ -287,9 +287,9 @@ Header Line Reader
 **                      will use this buffer first and then
 **                      proceed to read from socket.
 */
-PUBLIC void HTAA_setupReader PARAMS((char *     start_of_headers,
+extern void HTAA_setupReader (char *     start_of_headers,
                                      int        length,
-                                     int        soc));
+                                     int        soc);
 
 
 /* PUBLIC                                               HTAA_getUnfoldedLine()
@@ -313,6 +313,6 @@ PUBLIC void HTAA_setupReader PARAMS((char *     start_of_headers,
 **      Field-Name: Blaa-Blaa This-Is-A-Continuation-Line Here-Is_Another
 **
 */
-PUBLIC char *HTAA_getUnfoldedLine NOPARAMS;
+extern char *HTAA_getUnfoldedLine (void);
 
 #endif  /* NOT HTAAUTIL_H */
diff --git a/WWW/Library/Implementation/HTAccess.c b/WWW/Library/Implementation/HTAccess.c
index eda37d8f..c44d46af 100644
--- a/WWW/Library/Implementation/HTAccess.c
+++ b/WWW/Library/Implementation/HTAccess.c
@@ -67,28 +67,28 @@
 /*
 **  These flags may be set to modify the operation of this module
 */
-PUBLIC char * HTClientHost = NULL; /* Name of remote login host if any */
-PUBLIC FILE * HTlogfile = NULL;    /* File to which to output one-liners */
-PUBLIC BOOL HTSecure = NO;	   /* Disable access for telnet users? */
-PUBLIC BOOL HTPermitRedir = NO;	   /* Always allow redirection in getfile()? */
+char * HTClientHost = NULL; /* Name of remote login host if any */
+FILE * HTlogfile = NULL;    /* File to which to output one-liners */
+BOOL HTSecure = NO;	   /* Disable access for telnet users? */
+BOOL HTPermitRedir = NO;	   /* Always allow redirection in getfile()? */
 
-PUBLIC BOOL using_proxy = NO; /* are we using a proxy gateway? */
+BOOL using_proxy = NO; /* are we using a proxy gateway? */
 
 /*
 **  To generate other things, play with these:
 */
-PUBLIC HTFormat HTOutputFormat = NULL;
-PUBLIC HTStream* HTOutputStream = NULL; /* For non-interactive, set this */
+HTFormat HTOutputFormat = NULL;
+HTStream* HTOutputStream = NULL; /* For non-interactive, set this */
 
-PRIVATE HTList * protocols = NULL; /* List of registered protocol descriptors */
+static HTList * protocols = NULL; /* List of registered protocol descriptors */
 
-PUBLIC char *use_this_url_instead = NULL;
+char *use_this_url_instead = NULL;
 
-PRIVATE int pushed_assume_LYhndl = -1; /* see LYUC* functions below - kw */
-PRIVATE char * pushed_assume_MIMEname = NULL;
+static int pushed_assume_LYhndl = -1; /* see LYUC* functions below - kw */
+static char * pushed_assume_MIMEname = NULL;
 
 #ifdef LY_FIND_LEAKS
-PRIVATE void free_protocols NOARGS
+static void free_protocols (void)
 {
     HTList_delete(protocols);
     protocols = NULL;
@@ -99,8 +99,8 @@ PRIVATE void free_protocols NOARGS
 /*	Register a Protocol.				HTRegisterProtocol()
 **	--------------------
 */
-PUBLIC BOOL HTRegisterProtocol ARGS1(
-	HTProtocol *,	protocol)
+BOOL HTRegisterProtocol (
+	HTProtocol *	protocol)
 {
     if (!protocols) {
 	protocols = HTList_new();
@@ -179,7 +179,7 @@ GLOBALREF  HTProtocol HTWAIS;
 #endif /* !DECNET */
 #endif /* GLOBALREF_IS_MACRO */
 
-PRIVATE void HTAccessInit NOARGS			/* Call me once */
+static void HTAccessInit (void)			/* Call me once */
 {
     HTRegisterProtocol(&HTTP);
     HTRegisterProtocol(&HTTPS);
@@ -231,10 +231,10 @@ PRIVATE void HTAccessInit NOARGS			/* Call me once */
 **  Use "*" to override all proxy service:
 **	     no_proxy="*"
 */
-PUBLIC BOOL override_proxy ARGS1(
-	CONST char *,	addr)
+BOOL override_proxy (
+	const char *	addr)
 {
-    CONST char * no_proxy = getenv("no_proxy");
+    const char * no_proxy = getenv("no_proxy");
     char * p = NULL;
     char * at = NULL;
     char * host = NULL;
@@ -320,8 +320,8 @@ PUBLIC BOOL override_proxy ARGS1(
     h_len = strlen(Host);
 
     while (*no_proxy) {
-	CONST char * end;
-	CONST char * colon = NULL;
+	const char * end;
+	const char * colon = NULL;
 	int templ_port = 0;
 	int t_len;
 
@@ -378,9 +378,9 @@ PUBLIC BOOL override_proxy ARGS1(
 **	returns		HT_NO_ACCESS		Error has occurred.
 **			HT_OK			Success
 */
-PRIVATE int get_physical ARGS2(
-	CONST char *,		addr,
-	HTParentAnchor *,	anchor)
+static int get_physical (
+	const char *		addr,
+	HTParentAnchor *	anchor)
 {
     int result;
     char * acc_method = NULL;	/* Name of access method */
@@ -593,8 +593,8 @@ PRIVATE int get_physical ARGS2(
  *  I want the "pop" to occur as soon as possible after loading
  *  has finished. - kw @@@
  */
-PUBLIC void LYUCPushAssumed ARGS1(
-    HTParentAnchor *,	anchor)
+void LYUCPushAssumed (
+    HTParentAnchor *	anchor)
 {
     int anchor_LYhndl = -1;
     LYUCcharset * anchor_UCI = NULL;
@@ -628,7 +628,7 @@ PUBLIC void LYUCPushAssumed ARGS1(
  *  UCLYhndl_for_unspec used for charset "assuming" from the values
  *  saved by LYUCPushAssumed, if any. - kw
  */
-PUBLIC int LYUCPopAssumed NOARGS
+int LYUCPopAssumed (void)
 {
 
     if (pushed_assume_LYhndl >= 0) {
@@ -663,11 +663,11 @@ PUBLIC int LYUCPopAssumed NOARGS
 **			HT_NO_DATA	Success, but no document loaded.
 **					(telnet session started etc)
 */
-PRIVATE int HTLoad ARGS4(
-	CONST char *,		addr,
-	HTParentAnchor *,	anchor,
-	HTFormat,		format_out,
-	HTStream *,		sink)
+static int HTLoad (
+	const char *		addr,
+	HTParentAnchor *	anchor,
+	HTFormat		format_out,
+	HTStream *		sink)
 {
     HTProtocol *p;
     int status = get_physical(addr, anchor);
@@ -695,8 +695,8 @@ PRIVATE int HTLoad ARGS4(
 /*	Get a save stream for a document		HTSaveStream()
 **	--------------------------------
 */
-PUBLIC HTStream *HTSaveStream ARGS1(
-	HTParentAnchor *,	anchor)
+HTStream *HTSaveStream (
+	HTParentAnchor *	anchor)
 {
     HTProtocol *p = (HTProtocol *)HTAnchor_protocol(anchor);
     if (!p)
@@ -705,7 +705,7 @@ PUBLIC HTStream *HTSaveStream ARGS1(
     return p->saveStream(anchor);
 }
 
-PUBLIC int redirection_attempts = 0; /* counter in HTLoadDocument */
+int redirection_attempts = 0; /* counter in HTLoadDocument */
 
 /*	Load a document - with logging etc		HTLoadDocument()
 **	----------------------------------
@@ -725,15 +725,15 @@ PUBLIC int redirection_attempts = 0; /* counter in HTLoadDocument */
 **		     NO      Failure
 */
 
-PRIVATE BOOL HTLoadDocument ARGS4(
-	CONST char *,		full_address, /* may include #fragment */
-	HTParentAnchor *,	anchor,
-	HTFormat,		format_out,
-	HTStream*,		sink)
+static BOOL HTLoadDocument (
+	const char *		full_address, /* may include #fragment */
+	HTParentAnchor *	anchor,
+	HTFormat		format_out,
+	HTStream*		sink)
 {
     int     status;
     HText * text;
-    CONST char * address_to_load = full_address;
+    const char * address_to_load = full_address;
     char *cp;
     BOOL ForcingNoCache = LYforce_no_cache;
 
@@ -1106,8 +1106,8 @@ PRIVATE BOOL HTLoadDocument ARGS4(
 **	  returns    YES     Success in opening document
 **		     NO      Failure
 */
-PUBLIC BOOL HTLoadAbsolute ARGS1(
-	CONST DocAddress *,	docaddr)
+BOOL HTLoadAbsolute (
+	const DocAddress *	docaddr)
 {
     return HTLoadDocument(docaddr->address,
 			  HTAnchor_findAddress(docaddr),
@@ -1127,10 +1127,10 @@ PUBLIC BOOL HTLoadAbsolute ARGS1(
 **	  returns    YES     Success in opening document
 **		     NO      Failure
 */
-PUBLIC BOOL HTLoadToStream ARGS3(
-	CONST char *,	addr,
-	BOOL,		filter,
-	HTStream *,	sink)
+BOOL HTLoadToStream (
+	const char *	addr,
+	BOOL		filter,
+	HTStream *	sink)
 {
     return HTLoadDocument(addr,
 			  HTAnchor_findSimpleAddress(addr),
@@ -1150,9 +1150,9 @@ PUBLIC BOOL HTLoadToStream ARGS3(
 **	  returns    YES     Success in opening document
 **		     NO      Failure
 */
-PUBLIC BOOL HTLoadRelative ARGS2(
-	CONST char *,		relative_name,
-	HTParentAnchor *,	here)
+BOOL HTLoadRelative (
+	const char *		relative_name,
+	HTParentAnchor *	here)
 {
     DocAddress full_address;
     BOOL result;
@@ -1194,8 +1194,8 @@ PUBLIC BOOL HTLoadRelative ARGS2(
 **	  returns    YES     Success
 **		     NO      Failure
 */
-PUBLIC BOOL HTLoadAnchor ARGS1(
-	HTAnchor *,	destination)
+BOOL HTLoadAnchor (
+	HTAnchor *	destination)
 {
     HTParentAnchor * parent;
     BOOL loaded = NO;
@@ -1245,26 +1245,26 @@ PUBLIC BOOL HTLoadAnchor ARGS1(
 **	 *keywords	space-separated keyword list or similar search list
 **	here		is anchor search is to be done on.
 */
-PRIVATE char hex ARGS1(
-    int,		i)
+static char hex (
+    int		i)
 {
     char * hexchars = "0123456789ABCDEF";
     return hexchars[i];
 }
 
-PUBLIC BOOL HTSearch ARGS2(
-	CONST char *,		keywords,
-	HTParentAnchor *,	here)
+BOOL HTSearch (
+	const char *		keywords,
+	HTParentAnchor *	here)
 {
 #define acceptable \
 "1234567890abcdefghijlkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.-_"
 
     char *q, *u;
-    CONST char * p, *s, *e;		/* Pointers into keywords */
+    const char * p, *s, *e;		/* Pointers into keywords */
     char * address = NULL;
     BOOL result;
     char * escaped = typecallocn(char, (strlen(keywords)*3) + 1);
-    static CONST BOOL isAcceptable[96] =
+    static const BOOL isAcceptable[96] =
 
     /*	 0 1 2 3 4 5 6 7 8 9 A B C D E F */
     {	 0,0,0,0,0,0,0,0,0,0,1,0,0,1,1,0,	/* 2x	!"#$%&'()*+,-./  */
@@ -1333,9 +1333,9 @@ PUBLIC BOOL HTSearch ARGS2(
 **	*keywords	space-separated keyword list or similar search list
 **	*indexname	is name of object search is to be done on.
 */
-PUBLIC BOOL HTSearchAbsolute ARGS2(
-	CONST char *,	keywords,
-	char *,		indexname)
+BOOL HTSearchAbsolute (
+	const char *	keywords,
+	char *		indexname)
 {
     DocAddress abs_doc;
     HTParentAnchor * anchor;
@@ -1365,7 +1365,7 @@ PUBLIC BOOL HTSearchAbsolute ARGS2(
 **		3	/usr/local/bin/default.html
 **		4	http://www.w3.org/default.html
 */
-PUBLIC HTParentAnchor * HTHomeAnchor NOARGS
+HTParentAnchor * HTHomeAnchor (void)
 {
     char * my_home_document = NULL;
     char * home = LYGetEnv(LOGICAL_DEFAULT);
diff --git a/WWW/Library/Implementation/HTAccess.h b/WWW/Library/Implementation/HTAccess.h
index dbe36fa2..a8aa73ad 100644
--- a/WWW/Library/Implementation/HTAccess.h
+++ b/WWW/Library/Implementation/HTAccess.h
@@ -97,8 +97,8 @@ extern HTFormat HTOutputFormat;         /* To convert on load, set this */
 **  Use "*" to override all proxy service:
 **	     no_proxy="*"
 */
-extern BOOL override_proxy PARAMS((
-	CONST char *	addr));
+extern BOOL override_proxy (
+	const char *	addr);
 
 /*
 
@@ -113,9 +113,9 @@ Load a document from relative name
   NO                      Failure
 
  */
-extern  BOOL HTLoadRelative PARAMS((
-		CONST char *		relative_name,
-		HTParentAnchor *	here));
+extern  BOOL HTLoadRelative (
+		const char *		relative_name,
+		HTParentAnchor *	here);
 
 
 /*
@@ -131,7 +131,7 @@ Load a document from absolute name
   NO                      Failure
 
  */
-extern BOOL HTLoadAbsolute PARAMS((CONST DocAddress * addr));
+extern BOOL HTLoadAbsolute (const DocAddress * addr);
 
 
 /*
@@ -149,8 +149,8 @@ Load a document from absolute name to a stream
    Note: This is equivalent to HTLoadDocument
 
  */
-extern BOOL HTLoadToStream PARAMS((CONST char * addr, BOOL filter_it,
-				HTStream * sink));
+extern BOOL HTLoadToStream (const char * addr, BOOL filter_it,
+				HTStream * sink);
 
 
 /*
@@ -165,7 +165,7 @@ Load if necessary, and select an anchor
   returns NO              Failure
 
  */
-extern BOOL HTLoadAnchor PARAMS((HTAnchor * destination));
+extern BOOL HTLoadAnchor (HTAnchor * destination);
 
 
 /*
@@ -179,7 +179,7 @@ Make a stream for Saving object back
   returns                 0 if error else a stream to save the object to.
 
  */
-extern HTStream * HTSaveStream PARAMS((HTParentAnchor * anchor));
+extern HTStream * HTSaveStream (HTParentAnchor * anchor);
 
 
 /*
@@ -194,7 +194,7 @@ Search
   here                    The anchor of the object being searched
 
  */
-extern BOOL HTSearch PARAMS((CONST char * keywords, HTParentAnchor* here));
+extern BOOL HTSearch (const char * keywords, HTParentAnchor* here);
 
 
 /*
@@ -209,9 +209,9 @@ Search Given Indexname
   *indexname              is name of object search is to be done on.
 
  */
-extern BOOL HTSearchAbsolute PARAMS((
-	CONST char *	keywords,
-	char *		indexname));
+extern BOOL HTSearchAbsolute (
+	const char *	keywords,
+	char *		indexname);
 
 
 /*
@@ -223,17 +223,17 @@ Register an access method
 typedef struct _HTProtocol {
 	char * name;
 
-	int (*load)PARAMS((
-		CONST char *	full_address,
+	int (*load)(
+		const char *	full_address,
 		HTParentAnchor * anchor,
 		HTFormat	format_out,
-		HTStream*	sink));
+		HTStream*	sink);
 
-	HTStream* (*saveStream)PARAMS((HTParentAnchor * anchor));
+	HTStream* (*saveStream)(HTParentAnchor * anchor);
 
 } HTProtocol;
 
-extern BOOL HTRegisterProtocol PARAMS((HTProtocol * protocol));
+extern BOOL HTRegisterProtocol (HTProtocol * protocol);
 
 
 /*
@@ -248,25 +248,25 @@ Generate the anchor for the home page
    This is a default algorithm -- browser don't HAVE to use this.
 
  */
-extern HTParentAnchor * HTHomeAnchor NOPARAMS;
+extern HTParentAnchor * HTHomeAnchor (void);
 
 /*
 
 Return Host Name
 
  */
-extern CONST char * HTHostName NOPARAMS;
+extern const char * HTHostName (void);
 
 /*
 
 For registering protocols supported by Lynx
 
 */
-extern void LYRegisterLynxProtocols NOARGS;
+extern void LYRegisterLynxProtocols (void);
 
-extern void LYUCPushAssumed PARAMS((
-    HTParentAnchor *	anchor));
-extern int LYUCPopAssumed NOPARAMS;
+extern void LYUCPushAssumed (
+    HTParentAnchor *	anchor);
+extern int LYUCPopAssumed (void);
 
 extern BOOL using_proxy;	/* Are we using an NNTP proxy? */
 
diff --git a/WWW/Library/Implementation/HTAnchor.c b/WWW/Library/Implementation/HTAnchor.c
index e83a0fa8..9580a0db 100644
--- a/WWW/Library/Implementation/HTAnchor.c
+++ b/WWW/Library/Implementation/HTAnchor.c
@@ -39,14 +39,14 @@
 /*
  *	This is the original function.	We'll use it again. - FM
  */
-PRIVATE int HASH_FUNCTION ARGS1(
-	CONST char *,	cp_address)
+static int HASH_FUNCTION (
+	const char *	cp_address)
 {
     int hash;
-    CONST unsigned char *p;
+    const unsigned char *p;
 
-    for (p = (CONST unsigned char *)cp_address, hash = 0; *p; p++)
-	hash = (int) (hash * 3 + (*(CONST unsigned char *)p)) % HASH_SIZE;
+    for (p = (const unsigned char *)cp_address, hash = 0; *p; p++)
+	hash = (int) (hash * 3 + (*(const unsigned char *)p)) % HASH_SIZE;
 
     return(hash);
 }
@@ -59,7 +59,7 @@ struct _HyperDoc {
 #endif /* VMS */
 
 /* Table of lists of all parents */
-PRIVATE HTList adult_table[HASH_SIZE] = { {NULL, NULL} };
+static HTList adult_table[HASH_SIZE] = { {NULL, NULL} };
 
 
 /*				Creation Methods
@@ -69,9 +69,9 @@ PRIVATE HTList adult_table[HASH_SIZE] = { {NULL, NULL} };
 **	consistency, we insist that you furnish more information about the
 **	anchor you are creating : use newWithParent or newWithAddress.
 */
-PRIVATE HTParentAnchor0 * HTParentAnchor0_new ARGS2(
-	CONST char *,	address,
-	short,		hash)
+static HTParentAnchor0 * HTParentAnchor0_new (
+	const char *	address,
+	short		hash)
 {
     HTParentAnchor0 *newAnchor = typecalloc(HTParentAnchor0);
     if (newAnchor == NULL)
@@ -84,8 +84,8 @@ PRIVATE HTParentAnchor0 * HTParentAnchor0_new ARGS2(
     return(newAnchor);
 }
 
-PRIVATE HTParentAnchor * HTParentAnchor_new ARGS1(
-	HTParentAnchor0 *,	parent)
+static HTParentAnchor * HTParentAnchor_new (
+	HTParentAnchor0 *	parent)
 {
     HTParentAnchor *newAnchor = typecalloc(HTParentAnchor);
     if (newAnchor == NULL)
@@ -104,8 +104,8 @@ PRIVATE HTParentAnchor * HTParentAnchor_new ARGS1(
     return(newAnchor);
 }
 
-PRIVATE HTChildAnchor * HTChildAnchor_new ARGS1(
-	HTParentAnchor0 *,	parent)
+static HTChildAnchor * HTChildAnchor_new (
+	HTParentAnchor0 *	parent)
 {
     HTChildAnchor *p = typecalloc(HTChildAnchor);
     if (p == NULL)
@@ -115,8 +115,8 @@ PRIVATE HTChildAnchor * HTChildAnchor_new ARGS1(
     return p;
 }
 
-PRIVATE HTChildAnchor * HText_pool_ChildAnchor_new ARGS1(
-	HTParentAnchor *,	parent)
+static HTChildAnchor * HText_pool_ChildAnchor_new (
+	HTParentAnchor *	parent)
 {
     HTChildAnchor *p = (HTChildAnchor *)HText_pool_calloc((HText*)(parent->document),
 						sizeof(HTChildAnchor));
@@ -144,9 +144,9 @@ PRIVATE HTChildAnchor * HText_pool_ChildAnchor_new ARGS1(
 **	returns YES if the strings are equivalent
 **		NO if they differ.
 */
-PRIVATE BOOL HTSEquivalent ARGS2(
-	CONST char *,	s,
-	CONST char *,	t)
+static BOOL HTSEquivalent (
+	const char *	s,
+	const char *	t)
 {
     if (s && t) {  /* Make sure they point to something */
 	for (; *s && *t; s++, t++) {
@@ -169,9 +169,9 @@ PRIVATE BOOL HTSEquivalent ARGS2(
 **	returns YES if the strings are equivalent
 **		NO if they differ.
 */
-PRIVATE BOOL HTBEquivalent ARGS2(
-	CONST bstring *,	s,
-	CONST bstring *,	t)
+static BOOL HTBEquivalent (
+	const bstring *	s,
+	const bstring *	t)
 {
     if (s && t && BStrLen(s) == BStrLen(t)) {
 	int j;
@@ -190,12 +190,12 @@ PRIVATE BOOL HTBEquivalent ARGS2(
 /*
  *  Three-way compare function
  */
-PRIVATE int compare_anchors ARGS2(
-	void *, l,
-	void *, r)
+static int compare_anchors (
+	void * l,
+	void * r)
 {
-    CONST char* a = ((HTChildAnchor *)l)->tag;
-    CONST char* b = ((HTChildAnchor *)r)->tag;
+    const char* a = ((HTChildAnchor *)l)->tag;
+    const char* b = ((HTChildAnchor *)r)->tag;
     /* both tags are not NULL */
 
 #ifdef CASE_INSENSITIVE_ANCHORS
@@ -212,9 +212,9 @@ PRIVATE int compare_anchors ARGS2(
 **	This one is for a named child.
 **	The parent anchor must already exist.
 */
-PRIVATE HTChildAnchor * HTAnchor_findNamedChild ARGS2(
-	HTParentAnchor0 *,	parent,
-	CONST char *,		tag)
+static HTChildAnchor * HTAnchor_findNamedChild (
+	HTParentAnchor0 *	parent,
+	const char *		tag)
 {
     HTChildAnchor *child;
 
@@ -258,8 +258,8 @@ PRIVATE HTChildAnchor * HTAnchor_findNamedChild ARGS2(
 **	document.  The parent anchor and the document must already exist.
 **	(Just add new unnamed child).
 */
-PRIVATE HTChildAnchor * HTAnchor_addChild ARGS1(
-	HTParentAnchor *,	parent)
+static HTChildAnchor * HTAnchor_addChild (
+	HTParentAnchor *	parent)
 {
     HTChildAnchor *child;
 
@@ -280,13 +280,13 @@ PRIVATE HTChildAnchor * HTAnchor_addChild ARGS1(
 }
 
 
-PRIVATE HTParentAnchor0 * HTAnchor_findAddress_in_adult_table PARAMS((
-	CONST DocAddress *	newdoc));
+static HTParentAnchor0 * HTAnchor_findAddress_in_adult_table (
+	const DocAddress *	newdoc);
 
-PRIVATE BOOL HTAnchor_link PARAMS((
+static BOOL HTAnchor_link (
 	HTChildAnchor *		child,
 	HTAnchor *		destination,
-	HTLinkType *		type));
+	HTLinkType *		type);
 
 
 /*	Create or find a child anchor with a possible link
@@ -296,11 +296,11 @@ PRIVATE BOOL HTAnchor_link PARAMS((
 **	a name, and possibly a link to a _relatively_ named anchor.
 **	(Code originally in ParseHTML.h)
 */
-PUBLIC HTChildAnchor * HTAnchor_findChildAndLink ARGS4(
-	HTParentAnchor *,	parent, /* May not be 0   */
-	CONST char *,		tag,	/* May be "" or 0 */
-	CONST char *,		href,	/* May be "" or 0 */
-	HTLinkType *,		ltype)	/* May be 0	  */
+HTChildAnchor * HTAnchor_findChildAndLink (
+	HTParentAnchor *	parent, /* May not be 0   */
+	const char *		tag,	/* May be "" or 0 */
+	const char *		href,	/* May be "" or 0 */
+	HTLinkType *		ltype)	/* May be 0	  */
 {
     HTChildAnchor * child;
     CTRACE((tfp,"Entered HTAnchor_findChildAndLink:  tag=`%s',%s href=`%s'\n",
@@ -315,13 +315,13 @@ PUBLIC HTChildAnchor * HTAnchor_findChildAndLink ARGS4(
     }
 
     if (href && *href) {
-	CONST char *fragment = NULL;
+	const char *fragment = NULL;
 	HTParentAnchor0 * dest;
 
 	if (ltype == HTInternalLink && *href == '#') {
 	    dest = parent->parent;
 	} else {
-	    CONST char *relative_to = (parent->inBASE && *href != '#') ?
+	    const char *relative_to = (parent->inBASE && *href != '#') ?
 				parent->content_base : parent->address;
 	    DocAddress parsed_doc;
 	    parsed_doc.address = HTParse(href, relative_to,
@@ -382,11 +382,11 @@ PUBLIC HTChildAnchor * HTAnchor_findChildAndLink ARGS4(
 **	Note: You are not guaranteed a new anchor -- you might get an old one,
 **	like with fonts.
 */
-PUBLIC HTParentAnchor * HTAnchor_findAddress ARGS1(
-	CONST DocAddress *,	newdoc)
+HTParentAnchor * HTAnchor_findAddress (
+	const DocAddress *	newdoc)
 {
     /* Anchor tag specified ? */
-    CONST char *tag = HTParseAnchor(newdoc->address);
+    const char *tag = HTParseAnchor(newdoc->address);
 
     CTRACE((tfp,"Entered HTAnchor_findAddress\n"));
 
@@ -418,8 +418,8 @@ PUBLIC HTParentAnchor * HTAnchor_findAddress ARGS1(
 
 /*  The address has no anchor tag, for sure.
  */
-PRIVATE HTParentAnchor0 * HTAnchor_findAddress_in_adult_table ARGS1(
-	CONST DocAddress *,	newdoc)
+static HTParentAnchor0 * HTAnchor_findAddress_in_adult_table (
+	const DocAddress *	newdoc)
 {
     /*
     **  Check whether we have this node.
@@ -494,8 +494,8 @@ PRIVATE HTParentAnchor0 * HTAnchor_findAddress_in_adult_table ARGS1(
 **     Like HTAnchor_findAddress, but simpler to use for simple cases.
 **	No post data etc. can be supplied. - kw
 */
-PUBLIC HTParentAnchor * HTAnchor_findSimpleAddress ARGS1(
-	CONST char *,	url)
+HTParentAnchor * HTAnchor_findSimpleAddress (
+	const char *	url)
 {
     DocAddress urldoc;
 
@@ -512,10 +512,10 @@ PUBLIC HTParentAnchor * HTAnchor_findSimpleAddress ARGS1(
 /*	Link me Anchor to another given one
 **	-------------------------------------
 */
-PRIVATE BOOL HTAnchor_link ARGS3(
-	HTChildAnchor *,	child,
-	HTAnchor *,		destination,
-	HTLinkType *,		type)
+static BOOL HTAnchor_link (
+	HTChildAnchor *	child,
+	HTAnchor *		destination,
+	HTLinkType *		type)
 {
     if (!(child && destination))
 	return(NO);  /* Can't link to/from non-existing anchor */
@@ -552,8 +552,8 @@ PRIVATE BOOL HTAnchor_link ARGS3(
  *	In any event, this will tell destination anchor that we
  *	no longer consider it a destination.
  */
-PRIVATE void deleteLinks ARGS1(
-	HTChildAnchor *,	me)
+static void deleteLinks (
+	HTChildAnchor *	me)
 {
     /*
      *	Unregister me with our destination anchor's parent.
@@ -598,11 +598,11 @@ PRIVATE void deleteLinks ARGS1(
 }
 
 
-PRIVATE void HTParentAnchor_free PARAMS((
-	HTParentAnchor *	me));
+static void HTParentAnchor_free (
+	HTParentAnchor *	me);
 
-PUBLIC BOOL HTAnchor_delete ARGS1(
-	HTParentAnchor0 *,	me)
+BOOL HTAnchor_delete (
+	HTParentAnchor0 *	me)
 {
     /*
      *	Memory leaks fixed.
@@ -706,8 +706,8 @@ PUBLIC BOOL HTAnchor_delete ARGS1(
  *  delete them and their links if we are about to free HText.
  *  Document currently exists. Called within HText_free().
  */
-PUBLIC void HTAnchor_delete_links ARGS1(
-	HTParentAnchor *,	me)
+void HTAnchor_delete_links (
+	HTParentAnchor *	me)
 {
     HTList *cur;
     HTChildAnchor *child;
@@ -740,8 +740,8 @@ PUBLIC void HTAnchor_delete_links ARGS1(
 }
 
 
-PRIVATE void HTParentAnchor_free ARGS1(
-	HTParentAnchor *,	me)
+static void HTParentAnchor_free (
+	HTParentAnchor *	me)
 {
     /*
      *	Delete the methods list.
@@ -813,8 +813,8 @@ PRIVATE void HTParentAnchor_free ARGS1(
 }
 
 #ifdef USE_SOURCE_CACHE
-PUBLIC void HTAnchor_clearSourceCache ARGS1(
-	HTParentAnchor *,	me)
+void HTAnchor_clearSourceCache (
+	HTParentAnchor *	me)
 {
     /*
      * Clean up the source cache, if any.
@@ -837,8 +837,8 @@ PUBLIC void HTAnchor_clearSourceCache ARGS1(
 /*	Data access functions
 **	---------------------
 */
-PUBLIC HTParentAnchor * HTAnchor_parent ARGS1(
-	HTAnchor *,	me)
+HTParentAnchor * HTAnchor_parent (
+	HTAnchor *	me)
 {
     if (!me)
 	return NULL;
@@ -850,23 +850,23 @@ PUBLIC HTParentAnchor * HTAnchor_parent ARGS1(
     return HTParentAnchor_new(me->parent);
 }
 
-PUBLIC void HTAnchor_setDocument ARGS2(
-	HTParentAnchor *,	me,
-	HyperDoc *,		doc)
+void HTAnchor_setDocument (
+	HTParentAnchor *	me,
+	HyperDoc *		doc)
 {
     if (me)
 	me->document = doc;
 }
 
-PUBLIC HyperDoc * HTAnchor_document ARGS1(
-	HTParentAnchor *,	me)
+HyperDoc * HTAnchor_document (
+	HTParentAnchor *	me)
 {
     return( me ? me->document : NULL);
 }
 
 
-PUBLIC char * HTAnchor_address ARGS1(
-	HTAnchor *,	me)
+char * HTAnchor_address (
+	HTAnchor *	me)
 {
     char *addr = NULL;
 
@@ -883,23 +883,23 @@ PUBLIC char * HTAnchor_address ARGS1(
     return(addr);
 }
 
-PUBLIC void HTAnchor_setFormat ARGS2(
-	HTParentAnchor *,	me,
-	HTFormat,		form)
+void HTAnchor_setFormat (
+	HTParentAnchor *	me,
+	HTFormat		form)
 {
     if (me)
 	me->format = form;
 }
 
-PUBLIC HTFormat HTAnchor_format ARGS1(
-	HTParentAnchor *,	me)
+HTFormat HTAnchor_format (
+	HTParentAnchor *	me)
 {
     return( me ? me->format : NULL);
 }
 
-PUBLIC void HTAnchor_setIndex ARGS2(
-	HTParentAnchor *,	me,
-	CONST char *,		address)
+void HTAnchor_setIndex (
+	HTParentAnchor *	me,
+	const char *		address)
 {
     if (me) {
 	me->isIndex = YES;
@@ -907,17 +907,17 @@ PUBLIC void HTAnchor_setIndex ARGS2(
     }
 }
 
-PUBLIC void HTAnchor_setPrompt ARGS2(
-	HTParentAnchor *,	me,
-	CONST char *,		prompt)
+void HTAnchor_setPrompt (
+	HTParentAnchor *	me,
+	const char *		prompt)
 {
     if (me) {
 	StrAllocCopy(me->isIndexPrompt, prompt);
     }
 }
 
-PUBLIC BOOL HTAnchor_isIndex ARGS1(
-	HTParentAnchor *,	me)
+BOOL HTAnchor_isIndex (
+	HTParentAnchor *	me)
 {
     return( me ? me->isIndex : NO);
 }
@@ -925,8 +925,8 @@ PUBLIC BOOL HTAnchor_isIndex ARGS1(
 /*	Whether Anchor has been designated as an ISMAP link
 **	(normally by presence of an ISMAP attribute on A or IMG) - KW
 */
-PUBLIC BOOL HTAnchor_isISMAPScript ARGS1(
-	HTAnchor *,	me)
+BOOL HTAnchor_isISMAPScript (
+	HTAnchor *	me)
 {
     return( (me && me->parent->info) ? me->parent->info->isISMAPScript : NO);
 }
@@ -934,15 +934,15 @@ PUBLIC BOOL HTAnchor_isISMAPScript ARGS1(
 #if defined(USE_COLOR_STYLE)
 /*	Style handling.
 */
-PUBLIC CONST char * HTAnchor_style ARGS1(
-	HTParentAnchor *,	me)
+const char * HTAnchor_style (
+	HTParentAnchor *	me)
 {
 	return( me ? me->style : NULL);
 }
 
-PUBLIC void HTAnchor_setStyle ARGS2(
-	HTParentAnchor *,	me,
-	CONST char *,		style)
+void HTAnchor_setStyle (
+	HTParentAnchor *	me,
+	const char *		style)
 {
     if (me) {
 	StrAllocCopy(me->style, style);
@@ -953,15 +953,15 @@ PUBLIC void HTAnchor_setStyle ARGS2(
 
 /*	Title handling.
 */
-PUBLIC CONST char * HTAnchor_title ARGS1(
-	HTParentAnchor *,	me)
+const char * HTAnchor_title (
+	HTParentAnchor *	me)
 {
     return( me ? me->title : NULL);
 }
 
-PUBLIC void HTAnchor_setTitle ARGS2(
-	HTParentAnchor *,	me,
-	CONST char *,		title)
+void HTAnchor_setTitle (
+	HTParentAnchor *	me,
+	const char *		title)
 {
     int i;
 
@@ -986,9 +986,9 @@ PUBLIC void HTAnchor_setTitle ARGS2(
     }
 }
 
-PUBLIC void HTAnchor_appendTitle ARGS2(
-	HTParentAnchor *,	me,
-	CONST char *,		title)
+void HTAnchor_appendTitle (
+	HTParentAnchor *	me,
+	const char *		title)
 {
     int i;
 
@@ -1005,15 +1005,15 @@ PUBLIC void HTAnchor_appendTitle ARGS2(
 
 /*	Bookmark handling.
 */
-PUBLIC CONST char * HTAnchor_bookmark ARGS1(
-	HTParentAnchor *,	me)
+const char * HTAnchor_bookmark (
+	HTParentAnchor *	me)
 {
     return( me ? me->bookmark : NULL);
 }
 
-PUBLIC void HTAnchor_setBookmark ARGS2(
-	HTParentAnchor *,	me,
-	CONST char *,		bookmark)
+void HTAnchor_setBookmark (
+	HTParentAnchor *	me,
+	const char *		bookmark)
 {
     if (me)
 	StrAllocCopy(me->bookmark, bookmark);
@@ -1021,15 +1021,15 @@ PUBLIC void HTAnchor_setBookmark ARGS2(
 
 /*	Owner handling.
 */
-PUBLIC CONST char * HTAnchor_owner ARGS1(
-	HTParentAnchor *,	me)
+const char * HTAnchor_owner (
+	HTParentAnchor *	me)
 {
     return( me ? me->owner : NULL);
 }
 
-PUBLIC void HTAnchor_setOwner ARGS2(
-	HTParentAnchor *,	me,
-	CONST char *,		owner)
+void HTAnchor_setOwner (
+	HTParentAnchor *	me,
+	const char *		owner)
 {
     if (me) {
 	StrAllocCopy(me->owner, owner);
@@ -1038,15 +1038,15 @@ PUBLIC void HTAnchor_setOwner ARGS2(
 
 /*	TITLE handling in LINKs with REV="made" or REV="owner". - FM
 */
-PUBLIC CONST char * HTAnchor_RevTitle ARGS1(
-	HTParentAnchor *,	me)
+const char * HTAnchor_RevTitle (
+	HTParentAnchor *	me)
 {
     return( me ? me->RevTitle : NULL);
 }
 
-PUBLIC void HTAnchor_setRevTitle ARGS2(
-	HTParentAnchor *,	me,
-	CONST char *,		title)
+void HTAnchor_setRevTitle (
+	HTParentAnchor *	me,
+	const char *		title)
 {
     int i;
 
@@ -1064,15 +1064,15 @@ PUBLIC void HTAnchor_setRevTitle ARGS2(
 #ifndef DISABLE_BIBP
 /*	Citehost for bibp links from LINKs with REL="citehost". - RDC
 */
-PUBLIC CONST char * HTAnchor_citehost ARGS1(
-	HTParentAnchor *,	me)
+const char * HTAnchor_citehost (
+	HTParentAnchor *	me)
 {
     return( me ? me->citehost : NULL);
 }
 
-PUBLIC void HTAnchor_setCitehost ARGS2(
-	HTParentAnchor *,	me,
-	CONST char *,		citehost)
+void HTAnchor_setCitehost (
+	HTParentAnchor *	me,
+	const char *		citehost)
 {
     if (me) {
 	StrAllocCopy(me->citehost, citehost);
@@ -1084,8 +1084,8 @@ PUBLIC void HTAnchor_setCitehost ARGS2(
 **	(will be loaded if we had a Content-Disposition
 **	 header or META element with filename=name.suffix)
 */
-PUBLIC CONST char * HTAnchor_SugFname ARGS1(
-	HTParentAnchor *,	me)
+const char * HTAnchor_SugFname (
+	HTParentAnchor *	me)
 {
     return( me ? me->SugFname : NULL);
 }
@@ -1094,79 +1094,79 @@ PUBLIC CONST char * HTAnchor_SugFname ARGS1(
 **	(will be loaded if we had a Content-Encoding
 **	 header.)
 */
-PUBLIC CONST char * HTAnchor_content_encoding ARGS1(
-	HTParentAnchor *,	me)
+const char * HTAnchor_content_encoding (
+	HTParentAnchor *	me)
 {
     return( me ? me->content_encoding : NULL);
 }
 
 /*	Content-Type handling. - FM
 */
-PUBLIC CONST char * HTAnchor_content_type ARGS1(
-	HTParentAnchor *,	me)
+const char * HTAnchor_content_type (
+	HTParentAnchor *	me)
 {
     return( me ? me->content_type : NULL);
 }
 
 /*	Last-Modified header handling. - FM
 */
-PUBLIC CONST char * HTAnchor_last_modified ARGS1(
-	HTParentAnchor *,	me)
+const char * HTAnchor_last_modified (
+	HTParentAnchor *	me)
 {
     return( me ? me->last_modified : NULL);
 }
 
 /*	Date header handling. - FM
 */
-PUBLIC CONST char * HTAnchor_date ARGS1(
-	HTParentAnchor *,	me)
+const char * HTAnchor_date (
+	HTParentAnchor *	me)
 {
     return( me ? me->date : NULL);
 }
 
 /*	Server header handling. - FM
 */
-PUBLIC CONST char * HTAnchor_server ARGS1(
-	HTParentAnchor *,	me)
+const char * HTAnchor_server (
+	HTParentAnchor *	me)
 {
     return( me ? me->server : NULL);
 }
 
 /*	Safe header handling. - FM
 */
-PUBLIC BOOL HTAnchor_safe ARGS1(
-	HTParentAnchor *,	me)
+BOOL HTAnchor_safe (
+	HTParentAnchor *	me)
 {
     return (BOOL) ( me ? me->safe : FALSE);
 }
 
 /*	Content-Base header handling. - FM
 */
-PUBLIC CONST char * HTAnchor_content_base ARGS1(
-	HTParentAnchor *,	me)
+const char * HTAnchor_content_base (
+	HTParentAnchor *	me)
 {
     return( me ? me->content_base : NULL);
 }
 
 /*	Content-Location header handling. - FM
 */
-PUBLIC CONST char * HTAnchor_content_location ARGS1(
-	HTParentAnchor *,	me)
+const char * HTAnchor_content_location (
+	HTParentAnchor *	me)
 {
     return( me ? me->content_location : NULL);
 }
 
 /*	Message-ID, used for mail replies - kw
 */
-PUBLIC CONST char * HTAnchor_messageID ARGS1(
-	HTParentAnchor *,	me)
+const char * HTAnchor_messageID (
+	HTParentAnchor *	me)
 {
     return( me ? me->message_id : NULL);
 }
 
-PUBLIC BOOL HTAnchor_setMessageID ARGS2(
-	HTParentAnchor *,	me,
-	CONST char *,		messageid)
+BOOL HTAnchor_setMessageID (
+	HTParentAnchor *	me,
+	const char *		messageid)
 {
     if (!(me && messageid && *messageid)) {
 	return FALSE;
@@ -1177,15 +1177,15 @@ PUBLIC BOOL HTAnchor_setMessageID ARGS2(
 
 /*	Subject, used for mail replies - kw
 */
-PUBLIC CONST char * HTAnchor_subject ARGS1(
-	HTParentAnchor *,	me)
+const char * HTAnchor_subject (
+	HTParentAnchor *	me)
 {
     return( me ? me->subject : NULL);
 }
 
-PUBLIC BOOL HTAnchor_setSubject ARGS2(
-	HTParentAnchor *,	me,
-	CONST char *,		subject)
+BOOL HTAnchor_setSubject (
+	HTParentAnchor *	me,
+	const char *		subject)
 {
     if (!(me && subject && *subject)) {
 	return FALSE;
@@ -1197,15 +1197,15 @@ PUBLIC BOOL HTAnchor_setSubject ARGS2(
 /*	Manipulation of links
 **	---------------------
 */
-PUBLIC HTAnchor * HTAnchor_followLink ARGS1(
-	HTChildAnchor *,	me)
+HTAnchor * HTAnchor_followLink (
+	HTChildAnchor *	me)
 {
     return( me->dest);
 }
 
-PUBLIC HTAnchor * HTAnchor_followTypedLink ARGS2(
-	HTChildAnchor *,	me,
-	HTLinkType *,		type)
+HTAnchor * HTAnchor_followTypedLink (
+	HTChildAnchor *	me,
+	HTLinkType *		type)
 {
     if (me->type == type)
 	return( me->dest);
@@ -1216,8 +1216,8 @@ PUBLIC HTAnchor * HTAnchor_followTypedLink ARGS2(
 /*	Methods List
 **	------------
 */
-PUBLIC HTList * HTAnchor_methods ARGS1(
-	HTParentAnchor *,	me)
+HTList * HTAnchor_methods (
+	HTParentAnchor *	me)
 {
     if (!me->methods) {
 	me->methods = HTList_new();
@@ -1228,15 +1228,15 @@ PUBLIC HTList * HTAnchor_methods ARGS1(
 /*	Protocol
 **	--------
 */
-PUBLIC void * HTAnchor_protocol ARGS1(
-	HTParentAnchor *,	me)
+void * HTAnchor_protocol (
+	HTParentAnchor *	me)
 {
     return( me->protocol);
 }
 
-PUBLIC void HTAnchor_setProtocol ARGS2(
-	HTParentAnchor *,	me,
-	void*,			protocol)
+void HTAnchor_setProtocol (
+	HTParentAnchor *	me,
+	void*			protocol)
 {
     me->protocol = protocol;
 }
@@ -1244,15 +1244,15 @@ PUBLIC void HTAnchor_setProtocol ARGS2(
 /*	Physical Address
 **	----------------
 */
-PUBLIC char * HTAnchor_physical ARGS1(
-	HTParentAnchor *,	me)
+char * HTAnchor_physical (
+	HTParentAnchor *	me)
 {
     return( me->physical);
 }
 
-PUBLIC void HTAnchor_setPhysical ARGS2(
-	HTParentAnchor *,	me,
-	char *,			physical)
+void HTAnchor_setPhysical (
+	HTParentAnchor *	me,
+	char *			physical)
 {
     if (me) {
 	StrAllocCopy(me->physical, physical);
@@ -1283,9 +1283,9 @@ PUBLIC void HTAnchor_setPhysical ARGS2(
 **  We don't modify the HTParentAnchor's charset element
 **  here, that one will only be set when explicitly given.
 */
-PUBLIC LYUCcharset * HTAnchor_getUCInfoStage ARGS2(
-	HTParentAnchor *,	me,
-	int,			which_stage)
+LYUCcharset * HTAnchor_getUCInfoStage (
+	HTParentAnchor *	me,
+	int			which_stage)
 {
     if (me && !me->UCStages) {
 	int i;
@@ -1320,9 +1320,9 @@ PUBLIC LYUCcharset * HTAnchor_getUCInfoStage ARGS2(
     return(NULL);
 }
 
-PUBLIC int HTAnchor_getUCLYhndl ARGS2(
-	HTParentAnchor *,	me,
-	int,			which_stage)
+int HTAnchor_getUCLYhndl (
+	HTParentAnchor *	me,
+	int			which_stage)
 {
     if (me) {
 	if (!me->UCStages) {
@@ -1339,7 +1339,7 @@ PUBLIC int HTAnchor_getUCLYhndl ARGS2(
 }
 
 #ifdef CAN_SWITCH_DISPLAY_CHARSET
-PRIVATE void setup_switch_display_charset ARGS2(HTParentAnchor *, me, int, h)
+static void setup_switch_display_charset (HTParentAnchor * me, int h)
 {
     if (!Switch_Display_Charset(h,SWITCH_DISPLAY_CHARSET_MAYBE))
 	return;
@@ -1352,11 +1352,11 @@ PRIVATE void setup_switch_display_charset ARGS2(HTParentAnchor *, me, int, h)
 }
 #endif
 
-PUBLIC LYUCcharset * HTAnchor_setUCInfoStage ARGS4(
-	HTParentAnchor *,	me,
-	int,			LYhndl,
-	int,			which_stage,
-	int,			set_by)
+LYUCcharset * HTAnchor_setUCInfoStage (
+	HTParentAnchor *	me,
+	int			LYhndl,
+	int			which_stage,
+	int			set_by)
 {
     if (me) {
 	/*
@@ -1389,11 +1389,11 @@ PUBLIC LYUCcharset * HTAnchor_setUCInfoStage ARGS4(
     return(NULL);
 }
 
-PUBLIC LYUCcharset * HTAnchor_resetUCInfoStage ARGS4(
-	HTParentAnchor *,	me,
-	int,			LYhndl,
-	int,			which_stage,
-	int,			set_by)
+LYUCcharset * HTAnchor_resetUCInfoStage (
+	HTParentAnchor *	me,
+	int			LYhndl,
+	int			which_stage,
+	int			set_by)
 {
     int ohandle;
 
@@ -1413,11 +1413,11 @@ PUBLIC LYUCcharset * HTAnchor_resetUCInfoStage ARGS4(
 /*
 **  A set_by of (-1) means use the lock value from the from_stage.
 */
-PUBLIC LYUCcharset * HTAnchor_copyUCInfoStage ARGS4(
-	HTParentAnchor *,	me,
-	int,			to_stage,
-	int,			from_stage,
-	int,			set_by)
+LYUCcharset * HTAnchor_copyUCInfoStage (
+	HTParentAnchor *	me,
+	int			to_stage,
+	int			from_stage,
+	int			set_by)
 {
     if (me) {
 	/*
diff --git a/WWW/Library/Implementation/HTAnchor.h b/WWW/Library/Implementation/HTAnchor.h
index 3467f612..bd29fede 100644
--- a/WWW/Library/Implementation/HTAnchor.h
+++ b/WWW/Library/Implementation/HTAnchor.h
@@ -159,11 +159,11 @@ extern HTLinkType * HTInternalLink;
 **	a name, and possibly a link to a _relatively_ named anchor.
 **	(Code originally in ParseHTML.h)
 */
-extern HTChildAnchor * HTAnchor_findChildAndLink PARAMS((
+extern HTChildAnchor * HTAnchor_findChildAndLink (
 	HTParentAnchor * parent,	/* May not be 0 */
-	CONST char * tag,		/* May be "" or 0 */
-	CONST char * href,		/* May be "" or 0 */
-	HTLinkType * ltype));		/* May be 0 */
+	const char * tag,		/* May be "" or 0 */
+	const char * href,		/* May be "" or 0 */
+	HTLinkType * ltype);		/* May be 0 */
 
 /*	Create new or find old parent anchor
 **	------------------------------------
@@ -173,8 +173,8 @@ extern HTChildAnchor * HTAnchor_findChildAndLink PARAMS((
 **	Note: You are not guaranteed a new anchor -- you might get an old one,
 **	like with fonts.
 */
-extern HTParentAnchor * HTAnchor_findAddress PARAMS((
-	CONST DocAddress *	address));
+extern HTParentAnchor * HTAnchor_findAddress (
+	const DocAddress *	address);
 
 /*	Create new or find old named anchor - simple form
 **	-------------------------------------------------
@@ -182,8 +182,8 @@ extern HTParentAnchor * HTAnchor_findAddress PARAMS((
 **	Like the previous one, but simpler to use for simple cases.
 **	No post data etc. can be supplied. - kw
 */
-extern HTParentAnchor * HTAnchor_findSimpleAddress PARAMS((
-	CONST char *	url));
+extern HTParentAnchor * HTAnchor_findSimpleAddress (
+	const char *	url);
 
 /*	Delete an anchor and possibly related things (auto garbage collection)
 **	--------------------------------------------
@@ -194,255 +194,255 @@ extern HTParentAnchor * HTAnchor_findSimpleAddress PARAMS((
 **	We also try to delete the targets whose documents are not loaded.
 **	If this anchor's sources list is empty, we delete it and its children.
 */
-extern BOOL HTAnchor_delete PARAMS((
-	HTParentAnchor0 *	me));
+extern BOOL HTAnchor_delete (
+	HTParentAnchor0 *	me);
 
 /*
  *  Unnamed children (children_notag) have no sense without HText -
  *  delete them and their links if we are about to free HText.
  *  Document currently exists.  Called within HText_free().
  */
-extern void HTAnchor_delete_links PARAMS((
-	HTParentAnchor *	me));
+extern void HTAnchor_delete_links (
+	HTParentAnchor *	me);
 
 #ifdef USE_SOURCE_CACHE
-extern void HTAnchor_clearSourceCache PARAMS((
-	HTParentAnchor *	me));
+extern void HTAnchor_clearSourceCache (
+	HTParentAnchor *	me);
 #endif
 
 /*	Data access functions
 **	---------------------
 */
-extern HTParentAnchor * HTAnchor_parent PARAMS((
-	HTAnchor *		me));
+extern HTParentAnchor * HTAnchor_parent (
+	HTAnchor *		me);
 
-extern void HTAnchor_setDocument PARAMS((
+extern void HTAnchor_setDocument (
 	HTParentAnchor *	me,
-	HyperDoc *		doc));
+	HyperDoc *		doc);
 
-extern HyperDoc * HTAnchor_document PARAMS((
-	HTParentAnchor *	me));
+extern HyperDoc * HTAnchor_document (
+	HTParentAnchor *	me);
 
 /*	Returns the full URI of the anchor, child or parent
 **	as a malloc'd string to be freed by the caller.
 */
-extern char * HTAnchor_address PARAMS((
-	HTAnchor *		me));
+extern char * HTAnchor_address (
+	HTAnchor *		me);
 
-extern void HTAnchor_setFormat PARAMS((
+extern void HTAnchor_setFormat (
 	HTParentAnchor *	me,
-	HTFormat		form));
+	HTFormat		form);
 
-extern HTFormat HTAnchor_format PARAMS((
-	HTParentAnchor *	me));
+extern HTFormat HTAnchor_format (
+	HTParentAnchor *	me);
 
-extern void HTAnchor_setIndex PARAMS((
+extern void HTAnchor_setIndex (
 	HTParentAnchor *	me,
-	CONST char *		address));
+	const char *		address);
 
-extern void HTAnchor_setPrompt PARAMS((
+extern void HTAnchor_setPrompt (
 	HTParentAnchor *	me,
-	CONST char *		prompt));
+	const char *		prompt);
 
-extern BOOL HTAnchor_isIndex PARAMS((
-	HTParentAnchor *	me));
+extern BOOL HTAnchor_isIndex (
+	HTParentAnchor *	me);
 
-extern BOOL HTAnchor_isISMAPScript PARAMS((
-	HTAnchor *		me));
+extern BOOL HTAnchor_isISMAPScript (
+	HTAnchor *		me);
 
 #if defined(USE_COLOR_STYLE)
-extern CONST char * HTAnchor_style PARAMS((
-	HTParentAnchor *	me));
+extern const char * HTAnchor_style (
+	HTParentAnchor *	me);
 
-extern void HTAnchor_setStyle PARAMS((
+extern void HTAnchor_setStyle (
 	HTParentAnchor *	me,
-	CONST char *		style));
+	const char *		style);
 #endif
 
 /*	Title handling.
 */
-extern CONST char * HTAnchor_title PARAMS((
-	HTParentAnchor *	me));
+extern const char * HTAnchor_title (
+	HTParentAnchor *	me);
 
-extern void HTAnchor_setTitle PARAMS((
+extern void HTAnchor_setTitle (
 	HTParentAnchor *	me,
-	CONST char *		title));
+	const char *		title);
 
-extern void HTAnchor_appendTitle PARAMS((
+extern void HTAnchor_appendTitle (
 	HTParentAnchor *	me,
-	CONST char *		title));
+	const char *		title);
 
 /*	Bookmark handling.
 */
-extern CONST char * HTAnchor_bookmark PARAMS((
-	HTParentAnchor *	me));
+extern const char * HTAnchor_bookmark (
+	HTParentAnchor *	me);
 
-extern void HTAnchor_setBookmark PARAMS((
+extern void HTAnchor_setBookmark (
 	HTParentAnchor *	me,
-	CONST char *		bookmark));
+	const char *		bookmark);
 
 /*	Owner handling.
 */
-extern CONST char * HTAnchor_owner PARAMS((
-	HTParentAnchor *	me));
+extern const char * HTAnchor_owner (
+	HTParentAnchor *	me);
 
-extern void HTAnchor_setOwner PARAMS((
+extern void HTAnchor_setOwner (
 	HTParentAnchor *	me,
-	CONST char *		owner));
+	const char *		owner);
 
 /*	TITLE handling in LINKs with REV="made" or REV="owner". - FM
 */
-extern CONST char * HTAnchor_RevTitle PARAMS((
-	HTParentAnchor *	me));
+extern const char * HTAnchor_RevTitle (
+	HTParentAnchor *	me);
 
-extern void HTAnchor_setRevTitle PARAMS((
+extern void HTAnchor_setRevTitle (
 	HTParentAnchor *	me,
-	CONST char *		title));
+	const char *		title);
 
 /*	Citehost for bibp links from LINKs with REL="citehost". - RDC
 */
-extern CONST char * HTAnchor_citehost PARAMS((
-	HTParentAnchor *	me));
+extern const char * HTAnchor_citehost (
+	HTParentAnchor *	me);
 
-extern void HTAnchor_setCitehost PARAMS((
+extern void HTAnchor_setCitehost (
 	HTParentAnchor *	me,
-	CONST char *		citehost));
+	const char *		citehost);
 
 /*	Suggested filename handling. - FM
 **	(will be loaded if we had a Content-Disposition
 **	 header or META element with filename=name.suffix)
 */
-extern CONST char * HTAnchor_SugFname PARAMS((
-	HTParentAnchor *	me));
+extern const char * HTAnchor_SugFname (
+	HTParentAnchor *	me);
 
 /*	Content-Type handling. - FM
 */
-extern CONST char * HTAnchor_content_type PARAMS((
-	HTParentAnchor *	me));
+extern const char * HTAnchor_content_type (
+	HTParentAnchor *	me);
 
 /*	Content-Encoding handling. - FM
 **	(will be loaded if we had a Content-Encoding
 **	 header.)
 */
-extern CONST char * HTAnchor_content_encoding PARAMS((
-	HTParentAnchor *	me));
+extern const char * HTAnchor_content_encoding (
+	HTParentAnchor *	me);
 
 /*	Last-Modified header handling. - FM
 */
-extern CONST char * HTAnchor_last_modified PARAMS((
-	HTParentAnchor *	me));
+extern const char * HTAnchor_last_modified (
+	HTParentAnchor *	me);
 
 /*	Date header handling. - FM
 */
-extern CONST char * HTAnchor_date PARAMS((
-	HTParentAnchor *	me));
+extern const char * HTAnchor_date (
+	HTParentAnchor *	me);
 
 /*	Server header handling. - FM
 */
-extern CONST char * HTAnchor_server PARAMS((
-	HTParentAnchor *	me));
+extern const char * HTAnchor_server (
+	HTParentAnchor *	me);
 
 /*	Safe header handling. - FM
 */
-extern BOOL HTAnchor_safe PARAMS((
-	HTParentAnchor *	me));
+extern BOOL HTAnchor_safe (
+	HTParentAnchor *	me);
 
 /*	Content-Base header handling. - FM
 */
-extern CONST char * HTAnchor_content_base PARAMS((
-	HTParentAnchor *	me));
+extern const char * HTAnchor_content_base (
+	HTParentAnchor *	me);
 
 /*	Content-Location header handling. - FM
 */
-extern CONST char * HTAnchor_content_location PARAMS((
-	HTParentAnchor *	me));
+extern const char * HTAnchor_content_location (
+	HTParentAnchor *	me);
 
 /*	Message-ID, used for mail replies - kw
 */
-extern CONST char * HTAnchor_messageID PARAMS((
-	HTParentAnchor *	me));
+extern const char * HTAnchor_messageID (
+	HTParentAnchor *	me);
 
-extern BOOL HTAnchor_setMessageID PARAMS((
+extern BOOL HTAnchor_setMessageID (
 	HTParentAnchor *	me,
-	CONST char *		messageid));
+	const char *		messageid);
 
 /*	Subject, used for mail replies - kw
 */
-extern CONST char * HTAnchor_subject PARAMS((
-	HTParentAnchor *	me));
+extern const char * HTAnchor_subject (
+	HTParentAnchor *	me);
 
-extern BOOL HTAnchor_setSubject PARAMS((
+extern BOOL HTAnchor_setSubject (
 	HTParentAnchor *	me,
-	CONST char *		subject));
+	const char *		subject);
 
 /*	Manipulation of links
 **	---------------------
 */
-extern HTAnchor * HTAnchor_followLink PARAMS((
-	HTChildAnchor *		me));
+extern HTAnchor * HTAnchor_followLink (
+	HTChildAnchor *		me);
 
-extern HTAnchor * HTAnchor_followTypedLink PARAMS((
+extern HTAnchor * HTAnchor_followTypedLink (
 	HTChildAnchor *		me,
-	HTLinkType *		type));
+	HTLinkType *		type);
 
 /*	Read and write methods
 **	----------------------
 */
-extern HTList * HTAnchor_methods PARAMS((
-	HTParentAnchor *	me));
+extern HTList * HTAnchor_methods (
+	HTParentAnchor *	me);
 
 /*	Protocol
 **	--------
 */
-extern void * HTAnchor_protocol PARAMS((
-	HTParentAnchor *	me));
+extern void * HTAnchor_protocol (
+	HTParentAnchor *	me);
 
-extern void HTAnchor_setProtocol PARAMS((
+extern void HTAnchor_setProtocol (
 	HTParentAnchor *	me,
-	void *			protocol));
+	void *			protocol);
 
 /*	Physical address
 **	----------------
 */
-extern char * HTAnchor_physical PARAMS((
-	HTParentAnchor *	me));
+extern char * HTAnchor_physical (
+	HTParentAnchor *	me);
 
-extern void HTAnchor_setPhysical PARAMS((
+extern void HTAnchor_setPhysical (
 	HTParentAnchor *	me,
-	char *			protocol));
+	char *			protocol);
 
-extern LYUCcharset * HTAnchor_getUCInfoStage PARAMS((
+extern LYUCcharset * HTAnchor_getUCInfoStage (
 	HTParentAnchor *	me,
-	int			which_stage));
+	int			which_stage);
 
-extern int HTAnchor_getUCLYhndl PARAMS((
+extern int HTAnchor_getUCLYhndl (
 	HTParentAnchor *	me,
-	int			which_stage));
+	int			which_stage);
 
-extern LYUCcharset * HTAnchor_setUCInfoStage PARAMS((
+extern LYUCcharset * HTAnchor_setUCInfoStage (
 	HTParentAnchor *	me,
 	int			LYhndl,
 	int			which_stage,
-	int			set_by));
+	int			set_by);
 
-extern LYUCcharset * HTAnchor_setUCInfoStage PARAMS((
+extern LYUCcharset * HTAnchor_setUCInfoStage (
 	HTParentAnchor *	me,
 	int			LYhndl,
 	int			which_stage,
-	int			set_by));
+	int			set_by);
 
-extern LYUCcharset * HTAnchor_resetUCInfoStage PARAMS((
+extern LYUCcharset * HTAnchor_resetUCInfoStage (
 	HTParentAnchor *	me,
 	int			LYhndl,
 	int			which_stage,
-	int			set_by));
+	int			set_by);
 
-extern LYUCcharset * HTAnchor_copyUCInfoStage PARAMS((
+extern LYUCcharset * HTAnchor_copyUCInfoStage (
 	HTParentAnchor *	me,
 	int			to_stage,
 	int			from_stage,
-	int			set_by));
+	int			set_by);
 
-extern void ImageMapList_free PARAMS((HTList * list));
+extern void ImageMapList_free (HTList * list);
 
 #endif /* HTANCHOR_H */
diff --git a/WWW/Library/Implementation/HTAssoc.c b/WWW/Library/Implementation/HTAssoc.c
index 8e16e761..f3bfff9e 100644
--- a/WWW/Library/Implementation/HTAssoc.c
+++ b/WWW/Library/Implementation/HTAssoc.c
@@ -22,13 +22,13 @@
 
 #include <LYLeaks.h>
 
-PUBLIC HTAssocList *HTAssocList_new NOARGS
+HTAssocList *HTAssocList_new (void)
 {
     return HTList_new();
 }
 
 
-PUBLIC void HTAssocList_delete ARGS1(HTAssocList *, alist)
+void HTAssocList_delete (HTAssocList * alist)
 {
     if (alist) {
 	HTAssocList *cur = alist;
@@ -44,9 +44,9 @@ PUBLIC void HTAssocList_delete ARGS1(HTAssocList *, alist)
 }
 
 
-PUBLIC void HTAssocList_add ARGS3(HTAssocList *,	alist,
-				  CONST char *,		name,
-				  CONST char *,		value)
+void HTAssocList_add (HTAssocList *	alist,
+				  const char *		name,
+				  const char *		value)
 {
     HTAssoc *assoc;
 
@@ -67,8 +67,8 @@ PUBLIC void HTAssocList_add ARGS3(HTAssocList *,	alist,
 }
 
 
-PUBLIC char *HTAssocList_lookup ARGS2(HTAssocList *,	alist,
-				      CONST char *,	name)
+char *HTAssocList_lookup (HTAssocList *	alist,
+				      const char *	name)
 {
     HTAssocList *cur = alist;
     HTAssoc *assoc;
diff --git a/WWW/Library/Implementation/HTAssoc.h b/WWW/Library/Implementation/HTAssoc.h
index d45339d9..63ece0e9 100644
--- a/WWW/Library/Implementation/HTAssoc.h
+++ b/WWW/Library/Implementation/HTAssoc.h
@@ -17,14 +17,14 @@ typedef struct {
 } HTAssoc;
 
 
-PUBLIC HTAssocList *HTAssocList_new NOPARAMS;
-PUBLIC void HTAssocList_delete PARAMS((HTAssocList * alist));
+extern HTAssocList *HTAssocList_new (void);
+extern void HTAssocList_delete (HTAssocList * alist);
 
-PUBLIC void HTAssocList_add PARAMS((HTAssocList *       alist,
-                                    CONST char *        name,
-                                    CONST char *        value));
+extern void HTAssocList_add (HTAssocList *       alist,
+                                    const char *        name,
+                                    const char *        value);
 
-PUBLIC char *HTAssocList_lookup PARAMS((HTAssocList *   alist,
-                                        CONST char *    name));
+extern char *HTAssocList_lookup (HTAssocList *   alist,
+                                        const char *    name);
 
 #endif /* not HTASSOC_H */
diff --git a/WWW/Library/Implementation/HTAtom.c b/WWW/Library/Implementation/HTAtom.c
index b0b9273b..d8bf1106 100644
--- a/WWW/Library/Implementation/HTAtom.c
+++ b/WWW/Library/Implementation/HTAtom.c
@@ -23,14 +23,14 @@
 #include <LYexit.h>
 #include <LYLeaks.h>
 
-PRIVATE HTAtom * hash_table[HASH_SIZE];
-PRIVATE BOOL initialised = NO;
+static HTAtom * hash_table[HASH_SIZE];
+static BOOL initialised = NO;
 
 /*
  *	To free off all atoms.
  */
 #ifdef LY_FIND_LEAKS
-PRIVATE void free_atoms NOPARAMS;
+static void free_atoms (void);
 #endif
 
 /*
@@ -38,7 +38,7 @@ PRIVATE void free_atoms NOPARAMS;
  */
 #define HASH_FUNCTION(cp_hash) ((strlen(cp_hash) * UCH(*cp_hash)) % HASH_SIZE)
 
-PUBLIC HTAtom * HTAtom_for ARGS1(CONST char *, string)
+HTAtom * HTAtom_for (const char * string)
 {
     int hash;
     HTAtom * a;
@@ -99,7 +99,7 @@ PUBLIC HTAtom * HTAtom_for ARGS1(CONST char *, string)
  *	Revision History:
  *		05-29-94	created Lynx 2-3-1 Garrett Arch Blythe
  */
-PRIVATE void free_atoms NOARGS
+static void free_atoms (void)
 {
 	auto int i_counter;
 	HTAtom *HTAp_freeme;
@@ -123,8 +123,8 @@ PRIVATE void free_atoms NOARGS
 }
 #endif /* LY_FIND_LEAKS */
 
-PRIVATE BOOL mime_match ARGS2(CONST char *, name,
-			      CONST char *, templ)
+static BOOL mime_match (const char * name,
+			      const char * templ)
 {
     if (name && templ) {
 	static char *n1 = NULL;
@@ -149,7 +149,7 @@ PRIVATE BOOL mime_match ARGS2(CONST char *, name,
 }
 
 
-PUBLIC HTList *HTAtom_templateMatches ARGS1(CONST char *, templ)
+HTList *HTAtom_templateMatches (const char * templ)
 {
     HTList *matches = HTList_new();
 
diff --git a/WWW/Library/Implementation/HTAtom.h b/WWW/Library/Implementation/HTAtom.h
index 1af962fc..362f1e11 100644
--- a/WWW/Library/Implementation/HTAtom.h
+++ b/WWW/Library/Implementation/HTAtom.h
@@ -30,8 +30,8 @@ struct _HTAtom {
 }; /* struct _HTAtom */
 
 
-PUBLIC HTAtom * HTAtom_for PARAMS((CONST char * string));
-PUBLIC HTList * HTAtom_templateMatches PARAMS((CONST char * templ));
+extern HTAtom * HTAtom_for (const char * string);
+extern HTList * HTAtom_templateMatches (const char * templ);
 
 #define HTAtom_name(a) ((a)->name)
 
diff --git a/WWW/Library/Implementation/HTBTree.c b/WWW/Library/Implementation/HTBTree.c
index ca03df51..1aff0ada 100644
--- a/WWW/Library/Implementation/HTBTree.c
+++ b/WWW/Library/Implementation/HTBTree.c
@@ -14,7 +14,7 @@
 
 #include <LYLeaks.h>
 
-PUBLIC HTBTree * HTBTree_new ARGS1(HTComparer, comp)
+HTBTree * HTBTree_new (HTComparer comp)
     /*********************************************************
     ** This function returns an HTBTree with memory allocated
     ** for it when given a mean to compare things
@@ -32,7 +32,7 @@ PUBLIC HTBTree * HTBTree_new ARGS1(HTComparer, comp)
 
 
 
-PRIVATE void HTBTElement_free ARGS1(HTBTElement*, element)
+static void HTBTElement_free (HTBTElement* element)
     /**********************************************************
     ** This void will free the memory allocated for one element
     */
@@ -46,7 +46,7 @@ PRIVATE void HTBTElement_free ARGS1(HTBTElement*, element)
     }
 }
 
-PUBLIC void HTBTree_free ARGS1(HTBTree*, tree)
+void HTBTree_free (HTBTree* tree)
     /**************************************************************
     ** This void will free the memory allocated for the whole tree
     */
@@ -58,7 +58,7 @@ PUBLIC void HTBTree_free ARGS1(HTBTree*, tree)
 
 
 
-PRIVATE void HTBTElementAndObject_free ARGS1(HTBTElement*, element)
+static void HTBTElementAndObject_free (HTBTElement* element)
     /**********************************************************
     ** This void will free the memory allocated for one element
     */
@@ -73,7 +73,7 @@ PRIVATE void HTBTElementAndObject_free ARGS1(HTBTElement*, element)
     }
 }
 
-PUBLIC void HTBTreeAndObject_free ARGS1(HTBTree*, tree)
+void HTBTreeAndObject_free (HTBTree* tree)
     /**************************************************************
     ** This void will free the memory allocated for the whole tree
     */
@@ -83,9 +83,9 @@ PUBLIC void HTBTreeAndObject_free ARGS1(HTBTree*, tree)
 }
 
 
-PUBLIC void * HTBTree_search ARGS2(
-		   HTBTree*,  tree,
-		   void*,     object)
+void * HTBTree_search (
+		   HTBTree*  tree,
+		   void*     object)
     /**********************************************************************
     ** Returns a pointer to equivalent object in a tree or NULL if none.
     */
@@ -109,9 +109,9 @@ PUBLIC void * HTBTree_search ARGS2(
 
 
 
-PUBLIC void HTBTree_add ARGS2(
-		    HTBTree*,  tree,
-		    void*,     object)
+void HTBTree_add (
+		    HTBTree*  tree,
+		    void*     object)
     /**********************************************************************
     ** This void is the core of HTBTree.c . It will
     **       1/ add a new element to the tree at the right place
@@ -508,9 +508,9 @@ PUBLIC void HTBTree_add ARGS2(
 
 
 
-PUBLIC HTBTElement * HTBTree_next ARGS2(
-			       HTBTree*,       tree,
-			       HTBTElement*,   ele)
+HTBTElement * HTBTree_next (
+			       HTBTree*       tree,
+			       HTBTElement*   ele)
     /**************************************************************************
     ** this function returns a pointer to the leftmost element if ele is NULL,
     ** and to the next object to the right otherwise.
diff --git a/WWW/Library/Implementation/HTBTree.h b/WWW/Library/Implementation/HTBTree.h
index cbbfad43..0bf10cf7 100644
--- a/WWW/Library/Implementation/HTBTree.h
+++ b/WWW/Library/Implementation/HTBTree.h
@@ -30,7 +30,7 @@ typedef struct _HTBTree_element {
     int                         right_depth;
 } HTBTElement;
 
-typedef int (*HTComparer) PARAMS((void * a, void * b));
+typedef int (*HTComparer) (void * a, void * b);
 
 typedef struct _HTBTree_top {
     HTComparer                  compare;
@@ -43,7 +43,7 @@ typedef struct _HTBTree_top {
 Create a binary tree given its discrimination routine
 
  */
-extern HTBTree * HTBTree_new PARAMS((HTComparer comp));
+extern HTBTree * HTBTree_new (HTComparer comp);
 
 
 
@@ -52,7 +52,7 @@ extern HTBTree * HTBTree_new PARAMS((HTComparer comp));
 Free storage of the tree but not of the objects
 
  */
-extern void HTBTree_free PARAMS((HTBTree* tree));
+extern void HTBTree_free (HTBTree* tree);
 
 
 
@@ -61,7 +61,7 @@ extern void HTBTree_free PARAMS((HTBTree* tree));
 Free storage of the tree and of the objects
 
  */
-extern void HTBTreeAndObject_free PARAMS((HTBTree* tree));
+extern void HTBTreeAndObject_free (HTBTree* tree);
 
 
 
@@ -71,7 +71,7 @@ Add an object to a binary tree
 
  */
 
-extern void HTBTree_add PARAMS((HTBTree* tree, void * object));
+extern void HTBTree_add (HTBTree* tree, void * object);
 
 
 /*
@@ -81,7 +81,7 @@ Search an object in a binary tree
   returns          Pointer to equivalent object in a tree or NULL if none.
  */
 
-extern void * HTBTree_search PARAMS((HTBTree* tree, void * object));
+extern void * HTBTree_search (HTBTree* tree, void * object);
 
 
 /*
@@ -104,6 +104,6 @@ Find next element in depth-first order
   returns                Pointer to element or NULL if none left.
 
  */
-extern HTBTElement * HTBTree_next PARAMS((HTBTree* tree, HTBTElement * ele));
+extern HTBTElement * HTBTree_next (HTBTree* tree, HTBTElement * ele);
 
 #endif /* HTBTREE_H */
diff --git a/WWW/Library/Implementation/HTCJK.h b/WWW/Library/Implementation/HTCJK.h
index f234adfe..760fe199 100644
--- a/WWW/Library/Implementation/HTCJK.h
+++ b/WWW/Library/Implementation/HTCJK.h
@@ -60,63 +60,63 @@ extern HTCJKlang HTCJK;
 /*
 **  Function prototypes.
 */
-extern void JISx0201TO0208_EUC PARAMS((
+extern void JISx0201TO0208_EUC (
 	register unsigned char		IHI,
 	register unsigned char		ILO,
 	register unsigned char *	OHI,
-	register unsigned char *	OLO));
+	register unsigned char *	OLO);
 
-extern unsigned char * SJIS_TO_JIS1 PARAMS((
+extern unsigned char * SJIS_TO_JIS1 (
 	register unsigned char		HI,
 	register unsigned char		LO,
-	register unsigned char *	JCODE));
+	register unsigned char *	JCODE);
 
-extern unsigned char * JIS_TO_SJIS1 PARAMS((
+extern unsigned char * JIS_TO_SJIS1 (
 	register unsigned char		HI,
 	register unsigned char		LO,
-	register unsigned char *	SJCODE));
+	register unsigned char *	SJCODE);
 
-extern unsigned char * EUC_TO_SJIS1 PARAMS((
+extern unsigned char * EUC_TO_SJIS1 (
 	unsigned char			HI,
 	unsigned char			LO,
-	register unsigned char *	SJCODE));
+	register unsigned char *	SJCODE);
 
-extern void JISx0201TO0208_SJIS PARAMS((
+extern void JISx0201TO0208_SJIS (
 	register unsigned char		I,
 	register unsigned char *	OHI,
-	register unsigned char *	OLO));
+	register unsigned char *	OLO);
 
-extern unsigned char * SJIS_TO_EUC1 PARAMS((
+extern unsigned char * SJIS_TO_EUC1 (
 	unsigned char		HI,
 	unsigned char		LO,
-	unsigned char *		EUCp));
+	unsigned char *		EUCp);
 
-extern unsigned char * SJIS_TO_EUC PARAMS((
+extern unsigned char * SJIS_TO_EUC (
 	unsigned char *		src,
-	unsigned char *		dst));
+	unsigned char *		dst);
 
-extern unsigned char * EUC_TO_SJIS PARAMS((
+extern unsigned char * EUC_TO_SJIS (
 	unsigned char *		src,
-	unsigned char *		dst));
+	unsigned char *		dst);
 
-extern unsigned char * EUC_TO_JIS PARAMS((
+extern unsigned char * EUC_TO_JIS (
 	unsigned char *		src,
 	unsigned char *		dst,
-	CONST char *		toK,
-	CONST char *		toA));
+	const char *		toK,
+	const char *		toA);
 
-extern unsigned char * TO_EUC PARAMS((
-	CONST unsigned char *	jis,
-	unsigned char *		euc));
+extern unsigned char * TO_EUC (
+	const unsigned char *	jis,
+	unsigned char *		euc);
 
-extern void TO_SJIS PARAMS((
-	CONST unsigned char *	any,
-	unsigned char *		sjis));
+extern void TO_SJIS (
+	const unsigned char *	any,
+	unsigned char *		sjis);
 
-extern void TO_JIS PARAMS((
-	CONST unsigned char *	any,
-	unsigned char *		jis));
+extern void TO_JIS (
+	const unsigned char *	any,
+	unsigned char *		jis);
 
-extern char *str_kcode PARAMS((HTkcode code));
+extern char *str_kcode (HTkcode code);
 
 #endif /* HTCJK_H */
diff --git a/WWW/Library/Implementation/HTChunk.c b/WWW/Library/Implementation/HTChunk.c
index bc6eefcb..63a99f8a 100644
--- a/WWW/Library/Implementation/HTChunk.c
+++ b/WWW/Library/Implementation/HTChunk.c
@@ -11,7 +11,7 @@
 /*
 **	Initialize a chunk with a certain allocation unit
 */
-PUBLIC void HTChunkInit ARGS2 (HTChunk *,ch, int,grow)
+void HTChunkInit (HTChunk *ch, int grow)
 {
     ch->data = 0;
     ch->growby = grow;
@@ -22,7 +22,7 @@ PUBLIC void HTChunkInit ARGS2 (HTChunk *,ch, int,grow)
 /*	Create a chunk with a certain allocation unit
 **	--------------
 */
-PUBLIC HTChunk * HTChunkCreate ARGS1 (int,grow)
+HTChunk * HTChunkCreate (int grow)
 {
     HTChunk * ch = typecalloc(HTChunk);
     if (ch == NULL)
@@ -32,7 +32,7 @@ PUBLIC HTChunk * HTChunkCreate ARGS1 (int,grow)
     return ch;
 }
 
-PUBLIC HTChunk * HTChunkCreateMayFail ARGS2 (int,grow, int,failok)
+HTChunk * HTChunkCreateMayFail (int grow, int failok)
 {
     HTChunk * ch = typecalloc(HTChunk);
     if (ch == NULL) {
@@ -50,7 +50,7 @@ PUBLIC HTChunk * HTChunkCreateMayFail ARGS2 (int,grow, int,failok)
 /*	Create a chunk with a certain allocation unit and ensured size
 **	--------------
 */
-PUBLIC HTChunk * HTChunkCreate2 ARGS2 (int,grow, size_t, needed)
+HTChunk * HTChunkCreate2 (int grow, size_t  needed)
 {
     HTChunk * ch = typecalloc(HTChunk);
     if (ch == NULL)
@@ -73,7 +73,7 @@ PUBLIC HTChunk * HTChunkCreate2 ARGS2 (int,grow, size_t, needed)
 /*	Clear a chunk of all data
 **	--------------------------
 */
-PUBLIC void HTChunkClear ARGS1 (HTChunk *,ch)
+void HTChunkClear (HTChunk * ch)
 {
     FREE(ch->data);
     ch->size = 0;
@@ -84,7 +84,7 @@ PUBLIC void HTChunkClear ARGS1 (HTChunk *,ch)
 /*	Free a chunk
 **	------------
 */
-PUBLIC void HTChunkFree ARGS1 (HTChunk *,ch)
+void HTChunkFree (HTChunk * ch)
 {
     FREE(ch->data);
     FREE(ch);
@@ -94,7 +94,7 @@ PUBLIC void HTChunkFree ARGS1 (HTChunk *,ch)
 /*	Realloc the chunk
 **	-----------------
 */
-PUBLIC BOOL HTChunkRealloc ARGS2 (HTChunk *,ch, int,growby)
+BOOL HTChunkRealloc (HTChunk * ch, int growby)
 {
     char *data;
     ch->allocated = ch->allocated + growby;
@@ -118,7 +118,7 @@ PUBLIC BOOL HTChunkRealloc ARGS2 (HTChunk *,ch, int,growby)
 */
 /* Warning: the code of this function is defined as macro in SGML.c. Change
   the macro or undefine it in SGML.c when changing this function. -VH */
-PUBLIC void HTChunkPutc ARGS2 (HTChunk *,ch, char,c)
+void HTChunkPutc (HTChunk * ch, char c)
 {
     if (ch->size >= ch->allocated) {
 	if (!HTChunkRealloc(ch, ch->growby))
@@ -131,7 +131,7 @@ PUBLIC void HTChunkPutc ARGS2 (HTChunk *,ch, char,c)
 /*	Ensure a certain size
 **	---------------------
 */
-PUBLIC void HTChunkEnsure ARGS2 (HTChunk *,ch, int,needed)
+void HTChunkEnsure (HTChunk * ch, int needed)
 {
     if (needed <= ch->allocated) return;
     ch->allocated = needed-1 - ((needed-1) % ch->growby)
@@ -142,7 +142,7 @@ PUBLIC void HTChunkEnsure ARGS2 (HTChunk *,ch, int,needed)
 	outofmem(__FILE__, "HTChunkEnsure");
 }
 
-PUBLIC void HTChunkPutb ARGS3 (HTChunk *,ch, CONST char *,b, int,l)
+void HTChunkPutb (HTChunk *ch, const char *b, int l)
 {
     if (l <= 0) return;
     if (ch->size + l > ch->allocated) {
@@ -157,9 +157,9 @@ PUBLIC void HTChunkPutb ARGS3 (HTChunk *,ch, CONST char *,b, int,l)
 #define PUTC(code) ch->data[ch->size++] = (char)(code)
 #define PUTC2(code) ch->data[ch->size++] = (char)(0x80|(0x3f &(code)))
 
-PUBLIC void HTChunkPutUtf8Char ARGS2(
-	HTChunk *,	ch,
-	UCode_t,	code)
+void HTChunkPutUtf8Char (
+	HTChunk *	ch,
+	UCode_t	code)
 {
     int utflen;
 
@@ -228,7 +228,7 @@ PUBLIC void HTChunkPutUtf8Char ARGS2(
 /*	Terminate a chunk
 **	-----------------
 */
-PUBLIC void HTChunkTerminate ARGS1 (HTChunk *,ch)
+void HTChunkTerminate (HTChunk * ch)
 {
     HTChunkPutc(ch, (char)0);
 }
@@ -237,9 +237,9 @@ PUBLIC void HTChunkTerminate ARGS1 (HTChunk *,ch)
 /*	Append a string
 **	---------------
 */
-PUBLIC void HTChunkPuts ARGS2 (HTChunk *,ch, CONST char *,s)
+void HTChunkPuts (HTChunk * ch, const char * s)
 {
-    CONST char * p;
+    const char * p;
     for (p = s; *p; p++) {
 	if (ch->size >= ch->allocated) {
 	    if (!HTChunkRealloc(ch, ch->growby))
diff --git a/WWW/Library/Implementation/HTChunk.h b/WWW/Library/Implementation/HTChunk.h
index 4150c1e7..2d53aa72 100644
--- a/WWW/Library/Implementation/HTChunk.h
+++ b/WWW/Library/Implementation/HTChunk.h
@@ -28,7 +28,7 @@ typedef struct {
 /*
  * Initialize a chunk's allocation data and allocation-increment.
  */
-extern void HTChunkInit PARAMS((HTChunk * ch, int grow));
+extern void HTChunkInit (HTChunk * ch, int grow);
 
 /*
  *
@@ -46,7 +46,7 @@ extern void HTChunkInit PARAMS((HTChunk * ch, int grow));
  *
  */
 
-extern HTChunk * HTChunkCreate PARAMS((int growby));
+extern HTChunk * HTChunkCreate (int growby);
 
 /*
  *  Create a chunk for which an allocation error is not a fatal application
@@ -55,13 +55,13 @@ extern HTChunk * HTChunkCreate PARAMS((int growby));
  *  are ok each time after data have been appended.
  *  The create call may also fail and will reurn NULL in that case. - kw
  */
-extern HTChunk * HTChunkCreateMayFail PARAMS((int growby, int failok));
+extern HTChunk * HTChunkCreateMayFail (int growby, int failok);
 
 /*
  *  Like HTChunkCreate but with initial allocation - kw
  *
  */
-extern HTChunk * HTChunkCreate2 PARAMS((int growby, size_t needed));
+extern HTChunk * HTChunkCreate2 (int growby, size_t needed);
 
 
 /*
@@ -78,7 +78,7 @@ extern HTChunk * HTChunkCreate2 PARAMS((int growby, size_t needed));
  *
  */
 
-extern void HTChunkFree PARAMS((HTChunk * ch));
+extern void HTChunkFree (HTChunk * ch);
 
 
 /*
@@ -95,7 +95,7 @@ extern void HTChunkFree PARAMS((HTChunk * ch));
  *
  */
 
-extern void HTChunkClear PARAMS((HTChunk * ch));
+extern void HTChunkClear (HTChunk * ch);
 
 
 /*
@@ -114,7 +114,7 @@ extern void HTChunkClear PARAMS((HTChunk * ch));
  *
  */
 
-extern BOOL HTChunkRealloc PARAMS((HTChunk * ch, int growby));
+extern BOOL HTChunkRealloc (HTChunk * ch, int growby);
 
 
 /*
@@ -133,7 +133,7 @@ extern BOOL HTChunkRealloc PARAMS((HTChunk * ch, int growby));
  *
  */
 
-extern void HTChunkEnsure PARAMS((HTChunk * ch, int s));
+extern void HTChunkEnsure (HTChunk * ch, int s);
 
 
 /*
@@ -151,11 +151,11 @@ extern void HTChunkEnsure PARAMS((HTChunk * ch, int s));
  *   *ch		Is one character bigger
  *
  */
-extern void HTChunkPutc PARAMS((HTChunk * ch, char c));
+extern void HTChunkPutc (HTChunk * ch, char c);
 
-extern void HTChunkPutb PARAMS((HTChunk * ch, CONST char *b, int l));
+extern void HTChunkPutb (HTChunk * ch, const char *b, int l);
 
-extern void HTChunkPutUtf8Char PARAMS((HTChunk * ch, UCode_t code));
+extern void HTChunkPutUtf8Char (HTChunk * ch, UCode_t code);
 
 /*
  * Append a string to a  chunk
@@ -173,7 +173,7 @@ extern void HTChunkPutUtf8Char PARAMS((HTChunk * ch, UCode_t code));
  */
 
 
-extern void HTChunkPuts PARAMS((HTChunk * ch, CONST char *str));
+extern void HTChunkPuts (HTChunk * ch, const char *str);
 
 
 /*
@@ -195,6 +195,6 @@ extern void HTChunkPuts PARAMS((HTChunk * ch, CONST char *str));
  */
 
 
-extern void HTChunkTerminate PARAMS((HTChunk * ch));
+extern void HTChunkTerminate (HTChunk * ch);
 
 #endif /* HTCHUNK_H */
diff --git a/WWW/Library/Implementation/HTDOS.c b/WWW/Library/Implementation/HTDOS.c
index df667bef..0e4e5614 100644
--- a/WWW/Library/Implementation/HTDOS.c
+++ b/WWW/Library/Implementation/HTDOS.c
@@ -13,7 +13,7 @@
  * Make a copy of the source argument in the result, allowing some extra
  * space so we can append directly onto the result without reallocating.
  */
-PRIVATE char * copy_plus ARGS2(char **, result, CONST char *, source)
+static char * copy_plus (char **  result, const char *  source)
 {
     int length = strlen(source);
     HTSprintf0(result, "%-*s", length+10, source);
@@ -30,7 +30,7 @@ PRIVATE char * copy_plus ARGS2(char **, result, CONST char *, source)
 **	returns		WWW file specification
 **
 */
-char * HTDOS_wwwName ARGS1(CONST char *, dosname)
+char * HTDOS_wwwName (const char *  dosname)
 {
     static char *wwwname = NULL;
     char *cp_url = copy_plus(&wwwname, dosname);
@@ -78,7 +78,7 @@ char * HTDOS_wwwName ARGS1(CONST char *, dosname)
 /*
  * Convert slashes from Unix to DOS
  */
-char * HTDOS_slashes ARGS1(char *, path)
+char * HTDOS_slashes (char *  path)
 {
     char *s;
 
@@ -98,7 +98,7 @@ char * HTDOS_slashes ARGS1(char *, path)
 ** ON EXIT:
 **	returns		DOS file specification
 */
-char * HTDOS_name ARGS1(char *, wwwname)
+char * HTDOS_name (char *  wwwname)
 {
 #ifdef _WINDOWS	/* 1998/04/02 (Thu) 08:47:20 */
     extern char windows_drive[];
@@ -149,7 +149,7 @@ char * HTDOS_name ARGS1(char *, wwwname)
 }
 
 #ifdef WIN_EX
-PUBLIC char *HTDOS_short_name(char *path)
+char *HTDOS_short_name(char *path)
 {
     static char sbuf[LY_MAXPATH];
     char *ret;
diff --git a/WWW/Library/Implementation/HTDOS.h b/WWW/Library/Implementation/HTDOS.h
index 128608d9..cae9cb02 100644
--- a/WWW/Library/Implementation/HTDOS.h
+++ b/WWW/Library/Implementation/HTDOS.h
@@ -16,12 +16,12 @@
 **	returns		WWW file specification
 **
 */
-char * HTDOS_wwwName PARAMS((CONST char * dosname));
+char * HTDOS_wwwName (const char * dosname);
 
 /*
  * Converts Unix slashes to DOS
  */
-char * HTDOS_slashes PARAMS((char * path));
+char * HTDOS_slashes (char * path);
 
 /* PUBLIC                                                       HTDOS_name()
 **              CONVERTS WWW name into a DOS name
@@ -33,7 +33,7 @@ char * HTDOS_slashes PARAMS((char * path));
 **
 ** Bug:	Returns pointer to static -- non-reentrant
 */
-char * HTDOS_name PARAMS((char * wwwname));
+char * HTDOS_name (char * wwwname);
 
 #ifdef WIN_EX 
 char * HTDOS_short_name (char * fn);
diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c
index 4c90ac0e..62e91751 100644
--- a/WWW/Library/Implementation/HTFTP.c
+++ b/WWW/Library/Implementation/HTFTP.c
@@ -110,30 +110,30 @@ typedef struct _connection {
 #define ABORT_TARGET (*targetClass._free)         (target)
 
 struct _HTStructured {
-	CONST HTStructuredClass *	isa;
+	const HTStructuredClass *	isa;
 	/* ... */
 };
 
 /*	Global Variables
 **	---------------------
 */
-PUBLIC int HTfileSortMethod = FILE_BY_NAME;
+int HTfileSortMethod = FILE_BY_NAME;
 
 #ifndef DISABLE_FTP /*This disables everything to end-of-file */
-PRIVATE char ThisYear[8];
-PRIVATE char LastYear[8];
-PRIVATE int TheDate;
-PRIVATE BOOLEAN HaveYears = FALSE;
+static char ThisYear[8];
+static char LastYear[8];
+static int TheDate;
+static BOOLEAN HaveYears = FALSE;
 
 /*	Module-Wide Variables
 **	---------------------
 */
-PRIVATE connection * connections = NULL;/* Linked list of connections */
-PRIVATE char response_text[LINE_LENGTH+1];/* Last response from ftp host */
-PRIVATE connection * control = NULL;	/* Current connection */
-PRIVATE int data_soc = -1;		/* Socket for data transfer =invalid */
-PRIVATE char *user_entered_password = NULL;
-PRIVATE char *last_username_and_host = NULL;
+static connection * connections = NULL;/* Linked list of connections */
+static char response_text[LINE_LENGTH+1];/* Last response from ftp host */
+static connection * control = NULL;	/* Current connection */
+static int data_soc = -1;		/* Socket for data transfer =invalid */
+static char *user_entered_password = NULL;
+static char *last_username_and_host = NULL;
 
 /*
  * ProFTPD 1.2.5rc1 is known to have a broken implementation of RETR.  If asked
@@ -142,7 +142,7 @@ PRIVATE char *last_username_and_host = NULL;
  * at some point - TD 2004/1/1.
  */
 #define BROKEN_PROFTPD 1
-PRIVATE int ProFTPD_bugs = FALSE;
+static int ProFTPD_bugs = FALSE;
 
 typedef enum {
 	GENERIC_SERVER
@@ -163,39 +163,39 @@ typedef enum {
 	, DLS_SERVER
 } eServerType;
 
-PRIVATE eServerType server_type = GENERIC_SERVER; /* the type of ftp host */
-PRIVATE int	unsure_type = FALSE;		/* sure about the type? */
-PRIVATE BOOLEAN use_list = FALSE;		/* use the LIST command? */
+static eServerType server_type = GENERIC_SERVER; /* the type of ftp host */
+static int	unsure_type = FALSE;		/* sure about the type? */
+static BOOLEAN use_list = FALSE;		/* use the LIST command? */
 
-PRIVATE int	interrupted_in_next_data_char = FALSE;
+static int	interrupted_in_next_data_char = FALSE;
 
 #ifdef POLL_PORTS
-PRIVATE PortNumber	port_number = FIRST_TCP_PORT;
+static PortNumber	port_number = FIRST_TCP_PORT;
 #endif /* POLL_PORTS */
 
-PRIVATE int	master_socket = -1;	/* Listening socket = invalid	*/
-PRIVATE char	port_command[255];	/* Command for setting the port */
-PRIVATE fd_set	open_sockets;		/* Mask of active channels */
-PRIVATE int	num_sockets;		/* Number of sockets to scan */
-PRIVATE PortNumber	passive_port;	/* Port server specified for data */
+static int	master_socket = -1;	/* Listening socket = invalid	*/
+static char	port_command[255];	/* Command for setting the port */
+static fd_set	open_sockets;		/* Mask of active channels */
+static int	num_sockets;		/* Number of sockets to scan */
+static PortNumber	passive_port;	/* Port server specified for data */
 
 
 #define NEXT_CHAR HTGetCharacter()	/* Use function in HTFormat.c */
 
 #define DATA_BUFFER_SIZE 2048
-PRIVATE char data_buffer[DATA_BUFFER_SIZE];		/* Input data buffer */
-PRIVATE char * data_read_pointer;
-PRIVATE char * data_write_pointer;
+static char data_buffer[DATA_BUFFER_SIZE];		/* Input data buffer */
+static char * data_read_pointer;
+static char * data_write_pointer;
 #define NEXT_DATA_CHAR next_data_char()
-PRIVATE int close_connection PARAMS((
-	connection *	con));
+static int close_connection (
+	connection *	con);
 
 
 #ifdef LY_FIND_LEAKS
 /*
 **  This function frees module globals. - FM
 */
-PRIVATE void free_FTPGlobals NOARGS
+static void free_FTPGlobals (void)
 {
     FREE(user_entered_password);
     FREE(last_username_and_host);
@@ -218,9 +218,9 @@ PRIVATE void free_FTPGlobals NOARGS
 **
 ** Bug: Returns pointer to static -- non-reentrant
 */
-PUBLIC char * HTVMS_name ARGS2(
-	CONST char *,	nn,
-	CONST char *,	fn)
+char * HTVMS_name (
+	const char *	nn,
+	const char *	fn)
 {
 
 /*	We try converting the filename into Files-11 syntax.  That is, we assume
@@ -236,15 +236,15 @@ PUBLIC char * HTVMS_name ARGS2(
     char *second;		/* 2nd slash */
     char *last;			/* last slash */
 
-    CONST char * hostname = HTHostName();
+    const char * hostname = HTHostName();
 
     if (!filename || !nodename)
 	outofmem(__FILE__, "HTVMSname");
     strcpy(filename, fn);
     strcpy(nodename, "");	/* On same node?  Yes if node names match */
     if (strncmp(nn, "localhost", 9)) {
-	CONST char *p;
-	CONST char *q;
+	const char *p;
+	const char *q;
 	for (p = hostname, q = nn;
 	     *p && *p != '.' && *q && *q != '.'; p++, q++){
 	    if (TOUPPER(*p) != TOUPPER(*q)) {
@@ -287,7 +287,7 @@ PUBLIC char * HTVMS_name ARGS2(
 /*	Procedure: Read a character from the data connection
 **	----------------------------------------------------
 */
-PRIVATE int next_data_char NOARGS
+static int next_data_char (void)
 {
     int status;
     if (data_read_pointer >= data_write_pointer) {
@@ -313,8 +313,8 @@ PRIVATE int next_data_char NOARGS
 /*	Close an individual connection
 **
 */
-PRIVATE int close_connection ARGS1(
-	connection *,	con)
+static int close_connection (
+	connection *	con)
 {
     connection * scan;
     int status;
@@ -344,15 +344,15 @@ PRIVATE int close_connection ARGS1(
     return -1;		/* very strange -- was not on list. */
 }
 
-PRIVATE char *help_message_buffer = NULL;  /* global :( */
+static char *help_message_buffer = NULL;  /* global :( */
 
-PRIVATE void init_help_message_cache NOARGS
+static void init_help_message_cache (void)
 {
     FREE(help_message_buffer);
 }
 
-PRIVATE void help_message_cache_add ARGS1(
-	char *,		string)
+static void help_message_cache_add (
+	char *		string)
 {
     if (help_message_buffer)
 	StrAllocCat(help_message_buffer, string);
@@ -362,12 +362,12 @@ PRIVATE void help_message_cache_add ARGS1(
     CTRACE((tfp,"Adding message to help cache: %s\n",string));
 }
 
-PRIVATE char *help_message_cache_non_empty NOARGS
+static char *help_message_cache_non_empty (void)
 {
   return(help_message_buffer);
 }
 
-PRIVATE char *help_message_cache_contents NOARGS
+static char *help_message_cache_contents (void)
 {
    return(help_message_buffer);
 }
@@ -389,8 +389,8 @@ PRIVATE char *help_message_cache_contents NOARGS
 **		  or negative for communication failure (in which case
 **		  the control connection will be closed).
 */
-PRIVATE int write_cmd ARGS1(
-	char *,		cmd)
+static int write_cmd (
+	char *		cmd)
 {
     int status;
 
@@ -441,8 +441,8 @@ PRIVATE int write_cmd ARGS1(
 **	returns:  The first digit of the reply type,
 **		  or negative for communication failure.
 */
-PRIVATE int response ARGS1(
-	char *,		cmd)
+static int response (
+	char *		cmd)
 {
     int result;				/* Three-digit decimal code */
     int continuation_response = -1;
@@ -529,7 +529,7 @@ PRIVATE int response ARGS1(
     return result/100;
 }
 
-PRIVATE int send_cmd_1 ARGS1(char *, verb)
+static int send_cmd_1 (char *  verb)
 {
     char command[80];
 
@@ -537,7 +537,7 @@ PRIVATE int send_cmd_1 ARGS1(char *, verb)
     return response (command);
 }
 
-PRIVATE int send_cmd_2 ARGS2(char *, verb, char *, param)
+static int send_cmd_2 (char *  verb, char *  param)
 {
     char *command = 0;
     int status;
@@ -555,8 +555,8 @@ PRIVATE int send_cmd_2 ARGS2(char *, verb, char *, param)
  *  This function should try to set the macintosh server into binary mode.
  *  Some servers need an additional letter after the MACB command.
  */
-PRIVATE int set_mac_binary ARGS1(
-	eServerType,	ServerType)
+static int set_mac_binary (
+	eServerType	ServerType)
 {
     /* try to set mac binary mode */
     if (ServerType == APPLESHARE_SERVER ||
@@ -574,9 +574,9 @@ PRIVATE int set_mac_binary ARGS1(
  * determine what kind of host it is
  */
 
-PRIVATE void get_ftp_pwd ARGS2(
-	eServerType *,	ServerType,
-	BOOLEAN *,	UseList)
+static void get_ftp_pwd (
+	eServerType *	ServerType,
+	BOOLEAN *	UseList)
 {
 
     char *cp;
@@ -629,9 +629,9 @@ PRIVATE void get_ftp_pwd ARGS2(
  * Windows NT servers.
  */
 
-PRIVATE void set_unix_dirstyle ARGS2(
-	eServerType *,	ServerType,
-	BOOLEAN *,	UseList)
+static void set_unix_dirstyle (
+	eServerType *	ServerType,
+	BOOLEAN *	UseList)
 {
 
     char *cp;
@@ -679,9 +679,9 @@ PRIVATE void set_unix_dirstyle ARGS2(
 **	It ensures that all connections are logged in if they exist.
 **	It ensures they have the port number transferred.
 */
-PRIVATE int get_connection ARGS2(
-	CONST char *,		arg,
-	HTParentAnchor *,	anchor)
+static int get_connection (
+	const char *		arg,
+	HTParentAnchor *	anchor)
 {
     int status;
     char * command = 0;
@@ -866,7 +866,7 @@ PRIVATE int get_connection ARGS2(
 	     * Create and send a mail address as the password. - FM
 	     */
 	    char *user = NULL;
-	    CONST char *host = NULL;
+	    const char *host = NULL;
 	    char * cp;
 
 	    if (personal_mail_address && *personal_mail_address) {
@@ -1051,7 +1051,7 @@ PRIVATE int get_connection ARGS2(
 **
 **
 */
-PRIVATE int close_master_socket NOARGS
+static int close_master_socket (void)
 {
     int status;
 
@@ -1081,7 +1081,7 @@ PRIVATE int close_master_socket NOARGS
 **	master_socket	is socket number if good, else negative.
 **	port_number	is valid if good.
 */
-PRIVATE int get_listen_socket NOARGS
+static int get_listen_socket (void)
 {
 #ifdef INET6
     struct sockaddr_storage soc_address;	/* Binary network address */
@@ -1331,7 +1331,7 @@ PRIVATE int get_listen_socket NOARGS
 
 } /* get_listen_socket */
 
-PRIVATE char * months[12] = {
+static char * months[12] = {
     "Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"
 };
 
@@ -1345,7 +1345,7 @@ PRIVATE char * months[12] = {
 **		be perfect, but the actual date isn't changed in the display,
 **		i.e., the date is still correct. - FM
 */
-PRIVATE void set_years_and_date NOARGS
+static void set_years_and_date (void)
 {
     char day[8], month[8], date[12];
     time_t NowTime;
@@ -1381,8 +1381,8 @@ typedef struct _EntryInfo {
     BOOLEAN	 display;  /* show this entry? */
 } EntryInfo;
 
-PRIVATE void free_entryinfo_struct_contents ARGS1(
-	EntryInfo *,	entry_info)
+static void free_entryinfo_struct_contents (
+	EntryInfo *	entry_info)
 {
     if (entry_info) {
 	FREE(entry_info->filename);
@@ -1400,8 +1400,8 @@ PRIVATE void free_entryinfo_struct_contents ARGS1(
  *		"Dec 12 1989  " or
  *		"FCv 23 1990  " ...
  */
-PRIVATE BOOLEAN is_ls_date ARGS1(
-	char *,		s)
+static BOOLEAN is_ls_date (
+	char *		s)
 {
     /* must start with three alpha characters */
     if (!isalpha(UCH(*s++)) || !isalpha(UCH(*s++)) || !isalpha(UCH(*s++)))
@@ -1469,9 +1469,9 @@ PRIVATE BOOLEAN is_ls_date ARGS1(
  *  parse_eplf_line() --
  *	Extract the name, size, and date from an EPLF line. - 08-06-96 DJB
  */
-PRIVATE void parse_eplf_line ARGS2(
-	char *,		line,
-	EntryInfo *,	info)
+static void parse_eplf_line (
+	char *		line,
+	EntryInfo *	info)
 {
     char *cp = line;
     char ct[26];
@@ -1526,9 +1526,9 @@ PRIVATE void parse_eplf_line ARGS2(
  * parse_ls_line() --
  *	Extract the name, size, and date from an ls -l line.
  */
-PRIVATE void parse_ls_line ARGS2(
-	char *,		line,
-	EntryInfo *,	entry_info)
+static void parse_ls_line (
+	char *		line,
+	EntryInfo *	entry_info)
 {
     int    i, j;
     int    base=1;
@@ -1565,10 +1565,10 @@ PRIVATE void parse_ls_line ARGS2(
  *	Extract the name and size info and whether it refers to a
  *      directory from a LIST line in "dls" format.
  */
-PRIVATE void parse_dls_line ARGS3(
-	char *,		line,
-	EntryInfo *,	entry_info,
-	char **,	pspilledname)
+static void parse_dls_line (
+	char *		line,
+	EntryInfo *	entry_info,
+	char **	pspilledname)
 {
     short  j;
     int    base=1;
@@ -1670,9 +1670,9 @@ PRIVATE void parse_dls_line ARGS3(
  *	Format the name, date, and size from a VMS LIST line
  *	into the EntryInfo structure - FM
  */
-PRIVATE void parse_vms_dir_entry ARGS2(
-	char *,		line,
-	EntryInfo *,	entry_info)
+static void parse_vms_dir_entry (
+	char *		line,
+	EntryInfo *	entry_info)
 {
     int i, j;
     unsigned int ialloc;
@@ -1809,9 +1809,9 @@ PRIVATE void parse_vms_dir_entry ARGS2(
  *	Format the name, date, and size from an MS_WINDOWS LIST line into
  *	the EntryInfo structure (assumes Chameleon NEWT format). - FM
  */
-PRIVATE void parse_ms_windows_dir_entry ARGS2(
-	char *,		line,
-	EntryInfo *,	entry_info)
+static void parse_ms_windows_dir_entry (
+	char *		line,
+	EntryInfo *	entry_info)
 {
     char *cp = line;
     char *cps, *cpd, date[16];
@@ -1883,9 +1883,9 @@ PRIVATE void parse_ms_windows_dir_entry ARGS2(
  *	the EntryInfo structure (assumes Chameleon NEWT format). - FM
  */
 #ifdef NOTDEFINED
-PRIVATE void parse_windows_nt_dir_entry ARGS2(
-	char *,		line,
-	EntryInfo *,	entry_info)
+static void parse_windows_nt_dir_entry (
+	char *		line,
+	EntryInfo *	entry_info)
 {
     char *cp = line;
     char *cps, *cpd, date[16];
@@ -1992,9 +1992,9 @@ PRIVATE void parse_windows_nt_dir_entry ARGS2(
  *	Format the name, date, and size from a VM/CMS line into
  *	the EntryInfo structure. - FM
  */
-PRIVATE void parse_cms_dir_entry ARGS2(
-	char *,		line,
-	EntryInfo *,	entry_info)
+static void parse_cms_dir_entry (
+	char *		line,
+	EntryInfo *	entry_info)
 {
     char *cp = line;
     char *cps, *cpd, date[16];
@@ -2135,10 +2135,10 @@ PRIVATE void parse_cms_dir_entry ARGS2(
  *	If first is true, this is the first name in a directory.
  */
 
-PRIVATE EntryInfo * parse_dir_entry ARGS3(
-	char *,		entry,
-	BOOLEAN *,	first,
-	char **,	pspilledname)
+static EntryInfo * parse_dir_entry (
+	char *		entry,
+	BOOLEAN *	first,
+	char **	pspilledname)
 {
     EntryInfo *entry_info;
     int  i;
@@ -2435,7 +2435,7 @@ PRIVATE EntryInfo * parse_dir_entry ARGS3(
     **	Get real types eventually.
     */
     if (!entry_info->type) {
-	CONST char *cp2;
+	const char *cp2;
 	HTFormat format;
 	HTAtom * encoding;  /* @@ not used at all */
 	format = HTFileFormat(entry_info->filename, &encoding, &cp2);
@@ -2456,9 +2456,9 @@ PRIVATE EntryInfo * parse_dir_entry ARGS3(
     return(entry_info);
 } /* parse_dir_entry */
 
-PRIVATE int compare_EntryInfo_structs ARGS2(
-	EntryInfo *,	entry1,
-	EntryInfo *,	entry2)
+static int compare_EntryInfo_structs (
+	EntryInfo *	entry1,
+	EntryInfo *	entry2)
 {
     int i, status;
     char date1[16], date2[16], time1[8], time2[8], month[4];
@@ -2599,11 +2599,11 @@ PRIVATE int compare_EntryInfo_structs ARGS2(
 **	returns		HT_LOADED if OK
 **			<0 if error.
 */
-PRIVATE int read_directory ARGS4(
-	HTParentAnchor *,	parent,
-	CONST char *,		address,
-	HTFormat,		format_out,
-	HTStream *,		sink)
+static int read_directory (
+	HTParentAnchor *	parent,
+	const char *		address,
+	HTFormat		format_out,
+	HTStream *		sink)
 {
     int status;
     BOOLEAN WasInterrupted = FALSE;
@@ -2922,9 +2922,9 @@ unload_btree:
 /*
  * Setup an FTP connection.
  */
-PRIVATE int setup_connection ARGS2(
-	CONST char *,		name,
-	HTParentAnchor *,	anchor)
+static int setup_connection (
+	const char *		name,
+	HTParentAnchor *	anchor)
 {
     int retry;			/* How many times tried? */
     int status;
@@ -3103,11 +3103,11 @@ PRIVATE int setup_connection ARGS2(
 **	returns		Socket number for file if good.
 **			<0 if bad.
 */
-PUBLIC int HTFTPLoad ARGS4(
-	CONST char *,		name,
-	HTParentAnchor *,	anchor,
-	HTFormat,		format_out,
-	HTStream *,		sink)
+int HTFTPLoad (
+	const char *		name,
+	HTParentAnchor *	anchor,
+	HTFormat		format_out,
+	HTStream *		sink)
 {
     BOOL isDirectory = NO;
     HTAtom * encoding = NULL;
@@ -3797,7 +3797,7 @@ listen:
 **  This function frees any user entered password, so that
 **  it must be entered again for a future request. - FM
 */
-PUBLIC void HTClearFTPPassword NOARGS
+void HTClearFTPPassword (void)
 {
     /*
     **	Need code to check cached documents from
diff --git a/WWW/Library/Implementation/HTFTP.h b/WWW/Library/Implementation/HTFTP.h
index cda35834..6036e266 100644
--- a/WWW/Library/Implementation/HTFTP.h
+++ b/WWW/Library/Implementation/HTFTP.h
@@ -32,9 +32,9 @@ extern int HTfileSortMethod;  /* specifies the method of sorting */
 **
 ** Bug:	Returns pointer to static -- non-reentrant
 */
-PUBLIC char * HTVMS_name PARAMS((
-	CONST char * nn,
-	CONST char * fn));
+extern char * HTVMS_name (
+	const char * nn,
+	const char * fn);
 
 
 /*
@@ -46,25 +46,25 @@ Retrieve File from Server
   returns                 Socket number for file if good.<0 if bad.
 
  */
-extern int HTFTPLoad PARAMS
-((
-  CONST char *          name,
+extern int HTFTPLoad 
+(
+  const char *          name,
   HTParentAnchor *      anchor,
   HTFormat              format_out,
   HTStream*             sink
-));
+);
 
 /*
 **  This function frees any user entered password, so that
 **  it must be entered again for a future request. - FM
 */
-extern void HTClearFTPPassword NOPARAMS;
+extern void HTClearFTPPassword (void);
 
 /*
 
 Return Host Name
 
  */
-extern CONST char * HTHostName NOPARAMS;
+extern const char * HTHostName (void);
 
 #endif
diff --git a/WWW/Library/Implementation/HTFWriter.c b/WWW/Library/Implementation/HTFWriter.c
index b7b8ac17..2f398f84 100644
--- a/WWW/Library/Implementation/HTFWriter.c
+++ b/WWW/Library/Implementation/HTFWriter.c
@@ -24,7 +24,7 @@
 */
 
 struct _HTStream {
-	CONST HTStreamClass *	isa;
+	const HTStreamClass *	isa;
 
 	FILE *			fp;
 	char *			end_command;
@@ -41,22 +41,22 @@ struct _HTStream {
 **	who wanst a black hole.  These black holes don't radiate,
 **	they just absorb data.
 */
-PRIVATE void HTBlackHole_put_character ARGS2(HTStream *, me, char, c)
+static void HTBlackHole_put_character (HTStream * me, char c)
 {}
-PRIVATE void HTBlackHole_put_string ARGS2(HTStream *, me, CONST char*, s)
+static void HTBlackHole_put_string (HTStream * me, const char* s)
 {}
-PRIVATE void HTBlackHole_write ARGS3(HTStream *, me, CONST char*, s, int, l)
+static void HTBlackHole_write (HTStream * me, const char* s, int l)
 {}
-PRIVATE void HTBlackHole_free ARGS1(HTStream *, me)
+static void HTBlackHole_free (HTStream * me)
 {}
-PRIVATE void HTBlackHole_abort ARGS2(HTStream *, me, HTError, e)
+static void HTBlackHole_abort (HTStream * me, HTError e)
 {}
 
 
 /*	Black Hole stream
 **	-----------------
 */
-PRIVATE CONST HTStreamClass HTBlackHoleClass =
+static const HTStreamClass HTBlackHoleClass =
 {
 	"BlackHole",
 	HTBlackHole_free,
@@ -65,7 +65,7 @@ PRIVATE CONST HTStreamClass HTBlackHoleClass =
 	HTBlackHole_write
 };
 
-PRIVATE HTStream HTBlackHoleInstance =
+static HTStream HTBlackHoleInstance =
 {
 	&HTBlackHoleClass,
 	NULL,
@@ -76,7 +76,7 @@ PRIVATE HTStream HTBlackHoleInstance =
 
 /*	Black hole craetion
 */
-PUBLIC HTStream * HTBlackHole NOARGS
+HTStream * HTBlackHole (void)
 {
     return &HTBlackHoleInstance;
 }
@@ -93,7 +93,7 @@ PUBLIC HTStream * HTBlackHole NOARGS
 **	------------------
 */
 
-PRIVATE void HTFWriter_put_character ARGS2(HTStream *, me, char, c)
+static void HTFWriter_put_character (HTStream * me, char c)
 {
     putc(c, me->fp);
 }
@@ -105,7 +105,7 @@ PRIVATE void HTFWriter_put_character ARGS2(HTStream *, me, char, c)
 **
 **	Strings must be smaller than this buffer size.
 */
-PRIVATE void HTFWriter_put_string ARGS2(HTStream *, me, CONST char*, s)
+static void HTFWriter_put_string (HTStream * me, const char* s)
 {
     fputs(s, me->fp);
 }
@@ -114,7 +114,7 @@ PRIVATE void HTFWriter_put_string ARGS2(HTStream *, me, CONST char*, s)
 /*	Buffer write.  Buffers can (and should!) be big.
 **	------------
 */
-PRIVATE void HTFWriter_write ARGS3(HTStream *, me, CONST char*, s, int, l)
+static void HTFWriter_write (HTStream * me, const char* s, int l)
 {
     fwrite(s, 1, l, me->fp);
 }
@@ -129,7 +129,7 @@ PRIVATE void HTFWriter_write ARGS3(HTStream *, me, CONST char*, s, int, l)
 **	object is not,
 **	as it takes on an existence of its own unless explicitly freed.
 */
-PRIVATE void HTFWriter_free ARGS1(HTStream *, me)
+static void HTFWriter_free (HTStream * me)
 {
     fclose(me->fp);
     if (me->end_command) {		/* Temp file */
@@ -148,7 +148,7 @@ PRIVATE void HTFWriter_free ARGS1(HTStream *, me)
 /*	End writing
 */
 
-PRIVATE void HTFWriter_abort ARGS2(HTStream *, me, HTError, e)
+static void HTFWriter_abort (HTStream * me, HTError e)
 {
     fclose(me->fp);
     if (me->end_command) {		/* Temp file */
@@ -168,7 +168,7 @@ PRIVATE void HTFWriter_abort ARGS2(HTStream *, me, HTError, e)
 /*	Structured Object Class
 **	-----------------------
 */
-PRIVATE CONST HTStreamClass HTFWriter = /* As opposed to print etc */
+static const HTStreamClass HTFWriter = /* As opposed to print etc */
 {
 	"FileWriter",
 	HTFWriter_free,
@@ -182,7 +182,7 @@ PRIVATE CONST HTStreamClass HTFWriter = /* As opposed to print etc */
 **	-------------------------
 */
 
-PUBLIC HTStream* HTFWriter_new ARGS1(FILE *, fp)
+HTStream* HTFWriter_new (FILE * fp)
 {
     HTStream* me;
 
@@ -218,10 +218,10 @@ PUBLIC HTStream* HTFWriter_new ARGS1(FILE *, fp)
 **	in case the application is fussy, or so that a generic opener can
 **	be used.
 */
-PUBLIC HTStream* HTSaveAndExecute ARGS3(
-	HTPresentation *,	pres,
-	HTParentAnchor *,	anchor,	/* Not used */
-	HTStream *,		sink)	/* Not used */
+HTStream* HTSaveAndExecute (
+	HTPresentation *	pres,
+	HTParentAnchor *	anchor,	/* Not used */
+	HTStream *		sink)	/* Not used */
 
 #ifdef UNIX
 #define REMOVE_COMMAND "/bin/rm -f %s\n"
@@ -233,7 +233,7 @@ PUBLIC HTStream* HTSaveAndExecute ARGS3(
 #ifdef REMOVE_COMMAND
 {
     char *fnam;
-    CONST char * suffix;
+    const char * suffix;
 
     HTStream* me;
 
@@ -294,15 +294,15 @@ PUBLIC HTStream* HTSaveAndExecute ARGS3(
 **	GUI Apps should open local Save panel here really.
 **
 */
-PUBLIC HTStream* HTSaveLocally ARGS3(
-	HTPresentation *,	pres,
-	HTParentAnchor *,	anchor,	/* Not used */
-	HTStream *,		sink)	/* Not used */
+HTStream* HTSaveLocally (
+	HTPresentation *	pres,
+	HTParentAnchor *	anchor,	/* Not used */
+	HTStream *		sink)	/* Not used */
 
 {
     char *fnam;
     char *answer;
-    CONST char * suffix;
+    const char * suffix;
 
     HTStream* me;
 
diff --git a/WWW/Library/Implementation/HTFWriter.h b/WWW/Library/Implementation/HTFWriter.h
index 04acfb18..563644b1 100644
--- a/WWW/Library/Implementation/HTFWriter.h
+++ b/WWW/Library/Implementation/HTFWriter.h
@@ -11,16 +11,16 @@
 #include <HTStream.h>
 #include <HTFormat.h>
 
-extern HTStream * HTFWriter_new PARAMS((FILE * fp));
+extern HTStream * HTFWriter_new (FILE * fp);
 
-extern HTStream * HTSaveAndExecute PARAMS((
+extern HTStream * HTSaveAndExecute (
         HTPresentation *        pres,
         HTParentAnchor *        anchor, /* Not used */
-        HTStream *              sink));
+        HTStream *              sink);
 
-extern HTStream * HTSaveLocally PARAMS((
+extern HTStream * HTSaveLocally (
         HTPresentation *        pres,
         HTParentAnchor *        anchor, /* Not used */
-        HTStream *              sink));
+        HTStream *              sink);
 
 #endif /* HTFWRITE_H */
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index 98353450..6a4646f2 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -114,48 +114,48 @@ typedef struct {
 #define ABORT_TARGET (*targetClass._abort)(target, NULL);
 
 struct _HTStructured {
-	CONST HTStructuredClass *	isa;
+	const HTStructuredClass *	isa;
 	/* ... */
 };
 
 /*
 **  Controlling globals.
 */
-PUBLIC int HTDirAccess = HT_DIR_OK;
+int HTDirAccess = HT_DIR_OK;
 
 #ifdef DIRED_SUPPORT
-PUBLIC int HTDirReadme = HT_DIR_README_NONE;
+int HTDirReadme = HT_DIR_README_NONE;
 #else
-PUBLIC int HTDirReadme = HT_DIR_README_TOP;
+int HTDirReadme = HT_DIR_README_TOP;
 #endif /* DIRED_SUPPORT */
 
-PRIVATE char *HTMountRoot = "/Net/";		/* Where to find mounts */
+static char *HTMountRoot = "/Net/";		/* Where to find mounts */
 #ifdef VMS
-PRIVATE char *HTCacheRoot = "/WWW$SCRATCH";	/* Where to cache things */
+static char *HTCacheRoot = "/WWW$SCRATCH";	/* Where to cache things */
 #else
-PRIVATE char *HTCacheRoot = "/tmp/W3_Cache_";	/* Where to cache things */
+static char *HTCacheRoot = "/tmp/W3_Cache_";	/* Where to cache things */
 #endif /* VMS */
 
 /*
 **  Suffix registration.
 */
-PRIVATE HTList * HTSuffixes = 0;
-PRIVATE HTSuffix no_suffix = { "*", NULL, NULL, NULL, 1.0 };
-PRIVATE HTSuffix unknown_suffix = { "*.*", NULL, NULL, NULL, 1.0};
+static HTList * HTSuffixes = 0;
+static HTSuffix no_suffix = { "*", NULL, NULL, NULL, 1.0 };
+static HTSuffix unknown_suffix = { "*.*", NULL, NULL, NULL, 1.0};
 
 
 /*	To free up the suffixes at program exit.
 **	----------------------------------------
 */
 #ifdef LY_FIND_LEAKS
-PRIVATE void free_suffixes NOPARAMS;
+static void free_suffixes (void);
 #endif
 
 #ifdef LONG_LIST
-PRIVATE char *FormatStr ARGS3(
-    char **,	bufp,
-    char *,	start,
-    CONST char *,	entry)
+static char *FormatStr (
+    char **	bufp,
+    char *	start,
+    const char *	entry)
 {
     char fmt[512];
     if (*start) {
@@ -169,10 +169,10 @@ PRIVATE char *FormatStr ARGS3(
     return *bufp;
 }
 
-PRIVATE char *FormatNum ARGS3(
-    char **,	bufp,
-    char *,	start,
-    int,	entry)
+static char *FormatNum (
+    char **	bufp,
+    char *	start,
+    int	entry)
 {
     char fmt[512];
     if (*start) {
@@ -185,12 +185,12 @@ PRIVATE char *FormatNum ARGS3(
     return *bufp;
 }
 
-PRIVATE void LYListFmtParse ARGS5(
-	char *,		fmtstr,
-	DIRED *,	data,
-	char *,		file,
-	HTStructured *, target,
-	char *,		tail)
+static void LYListFmtParse (
+	char *		fmtstr,
+	DIRED *	data,
+	char *		file,
+	HTStructured * target,
+	char *		tail)
 {
 	char c;
 	char *s;
@@ -296,7 +296,7 @@ PRIVATE void LYListFmtParse ARGS5(
 			    FormatStr(&buf, start, "");
 			}
 		    } else {
-			CONST char *cp2;
+			const char *cp2;
 			HTFormat format;
 			format = HTFileFormat(file, NULL, &cp2);
 
@@ -451,12 +451,12 @@ PRIVATE void LYListFmtParse ARGS5(
 **	If filename suffix is already defined with the same encoding
 **	its previous definition is overridden.
 */
-PUBLIC void HTSetSuffix5 ARGS5(
-	CONST char *,	suffix,
-	CONST char *,	representation,
-	CONST char *,	encoding,
-	CONST char *,	desc,
-	double,		value)
+void HTSetSuffix5 (
+	const char *	suffix,
+	const char *	representation,
+	const char *	encoding,
+	const char *	desc,
+	double		value)
 {
     HTSuffix * suff;
     BOOL trivial_enc = (BOOL) IsUnityEncStr(encoding);
@@ -522,7 +522,7 @@ PUBLIC void HTSetSuffix5 ARGS5(
 **	Revision History:
 **		05-28-94	created Lynx 2-3-1 Garrett Arch Blythe
 */
-PRIVATE void free_suffixes NOARGS
+static void free_suffixes (void)
 {
     HTSuffix * suff = NULL;
 
@@ -557,8 +557,8 @@ PRIVATE void free_suffixes NOARGS
 **  On exit:
 **	Returns a malloc'ed string which must be freed by the caller.
 */
-PUBLIC char * HTCacheFileName ARGS1(
-	CONST char *,	name)
+char * HTCacheFileName (
+	const char *	name)
 {
     char * acc_method = HTParse(name, "", PARSE_ACCESS);
     char * host = HTParse(name, "", PARSE_HOST);
@@ -577,7 +577,7 @@ PUBLIC char * HTCacheFileName ARGS1(
 **	-----------------------------------------
 */
 #ifdef NOT_IMPLEMENTED
-PRIVATE int HTCreatePath ARGS1(CONST char *,path)
+static int HTCreatePath (const char * path)
 {
     return -1;
 }
@@ -593,10 +593,10 @@ PRIVATE int HTCreatePath ARGS1(CONST char *,path)
 **  On exit:
 **	Returns a malloc'ed string which must be freed by the caller.
 */
-PUBLIC char * HTURLPath_toFile ARGS3(
-	CONST char *,	name,
-	BOOL,		expand_all,
-	BOOL,		is_remote GCC_UNUSED)
+char * HTURLPath_toFile (
+	const char *	name,
+	BOOL		expand_all,
+	BOOL		is_remote GCC_UNUSED)
 {
     char * path = NULL;
     char * result = NULL;
@@ -633,10 +633,10 @@ PUBLIC char * HTURLPath_toFile ARGS3(
 	 this function will return the wrong thing for some unusual
 	 paths (like ones containing "//", possibly escaped). - kw
 */
-PUBLIC char * HTnameOfFile_WWW ARGS3(
-	CONST char *,	name,
-	BOOL,		WWW_prefix,
-	BOOL,		expand_all)
+char * HTnameOfFile_WWW (
+	const char *	name,
+	BOOL		WWW_prefix,
+	BOOL		expand_all)
 {
     char * acc_method = HTParse(name, "", PARSE_ACCESS);
     char * host = HTParse(name, "", PARSE_HOST);
@@ -699,8 +699,8 @@ PUBLIC char * HTnameOfFile_WWW ARGS3(
 **	in and valid for the NeXT only.  This should be configurable in
 **	the general case.
 */
-PUBLIC char * WWW_nameOfFile ARGS1(
-	CONST char *,	name)
+char * WWW_nameOfFile (
+	const char *	name)
 {
     char * result = NULL;
 #ifdef NeXT
@@ -728,9 +728,9 @@ PUBLIC char * WWW_nameOfFile ARGS1(
 **	Returns a pointer to a suitable suffix string if one has been
 **	found, else "".
 */
-PUBLIC CONST char * HTFileSuffix ARGS2(
-	HTAtom*,	rep,
-	CONST char *,	enc)
+const char * HTFileSuffix (
+	HTAtom*	rep,
+	const char *	enc)
 {
     HTSuffix * suff;
 #ifdef FNAMES_8_3
@@ -796,10 +796,10 @@ PUBLIC CONST char * HTFileSuffix ARGS2(
 **
 **	It will handle for example  x.txt, x.txt,Z, x.Z
 */
-PUBLIC HTFormat HTFileFormat ARGS3(
-	CONST char *,	filename,
-	HTAtom **,	pencoding,
-	CONST char**,	pdesc)
+HTFormat HTFileFormat (
+	const char *	filename,
+	HTAtom **	pencoding,
+	const char**	pdesc)
 {
     HTSuffix * suff;
     int n;
@@ -904,10 +904,10 @@ PUBLIC HTFormat HTFileFormat ARGS3(
 **	indicated, sets Lynx up for proper handling in relation
 **	to the currently selected character set. - FM
 */
-PUBLIC HTFormat HTCharsetFormat ARGS3(
-	HTFormat,		format,
-	HTParentAnchor *,	anchor,
-	int,			default_LYhndl)
+HTFormat HTCharsetFormat (
+	HTFormat		format,
+	HTParentAnchor *	anchor,
+	int			default_LYhndl)
 {
     char *cp = NULL, *cp1, *cp2, *cp3 = NULL, *cp4;
     BOOL chartrans_ok = FALSE;
@@ -1088,21 +1088,21 @@ PUBLIC HTFormat HTCharsetFormat ARGS3(
 **  through HTuncache_current_document or at the next document load.
 **  - kw
 */
-PUBLIC void LYGetFileInfo ARGS7(
-	CONST char *,		filename,
-	HTParentAnchor **,	pfile_anchor,
-	HTFormat *,		pformat,
-	HTAtom **,		pencoding,
-	CONST char**,		pdesc,
-	CONST char**,		pcharset,
-	int *,			pfile_cs)
+void LYGetFileInfo (
+	const char *		filename,
+	HTParentAnchor **	pfile_anchor,
+	HTFormat *		pformat,
+	HTAtom **		pencoding,
+	const char**		pdesc,
+	const char**		pcharset,
+	int *			pfile_cs)
 {
 	char *Afn;
 	char *Aname = NULL;
 	HTFormat format;
 	HTAtom * myEnc = NULL;
 	HTParentAnchor *file_anchor;
-	CONST char *file_csname;
+	const char *file_csname;
 	int file_cs;
 
 	/*
@@ -1149,8 +1149,8 @@ PUBLIC void LYGetFileInfo ARGS7(
 **	-------------------------------
 **
 */
-PUBLIC float HTFileValue ARGS1(
-	CONST char *,	filename)
+float HTFileValue (
+	const char *	filename)
 {
     HTSuffix * suff;
     int n;
@@ -1179,10 +1179,10 @@ PUBLIC float HTFileValue ARGS1(
 **  Determine compression type from file name, by looking at its suffix.
 **  Sets as side-effect a pointer to the "dot" that begins the suffix.
 */
-PUBLIC CompressFileType HTCompressFileType ARGS3(
-	char *,		filename,
-	char *,		dots,
-	char **,	suffix)
+CompressFileType HTCompressFileType (
+	char *		filename,
+	char *		dots,
+	char **	suffix)
 {
     CompressFileType result = cftNone;
     size_t len = strlen(filename);
@@ -1221,8 +1221,8 @@ PUBLIC CompressFileType HTCompressFileType ARGS3(
 **	1.	No code for non-unix systems.
 **	2.	Isn't there a quicker way?
 */
-PUBLIC BOOL HTEditable ARGS1(
-	CONST char *,	filename)
+BOOL HTEditable (
+	const char *	filename)
 {
 #ifndef NO_GROUPS
     GETGROUPS_T groups[NGROUPS];
@@ -1276,10 +1276,10 @@ PUBLIC BOOL HTEditable ARGS1(
 **	The stream must be used for writing back the file.
 **	@@@ no backup done
 */
-PUBLIC HTStream * HTFileSaveStream ARGS1(
-	HTParentAnchor *,	anchor)
+HTStream * HTFileSaveStream (
+	HTParentAnchor *	anchor)
 {
-    CONST char * addr = anchor->address;
+    const char * addr = anchor->address;
     char * localname = HTLocalName(addr);
     FILE * fp = fopen(localname, BIN_W);
 
@@ -1293,10 +1293,10 @@ PUBLIC HTStream * HTFileSaveStream ARGS1(
 /*	Output one directory entry.
 **	---------------------------
 */
-PUBLIC void HTDirEntry ARGS3(
-	HTStructured *, target,
-	CONST char *,	tail,
-	CONST char *,	entry)
+void HTDirEntry (
+	HTStructured * target,
+	const char *	tail,
+	const char *	entry)
 {
     char * relative = NULL;
     char * stripped = NULL;
@@ -1350,12 +1350,12 @@ PUBLIC void HTDirEntry ARGS3(
 **	calling function should use LYListFmtParse() to create a link
 **	to the parent directory.  Otherwise, it returns FALSE. - FM
 */
-PUBLIC BOOL HTDirTitles ARGS3(
-	HTStructured *, target,
-	HTParentAnchor *, anchor,
-	BOOL,		tildeIsTop)
+BOOL HTDirTitles (
+	HTStructured * target,
+	HTParentAnchor * anchor,
+	BOOL		tildeIsTop)
 {
-    CONST char * logical = anchor->address;
+    const char * logical = anchor->address;
     char * path = HTParse(logical, "", PARSE_PATH + PARSE_PUNCTUATION);
     char * current;
     char * cp = NULL;
@@ -1578,7 +1578,7 @@ PUBLIC BOOL HTDirTitles ARGS3(
 **
 **  If a README file exists, then it is inserted into the document here.
 */
-PRIVATE void do_readme ARGS2(HTStructured *, target, CONST char *, localname)
+static void do_readme (HTStructured *  target, const char *  localname)
 {
     FILE * fp;
     char * readme_file_name = NULL;
@@ -1609,7 +1609,7 @@ PRIVATE void do_readme ARGS2(HTStructured *, target, CONST char *, localname)
 #define NM_cmp(a,b) ((a) < (b) ? -1 : ((a) > (b) ? 1 : 0))
 
 #if defined(LONG_LIST) && defined(DIRED_SUPPORT)
-PRIVATE char *file_type ARGS1(char *, path)
+static char *file_type (char *  path)
 {
     char *type;
     while (*path == '.')
@@ -1621,7 +1621,7 @@ PRIVATE char *file_type ARGS1(char *, path)
 }
 #endif /* LONG_LIST && DIRED_SUPPORT */
 
-PRIVATE int dired_cmp ARGS2(void *, a, void *, b)
+static int dired_cmp (void *  a, void *  b)
 {
     DIRED *p = (DIRED *)a;
     DIRED *q = (DIRED *)b;
@@ -1665,12 +1665,12 @@ PRIVATE int dired_cmp ARGS2(void *, a, void *, b)
     return code;
 }
 
-PRIVATE int print_local_dir ARGS5(
-	DIR  *,			dp,
-	char *,			localname,
-	HTParentAnchor *,	anchor,
-	HTFormat,		format_out,
-	HTStream *,		sink)
+static int print_local_dir (
+	DIR  *			dp,
+	char *			localname,
+	HTParentAnchor *	anchor,
+	HTFormat		format_out,
+	HTStream *		sink)
 {
     HTStructured *target;	/* HTML object */
     HTStructuredClass targetClass;
@@ -2020,9 +2020,9 @@ PRIVATE int print_local_dir ARGS5(
 
 
 #ifndef VMS
-PUBLIC int HTStat ARGS2(
-	CONST char *,	filename,
-	struct stat *,	data)
+int HTStat (
+	const char *	filename,
+	struct stat *	data)
 {
     int result = -1;
     size_t len = strlen(filename);
@@ -2062,11 +2062,11 @@ PUBLIC int HTStat ARGS2(
 **			HTLOADED	OK
 **
 */
-PUBLIC int HTLoadFile ARGS4(
-	CONST char *,		addr,
-	HTParentAnchor *,	anchor,
-	HTFormat,		format_out,
-	HTStream *,		sink)
+int HTLoadFile (
+	const char *		addr,
+	HTParentAnchor *	anchor,
+	HTFormat		format_out,
+	HTStream *		sink)
 {
     char * filename = NULL;
     char * acc_method = NULL;
@@ -2860,15 +2860,15 @@ PUBLIC int HTLoadFile ARGS4(
     }
 }
 
-static CONST char *program_paths[pp_Last];
+static const char *program_paths[pp_Last];
 
 /*
  * Given a program number, return its path
  */
-PUBLIC CONST char * HTGetProgramPath ARGS1(
-	ProgramPaths,	code)
+const char * HTGetProgramPath (
+	ProgramPaths	code)
 {
-    CONST char *result = NULL;
+    const char *result = NULL;
     if (code > ppUnknown && code < pp_Last)
 	result = program_paths[code];
     return result;
@@ -2878,9 +2878,9 @@ PUBLIC CONST char * HTGetProgramPath ARGS1(
  * Store a program's path.  The caller must allocate the string used for 'path',
  * since HTInitProgramPaths() may free it.
  */
-PUBLIC void HTSetProgramPath ARGS2(
-	ProgramPaths,	code,
-	CONST char *,	path)
+void HTSetProgramPath (
+	ProgramPaths	code,
+	const char *	path)
 {
     if (code > ppUnknown && code < pp_Last) {
 	program_paths[code] = isEmpty(path) ? 0 : path;
@@ -2890,11 +2890,11 @@ PUBLIC void HTSetProgramPath ARGS2(
 /*
  * Reset the list of known program paths to the ones that are compiled-in
  */
-PUBLIC void HTInitProgramPaths NOARGS
+void HTInitProgramPaths (void)
 {
     int code;
-    CONST char *path;
-    CONST char *test;
+    const char *path;
+    const char *test;
 
     for (code = (int) ppUnknown + 1; code < (int) pp_Last; ++code) {
 	switch (code) {
@@ -3024,6 +3024,6 @@ GLOBALDEF (HTProtocol,HTFTP,_HTFILE_C_1_INIT);
 #define _HTFILE_C_2_INIT { "file", HTLoadFile, HTFileSaveStream }
 GLOBALDEF (HTProtocol,HTFile,_HTFILE_C_2_INIT);
 #else
-GLOBALDEF PUBLIC HTProtocol HTFTP  = { "ftp", HTLoadFile, 0 };
-GLOBALDEF PUBLIC HTProtocol HTFile = { "file", HTLoadFile, HTFileSaveStream };
+GLOBALDEF HTProtocol HTFTP  = { "ftp", HTLoadFile, 0 };
+GLOBALDEF HTProtocol HTFile = { "file", HTLoadFile, HTFileSaveStream };
 #endif /* GLOBALDEF_IS_MACRO */
diff --git a/WWW/Library/Implementation/HTFile.h b/WWW/Library/Implementation/HTFile.h
index 976e18b0..c44ba1e2 100644
--- a/WWW/Library/Implementation/HTFile.h
+++ b/WWW/Library/Implementation/HTFile.h
@@ -42,8 +42,8 @@ extern int HTDirReadme;         /* Include readme files in listing? */
 /*
 **  Convert filenames between local and WWW formats
 */
-extern char * HTURLPath_toFile PARAMS((CONST char * name, BOOL expand_all, BOOL is_remote));
-extern char * HTnameOfFile_WWW PARAMS((CONST char * name, BOOL WWW_prefix, BOOL expand_all));
+extern char * HTURLPath_toFile (const char * name, BOOL expand_all, BOOL is_remote);
+extern char * HTnameOfFile_WWW (const char * name, BOOL WWW_prefix, BOOL expand_all);
 #define HTLocalName(name)      HTnameOfFile_WWW(name,TRUE,TRUE)
 #define HTfullURL_toFile(name) HTnameOfFile_WWW(name,FALSE,TRUE)
 #define HTpartURL_toFile(name) HTnameOfFile_WWW(name,FALSE,FALSE)
@@ -51,12 +51,12 @@ extern char * HTnameOfFile_WWW PARAMS((CONST char * name, BOOL WWW_prefix, BOOL
 /*
 **  Make a WWW name from a full local path name
 */
-extern char * WWW_nameOfFile PARAMS((CONST char * name));
+extern char * WWW_nameOfFile (const char * name);
 
 /*
 **  Generate the name of a cache file
 */
-extern char * HTCacheFileName PARAMS((CONST char * name));
+extern char * HTCacheFileName (const char * name);
 
 /*
 **  Output directory titles
@@ -67,26 +67,26 @@ extern char * HTCacheFileName PARAMS((CONST char * name));
 ** changed to return TRUE if parent directory link was generated,
 ** FALSE otherwise - KW
 */
-extern BOOL HTDirTitles PARAMS((
+extern BOOL HTDirTitles (
         HTStructured *  target,
         HTParentAnchor* anchor,
-	BOOL		tildeIsTop));
+	BOOL		tildeIsTop);
 
 /*
 **	Check existence.
 */
-extern int HTStat PARAMS((
-	CONST char *	filename,
-	struct stat *	data));
+extern int HTStat (
+	const char *	filename,
+	struct stat *	data);
 
 /*	Load a document.
 **	----------------
 */
-extern int HTLoadFile PARAMS((
-	CONST char *		addr,
+extern int HTLoadFile (
+	const char *		addr,
 	HTParentAnchor *	anchor,
 	HTFormat		format_out,
-	HTStream *		sink));
+	HTStream *		sink);
 
 /*
 **  Output a directory entry
@@ -94,10 +94,10 @@ extern int HTLoadFile PARAMS((
 ** This is used by HTFTP.c for example -- it is a common routine for
 **  generating a linked directory entry.
 */
-extern void HTDirEntry PARAMS((
+extern void HTDirEntry (
         HTStructured *  target,         /* in which to put the linked text */
-        CONST char *    tail,           /* last part of directory name */
-        CONST char *    entry));        /* name of this entry */
+        const char *    tail,           /* last part of directory name */
+        const char *    entry);        /* name of this entry */
 
 /*
 **  HTSetSuffix: Define the representation for a file suffix
@@ -129,12 +129,12 @@ extern void HTDirEntry PARAMS((
 **  ("application/x-compressed-tar"), but in that case don't use enconding
 **  to also indicate it but use "binary" etc.
 */
-extern void HTSetSuffix5 PARAMS((
-        CONST char *    suffix,
-        CONST char *    representation,
-        CONST char *    encoding,
-        CONST char *    desc,
-        double          quality));
+extern void HTSetSuffix5 (
+        const char *    suffix,
+        const char *    representation,
+        const char *    encoding,
+        const char *    desc,
+        double          quality);
 
 #define HTSetSuffix(suff,rep,enc,q) HTSetSuffix5(suff, rep, enc, NULL, q)
 
@@ -147,10 +147,10 @@ extern void HTSetSuffix5 PARAMS((
 **
 **  *pEncoding		The encoding (binary, 7bit, etc). See HTSetSuffix.
 */
-extern HTFormat HTFileFormat PARAMS((
-	CONST char *		filename,
+extern HTFormat HTFileFormat (
+	const char *		filename,
 	HTAtom **		pEncoding,
-	CONST char **		pDesc));
+	const char **		pDesc);
 
 /*
 **  HTCharsetFormat: Revise the file format in relation to the Lynx charset.
@@ -160,10 +160,10 @@ extern HTFormat HTFileFormat PARAMS((
 **  indicated, sets Lynx up for proper handling in relation
 **  to the currently selected character set. - FM
 */
-extern HTFormat HTCharsetFormat PARAMS((
+extern HTFormat HTCharsetFormat (
 	HTFormat		format,
 	HTParentAnchor *	anchor,
-	int			default_LYhndl));
+	int			default_LYhndl);
 
 /*	Get various pieces of meta info from file name.
 **	-----------------------------------------------
@@ -185,20 +185,20 @@ extern HTFormat HTCharsetFormat PARAMS((
 **  through HTuncache_current_document or at the next document load.
 **  - kw
 */
-extern void LYGetFileInfo PARAMS((
-	CONST char *		filename,
+extern void LYGetFileInfo (
+	const char *		filename,
 	HTParentAnchor **	pfile_anchor,
 	HTFormat *		pformat,
 	HTAtom **		pencoding,
-	CONST char**		pdesc,
-	CONST char**		pcharset,
-	int *			pfile_cs));
+	const char**		pdesc,
+	const char**		pcharset,
+	int *			pfile_cs);
 
 /*
 **  Determine file value from file name.
 */
-extern float HTFileValue PARAMS((
-	CONST char *	filename));
+extern float HTFileValue (
+	const char *	filename);
 
 /*
 **  Determine compression type from file name, by looking at its suffix.
@@ -210,10 +210,10 @@ typedef enum {
     , cftBzip2
 } CompressFileType;
 
-extern CompressFileType HTCompressFileType PARAMS((
+extern CompressFileType HTCompressFileType (
 	char *			filename,
 	char *			dots,
-	char **			suffix));
+	char **			suffix);
 
 /*
 **  Determine write access to a file.
@@ -250,13 +250,13 @@ extern CompressFileType HTCompressFileType PARAMS((
 
 #endif /* HAVE_CONFIG_H */
 
-extern BOOL HTEditable PARAMS((CONST char * filename));
+extern BOOL HTEditable (const char * filename);
 
 /*	Make a save stream.
 **	-------------------
 */
-extern HTStream * HTFileSaveStream PARAMS((
-	HTParentAnchor *	anchor));
+extern HTStream * HTFileSaveStream (
+	HTParentAnchor *	anchor);
 
 /*
 ** Determine a suitable suffix, given the representation.
@@ -271,9 +271,9 @@ extern HTStream * HTFileSaveStream PARAMS((
 **  returns		a pointer to a suitable suffix string if one has
 **			been found, else NULL.
 */
-extern CONST char * HTFileSuffix PARAMS((
+extern const char * HTFileSuffix (
                 HTAtom* rep,
-                CONST char* enc));
+                const char* enc);
 
 /*
  * Enumerate external programs that lynx may assume exists.  Unlike those
@@ -309,20 +309,20 @@ typedef enum {
 /*
  * Given a program number, return its path
  */
-extern CONST char * HTGetProgramPath PARAMS((
-		ProgramPaths code));
+extern const char * HTGetProgramPath (
+		ProgramPaths code);
 
 /*
  * Store a program's path 
  */
-extern void HTSetProgramPath PARAMS((
+extern void HTSetProgramPath (
 		ProgramPaths code,
-		CONST char *path));
+		const char *path);
 
 /*
  * Reset the list of known program paths to the ones that are compiled-in
  */
-extern void HTInitProgramPaths NOPARAMS;
+extern void HTInitProgramPaths (void);
 
 /*
 **  The Protocols
diff --git a/WWW/Library/Implementation/HTFinger.c b/WWW/Library/Implementation/HTFinger.c
index 08d0932d..7a9fc532 100644
--- a/WWW/Library/Implementation/HTFinger.c
+++ b/WWW/Library/Implementation/HTFinger.c
@@ -53,21 +53,21 @@
 
 /*	Module-wide variables
 */
-PRIVATE int finger_fd;				/* Socket for FingerHost */
+static int finger_fd;				/* Socket for FingerHost */
 
 struct _HTStructured {
-	CONST HTStructuredClass * isa;		/* For gopher streams */
+	const HTStructuredClass * isa;		/* For gopher streams */
 	/* ... */
 };
 
-PRIVATE HTStructured * target;			/* The output sink */
-PRIVATE HTStructuredClass targetClass;		/* Copy of fn addresses */
+static HTStructured * target;			/* The output sink */
+static HTStructuredClass targetClass;		/* Copy of fn addresses */
 
 /*	Initialisation for this module
 **	------------------------------
 */
-PRIVATE BOOL initialized = NO;
-PRIVATE BOOL initialize NOARGS
+static BOOL initialized = NO;
+static BOOL initialize (void)
 {
   finger_fd = -1;		/* Disconnected */
   return YES;
@@ -78,19 +78,19 @@ PRIVATE BOOL initialize NOARGS
 /*	Start anchor element
 **	--------------------
 */
-PRIVATE void start_anchor ARGS1(CONST char *,  href)
+static void start_anchor (const char *   href)
 {
     BOOL		present[HTML_A_ATTRIBUTES];
-    CONST char*		value[HTML_A_ATTRIBUTES];
+    const char*		value[HTML_A_ATTRIBUTES];
 
     {
 	int i;
 	for(i=0; i<HTML_A_ATTRIBUTES; i++)
 	    present[i] = (BOOL) (i==HTML_A_HREF);
     }
-    ((CONST char **)value)[HTML_A_HREF] = href;
+    ((const char **)value)[HTML_A_HREF] = href;
     (*targetClass.start_element)(target, HTML_A, present,
-				 (CONST char **)value, -1, 0);
+				 (const char **)value, -1, 0);
 
 }
 
@@ -106,12 +106,12 @@ PRIVATE void start_anchor ARGS1(CONST char *,  href)
 */
 
 
-PRIVATE int response ARGS5(
-	char *,			command,
-	char *,			sitename,
-	HTParentAnchor *,	anAnchor,
-	HTFormat,		format_out,
-	HTStream*,		sink)
+static int response (
+	char *			command,
+	char *			sitename,
+	HTParentAnchor *	anAnchor,
+	HTFormat		format_out,
+	HTStream*		sink)
 {
     int status;
     int length = strlen(command);
@@ -250,11 +250,11 @@ end_html:
 /*		Load by name					HTLoadFinger
 **		============
 */
-PUBLIC int HTLoadFinger ARGS4(
-	CONST char *,		arg,
-	HTParentAnchor *,	anAnchor,
-	HTFormat,		format_out,
-	HTStream*,		stream)
+int HTLoadFinger (
+	const char *		arg,
+	HTParentAnchor *	anAnchor,
+	HTFormat		format_out,
+	HTStream*		stream)
 {
     char *username, *sitename, *colon;	/* Fields extracted from URL */
     char *slash, *at_sign;		/* Fields extracted from URL */
@@ -263,7 +263,7 @@ PUBLIC int HTLoadFinger ARGS4(
     int status;				/* tcp return */
     int result = HT_LOADED;
     BOOL IsGopherURL = FALSE;
-    CONST char * p1 = arg;
+    const char * p1 = arg;
 
     CTRACE((tfp, "HTFinger: Looking for %s\n", (arg ? arg : "NULL")));
 
@@ -416,7 +416,7 @@ PUBLIC int HTLoadFinger ARGS4(
 #define _HTFINGER_C_1_INIT { "finger", HTLoadFinger, NULL }
 GLOBALDEF (HTProtocol, HTFinger, _HTFINGER_C_1_INIT);
 #else
-GLOBALDEF PUBLIC HTProtocol HTFinger = { "finger", HTLoadFinger, NULL };
+GLOBALDEF HTProtocol HTFinger = { "finger", HTLoadFinger, NULL };
 #endif /* GLOBALDEF_IS_MACRO */
 
 #endif /* not DISABLE_FINGER */
diff --git a/WWW/Library/Implementation/HTFinger.h b/WWW/Library/Implementation/HTFinger.h
index 8fece0ec..976afa25 100644
--- a/WWW/Library/Implementation/HTFinger.h
+++ b/WWW/Library/Implementation/HTFinger.h
@@ -15,10 +15,10 @@ extern GLOBALREF (HTProtocol, HTFinger);
 GLOBALREF HTProtocol HTFinger;
 #endif /* GLOBALREF_IS_MACRO */
 
-extern int HTLoadFinger PARAMS((
-	CONST char *		arg,
+extern int HTLoadFinger (
+	const char *		arg,
 	HTParentAnchor *	anAnchor,
 	HTFormat		format_out,
-	HTStream *		stream));
+	HTStream *		stream);
 
 #endif /* HTFINGER_H */
diff --git a/WWW/Library/Implementation/HTFormat.c b/WWW/Library/Implementation/HTFormat.c
index d93f59cc..0f0ea99b 100644
--- a/WWW/Library/Implementation/HTFormat.c
+++ b/WWW/Library/Implementation/HTFormat.c
@@ -16,9 +16,9 @@
 */
 #include <HTFormat.h>
 
-PUBLIC float HTMaxSecs = 1e10;		/* No effective limit */
-PUBLIC float HTMaxLength = 1e10;	/* No effective limit */
-PUBLIC long int HTMaxBytes  = 0;	/* No effective limit */
+float HTMaxSecs = 1e10;		/* No effective limit */
+float HTMaxLength = 1e10;	/* No effective limit */
+long int HTMaxBytes  = 0;	/* No effective limit */
 
 #ifdef UNIX
 #ifdef NeXT
@@ -54,18 +54,18 @@ PUBLIC long int HTMaxBytes  = 0;	/* No effective limit */
 #include <LYMainLoop.h>
 #endif
 
-PUBLIC	BOOL HTOutputSource = NO;	/* Flag: shortcut parser to stdout */
+BOOL HTOutputSource = NO;	/* Flag: shortcut parser to stdout */
 
 #ifdef ORIGINAL
 struct _HTStream {
-      CONST HTStreamClass*	isa;
+      const HTStreamClass*	isa;
       /* ... */
 };
 #endif /* ORIGINAL */
 
 /* this version used by the NetToText stream */
 struct _HTStream {
-	CONST HTStreamClass *	isa;
+	const HTStreamClass *	isa;
 	BOOL			had_cr;
 	HTStream *		sink;
 };
@@ -73,26 +73,26 @@ struct _HTStream {
 /*	Presentation methods
 **	--------------------
 */
-PUBLIC	HTList * HTPresentations = NULL;
-PUBLIC	HTPresentation * default_presentation = NULL;
+HTList * HTPresentations = NULL;
+HTPresentation * default_presentation = NULL;
 
 /*
  *	To free off the presentation list.
  */
 #ifdef LY_FIND_LEAKS
-PRIVATE void HTFreePresentations NOPARAMS;
+static void HTFreePresentations (void);
 #endif
 
 /*	Define a presentation system command for a content-type
 **	-------------------------------------------------------
 */
-PUBLIC void HTSetPresentation ARGS6(
-	CONST char *,	representation,
-	CONST char *,	command,
-	double,		quality,
-	double,		secs,
-	double,		secs_per_byte,
-	long int,	maxbytes)
+void HTSetPresentation (
+	const char *	representation,
+	const char *	command,
+	double		quality,
+	double		secs,
+	double		secs_per_byte,
+	long int	maxbytes)
 {
     HTPresentation * pres = typecalloc(HTPresentation);
     if (pres == NULL)
@@ -130,14 +130,14 @@ PUBLIC void HTSetPresentation ARGS6(
 /*	Define a built-in function for a content-type
 **	---------------------------------------------
 */
-PUBLIC void HTSetConversion ARGS7(
-	CONST char *,	representation_in,
-	CONST char *,	representation_out,
-	HTConverter*,	converter,
-	float,		quality,
-	float,		secs,
-	float,		secs_per_byte,
-	long int,	maxbytes)
+void HTSetConversion (
+	const char *	representation_in,
+	const char *	representation_out,
+	HTConverter*	converter,
+	float		quality,
+	float		secs,
+	float		secs_per_byte,
+	long int	maxbytes)
 {
     HTPresentation * pres = typecalloc(HTPresentation);
     if (pres == NULL)
@@ -177,7 +177,7 @@ PUBLIC void HTSetConversion ARGS7(
 **	Revision History:
 **		05-28-94	created Lynx 2-3-1 Garrett Arch Blythe
 */
-PRIVATE void HTFreePresentations NOARGS
+static void HTFreePresentations (void)
 {
     HTPresentation * pres = NULL;
 
@@ -211,10 +211,10 @@ PRIVATE void HTFreePresentations NOARGS
 **	release the server faster, and if small will save space on PCs etc.
 */
 #define INPUT_BUFFER_SIZE 4096		/* Tradeoff */
-PRIVATE char input_buffer[INPUT_BUFFER_SIZE];
-PRIVATE char * input_pointer;
-PRIVATE char * input_limit;
-PRIVATE int input_file_number;
+static char input_buffer[INPUT_BUFFER_SIZE];
+static char * input_pointer;
+static char * input_limit;
+static int input_file_number;
 
 /*	Set up the buffering
 **
@@ -222,14 +222,14 @@ PRIVATE int input_file_number;
 **	many parsers, and on PCs and Macs we should not duplicate
 **	the static buffer area.
 */
-PUBLIC void HTInitInput ARGS1 (int,file_number)
+void HTInitInput (int file_number)
 {
     input_file_number = file_number;
     input_pointer = input_limit = input_buffer;
 }
 
-PUBLIC int interrupted_in_htgetcharacter = 0;
-PUBLIC int HTGetCharacter NOARGS
+int interrupted_in_htgetcharacter = 0;
+int HTGetCharacter (void)
 {
     char ch;
     interrupted_in_htgetcharacter = 0;
@@ -259,7 +259,7 @@ PUBLIC int HTGetCharacter NOARGS
 }
 
 #ifdef USE_SSL
-PUBLIC char HTGetSSLCharacter ARGS1(void *, handle)
+char HTGetSSLCharacter (void *  handle)
 {
     char ch;
     interrupted_in_htgetcharacter = 0;
@@ -294,7 +294,7 @@ PUBLIC char HTGetSSLCharacter ARGS1(void *, handle)
 /*  Match maintype to any MIME type starting with maintype,
  *  for example:  image/gif should match image
  */
-PRIVATE int half_match ARGS2(char *,trial_type, char *,target)
+static int half_match (char * trial_type, char * target)
 {
     char *cp = strchr(trial_type, '/');
 
@@ -325,10 +325,10 @@ PRIVATE int half_match ARGS2(char *,trial_type, char *,target)
 **	nothing found. - kw
 **
 */
-PRIVATE HTPresentation * HTFindPresentation ARGS3(
-	HTFormat,		rep_in,
-	HTFormat,		rep_out,
-	HTPresentation*,	fill_in)
+static HTPresentation * HTFindPresentation (
+	HTFormat		rep_in,
+	HTFormat		rep_out,
+	HTPresentation*	fill_in)
 {
     HTAtom * wildcard = NULL; /* = HTAtom_for("*"); lookup when needed - kw */
 
@@ -425,11 +425,11 @@ PRIVATE HTPresentation * HTFindPresentation ARGS3(
 **	be a lot neater.
 **
 */
-PUBLIC HTStream * HTStreamStack ARGS4(
-	HTFormat,		rep_in,
-	HTFormat,		rep_out,
-	HTStream*,		sink,
-	HTParentAnchor*,	anchor)
+HTStream * HTStreamStack (
+	HTFormat		rep_in,
+	HTFormat		rep_out,
+	HTStream*		sink,
+	HTParentAnchor*	anchor)
 {
     HTPresentation temp;
     HTPresentation *match;
@@ -479,9 +479,9 @@ PUBLIC HTStream * HTStreamStack ARGS4(
 **	Look up a presentation (exact match only) and, if found, reorder
 **	it to the start of the HTPresentations list. - kw
 */
-PUBLIC void HTReorderPresentation ARGS2(
-	HTFormat,		rep_in,
-	HTFormat,		rep_out)
+void HTReorderPresentation (
+	HTFormat		rep_in,
+	HTFormat		rep_out)
 {
     HTPresentation *match;
     if ((match = HTFindPresentation(rep_in, rep_out, NULL))) {
@@ -494,7 +494,7 @@ PUBLIC void HTReorderPresentation ARGS2(
  * Setup 'get_accept' flag to denote presentations that are not redundant,
  * and will be listed in "Accept:" header.
  */
-PUBLIC void HTFilterPresentations NOARGS
+void HTFilterPresentations (void)
 {
     int i, j;
     int n = HTList_count(HTPresentations);
@@ -547,11 +547,11 @@ PUBLIC void HTFilterPresentations NOARGS
 ** On entry,
 **	length	The size of the data to be converted
 */
-PUBLIC float HTStackValue ARGS4(
-	HTFormat,		rep_in,
-	HTFormat,		rep_out,
-	float,			initial_value,
-	long int,		length)
+float HTStackValue (
+	HTFormat		rep_in,
+	HTFormat		rep_out,
+	float			initial_value,
+	long int		length)
 {
     HTAtom * wildcard = WWW_WILDCARD_REP_OUT;
 
@@ -592,7 +592,7 @@ PUBLIC float HTStackValue ARGS4(
 **   This is a traverse call for HText_pageDisplay() - it works!.
 **
 */
-PUBLIC void HTDisplayPartial NOARGS
+void HTDisplayPartial (void)
 {
 #ifdef DISP_PARTIAL
     if (display_partial) {
@@ -635,7 +635,7 @@ PUBLIC void HTDisplayPartial NOARGS
 }
 
 /* Put this as early as possible, OK just after HTDisplayPartial() */
-PUBLIC void HTFinishDisplayPartial NOARGS
+void HTFinishDisplayPartial (void)
 {
 #ifdef DISP_PARTIAL
 		    /*
@@ -677,11 +677,11 @@ PUBLIC void HTFinishDisplayPartial NOARGS
 **	-1		socket still open, target aborted.
 **	otherwise	socket closed,	target stream still valid.
 */
-PUBLIC int HTCopy ARGS4(
-	HTParentAnchor *,	anchor,
-	int,			file_number,
-	void*,			handle GCC_UNUSED,
-	HTStream*,		sink)
+int HTCopy (
+	HTParentAnchor *	anchor,
+	int			file_number,
+	void*			handle GCC_UNUSED,
+	HTStream*		sink)
 {
     HTStreamClass targetClass;
     BOOL suppress_readprogress = NO;
@@ -859,9 +859,9 @@ finished:
 **  State of file and target stream on return:
 **	always		fp still open, target stream still valid.
 */
-PUBLIC int HTFileCopy ARGS2(
-	FILE *,			fp,
-	HTStream*,		sink)
+int HTFileCopy (
+	FILE *			fp,
+	HTStream*		sink)
 {
     HTStreamClass targetClass;
     int status, bytes;
@@ -934,13 +934,13 @@ PUBLIC int HTFileCopy ARGS2(
 **  State of memory and target stream on return:
 **	always		chunk unchanged, target stream still valid.
 */
-PUBLIC int HTMemCopy ARGS2(
-	HTChunk *,		chunk,
-	HTStream *,		sink)
+int HTMemCopy (
+	HTChunk *		chunk,
+	HTStream *		sink)
 {
     HTStreamClass targetClass;
     int bytes = 0;
-    CONST char *data = chunk->data;
+    const char *data = chunk->data;
     int rv = HT_OK;
 
     targetClass = *(sink->isa);
@@ -997,9 +997,9 @@ PUBLIC int HTMemCopy ARGS2(
 **  State of file and target stream on return:
 **	always		gzfp still open, target stream still valid.
 */
-PRIVATE int HTGzFileCopy ARGS2(
-	gzFile,			gzfp,
-	HTStream*,		sink)
+static int HTGzFileCopy (
+	gzFile			gzfp,
+	HTStream*		sink)
 {
     HTStreamClass targetClass;
     int status, bytes;
@@ -1078,9 +1078,9 @@ PRIVATE int HTGzFileCopy ARGS2(
 **  State of file and target stream on return:
 **	always		bzfp still open, target stream still valid.
 */
-PRIVATE int HTBzFileCopy ARGS2(
-	BZFILE *,		bzfp,
-	HTStream*,		sink)
+static int HTBzFileCopy (
+	BZFILE *		bzfp,
+	HTStream*		sink)
 {
     HTStreamClass targetClass;
     int status, bytes;
@@ -1145,10 +1145,10 @@ PRIVATE int HTBzFileCopy ARGS2(
 **   when the format is textual.
 **
 */
-PUBLIC void HTCopyNoCR ARGS3(
-	HTParentAnchor *,	anchor GCC_UNUSED,
-	int,			file_number,
-	HTStream*,		sink)
+void HTCopyNoCR (
+	HTParentAnchor *	anchor GCC_UNUSED,
+	int			file_number,
+	HTStream*		sink)
 {
     HTStreamClass targetClass;
     int character;
@@ -1205,12 +1205,12 @@ PUBLIC void HTCopyNoCR ARGS3(
 **	-1		socket still open, target stream aborted or NULL.
 **	otherwise	socket closed,	target stream freed.
 */
-PUBLIC int HTParseSocket ARGS5(
-	HTFormat,		rep_in,
-	HTFormat,		format_out,
-	HTParentAnchor *,	anchor,
-	int,			file_number,
-	HTStream*,		sink)
+int HTParseSocket (
+	HTFormat		rep_in,
+	HTFormat		format_out,
+	HTParentAnchor *	anchor,
+	int			file_number,
+	HTStream*		sink)
 {
     HTStream * stream;
     HTStreamClass targetClass;
@@ -1265,12 +1265,12 @@ PUBLIC int HTParseSocket ARGS5(
 **  State of file and target stream on return:
 **	always		fp still open; target freed, aborted, or NULL.
 */
-PUBLIC int HTParseFile ARGS5(
-	HTFormat,		rep_in,
-	HTFormat,		format_out,
-	HTParentAnchor *,	anchor,
-	FILE *,			fp,
-	HTStream*,		sink)
+int HTParseFile (
+	HTFormat		rep_in,
+	HTFormat		format_out,
+	HTParentAnchor *	anchor,
+	FILE *			fp,
+	HTStream*		sink)
 {
     HTStream * stream;
     HTStreamClass targetClass;
@@ -1336,12 +1336,12 @@ PUBLIC int HTParseFile ARGS5(
 **  State of memory and target stream on return:
 **	always		chunk unchanged; target freed, aborted, or NULL.
 */
-PUBLIC int HTParseMem ARGS5(
-	HTFormat,		rep_in,
-	HTFormat,		format_out,
-	HTParentAnchor *,	anchor,
-	HTChunk *,		chunk,
-	HTStream *,		sink)
+int HTParseMem (
+	HTFormat		rep_in,
+	HTFormat		format_out,
+	HTParentAnchor *	anchor,
+	HTChunk *		chunk,
+	HTStream *		sink)
 {
     HTStream * stream;
     HTStreamClass targetClass;
@@ -1368,8 +1368,8 @@ PUBLIC int HTParseMem ARGS5(
 #endif
 
 #ifdef USE_ZLIB
-PRIVATE int HTCloseGzFile ARGS1(
-	gzFile,			gzfp)
+static int HTCloseGzFile (
+	gzFile			gzfp)
 {
     int gzres;
     if (gzfp == NULL)
@@ -1401,12 +1401,12 @@ PRIVATE int HTCloseGzFile ARGS1(
 **  State of file and target stream on return:
 **	always		gzfp closed; target freed, aborted, or NULL.
 */
-PUBLIC int HTParseGzFile ARGS5(
-	HTFormat,		rep_in,
-	HTFormat,		format_out,
-	HTParentAnchor *,	anchor,
-	gzFile,			gzfp,
-	HTStream*,		sink)
+int HTParseGzFile (
+	HTFormat		rep_in,
+	HTFormat		format_out,
+	HTParentAnchor *	anchor,
+	gzFile			gzfp,
+	HTStream*		sink)
 {
     HTStream * stream;
     HTStreamClass targetClass;
@@ -1454,8 +1454,8 @@ PUBLIC int HTParseGzFile ARGS5(
 #endif /* USE_ZLIB */
 
 #ifdef USE_BZLIB
-PRIVATE void HTCloseBzFile ARGS1(
-	BZFILE *,		bzfp)
+static void HTCloseBzFile (
+	BZFILE *		bzfp)
 {
     if (bzfp)
 	BZ2_bzclose(bzfp);
@@ -1477,12 +1477,12 @@ PRIVATE void HTCloseBzFile ARGS1(
 **  State of file and target stream on return:
 **	always		bzfp closed; target freed, aborted, or NULL.
 */
-PUBLIC int HTParseBzFile ARGS5(
-	HTFormat,		rep_in,
-	HTFormat,		format_out,
-	HTParentAnchor *,	anchor,
-	BZFILE*,		bzfp,
-	HTStream*,		sink)
+int HTParseBzFile (
+	HTFormat		rep_in,
+	HTFormat		format_out,
+	HTParentAnchor *	anchor,
+	BZFILE*		bzfp,
+	HTStream*		sink)
 {
     HTStream * stream;
     HTStreamClass targetClass;
@@ -1539,7 +1539,7 @@ PUBLIC int HTParseBzFile ARGS5(
 **	C representation of a new line.
 */
 
-PRIVATE void NetToText_put_character ARGS2(HTStream *, me, char, net_char)
+static void NetToText_put_character (HTStream *  me, char  net_char)
 {
     char c = FROMASCII(net_char);
     if (me->had_cr) {
@@ -1556,29 +1556,29 @@ PRIVATE void NetToText_put_character ARGS2(HTStream *, me, char, net_char)
 	me->sink->isa->put_character(me->sink, c);		/* normal */
 }
 
-PRIVATE void NetToText_put_string ARGS2(HTStream *, me, CONST char *, s)
+static void NetToText_put_string (HTStream *  me, const char *  s)
 {
-    CONST char * p;
+    const char * p;
 
     for (p = s; *p; p++)
 	NetToText_put_character(me, *p);
 }
 
-PRIVATE void NetToText_put_block ARGS3(HTStream *, me, CONST char*, s, int, l)
+static void NetToText_put_block (HTStream * me, const char* s, int l)
 {
-    CONST char * p;
+    const char * p;
 
     for (p = s; p < (s+l); p++)
 	NetToText_put_character(me, *p);
 }
 
-PRIVATE void NetToText_free ARGS1(HTStream *, me)
+static void NetToText_free (HTStream *  me)
 {
     (me->sink->isa->_free)(me->sink);		/* Close rest of pipe */
     FREE(me);
 }
 
-PRIVATE void NetToText_abort ARGS2(HTStream *, me, HTError, e)
+static void NetToText_abort (HTStream *  me, HTError  e)
 {
     me->sink->isa->_abort(me->sink,e);		/* Abort rest of pipe */
     FREE(me);
@@ -1586,7 +1586,7 @@ PRIVATE void NetToText_abort ARGS2(HTStream *, me, HTError, e)
 
 /*	The class structure
 */
-PRIVATE HTStreamClass NetToTextClass = {
+static HTStreamClass NetToTextClass = {
     "NetToText",
     NetToText_free,
     NetToText_abort,
@@ -1597,7 +1597,7 @@ PRIVATE HTStreamClass NetToTextClass = {
 
 /*	The creation method
 */
-PUBLIC HTStream * HTNetToText ARGS1(HTStream *, sink)
+HTStream * HTNetToText (HTStream *  sink)
 {
     HTStream* me = typecalloc(HTStream);
 
@@ -1610,41 +1610,41 @@ PUBLIC HTStream * HTNetToText ARGS1(HTStream *, sink)
     return me;
 }
 
-PRIVATE HTStream	HTBaseStreamInstance;		      /* Made static */
+static HTStream	HTBaseStreamInstance;		      /* Made static */
 /*
 **	ERROR STREAM
 **	------------
 **	There is only one error stream shared by anyone who wants a
 **	generic error returned from all stream methods.
 */
-PRIVATE void HTErrorStream_put_character ARGS2(HTStream *, me GCC_UNUSED, char, c GCC_UNUSED)
+static void HTErrorStream_put_character (HTStream *  me GCC_UNUSED, char  c GCC_UNUSED)
 {
     LYCancelDownload = TRUE;
 }
 
-PRIVATE void HTErrorStream_put_string ARGS2(HTStream *, me GCC_UNUSED, CONST char *, s)
+static void HTErrorStream_put_string (HTStream *  me GCC_UNUSED, const char *  s)
 {
     if (s && *s)
 	LYCancelDownload = TRUE;
 }
 
-PRIVATE void HTErrorStream_write ARGS3(HTStream *, me GCC_UNUSED, CONST char *, s, int, l)
+static void HTErrorStream_write (HTStream * me GCC_UNUSED, const char * s, int l)
 {
     if (l && s)
 	LYCancelDownload = TRUE;
 }
 
-PRIVATE void HTErrorStream_free ARGS1(HTStream *, me GCC_UNUSED)
+static void HTErrorStream_free (HTStream *  me GCC_UNUSED)
 {
     return;
 }
 
-PRIVATE void HTErrorStream_abort ARGS2(HTStream *, me GCC_UNUSED, HTError, e GCC_UNUSED)
+static void HTErrorStream_abort (HTStream *  me GCC_UNUSED, HTError  e GCC_UNUSED)
 {
     return;
 }
 
-PRIVATE CONST HTStreamClass HTErrorStreamClass =
+static const HTStreamClass HTErrorStreamClass =
 {
     "ErrorStream",
     HTErrorStream_free,
@@ -1654,7 +1654,7 @@ PRIVATE CONST HTStreamClass HTErrorStreamClass =
     HTErrorStream_write
 };
 
-PUBLIC HTStream * HTErrorStream NOARGS
+HTStream * HTErrorStream (void)
 {
     CTRACE((tfp, "ErrorStream. Created\n"));
     HTBaseStreamInstance.isa = &HTErrorStreamClass;    /* The rest is random */
diff --git a/WWW/Library/Implementation/HTFormat.h b/WWW/Library/Implementation/HTFormat.h
index 4ee14688..500ce640 100644
--- a/WWW/Library/Implementation/HTFormat.h
+++ b/WWW/Library/Implementation/HTFormat.h
@@ -159,10 +159,10 @@ The HTPresentation and HTConverter types
  */
 typedef struct _HTPresentation HTPresentation;
 
-typedef HTStream * HTConverter PARAMS((
+typedef HTStream * HTConverter (
         HTPresentation *        pres,
         HTParentAnchor *        anchor,
-        HTStream *              sink));
+        HTStream *              sink);
 
 struct _HTPresentation {
         HTAtom	*	rep;            /* representation name atomized */
@@ -209,14 +209,14 @@ HTSetPresentation: Register a system command to present a format
   maxbytes                A limit on the length acceptable as input (0 infinite)
 
  */
-extern void HTSetPresentation PARAMS((
-        CONST char *	representation,
-        CONST char *	command,
+extern void HTSetPresentation (
+        const char *	representation,
+        const char *	command,
         double		quality,
         double		secs,
         double		secs_per_byte,
 	long int	maxbytes
-));
+);
 
 
 /*
@@ -233,15 +233,15 @@ HTSetConversion:   Register a converstion routine
 
  */
 
-extern void HTSetConversion PARAMS((
-        CONST char *    rep_in,
-        CONST char *    rep_out,
+extern void HTSetConversion (
+        const char *    rep_in,
+        const char *    rep_out,
         HTConverter *   converter,
         float           quality,
         float           secs,
         float           secs_per_byte,
 	long int	maxbytes
-));
+);
 
 
 /*
@@ -256,11 +256,11 @@ HTStreamStack:   Create a stack of streams
    represents them.
 
  */
-extern HTStream * HTStreamStack PARAMS((
+extern HTStream * HTStreamStack (
         HTFormat                format_in,
         HTFormat                format_out,
         HTStream*               stream_out,
-        HTParentAnchor*         anchor));
+        HTParentAnchor*         anchor);
 
 /*
 HTReorderPresentation: put presentation near head of list
@@ -269,15 +269,15 @@ HTReorderPresentation: put presentation near head of list
     it to the start of the HTPresentations list. - kw
     */
 
-extern void HTReorderPresentation PARAMS((
+extern void HTReorderPresentation (
         HTFormat                format_in,
-        HTFormat                format_out));
+        HTFormat                format_out);
 
 /*
  * Setup 'get_accept' flag to denote presentations that are not redundant,
  * and will be listed in "Accept:" header.
  */
-extern void HTFilterPresentations NOPARAMS;
+extern void HTFilterPresentations (void);
 
 /*
 
@@ -297,11 +297,11 @@ HTStackValue: Find the cost of a filter stack
   length                  The number of bytes expected in the input format
 
  */
-extern float HTStackValue PARAMS((
+extern float HTStackValue (
         HTFormat                format_in,
         HTFormat                rep_out,
         float                   initial_value,
-        long int                length));
+        long int                length);
 
 #define NO_VALUE_FOUND  -1e20	/* returned if none found */
 
@@ -312,9 +312,9 @@ extern float HTStackValue PARAMS((
 **   This is a traverse call for HText_pageDispaly() - it works!.
 **
 */
-extern void HTDisplayPartial NOPARAMS;
+extern void HTDisplayPartial (void);
 
-extern void HTFinishDisplayPartial NOPARAMS;
+extern void HTFinishDisplayPartial (void);
 
 /*
 
@@ -324,11 +324,11 @@ HTCopy:  Copy a socket to a stream
    has been generated by HTStreamStack.
 
  */
-extern int HTCopy PARAMS((
+extern int HTCopy (
 	HTParentAnchor *	anchor,
         int                     file_number,
 	void*			handle,
-        HTStream*               sink));
+        HTStream*               sink);
 
 
 /*
@@ -339,9 +339,9 @@ HTFileCopy:  Copy a file to a stream
    has been generated by HTStreamStack.  It is currently called by HTParseFile
 
  */
-extern int HTFileCopy PARAMS((
+extern int HTFileCopy (
         FILE*                   fp,
-        HTStream*               sink));
+        HTStream*               sink);
 
 
 #ifdef USE_SOURCE_CACHE
@@ -354,9 +354,9 @@ HTMemCopy:  Copy a memory chunk to a stream
    has been generated by HTStreamStack.  It is currently called by HTParseMem
 
  */
-extern int HTMemCopy PARAMS((
+extern int HTMemCopy (
 	HTChunk *		chunk,
-	HTStream*		sink));
+	HTStream*		sink);
 #endif
 
 
@@ -368,10 +368,10 @@ HTCopyNoCR: Copy a socket to a stream, stripping CR characters.
 
  */
 
-extern void HTCopyNoCR PARAMS((
+extern void HTCopyNoCR (
 	HTParentAnchor *	anchor,
         int                     file_number,
-        HTStream*               sink));
+        HTStream*               sink);
 
 
 /*
@@ -383,7 +383,7 @@ Clear input buffer and set file number
    a common routine and buffer saves memory space in small implementations.
 
  */
-extern void HTInitInput PARAMS((int file_number));
+extern void HTInitInput (int file_number);
 
 /*
 
@@ -391,7 +391,7 @@ Get next character from buffer
 
  */
 extern int interrupted_in_htgetcharacter;
-extern int HTGetCharacter NOPARAMS;
+extern int HTGetCharacter (void);
 
 
 /*
@@ -402,12 +402,12 @@ HTParseSocket: Parse a socket given its format
    the copy routines above.  Returns HT_LOADED if succesful, <0 if not.
 
  */
-extern int HTParseSocket PARAMS((
+extern int HTParseSocket (
         HTFormat        format_in,
         HTFormat        format_out,
         HTParentAnchor  *anchor,
         int             file_number,
-        HTStream*       sink));
+        HTStream*       sink);
 
 /*
 
@@ -418,12 +418,12 @@ HTParseFile: Parse a File through a file pointer
    return HT_PARTIAL_CONTENT, HT_NO_DATA, or other <0 for failure.
 
  */
-extern int HTParseFile PARAMS((
+extern int HTParseFile (
         HTFormat        format_in,
         HTFormat        format_out,
         HTParentAnchor  *anchor,
         FILE            *fp,
-        HTStream*       sink));
+        HTStream*       sink);
 
 #ifdef USE_SOURCE_CACHE
 /*
@@ -435,12 +435,12 @@ HTParseMem: Parse a document in memory
    return <0 for failure.
 
  */
-extern int HTParseMem PARAMS((
+extern int HTParseMem (
 	HTFormat	format_in,
 	HTFormat	format_out,
 	HTParentAnchor	*anchor,
 	HTChunk*	chunk,
-	HTStream*	sink));
+	HTStream*	sink);
 #endif
 
 #ifdef USE_ZLIB
@@ -452,12 +452,12 @@ HTParseGzFile: Parse a gzip'ed File through a file pointer
    HTStreamStack and HTGzFileCopy.  Returns HT_LOADED if successful, can also
    return HT_PARTIAL_CONTENT, HT_NO_DATA, or other <0 for failure.
  */
-extern int HTParseGzFile PARAMS((
+extern int HTParseGzFile (
         HTFormat        format_in,
         HTFormat        format_out,
         HTParentAnchor  *anchor,
         gzFile          gzfp,
-        HTStream*       sink));
+        HTStream*       sink);
 
 #endif /* USE_ZLIB */
 
@@ -470,12 +470,12 @@ HTParseBzFile: Parse a bzip2'ed File through a file pointer
    HTStreamStack and HTGzFileCopy.  Returns HT_LOADED if successful, can also
    return HT_PARTIAL_CONTENT, HT_NO_DATA, or other <0 for failure.
  */
-extern int HTParseBzFile PARAMS((
+extern int HTParseBzFile (
         HTFormat        format_in,
         HTFormat        format_out,
         HTParentAnchor  *anchor,
         BZFILE          *bzfp,
-        HTStream*       sink));
+        HTStream*       sink);
 
 #endif /* USE_BZLIB */
 
@@ -488,7 +488,7 @@ HTNetToText: Convert Net ASCII to local representation
    conversion.  As usual, pass its output stream to it when creating it.
 
  */
-extern HTStream *  HTNetToText PARAMS ((HTStream * sink));
+extern HTStream *  HTNetToText (HTStream * sink);
 
 /*
 
@@ -501,7 +501,7 @@ HTFormatInit: Set up default presentations and conversions
    explicitly call this to get the defaults as well.
 
  */
-extern void HTFormatInit NOPARAMS;
+extern void HTFormatInit (void);
 
 /*
 
diff --git a/WWW/Library/Implementation/HTGopher.c b/WWW/Library/Implementation/HTGopher.c
index b47822ff..d0aafb61 100644
--- a/WWW/Library/Implementation/HTGopher.c
+++ b/WWW/Library/Implementation/HTGopher.c
@@ -84,15 +84,15 @@
 /*
 **  Module-wide variables.
 */
-PRIVATE int s;				/* Socket for gopher or CSO host */
+static int s;				/* Socket for gopher or CSO host */
 
 struct _HTStructured {
-	CONST HTStructuredClass * isa;	/* For gopher streams */
+	const HTStructuredClass * isa;	/* For gopher streams */
 	/* ... */
 };
 
-PRIVATE HTStructured *target;		/* the new gopher hypertext */
-PRIVATE HTStructuredClass targetClass;	/* Its action routines */
+static HTStructured *target;		/* the new gopher hypertext */
+static HTStructuredClass targetClass;	/* Its action routines */
 
 struct _HTStream
 {
@@ -118,7 +118,7 @@ typedef struct _CSOfield_info {		/* For form-based CSO gateway - FM */
     char			attr_buf[80];	/* Avoid malloc if we can */
 } CSOfield_info;
 
-PRIVATE CSOfield_info *CSOfields = NULL; /* For form-based CSO gateway - FM */
+static CSOfield_info *CSOfields = NULL; /* For form-based CSO gateway - FM */
 
 typedef struct _CSOformgen_context {	 /* For form-based CSO gateway - FM */
     char *		host;
@@ -136,10 +136,10 @@ typedef struct _CSOformgen_context {	 /* For form-based CSO gateway - FM */
 /*	Matrix of allowed characters in filenames
 **	=========================================
 */
-PRIVATE BOOL acceptable[256];
-PRIVATE BOOL acceptable_inited = NO;
+static BOOL acceptable[256];
+static BOOL acceptable_inited = NO;
 
-PRIVATE void init_acceptable NOARGS
+static void init_acceptable (void)
 {
     unsigned int i;
     char * good =
@@ -154,9 +154,9 @@ PRIVATE void init_acceptable NOARGS
 /*	Decode one hex character
 **	========================
 */
-PRIVATE CONST char hex[17] = "0123456789abcdef";
+static const char hex[17] = "0123456789abcdef";
 
-PRIVATE char from_hex ARGS1(char, c)
+static char from_hex (char  c)
 {
     return (char) (       (c>='0')&&(c<='9') ? c-'0'
 			: (c>='A')&&(c<='F') ? c-'A'+10
@@ -175,27 +175,27 @@ PRIVATE char from_hex ARGS1(char, c)
 **	text	points to the text to be put into the file, 0 terminated.
 **	addr	points to the hypertext refernce address 0 terminated.
 */
-PUBLIC BOOLEAN HT_Is_Gopher_URL=FALSE;
+BOOLEAN HT_Is_Gopher_URL=FALSE;
 
-PRIVATE void write_anchor ARGS2(CONST char *,text, CONST char *,addr)
+static void write_anchor (const char * text, const char * addr)
 {
     BOOL present[HTML_A_ATTRIBUTES];
-    CONST char * value[HTML_A_ATTRIBUTES];
+    const char * value[HTML_A_ATTRIBUTES];
 
     int i;
 
     for (i = 0; i < HTML_A_ATTRIBUTES; i++)
 	present[i] = 0;
     present[HTML_A_HREF] = YES;
-    ((CONST char **)value)[HTML_A_HREF] = addr;
+    ((const char **)value)[HTML_A_HREF] = addr;
     present[HTML_A_TITLE] = YES;
-    ((CONST char **)value)[HTML_A_TITLE] = text;
+    ((const char **)value)[HTML_A_TITLE] = text;
 
     CTRACE((tfp,"HTGopher: adding URL: %s\n",addr));
 
     HT_Is_Gopher_URL = TRUE;  /* tell HTML.c that this is a Gopher URL */
     (*targetClass.start_element)(target, HTML_A, present,
-				 (CONST char **)value, -1, 0);
+				 (const char **)value, -1, 0);
 
     PUTS(text);
     END(HTML_A);
@@ -204,9 +204,9 @@ PRIVATE void write_anchor ARGS2(CONST char *,text, CONST char *,addr)
 /*	Parse a Gopher Menu document
 **	============================
 */
-PRIVATE void parse_menu ARGS2(
-	CONST char *,		arg GCC_UNUSED,
-	HTParentAnchor *,	anAnchor)
+static void parse_menu (
+	const char *		arg GCC_UNUSED,
+	HTParentAnchor *	anAnchor)
 {
     char gtype;
     int ich;
@@ -215,7 +215,7 @@ PRIVATE void parse_menu ARGS2(
     char *host = NULL;
     char *port;
     char *p = line;
-    CONST char *title;
+    const char *title;
     int bytes = 0;
     int BytesReported = 0;
     char buffer[128];
@@ -451,15 +451,15 @@ end_html:
 **  on XMosaic-1.1, and put on libwww 2.11 by Arthur Secret,
 **  secret@dxcern.cern.ch .
 */
-PRIVATE void parse_cso ARGS2(
-	CONST char *,		arg,
-	HTParentAnchor *,	anAnchor)
+static void parse_cso (
+	const char *		arg,
+	HTParentAnchor *	anAnchor)
 {
     int ich;
     char line[BIG];
     char *p = line;
     char *second_colon, last_char='\0';
-    CONST char *title;
+    const char *title;
 
     START(HTML_HEAD);
     PUTC('\n');
@@ -598,11 +598,11 @@ PRIVATE void parse_cso ARGS2(
 /*	Display a Gopher CSO ISINDEX cover page.
 **	========================================
 */
-PRIVATE void display_cso ARGS2(
-	CONST char *,		arg,
-	HTParentAnchor *,	anAnchor)
+static void display_cso (
+	const char *		arg,
+	HTParentAnchor *	anAnchor)
 {
-    CONST char * title;
+    const char * title;
 
     START(HTML_HEAD);
     PUTC('\n');
@@ -642,11 +642,11 @@ PRIVATE void display_cso ARGS2(
 /*	Display a Gopher Index document.
 **	================================
 */
-PRIVATE void display_index ARGS2(
-				  CONST char *, arg,
-				  HTParentAnchor *,anAnchor)
+static void display_index (
+				  const char * arg,
+				  HTParentAnchor *anAnchor)
 {
-    CONST char * title;
+    const char * title;
 
     START(HTML_HEAD);
     PUTC('\n');
@@ -686,9 +686,9 @@ PRIVATE void display_index ARGS2(
 **
 **	The % hex escapes are converted. Otheriwse, the string is copied.
 */
-PRIVATE void de_escape ARGS2(char *, command, CONST char *, selector)
+static void de_escape (char * command, const char * selector)
 {
-    CONST char * p = selector;
+    const char * p = selector;
     char * q = command;
 	if (command == NULL)
 	    outofmem(__FILE__, "HTLoadGopher");
@@ -713,7 +713,7 @@ PRIVATE void de_escape ARGS2(char *, command, CONST char *, selector)
 /*	Free the CSOfields structures. - FM
 **	===================================
 */
-PRIVATE void free_CSOfields NOPARAMS
+static void free_CSOfields (void)
 {
     CSOfield_info *cur = CSOfields;
     CSOfield_info *prev;
@@ -736,12 +736,12 @@ PRIVATE void free_CSOfields NOPARAMS
 /*	Interpret CSO/PH form template keys. - FM
 **	=========================================
 */
-PRIVATE void interpret_cso_key ARGS5(
-	char *,			key,
-	char *,			buf,
-	int *,			length,
-	CSOformgen_context *,	ctx,
-	HTStream *,		Target)
+static void interpret_cso_key (
+	char *			key,
+	char *			buf,
+	int *			length,
+	CSOformgen_context *	ctx,
+	HTStream *		Target)
 {
     CSOfield_info *fld;
 
@@ -869,8 +869,8 @@ PRIVATE void interpret_cso_key ARGS5(
 /*	Parse the elements in a CSO/PH fields structure. - FM
 **	=====================================================
 */
-PRIVATE int parse_cso_field_info ARGS1(
-	CSOfield_info *,	blk)
+static int parse_cso_field_info (
+	CSOfield_info *	blk)
 {
     char *info, *max_spec;
 
@@ -911,9 +911,9 @@ PRIVATE int parse_cso_field_info ARGS1(
 /*	Parse a reply from a CSO/PH fields request. - FM
 **	================================================
 */
-PRIVATE int parse_cso_fields ARGS2(
-	char *,		buf,
-	int,		size)
+static int parse_cso_fields (
+	char *		buf,
+	int		size)
 {
     int ich;
     char *p = buf;
@@ -1078,11 +1078,11 @@ PRIVATE int parse_cso_fields ARGS2(
 /*	Generate a form for submitting CSO/PH searches. - FM
 **	====================================================
 */
-PRIVATE int generate_cso_form ARGS4(
-	char *,		host,
-	int,		port,
-	char *,		buf,
-	HTStream *,	Target)
+static int generate_cso_form (
+	char *		host,
+	int		port,
+	char *		buf,
+	HTStream *	Target)
 {
     int i, j, length;
     size_t out;
@@ -1209,8 +1209,8 @@ PRIVATE int generate_cso_form ARGS4(
 /*	Generate a results report for CSO/PH form-based searches. - FM
 **	==============================================================
 */
-PRIVATE int generate_cso_report ARGS1(
-	HTStream *,	Target)
+static int generate_cso_report (
+	HTStream *	Target)
 {
     int ich;
     char line[BIG];
@@ -1426,13 +1426,13 @@ end_CSOreport:
 /*	CSO/PH form-based search gateway - FM			HTLoadCSO
 **	=====================================
 */
-PRIVATE int HTLoadCSO ARGS4(
-	CONST char *,		arg,
-	HTParentAnchor *,	anAnchor,
-	HTFormat,		format_out,
-	HTStream*,		sink)
+static int HTLoadCSO (
+	const char *		arg,
+	HTParentAnchor *	anAnchor,
+	HTFormat		format_out,
+	HTStream*		sink)
 {
-    static CONST char end_form[] = "</BODY>\n</HTML>\n";
+    static const char end_form[] = "</BODY>\n</HTML>\n";
     char *host, *cp, *data;
     int port = CSO_PORT;
     int status;				/* tcp return */
@@ -1684,11 +1684,11 @@ PRIVATE int HTLoadCSO ARGS4(
 **  Bug:  No decoding of strange data types as yet.
 **
 */
-PRIVATE int HTLoadGopher ARGS4(
-	CONST char *,		arg,
-	HTParentAnchor *,	anAnchor,
-	HTFormat,		format_out,
-	HTStream*,		sink)
+static int HTLoadGopher (
+	const char *		arg,
+	HTParentAnchor *	anAnchor,
+	HTFormat		format_out,
+	HTStream*		sink)
 {
     char *command;			/* The whole command */
     int status;				/* tcp return */
@@ -1713,7 +1713,7 @@ PRIVATE int HTLoadGopher ARGS4(
 	int len;
 
 	if ((len = strlen(arg)) > 5) {
-	    if (0 == strcmp((CONST char *)&arg[len-6], ":105/2")) {
+	    if (0 == strcmp((const char *)&arg[len-6], ":105/2")) {
 		/* Use CSO gateway. */
 		CTRACE((tfp, "HTGopher: Passing to CSO/PH gateway.\n"));
 		return HTLoadCSO(arg, anAnchor, format_out, sink);
@@ -1937,8 +1937,8 @@ GLOBALDEF (HTProtocol, HTGopher, _HTGOPHER_C_1_INIT);
 #define _HTCSO_C_1_INIT { "cso", HTLoadCSO, NULL }
 GLOBALDEF (HTProtocol, HTCSO, _HTCSO_C_1_INIT);
 #else
-GLOBALDEF PUBLIC HTProtocol HTGopher = { "gopher", HTLoadGopher, NULL };
-GLOBALDEF PUBLIC HTProtocol HTCSO = { "cso", HTLoadCSO, NULL };
+GLOBALDEF HTProtocol HTGopher = { "gopher", HTLoadGopher, NULL };
+GLOBALDEF HTProtocol HTCSO = { "cso", HTLoadCSO, NULL };
 #endif /* GLOBALDEF_IS_MACRO */
 
 #endif /* not DISABLE_GOPHER */
diff --git a/WWW/Library/Implementation/HTGroup.c b/WWW/Library/Implementation/HTGroup.c
index 8f9e4d1d..36cfea16 100644
--- a/WWW/Library/Implementation/HTGroup.c
+++ b/WWW/Library/Implementation/HTGroup.c
@@ -70,9 +70,9 @@ typedef struct {
 
 
 
-PRIVATE void syntax_error ARGS3(FILE *,	 fp,
-				char *,	 msg,
-				LexItem, lex_item)
+static void syntax_error (FILE *	 fp,
+				char *	 msg,
+				LexItem lex_item)
 {
     char buffer[41];
     int cnt = 0;
@@ -89,7 +89,7 @@ PRIVATE void syntax_error ARGS3(FILE *,	 fp,
 }
 
 
-PRIVATE AddressDefList *parse_address_part ARGS1(FILE *, fp)
+static AddressDefList *parse_address_part (FILE *  fp)
 {
     AddressDefList *address_def_list = NULL;
     LexItem lex_item;
@@ -146,7 +146,7 @@ PRIVATE AddressDefList *parse_address_part ARGS1(FILE *, fp)
 }
 
 
-PRIVATE UserDefList *parse_user_part ARGS1(FILE *, fp)
+static UserDefList *parse_user_part (FILE *  fp)
 {
     UserDefList *user_def_list = NULL;
     LexItem lex_item;
@@ -202,7 +202,7 @@ PRIVATE UserDefList *parse_user_part ARGS1(FILE *, fp)
 }
 
 
-PRIVATE Item *parse_item ARGS1(FILE *, fp)
+static Item *parse_item (FILE *  fp)
 {
     Item *item = NULL;
     UserDefList *user_def_list = NULL;
@@ -248,7 +248,7 @@ PRIVATE Item *parse_item ARGS1(FILE *, fp)
 }
 
 
-PRIVATE ItemList *parse_item_list ARGS1(FILE *, fp)
+static ItemList *parse_item_list (FILE *  fp)
 {
     ItemList *item_list = HTList_new();
     Item *item;
@@ -279,7 +279,7 @@ PRIVATE ItemList *parse_item_list ARGS1(FILE *, fp)
 }
 
 
-PUBLIC GroupDef *HTAA_parseGroupDef ARGS1(FILE *, fp)
+GroupDef *HTAA_parseGroupDef (FILE *  fp)
 {
     ItemList *item_list = NULL;
     GroupDef *group_def = NULL;
@@ -302,7 +302,7 @@ PUBLIC GroupDef *HTAA_parseGroupDef ARGS1(FILE *, fp)
 }
 
 
-PRIVATE GroupDef *parse_group_decl ARGS1(FILE *, fp)
+static GroupDef *parse_group_decl (FILE *  fp)
 {
     char *group_name = NULL;
     GroupDef *group_def = NULL;
@@ -340,8 +340,8 @@ PRIVATE GroupDef *parse_group_decl ARGS1(FILE *, fp)
 ** Group manipulation routines
 */
 
-PRIVATE GroupDef *find_group_def ARGS2(GroupDefList *,	group_list,
-				       CONST char *,	group_name)
+static GroupDef *find_group_def (GroupDefList *	group_list,
+				       const char *	group_name)
 {
     if (group_list && group_name) {
 	GroupDefList *cur = group_list;
@@ -357,8 +357,8 @@ PRIVATE GroupDef *find_group_def ARGS2(GroupDefList *,	group_list,
 }
 
 
-PUBLIC void HTAA_resolveGroupReferences ARGS2(GroupDef *,	group_def,
-					      GroupDefList *,	group_def_list)
+void HTAA_resolveGroupReferences (GroupDef *	group_def,
+					      GroupDefList *	group_def_list)
 {
     if (group_def && group_def->item_list && group_def_list) {
 	ItemList *cur1 = group_def->item_list;
@@ -377,15 +377,15 @@ PUBLIC void HTAA_resolveGroupReferences ARGS2(GroupDef *,	group_def,
 }
 
 
-PRIVATE void add_group_def ARGS2(GroupDefList *, group_def_list,
-				 GroupDef *,	 group_def)
+static void add_group_def (GroupDefList * group_def_list,
+				 GroupDef *	 group_def)
 {
     HTAA_resolveGroupReferences(group_def, group_def_list);
     HTList_addObject(group_def_list, (void*)group_def);
 }
 
 
-PRIVATE GroupDefList *parse_group_file ARGS1(FILE *, fp)
+static GroupDefList *parse_group_file (FILE *  fp)
 {
     GroupDefList *group_def_list = HTList_new();
     GroupDef *group_def;
@@ -401,7 +401,7 @@ PRIVATE GroupDefList *parse_group_file ARGS1(FILE *, fp)
 ** Trace functions
 */
 
-PRIVATE void print_item ARGS1(Item *, item)
+static void print_item (Item *  item)
 {
     if (!item)
 	fprintf(tfp, "\tNULL-ITEM\n");
@@ -430,7 +430,7 @@ PRIVATE void print_item ARGS1(Item *, item)
 }
 
 
-PRIVATE void print_item_list ARGS1(ItemList *, item_list)
+static void print_item_list (ItemList *  item_list)
 {
     ItemList *cur = item_list;
     Item *item;
@@ -442,7 +442,7 @@ PRIVATE void print_item_list ARGS1(ItemList *, item_list)
 }
 
 
-PUBLIC void HTAA_printGroupDef ARGS1(GroupDef *, group_def)
+void HTAA_printGroupDef (GroupDef *  group_def)
 {
     if (!group_def) {
 	fprintf(tfp, "\nNULL RECORD\n");
@@ -457,7 +457,7 @@ PUBLIC void HTAA_printGroupDef ARGS1(GroupDef *, group_def)
 }
 
 
-PRIVATE void print_group_def_list ARGS1(GroupDefList *, group_list)
+static void print_group_def_list (GroupDefList *  group_list)
 {
     GroupDefList *cur = group_list;
     GroupDef *group_def;
@@ -472,7 +472,7 @@ PRIVATE void print_group_def_list ARGS1(GroupDefList *, group_list)
 ** IP address template matching
 */
 
-/* PRIVATE						part_match()
+/* static						part_match()
 **		MATCH ONE PART OF INET ADDRESS AGAIST
 **		A PART OF MASK (inet address has 4 parts)
 ** ON ENTRY:
@@ -483,12 +483,12 @@ PRIVATE void print_group_def_list ARGS1(GroupDefList *, group_list)
 ** ON EXIT:
 **	returns	YES, if match.
 */
-PRIVATE BOOL part_match ARGS2(CONST char *, tcur,
-			      CONST char *, icur)
+static BOOL part_match (const char * tcur,
+			      const char * icur)
 {
     char required[4];
     char actual[4];
-    CONST char *cur;
+    const char *cur;
     int cnt;
     BOOL status;
 
@@ -515,7 +515,7 @@ PRIVATE BOOL part_match ARGS2(CONST char *, tcur,
 
 
 
-/* PRIVATE						ip_number_match()
+/* static						ip_number_match()
 **		MATCH INET NUMBER AGAINST AN INET NUMBER MASK
 ** ON ENTRY:
 **	template	mask to match agaist, e.g., 128.141.*.*
@@ -524,11 +524,11 @@ PRIVATE BOOL part_match ARGS2(CONST char *, tcur,
 ** ON EXIT:
 **	returns		YES, if match;  NO, if not.
 */
-PRIVATE BOOL ip_number_match ARGS2(CONST char *,	template,
-				   CONST char *,	the_inet_addr)
+static BOOL ip_number_match (const char *	template,
+				   const char *	the_inet_addr)
 {
-    CONST char *tcur = template;
-    CONST char *icur = the_inet_addr;
+    const char *tcur = template;
+    const char *icur = the_inet_addr;
     int cnt;
 
     for (cnt=0; cnt<4; cnt++) {
@@ -542,7 +542,7 @@ PRIVATE BOOL ip_number_match ARGS2(CONST char *,	template,
 
 
 
-/* PRIVATE						is_domain_mask()
+/* static						is_domain_mask()
 **		DETERMINE IF A GIVEN MASK IS A
 **		DOMAIN NAME MASK OR AN INET NUMBER MASK
 ** ON ENTRY:
@@ -558,9 +558,9 @@ PRIVATE BOOL ip_number_match ARGS2(CONST char *,	template,
 **	returns	YES, if mask is a domain name mask.
 **		NO, if it is an inet number mask.
 */
-PRIVATE BOOL is_domain_mask ARGS1(CONST char *,	mask)
+static BOOL is_domain_mask (const char * 	mask)
 {
-    CONST char *cur = mask;
+    const char *cur = mask;
 
     if (!mask) return NO;
 
@@ -574,7 +574,7 @@ PRIVATE BOOL is_domain_mask ARGS1(CONST char *,	mask)
 
 
 
-/* PRIVATE							ip_mask_match()
+/* static							ip_mask_match()
 **		MATCH AN IP NUMBER MASK OR IP NAME MASK
 **		AGAINST ACTUAL IP NUMBER OR IP NAME
 **
@@ -594,9 +594,9 @@ PRIVATE BOOL is_domain_mask ARGS1(CONST char *,	mask)
 **			matches the mask.
 **			NO, if no match (no fire).
 */
-PRIVATE BOOL ip_mask_match ARGS3(CONST char *,	mask,
-				 CONST char *,	ip_number,
-				 CONST char *,	ip_name)
+static BOOL ip_mask_match (const char *	mask,
+				 const char *	ip_number,
+				 const char *	ip_name)
 {
     if (mask && (ip_number || ip_name)) {
 	if (is_domain_mask(mask)) {
@@ -614,9 +614,9 @@ PRIVATE BOOL ip_mask_match ARGS3(CONST char *,	mask,
 
 
 
-PRIVATE BOOL ip_in_def_list ARGS3(AddressDefList *,	address_def_list,
-				  char *,		ip_number,
-				  char *,		ip_name)
+static BOOL ip_in_def_list (AddressDefList *	address_def_list,
+				  char *		ip_number,
+				  char *		ip_name)
 {
     if (address_def_list && (ip_number || ip_name)) {
 	AddressDefList *cur = address_def_list;
@@ -644,10 +644,10 @@ typedef struct {
 
 typedef HTList GroupCacheList;
 
-PRIVATE GroupCacheList *group_cache_list = NULL;
+static GroupCacheList *group_cache_list = NULL;
 
 
-PUBLIC GroupDefList *HTAA_readGroupFile ARGS1(CONST char *, filename)
+GroupDefList *HTAA_readGroupFile (const char *  filename)
 {
     FILE *fp;
     GroupCache *group_cache;
@@ -714,10 +714,10 @@ PUBLIC GroupDefList *HTAA_readGroupFile ARGS1(CONST char *, filename)
 **			to the group.
 **			HTAA_OK if both IP address and user are ok.
 */
-PUBLIC HTAAFailReasonType HTAA_userAndInetInGroup ARGS4(GroupDef *, group,
-							char *,	    username,
-							char *,	    ip_number,
-							char *,	    ip_name)
+HTAAFailReasonType HTAA_userAndInetInGroup (GroupDef * group,
+							char *	    username,
+							char *	    ip_number,
+							char *	    ip_name)
 {
     HTAAFailReasonType reason = HTAA_NOT_MEMBER;
 
@@ -762,7 +762,7 @@ PUBLIC HTAAFailReasonType HTAA_userAndInetInGroup ARGS4(GroupDef *, group,
 }
 
 
-PUBLIC void GroupDef_delete ARGS1(GroupDef *, group_def)
+void GroupDef_delete (GroupDef *  group_def)
 {
     if (group_def) {
 	FREE(group_def->group_name);
diff --git a/WWW/Library/Implementation/HTGroup.h b/WWW/Library/Implementation/HTGroup.h
index 5288b8d6..eee5f46c 100644
--- a/WWW/Library/Implementation/HTGroup.h
+++ b/WWW/Library/Implementation/HTGroup.h
@@ -100,7 +100,7 @@ Group definition grammar
 
  */
 
-PUBLIC GroupDef *HTAA_parseGroupDef PARAMS((FILE * fp));
+extern GroupDef *HTAA_parseGroupDef (FILE * fp);
 /*
 
 Fill in Pointers to referenced Group Definitions in a Group Definition
@@ -110,8 +110,8 @@ Fill in Pointers to referenced Group Definitions in a Group Definition
 
  */
 
-PUBLIC void HTAA_resolveGroupReferences PARAMS((GroupDef *     group_def,
-                                                GroupDefList * group_def_list));
+extern void HTAA_resolveGroupReferences (GroupDef *     group_def,
+                                                GroupDefList * group_def_list);
 /*
 
 Read Group File (and do caching)
@@ -121,7 +121,7 @@ Read Group File (and do caching)
 
  */
 
-PUBLIC GroupDefList *HTAA_readGroupFile PARAMS((CONST char * filename));
+extern GroupDefList *HTAA_readGroupFile (const char * filename);
 /*
 
 Delete Group Definition
@@ -131,14 +131,14 @@ Delete Group Definition
 
  */
 
-PUBLIC void GroupDef_delete PARAMS((GroupDef * group_def));
+extern void GroupDef_delete (GroupDef * group_def);
 /*
 
 Print Out Group Definition (for trace purposes)
 
  */
 
-PUBLIC void HTAA_printGroupDef PARAMS((GroupDef * group_def));
+extern void HTAA_printGroupDef (GroupDef * group_def);
 /*
 
 Does a User Belong to a Given Set of Groups
@@ -165,9 +165,9 @@ Does a User Belong to a Given Set of Groups
 **                      to the group.
 **                      HTAA_OK if both IP address and user are ok.
 */
-PUBLIC HTAAFailReasonType HTAA_userAndInetInGroup PARAMS((GroupDef * group,
+extern HTAAFailReasonType HTAA_userAndInetInGroup (GroupDef * group,
                                                           char *     username,
                                                           char *     ip_number,
-                                                          char *     ip_name));
+                                                          char *     ip_name);
 
 #endif /* not HTGROUP_H */
diff --git a/WWW/Library/Implementation/HTInit.h b/WWW/Library/Implementation/HTInit.h
index cedbb25c..f5f12b88 100644
--- a/WWW/Library/Implementation/HTInit.h
+++ b/WWW/Library/Implementation/HTInit.h
@@ -18,8 +18,8 @@
 #include <HTUtils.h>
 #endif
  
-extern void HTFormatInit NOPARAMS;
-extern void HTPreparsedFormatInit NOPARAMS;
-extern void HTFileInit NOPARAMS;
+extern void HTFormatInit (void);
+extern void HTPreparsedFormatInit (void);
+extern void HTFileInit (void);
 
 #endif /* HTINIT_H */
diff --git a/WWW/Library/Implementation/HTLex.c b/WWW/Library/Implementation/HTLex.c
index 9d9412af..6297a1f7 100644
--- a/WWW/Library/Implementation/HTLex.c
+++ b/WWW/Library/Implementation/HTLex.c
@@ -22,26 +22,26 @@
 /*
 ** Global variables
 */
-PUBLIC char HTlex_buffer[40];	/* Read lexical string		*/
-PUBLIC int HTlex_line = 1;	/* Line number in source file	*/
+char HTlex_buffer[40];	/* Read lexical string		*/
+int HTlex_line = 1;	/* Line number in source file	*/
 
 
 /*
 ** Module-wide variables
 */
-PRIVATE int lex_cnt;
-PRIVATE BOOL lex_template;
-PRIVATE LexItem lex_pushed_back = LEX_NONE;
-PRIVATE FILE *cache = NULL;
+static int lex_cnt;
+static BOOL lex_template;
+static LexItem lex_pushed_back = LEX_NONE;
+static FILE *cache = NULL;
 
 
-PUBLIC void unlex ARGS1(LexItem, lex_item)
+void unlex (LexItem  lex_item)
 {
     lex_pushed_back = lex_item;
 }
 
 
-PUBLIC LexItem lex ARGS1(FILE *, fp)
+LexItem lex (FILE *  fp)
 {
     int ch = 0;
 
@@ -97,7 +97,7 @@ PUBLIC LexItem lex ARGS1(FILE *, fp)
 }
 
 
-PUBLIC char *lex_verbose ARGS1(LexItem, lex_item)
+char *lex_verbose (LexItem  lex_item)
 {
     static char msg[100];	/* @@@@@@@@ */
 
diff --git a/WWW/Library/Implementation/HTLex.h b/WWW/Library/Implementation/HTLex.h
index f0b6875e..fd0f3c75 100644
--- a/WWW/Library/Implementation/HTLex.h
+++ b/WWW/Library/Implementation/HTLex.h
@@ -33,21 +33,21 @@ Get Next Lexical Item
 
  */
 
-PUBLIC LexItem lex PARAMS((FILE * fp));
+extern LexItem lex (FILE * fp);
 /*
 
 Push Back Latest Item
 
  */
 
-PUBLIC void unlex PARAMS((LexItem lex_item));
+extern void unlex (LexItem lex_item);
 /*
 
 Get the Name for Lexical Item
 
  */
 
-PUBLIC char *lex_verbose PARAMS((LexItem lex_item));
+extern char *lex_verbose (LexItem lex_item);
 /*
 
  */
diff --git a/WWW/Library/Implementation/HTList.c b/WWW/Library/Implementation/HTList.c
index 7a517ec6..ca95864c 100644
--- a/WWW/Library/Implementation/HTList.c
+++ b/WWW/Library/Implementation/HTList.c
@@ -13,7 +13,7 @@
 
 /*	Create list.
 */
-PUBLIC HTList * HTList_new NOARGS
+HTList * HTList_new (void)
 {
     HTList *newList;
 
@@ -29,8 +29,8 @@ PUBLIC HTList * HTList_new NOARGS
 
 /*	Delete list.
 */
-PUBLIC void HTList_delete ARGS1(
-	HTList *,	me)
+void HTList_delete (
+	HTList *	me)
 {
     HTList *current;
 
@@ -44,8 +44,8 @@ PUBLIC void HTList_delete ARGS1(
 
 /*	Reverse order of elements in list.
  */
-PUBLIC HTList * HTList_reverse ARGS1(
-    HTList *,		start)
+HTList * HTList_reverse (
+    HTList *		start)
 {
     HTList *cur, *succ;
     if (!(start && start->next && (cur = start->next->next)))
@@ -64,9 +64,9 @@ PUBLIC HTList * HTList_reverse ARGS1(
  *
  *	If successful, the second list will become empty but not freed.
  */
-PUBLIC HTList * HTList_appendList ARGS2(
-    HTList *,		start,
-    HTList *,		tail)
+HTList * HTList_appendList (
+    HTList *		start,
+    HTList *		tail)
 {
     HTList * temp = start;
 
@@ -93,10 +93,10 @@ PUBLIC HTList * HTList_appendList ARGS2(
  *	it use already allocated memory which should not be free'd by any
  *	list operations (optimization).
  */
-PUBLIC void HTList_linkObject ARGS3(
-	HTList *,	me,
-	void *,		newObject,
-	HTList *,	newNode)
+void HTList_linkObject (
+	HTList *	me,
+	void *		newObject,
+	HTList *	newNode)
 {
     if (me) {
 	if (newNode->object == NULL && newNode->next == NULL) {
@@ -126,9 +126,9 @@ PUBLIC void HTList_linkObject ARGS3(
 
 /*      Add object to START of list (so it is pointed to by the head).
 */
-PUBLIC void HTList_addObject ARGS2(
-	HTList *,	me,
-	void *,		newObject)
+void HTList_addObject (
+	HTList *	me,
+	void *		newObject)
 {
     HTList *newNode;
 
@@ -150,9 +150,9 @@ PUBLIC void HTList_addObject ARGS2(
 
 /*      Append object to END of list (furthest from the head).
 */
-PUBLIC void HTList_appendObject ARGS2(
-	HTList *,	me,
-	void *,		newObject)
+void HTList_appendObject (
+	HTList *	me,
+	void *		newObject)
 {
     HTList *temp = me;
 
@@ -170,10 +170,10 @@ PUBLIC void HTList_appendObject ARGS2(
 **      If position is 0, this places the object at the head of the list
 **      and is equivalent to HTList_addObject().
 */
-PUBLIC void HTList_insertObjectAt ARGS3(
-	HTList *,	me,
-	void *,		newObject,
-	int,		pos)
+void HTList_insertObjectAt (
+	HTList *	me,
+	void *		newObject,
+	int		pos)
 {
     HTList * newNode;
     HTList * temp = me;
@@ -215,9 +215,9 @@ PUBLIC void HTList_insertObjectAt ARGS3(
 /*	Unlink specified object from list.
  *	It does not free memory.
  */
-PUBLIC BOOL HTList_unlinkObject ARGS2(
-	HTList *,	me,
-	void *,		oldObject)
+BOOL HTList_unlinkObject (
+	HTList *	me,
+	void *		oldObject)
 {
     HTList *temp = me;
     HTList *prevNode;
@@ -240,9 +240,9 @@ PUBLIC BOOL HTList_unlinkObject ARGS2(
 
 /*	Remove specified object from list.
 */
-PUBLIC BOOL HTList_removeObject ARGS2(
-	HTList *,	me,
-	void *,		oldObject)
+BOOL HTList_removeObject (
+	HTList *	me,
+	void *		oldObject)
 {
     HTList *temp = me;
     HTList *prevNode;
@@ -267,9 +267,9 @@ PUBLIC BOOL HTList_removeObject ARGS2(
 **	(->object) for the object, and NULL if the list is empty, or
 **	if it doesn't exist - Yuk!).
 */
-PUBLIC void * HTList_removeObjectAt  ARGS2(
-	HTList *,	me,
-	int,		position)
+void * HTList_removeObjectAt  (
+	HTList *	me,
+	int		position)
 {
     HTList * temp = me;
     HTList * prevNode;
@@ -297,8 +297,8 @@ PUBLIC void * HTList_removeObjectAt  ARGS2(
  *	via HTList_linkObject(), and pointed to by the head).
  *	It does not free memory.
  */
-PUBLIC void * HTList_unlinkLastObject ARGS1(
-	HTList *,	me)
+void * HTList_unlinkLastObject (
+	HTList *	me)
 {
     HTList * lastNode;
     void * lastObject;
@@ -320,8 +320,8 @@ PUBLIC void * HTList_unlinkLastObject ARGS1(
 /*	Remove object from START of list (the Last one inserted
 **	via HTList_addObject(), and pointed to by the head).
 */
-PUBLIC void * HTList_removeLastObject ARGS1(
-	HTList *,	me)
+void * HTList_removeLastObject (
+	HTList *	me)
 {
     HTList * lastNode;
     void * lastObject;
@@ -342,8 +342,8 @@ PUBLIC void * HTList_removeLastObject ARGS1(
 /*	Remove object from END of list (the First one inserted
 **	via HTList_addObject(), and furthest from the head).
 */
-PUBLIC void * HTList_removeFirstObject ARGS1(
-	HTList *,	me)
+void * HTList_removeFirstObject (
+	HTList *	me)
 {
     HTList * temp = me;
     HTList * prevNode;
@@ -372,8 +372,8 @@ PUBLIC void * HTList_removeFirstObject ARGS1(
 /*	Determine total number of objects in the list,
 **	not counting the head.
 */
-PUBLIC int HTList_count ARGS1(
-	HTList *,	me)
+int HTList_count (
+	HTList *	me)
 {
     HTList * temp = me;
     int count = 0;
@@ -389,9 +389,9 @@ PUBLIC int HTList_count ARGS1(
 /*	Determine position of an object in the list (a value of 0
 **	means it is pointed to by the head; returns -1 if not found).
 */
-PUBLIC int HTList_indexOf ARGS2(
-	HTList *,	me,
-	void *,		object)
+int HTList_indexOf (
+	HTList *	me,
+	void *		object)
 {
     HTList * temp = me;
     int position = 0;
@@ -412,9 +412,9 @@ PUBLIC int HTList_indexOf ARGS2(
 **	where 0 is the object pointed to by the head (returns NULL if
 **	the list is empty, or if it doesn't exist - Yuk!).
 */
-PUBLIC void * HTList_objectAt ARGS2(
-	HTList *,	me,
-	int,		position)
+void * HTList_objectAt (
+	HTList *	me,
+	int		position)
 {
     HTList * temp = me;
     int pos = position;
diff --git a/WWW/Library/Implementation/HTList.h b/WWW/Library/Implementation/HTList.h
index 19739d9c..a9973ba8 100644
--- a/WWW/Library/Implementation/HTList.h
+++ b/WWW/Library/Implementation/HTList.h
@@ -41,55 +41,55 @@ struct _HTList {
 
 /*	Create list.
 */
-extern HTList * HTList_new NOPARAMS;
+extern HTList * HTList_new (void);
 
 
 /*	Delete list.
 */
-extern void HTList_delete PARAMS((
-	HTList *	me));
+extern void HTList_delete (
+	HTList *	me);
 
 /*	Reverse a list.
 */
-extern HTList * HTList_reverse PARAMS((
-	HTList *	start));
+extern HTList * HTList_reverse (
+	HTList *	start);
 
 /*	Append two lists, making second list empty.
 */
-extern HTList * HTList_appendList PARAMS((
+extern HTList * HTList_appendList (
 	HTList *	start,
-	HTList *	tail));
+	HTList *	tail);
 
 
 /*      Add object to START of list (so it is pointed to by the head).
 */
-extern void HTList_addObject PARAMS((
+extern void HTList_addObject (
 	HTList *	me,
-	void *		newObject));
+	void *		newObject);
 
 
 /*      Append object to END of list (furthest from the head).
 */
-extern void HTList_appendObject PARAMS((
+extern void HTList_appendObject (
 	HTList *	me,
-	void *		newObject));
+	void *		newObject);
 
 
 /*	Insert an object into the list at a specified position.
 **      If position is 0, this places the object at the head of the list
 **      and is equivalent to HTList_addObject().
 */
-extern void HTList_insertObjectAt PARAMS((
+extern void HTList_insertObjectAt (
 	HTList *	me,
 	void *		newObject,
-	int		pos));
+	int		pos);
 
 
 /*	Remove specified object from list.
 */
-extern BOOL HTList_removeObject PARAMS((
+extern BOOL HTList_removeObject (
 	HTList *	me,
-	void *		oldObject));
+	void *		oldObject);
 
 
 /*	Remove object at a given position in the list, where 0 is the
@@ -97,47 +97,47 @@ extern BOOL HTList_removeObject PARAMS((
 **	(->object) for the object, and NULL if the list is empty, or
 **	if it doesn't exist - Yuk!).
 */
-extern void * HTList_removeObjectAt PARAMS((
+extern void * HTList_removeObjectAt (
 	HTList *	me,
-	int		position));
+	int		position);
 
 
 /*	Remove object from START of list (the Last one inserted
 **	via HTList_addObject(), and pointed to by the head).
 */
-extern void * HTList_removeLastObject PARAMS((
-	HTList *	me));
+extern void * HTList_removeLastObject (
+	HTList *	me);
 
 
 /*	Remove object from END of list (the First one inserted
 **	via HTList_addObject(), and furthest from the head).
 */
-extern void * HTList_removeFirstObject PARAMS((
-	HTList *	me));
+extern void * HTList_removeFirstObject (
+	HTList *	me);
 
 
 /*	Determine total number of objects in the list,
 **	not counting the head.
 */
-extern int HTList_count PARAMS((
-	HTList *	me));
+extern int HTList_count (
+	HTList *	me);
 
 
 /*	Determine position of an object in the list (a value of 0
 **	means it is pointed to by the head; returns -1 if not found).
 */
-extern int HTList_indexOf PARAMS((
+extern int HTList_indexOf (
 	HTList *	me,
-	void *		object));
+	void *		object);
 
 
 /*	Return pointer to the object at a specified position in the list,
 **	where 0 is the object pointed to by the head (returns NULL if
 **	the list is empty, or if it doesn't exist - Yuk!).
 */
-extern void * HTList_objectAt PARAMS((
+extern void * HTList_objectAt (
 	HTList *	me,
-	int		position));
+	int		position);
 
 /*      Link object to START of list (so it is pointed to by the head).
  *
@@ -145,23 +145,23 @@ extern void * HTList_objectAt PARAMS((
  *	it use already allocated memory which should not be free'd by any
  *	list operations (optimization).
  */
-extern void HTList_linkObject PARAMS((
+extern void HTList_linkObject (
 	HTList *	me,
 	void *		newObject,
-	HTList *	newNode));
+	HTList *	newNode);
 
 /*	Unlink object from START of list (the Last one inserted
  *	via HTList_linkObject(), and pointed to by the head).
  *	It does not free memory.
  */
-extern void * HTList_unlinkLastObject PARAMS((
-	HTList *	me));
+extern void * HTList_unlinkLastObject (
+	HTList *	me);
 
 /*	Unlink specified object from list.
  *	It does not free memory.
  */
-extern BOOL HTList_unlinkObject PARAMS((
+extern BOOL HTList_unlinkObject (
 	HTList *	me,
-	void *		oldObject));
+	void *		oldObject);
 
 #endif /* HTLIST_H */
diff --git a/WWW/Library/Implementation/HTMIME.c b/WWW/Library/Implementation/HTMIME.c
index aaba3d0e..dc0ba31c 100644
--- a/WWW/Library/Implementation/HTMIME.c
+++ b/WWW/Library/Implementation/HTMIME.c
@@ -109,7 +109,7 @@ typedef enum {
 
 #define VALUE_SIZE 5120		/* @@@@@@@ Arbitrary? */
 struct _HTStream {
-	CONST HTStreamClass *	isa;
+	const HTStreamClass *	isa;
 
 	BOOL			net_ascii;	/* Is input net ascii? */
 	MIME_state		state;		/* current state */
@@ -119,7 +119,7 @@ struct _HTStream {
 	BOOL			head_only;	/* only parsing header */
 	BOOL			pickup_redirection; /* parsing for location */
 	BOOL			no_streamstack; /* use sink directly */
-	CONST char *		check_pointer;	/* checking input */
+	const char *		check_pointer;	/* checking input */
 
 	char *			value_pointer;	/* storing values */
 	char			value[VALUE_SIZE];
@@ -150,8 +150,8 @@ struct _HTStream {
 **  and will not modify the string unless both the
 **  first and last characters are double-quotes. - FM
 */
-PUBLIC void HTMIME_TrimDoubleQuotes ARGS1(
-	char *,		value)
+void HTMIME_TrimDoubleQuotes (
+	char *		value)
 {
     int i;
     char *cp = value;
@@ -169,7 +169,7 @@ PUBLIC void HTMIME_TrimDoubleQuotes ARGS1(
 	value[i] = cp[(i +1)];
 }
 
-PRIVATE BOOL content_is_compressed ARGS1(HTStream *, me)
+static BOOL content_is_compressed (HTStream *  me)
 {
     char *encoding = me->anchor->content_encoding;
 
@@ -182,7 +182,7 @@ PRIVATE BOOL content_is_compressed ARGS1(HTStream *, me)
 /*
  * Strip quotes from a refresh-URL.
  */
-PRIVATE void dequote ARGS1(char *, url)
+static void dequote (char *  url)
 {
     int len;
 
@@ -195,7 +195,7 @@ PRIVATE void dequote ARGS1(char *, url)
     }
 }
 
-PRIVATE int pumpData ARGS1(HTStream *, me)
+static int pumpData (HTStream *  me)
 {
     if (strchr(HTAtom_name(me->format), ';') != NULL) {
 	char *cp = NULL, *cp1, *cp2, *cp3 = NULL, *cp4;
@@ -485,7 +485,7 @@ PRIVATE int pumpData ARGS1(HTStream *, me)
     return HT_OK;
 }
 
-PRIVATE int dispatchField ARGS1(HTStream *, me)
+static int dispatchField (HTStream *  me)
 {
     int i, j;
     char *cp;
@@ -973,9 +973,9 @@ PRIVATE int dispatchField ARGS1(HTStream *, me)
 **	the beginning (that are not folded continuation lines) are ignored
 **	as unknown field names.  Fields with empty values are not picked up.
 */
-PRIVATE void HTMIME_put_character ARGS2(
-	HTStream *,	me,
-	char,		c)
+static void HTMIME_put_character (
+	HTStream *	me,
+	char		c)
 {
     if (me->state == MIME_TRANSPARENT) {
 	(*me->targetClass.put_character)(me->target, c);/* MUST BE FAST */
@@ -1839,11 +1839,11 @@ bad_field_name:				/* Ignore it */
 **
 **	Strings must be smaller than this buffer size.
 */
-PRIVATE void HTMIME_put_string ARGS2(
-	HTStream *,	me,
-	CONST char *,	s)
+static void HTMIME_put_string (
+	HTStream *	me,
+	const char *	s)
 {
-    CONST char * p;
+    const char * p;
 
     if (me->state == MIME_TRANSPARENT) {	/* Optimisation */
 	(*me->targetClass.put_string)(me->target,s);
@@ -1860,12 +1860,12 @@ PRIVATE void HTMIME_put_string ARGS2(
 /*	Buffer write.  Buffers can (and should!) be big.
 **	------------
 */
-PRIVATE void HTMIME_write ARGS3(
-	HTStream *,	me,
-	CONST char *,	s,
-	int,		l)
+static void HTMIME_write (
+	HTStream *	me,
+	const char *	s,
+	int		l)
 {
-    CONST char * p;
+    const char * p;
 
     if (me->state == MIME_TRANSPARENT) {	/* Optimisation */
 	(*me->targetClass.put_block)(me->target, s, l);
@@ -1883,8 +1883,8 @@ PRIVATE void HTMIME_write ARGS3(
 **	-------------------
 **
 */
-PRIVATE void HTMIME_free ARGS1(
-	HTStream *,	me)
+static void HTMIME_free (
+	HTStream *	me)
 {
     if (me) {
 	FREE(me->location);
@@ -1897,9 +1897,9 @@ PRIVATE void HTMIME_free ARGS1(
 
 /*	End writing
 */
-PRIVATE void HTMIME_abort ARGS2(
-	HTStream *,	me,
-	HTError,	e)
+static void HTMIME_abort (
+	HTStream *	me,
+	HTError	e)
 {
     if (me) {
 	FREE(me->location);
@@ -1914,7 +1914,7 @@ PRIVATE void HTMIME_abort ARGS2(
 /*	Structured Object Class
 **	-----------------------
 */
-PRIVATE CONST HTStreamClass HTMIME =
+static const HTStreamClass HTMIME =
 {
 	"MIMEParser",
 	HTMIME_free,
@@ -1928,10 +1928,10 @@ PRIVATE CONST HTStreamClass HTMIME =
 /*	Subclass-specific Methods
 **	-------------------------
 */
-PUBLIC HTStream* HTMIMEConvert ARGS3(
-	HTPresentation *,	pres,
-	HTParentAnchor *,	anchor,
-	HTStream *,		sink)
+HTStream* HTMIMEConvert (
+	HTPresentation *	pres,
+	HTParentAnchor *	anchor,
+	HTStream *		sink)
 {
     HTStream* me;
 
@@ -1998,10 +1998,10 @@ PUBLIC HTStream* HTMIMEConvert ARGS3(
     return me;
 }
 
-PUBLIC HTStream* HTNetMIME ARGS3(
-	HTPresentation *,	pres,
-	HTParentAnchor *,	anchor,
-	HTStream *,		sink)
+HTStream* HTNetMIME (
+	HTPresentation *	pres,
+	HTParentAnchor *	anchor,
+	HTStream *		sink)
 {
     HTStream* me = HTMIMEConvert(pres,anchor, sink);
     if (!me)
@@ -2011,10 +2011,10 @@ PUBLIC HTStream* HTNetMIME ARGS3(
     return me;
 }
 
-PUBLIC HTStream* HTMIMERedirect ARGS3(
-	HTPresentation *,	pres,
-	HTParentAnchor *,	anchor,
-	HTStream *,		sink)
+HTStream* HTMIMERedirect (
+	HTPresentation *	pres,
+	HTParentAnchor *	anchor,
+	HTStream *		sink)
 {
     HTStream* me = HTMIMEConvert(pres,anchor, sink);
     if (!me)
@@ -2072,14 +2072,14 @@ PUBLIC HTStream* HTMIMERedirect ARGS3(
 #include <LYCharVals.h>  /* S/390 -- gil -- 0163 */
 #define ESC	CH_ESC
 
-PRIVATE char HTmm64[] =
+static char HTmm64[] =
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=" ;
-PRIVATE char HTmmquote[] = "0123456789ABCDEF";
-PRIVATE int HTmmcont = 0;
+static char HTmmquote[] = "0123456789ABCDEF";
+static int HTmmcont = 0;
 
-PUBLIC void HTmmdec_base64 ARGS2(
-	char *,		t,
-	char *,		s)
+void HTmmdec_base64 (
+	char *		t,
+	char *		s)
 {
     int   d, count, j, val;
     char  buf[LINE_LENGTH], *bp, nw[4], *p;
@@ -2116,9 +2116,9 @@ PUBLIC void HTmmdec_base64 ARGS2(
     strcpy(t, buf);
 }
 
-PUBLIC void HTmmdec_quote ARGS2(
-	char *,		t,
-	char *,		s)
+void HTmmdec_quote (
+	char *		t,
+	char *		s)
 {
     char  buf[LINE_LENGTH], cval, *bp, *p;
 
@@ -2153,9 +2153,9 @@ PUBLIC void HTmmdec_quote ARGS2(
 /*
 **	HTmmdecode for ISO-2022-JP - FM
 */
-PUBLIC void HTmmdecode ARGS2(
-	char *,		trg,
-	char *,		str)
+void HTmmdecode (
+	char *		trg,
+	char *		str)
 {
     char buf[LINE_LENGTH], mmbuf[LINE_LENGTH];
     char *s, *t, *u;
@@ -2218,9 +2218,9 @@ end:
 **  Insert ESC where it seems lost.
 **  (The author of this function "rjis" is S. Ichikawa.)
 */
-PUBLIC int HTrjis ARGS2(
-	char *,		t,
-	char *,		s)
+int HTrjis (
+	char *		t,
+	char *		s)
 {
     char *p, buf[LINE_LENGTH];
     int kanji = 0;
@@ -2286,9 +2286,9 @@ PUBLIC int HTrjis ARGS2(
  * Software Foundation Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-PUBLIC int HTmaybekanji ARGS2(
-	int,		c1,
-	int,		c2)
+int HTmaybekanji (
+	int		c1,
+	int		c2)
 {
 
     if ((c2 < 33) || (c2 > 126))
diff --git a/WWW/Library/Implementation/HTMIME.h b/WWW/Library/Implementation/HTMIME.h
index 211e21b4..96306745 100644
--- a/WWW/Library/Implementation/HTMIME.h
+++ b/WWW/Library/Implementation/HTMIME.h
@@ -33,33 +33,33 @@
 **  and will not modify the string unless both the
 **  first and last characters are double-quotes. - FM
 */
-extern void HTMIME_TrimDoubleQuotes PARAMS((
-	char *		value));
+extern void HTMIME_TrimDoubleQuotes (
+	char *		value);
 
 /*
 
   INPUT: LOCAL TEXT
 
  */
-extern HTStream * HTMIMEConvert PARAMS((HTPresentation * pres,
+extern HTStream * HTMIMEConvert (HTPresentation * pres,
                                         HTParentAnchor * anchor,
-                                        HTStream * sink));
+                                        HTStream * sink);
 /*
 
   INPUT: NET ASCII
 
  */
-extern HTStream * HTNetMIME PARAMS((HTPresentation * pres,
+extern HTStream * HTNetMIME (HTPresentation * pres,
                                         HTParentAnchor * anchor,
-                                        HTStream * sink));
+                                        HTStream * sink);
 /*
 
   INPUT: Redirection message, parse headers only for Location if present
 
  */
-extern HTStream * HTMIMERedirect PARAMS((HTPresentation * pres,
+extern HTStream * HTMIMERedirect (HTPresentation * pres,
                                         HTParentAnchor * anchor,
-                                        HTStream * sink));
+                                        HTStream * sink);
 
 
 /*
@@ -67,24 +67,24 @@ extern HTStream * HTMIMERedirect PARAMS((HTPresentation * pres,
   For handling Japanese headers.
 
 */
-extern void HTmmdec_base64 PARAMS((
+extern void HTmmdec_base64 (
 	char *	t,
-	char *	s));
+	char *	s);
 
-extern void HTmmdec_quote PARAMS((
+extern void HTmmdec_quote (
 	char *	t,
-	char *	s));
+	char *	s);
 
-extern void HTmmdecode PARAMS((
+extern void HTmmdecode (
 	char *	trg,
-	char *	str));
+	char *	str);
 
-extern int HTrjis PARAMS((
+extern int HTrjis (
 	char *	t,
-	char *	s));
+	char *	s);
 
-extern int HTmaybekanji PARAMS((
+extern int HTmaybekanji (
 	int	c1,
-	int	c2));
+	int	c2);
 
 #endif /* !HTMIME_H */
diff --git a/WWW/Library/Implementation/HTMLDTD.c b/WWW/Library/Implementation/HTMLDTD.c
index 8264f7d8..412b26d3 100644
--- a/WWW/Library/Implementation/HTMLDTD.c
+++ b/WWW/Library/Implementation/HTMLDTD.c
@@ -24,7 +24,7 @@
 **		(this is an obsolete translation mechanism, probably unused,
 **		currently replaced with Unicode chartrans in most cases...)
 */
-static CONST char* entities[] = {
+static const char* entities[] = {
   "AElig",	/* capital AE diphthong (ligature) */
   "Aacute",	/* capital A, acute accent */
   "Acirc",	/* capital A, circumflex accent */
@@ -1386,7 +1386,7 @@ static attr ulist_attr[] = {		/* UL attributes */
 #define NULL_HTTag NULL_HTTag_
 #endif
 
-static CONST HTTag tags_old[HTML_ALL_ELEMENTS] = {
+static const HTTag tags_old[HTML_ALL_ELEMENTS] = {
  { P("A")	, a_attr,	HTML_A_ATTRIBUTES,	SGML_EMPTY,T_A},
  { P("ABBREV")	, gen_attr,	HTML_GEN_ATTRIBUTES,	SGML_MIXED,T_ABBREV},
  { P("ACRONYM") , gen_attr,	HTML_GEN_ATTRIBUTES,	SGML_MIXED,T_ACRONYM},
@@ -1511,7 +1511,7 @@ static CONST HTTag tags_old[HTML_ALL_ELEMENTS] = {
  { P("OBJECT")	, object_attr,	HTML_OBJECT_ATTRIBUTES, SGML_MIXED,T_OBJECT_PCDATA},
 };
 
-static CONST HTTag tags_new[HTML_ALL_ELEMENTS] = {
+static const HTTag tags_new[HTML_ALL_ELEMENTS] = {
  { P("A")	, a_attr,	HTML_A_ATTRIBUTES,	SGML_MIXED,T_A},
  { P("ABBREV")	, gen_attr,	HTML_GEN_ATTRIBUTES,	SGML_MIXED,T_ABBREV},
  { P("ACRONYM") , gen_attr,	HTML_GEN_ATTRIBUTES,	SGML_MIXED,T_ACRONYM},
@@ -1645,7 +1645,7 @@ static CONST HTTag tags_new[HTML_ALL_ELEMENTS] = {
 
 static HTTag tags[HTML_ALL_ELEMENTS];
 
-PUBLIC CONST SGML_dtd HTML_dtd = {
+const SGML_dtd HTML_dtd = {
 	tags,
 	HTML_ELEMENTS,
 	entities, /* probably unused */
@@ -1659,8 +1659,8 @@ PUBLIC CONST SGML_dtd HTML_dtd = {
    that would make an initialisation call unnecessary, but my C knowledge
    is limited and I didn't want to list the whole tags_new table
    twice... - kw */
-PUBLIC void HTSwitchDTD ARGS1(
-    int,		new_flag)
+void HTSwitchDTD (
+    int		new_flag)
 {
     if (TRACE)
 	CTRACE((tfp,"HTMLDTD: Copying %s DTD element info of size %d, %d * %d\n",
@@ -1674,7 +1674,7 @@ PUBLIC void HTSwitchDTD ARGS1(
 	memcpy(tags, tags_old, HTML_ALL_ELEMENTS * sizeof(HTTag));
 }
 
-PUBLIC HTTag HTTag_unrecognized =
+HTTag HTTag_unrecognized =
 
     { NULL_HTTag,    NULL,	0,	SGML_EMPTY,T__UNREC_};
 
@@ -1695,13 +1695,13 @@ struct _HTStructured {
 	/* ... */
 };
 
-PUBLIC void HTStartAnchor ARGS3(
-	HTStructured *,		obj,
-	CONST char *,		name,
-	CONST char *,		href)
+void HTStartAnchor (
+	HTStructured *		obj,
+	const char *		name,
+	const char *		href)
 {
     BOOL		present[HTML_A_ATTRIBUTES];
-    CONST char *	value[HTML_A_ATTRIBUTES];
+    const char *	value[HTML_A_ATTRIBUTES];
     int i;
 
     for (i = 0; i < HTML_A_ATTRIBUTES; i++)
@@ -1709,26 +1709,26 @@ PUBLIC void HTStartAnchor ARGS3(
 
     if (name && *name) {
 	present[HTML_A_NAME] = YES;
-	value[HTML_A_NAME] = (CONST char *)name;
+	value[HTML_A_NAME] = (const char *)name;
     }
     if (href) {
 	present[HTML_A_HREF] = YES;
-	value[HTML_A_HREF] = (CONST char *)href;
+	value[HTML_A_HREF] = (const char *)href;
     }
 
     (*obj->isa->start_element)(obj, HTML_A, present, value, -1, 0);
 }
 
 
-PUBLIC void HTStartAnchor5 ARGS5(
-	HTStructured *,		obj,
-	CONST char *,		name,
-	CONST char *,		href,
-	CONST char *,		linktype,
-	int,			tag_charset)
+void HTStartAnchor5 (
+	HTStructured *		obj,
+	const char *		name,
+	const char *		href,
+	const char *		linktype,
+	int			tag_charset)
 {
     BOOL		present[HTML_A_ATTRIBUTES];
-    CONST char *	value[HTML_A_ATTRIBUTES];
+    const char *	value[HTML_A_ATTRIBUTES];
     int i;
 
     for (i = 0; i < HTML_A_ATTRIBUTES; i++)
@@ -1750,13 +1750,13 @@ PUBLIC void HTStartAnchor5 ARGS5(
     (*obj->isa->start_element)(obj, HTML_A, present, value, tag_charset, 0);
 }
 
-PUBLIC void HTStartIsIndex ARGS3(
-	HTStructured *,		obj,
-	CONST char *,		prompt,
-	CONST char *,		href)
+void HTStartIsIndex (
+	HTStructured *		obj,
+	const char *		prompt,
+	const char *		href)
 {
     BOOL		present[HTML_ISINDEX_ATTRIBUTES];
-    CONST char *	value[HTML_ISINDEX_ATTRIBUTES];
+    const char *	value[HTML_ISINDEX_ATTRIBUTES];
     int i;
 
     for (i = 0; i < HTML_ISINDEX_ATTRIBUTES; i++)
@@ -1764,11 +1764,11 @@ PUBLIC void HTStartIsIndex ARGS3(
 
     if (prompt && *prompt) {
 	present[HTML_ISINDEX_PROMPT] = YES;
-	value[HTML_ISINDEX_PROMPT] = (CONST char *)prompt;
+	value[HTML_ISINDEX_PROMPT] = (const char *)prompt;
     }
     if (href) {
 	present[HTML_ISINDEX_HREF] = YES;
-	value[HTML_ISINDEX_HREF] = (CONST char *)href;
+	value[HTML_ISINDEX_HREF] = (const char *)href;
     }
 
     (*obj->isa->start_element)(obj, HTML_ISINDEX , present, value, -1, 0);
diff --git a/WWW/Library/Implementation/HTMLDTD.h b/WWW/Library/Implementation/HTMLDTD.h
index d6d21096..89cf3412 100644
--- a/WWW/Library/Implementation/HTMLDTD.h
+++ b/WWW/Library/Implementation/HTMLDTD.h
@@ -980,9 +980,9 @@ Attribute numbers
 #define HTMLA_AUXCLASS 8 /* attribute, the value of which also designates
 			    a class name */
 #endif
-extern CONST SGML_dtd HTML_dtd;
+extern const SGML_dtd HTML_dtd;
 
-extern void HTSwitchDTD PARAMS((int new_flag));
+extern void HTSwitchDTD (int new_flag);
 
 extern HTTag HTTag_unrecognized;
 extern HTTag HTTag_mixedObject;
@@ -1002,17 +1002,17 @@ Start anchor element
    to be omitted.
 
  */
-extern void HTStartAnchor PARAMS((
+extern void HTStartAnchor (
 		HTStructured * targetstream,
-		CONST char *	name,
-		CONST char *	href));
+		const char *	name,
+		const char *	href);
 
-extern void HTStartAnchor5 PARAMS((
+extern void HTStartAnchor5 (
 		HTStructured * targetstream,
-		CONST char *	name,
-		CONST char *	href,
-		CONST char *	linktype,
-		int		tag_charset));
+		const char *	name,
+		const char *	href,
+		const char *	linktype,
+		int		tag_charset);
 
 /*
 
@@ -1029,9 +1029,9 @@ Start IsIndex element - FM
    to be omitted.
 
  */
-extern void HTStartIsIndex PARAMS((
+extern void HTStartIsIndex (
 		HTStructured * targetstream,
-		CONST char *	prompt,
-		CONST char *	href));
+		const char *	prompt,
+		const char *	href);
 
 #endif /* HTMLDTD_H */
diff --git a/WWW/Library/Implementation/HTMLGen.c b/WWW/Library/Implementation/HTMLGen.c
index 6047d074..51afd388 100644
--- a/WWW/Library/Implementation/HTMLGen.c
+++ b/WWW/Library/Implementation/HTMLGen.c
@@ -41,7 +41,7 @@
 #define PUTB(s,l) (*me->targetClass.put_block)(me->target, s, l)
 
 #ifdef USE_COLOR_STYLE
-PUBLIC char class_string[TEMPSTRINGSIZE];
+char class_string[TEMPSTRINGSIZE];
 
 static char *Style_className = NULL;
 static char myHash[128];
@@ -52,13 +52,13 @@ static int hcode;
 **		-----------
 */
 struct _HTStream {
-	CONST HTStreamClass *		isa;
+	const HTStreamClass *		isa;
 	HTStream *			target;
 	HTStreamClass			targetClass;	/* COPY for speed */
 };
 
 struct _HTStructured {
-	CONST HTStructuredClass *	isa;
+	const HTStructuredClass *	isa;
 	HTStream *			target;
 	HTStreamClass			targetClass;	/* COPY for speed */
 
@@ -81,8 +81,8 @@ struct _HTStructured {
 **	------------
 */
 
-PRIVATE void flush_breaks ARGS1(
-	HTStructured *,		me)
+static void flush_breaks (
+	HTStructured *		me)
 {
     int i;
     for (i=0; i<= MAX_CLEANNESS; i++) {
@@ -90,8 +90,8 @@ PRIVATE void flush_breaks ARGS1(
     }
 }
 
-PRIVATE void HTMLGen_flush ARGS1(
-	HTStructured *,		me)
+static void HTMLGen_flush (
+	HTStructured *		me)
 {
     (*me->targetClass.put_block)(me->target,
 				 me->buffer,
@@ -130,8 +130,8 @@ PRIVATE void HTMLGen_flush ARGS1(
  *  user: color styles are applied to html source only with the
  *  -preparsed flag. - kw
  */
-PRIVATE void do_cstyle_flush ARGS1(
-	HTStructured *,		me)
+static void do_cstyle_flush (
+	HTStructured *		me)
 {
     if (!me->text && LYPreparsedSource) {
 	me->text = HTMainText;
@@ -147,10 +147,10 @@ PRIVATE void do_cstyle_flush ARGS1(
 **	We keep track of all the breaks for when we chop the line
 */
 
-PRIVATE void allow_break ARGS3(
-	HTStructured *, me,
-	int,		new_cleanness,
-	BOOL,		dlbc)
+static void allow_break (
+	HTStructured * me,
+	int		new_cleanness,
+	BOOL		dlbc)
 {
     if (dlbc && me->write_pointer == me->buffer) dlbc = NO;
     me->line_break[new_cleanness] =
@@ -175,9 +175,9 @@ PRIVATE void allow_break ARGS3(
 **	   This should make the source files easier to read and modify
 **	by hand, too, though this is not a primary design consideration. TBL
 */
-PRIVATE void HTMLGen_put_character ARGS2(
-	HTStructured *,		me,
-	char,			c)
+static void HTMLGen_put_character (
+	HTStructured *		me,
+	char			c)
 {
     if (me->escape_specials && UCH(c) < 32) {
 	if (c == HT_NON_BREAK_SPACE || c == HT_EN_SPACE ||
@@ -286,22 +286,22 @@ PRIVATE void HTMLGen_put_character ARGS2(
 /*	String handling
 **	---------------
 */
-PRIVATE void HTMLGen_put_string ARGS2(
-	HTStructured *,		me,
-	CONST char *,		s)
+static void HTMLGen_put_string (
+	HTStructured *		me,
+	const char *		s)
 {
-    CONST char * p;
+    const char * p;
 
     for (p = s; *p; p++)
 	HTMLGen_put_character(me, *p);
 }
 
-PRIVATE void HTMLGen_write ARGS3(
-	HTStructured *,		me,
-	CONST char *,		s,
-	int,			l)
+static void HTMLGen_write (
+	HTStructured *		me,
+	const char *		s,
+	int			l)
 {
-    CONST char * p;
+    const char * p;
 
     for (p = s; p < (s + l); p++)
 	HTMLGen_put_character(me, *p);
@@ -313,13 +313,13 @@ PRIVATE void HTMLGen_write ARGS3(
 **	Within the opening tag, there may be spaces
 **	and the line may be broken at these spaces.
 */
-PRIVATE int HTMLGen_start_element ARGS6(
-	HTStructured *,		me,
-	int,			element_number,
-	CONST BOOL*,		present,
-	CONST char **,		value,
-	int,			charset GCC_UNUSED,
-	char **,		insert GCC_UNUSED)
+static int HTMLGen_start_element (
+	HTStructured *		me,
+	int			element_number,
+	const BOOL*		present,
+	const char **		value,
+	int			charset GCC_UNUSED,
+	char **			insert GCC_UNUSED)
 {
     int i;
     BOOL was_preformatted = me->preformatted;
@@ -433,7 +433,7 @@ PRIVATE int HTMLGen_start_element ARGS6(
 			HTMLGen_put_string(me, value[i]);
 			HTMLGen_put_character(me, '\'');
 		    } else {  /* attribute value has both kinds of quotes */
-			CONST char *p;
+			const char *p;
 			HTMLGen_put_string(me, "=\"");
 			for (p = value[i]; *p; p++) {
 			    if (*p != '"') {
@@ -529,10 +529,10 @@ PRIVATE int HTMLGen_start_element ARGS6(
 **	should be linked to the whole stack not just the top one.)
 **	TBL 921119
 */
-PRIVATE int HTMLGen_end_element ARGS3(
-	HTStructured *,		me,
-	int,			element_number,
-	char **,		insert GCC_UNUSED)
+static int HTMLGen_end_element (
+	HTStructured *		me,
+	int			element_number,
+	char **		insert GCC_UNUSED)
 {
     if (!me->preformatted &&
 	HTML_dtd.tags[element_number].contents != SGML_EMPTY) {
@@ -571,9 +571,9 @@ PRIVATE int HTMLGen_end_element ARGS3(
 **		------------------
 **
 */
-PRIVATE int HTMLGen_put_entity ARGS2(
-	HTStructured *,		me,
-	int,			entity_number)
+static int HTMLGen_put_entity (
+	HTStructured *		me,
+	int			entity_number)
 {
     int nent = HTML_dtd.number_of_entities;
 
@@ -589,8 +589,8 @@ PRIVATE int HTMLGen_put_entity ARGS2(
 **	-------------------
 **
 */
-PRIVATE void HTMLGen_free ARGS1(
-	HTStructured *,		me)
+static void HTMLGen_free (
+	HTStructured *		me)
 {
     (*me->targetClass.put_character)(me->target, '\n');
     HTMLGen_flush(me);
@@ -601,16 +601,16 @@ PRIVATE void HTMLGen_free ARGS1(
     FREE(me);
 }
 
-PRIVATE void PlainToHTML_free ARGS1(
-	HTStructured *,		me)
+static void PlainToHTML_free (
+	HTStructured *		me)
 {
     HTMLGen_end_element(me, HTML_PRE, 0);
     HTMLGen_free(me);
 }
 
-PRIVATE void HTMLGen_abort ARGS2(
-	HTStructured *,		me,
-	HTError,		e GCC_UNUSED)
+static void HTMLGen_abort (
+	HTStructured *		me,
+	HTError		e GCC_UNUSED)
 {
     HTMLGen_free(me);
 #ifdef USE_COLOR_STYLE
@@ -618,9 +618,9 @@ PRIVATE void HTMLGen_abort ARGS2(
 #endif
 }
 
-PRIVATE void PlainToHTML_abort ARGS2(
-	HTStructured *,		me,
-	HTError,		e GCC_UNUSED)
+static void PlainToHTML_abort (
+	HTStructured *		me,
+	HTError		e GCC_UNUSED)
 {
     PlainToHTML_free(me);
 }
@@ -628,7 +628,7 @@ PRIVATE void PlainToHTML_abort ARGS2(
 /*	Structured Object Class
 **	-----------------------
 */
-PRIVATE CONST HTStructuredClass HTMLGeneration = /* As opposed to print etc */
+static const HTStructuredClass HTMLGeneration = /* As opposed to print etc */
 {
 	"HTMLGen",
 	HTMLGen_free,
@@ -643,8 +643,8 @@ PRIVATE CONST HTStructuredClass HTMLGeneration = /* As opposed to print etc */
 */
 extern int LYcols;			/* LYCurses.h, set in LYMain.c	*/
 
-PUBLIC HTStructured * HTMLGenerator ARGS1(
-	HTStream *,		output)
+HTStructured * HTMLGenerator (
+	HTStream *		output)
 {
     HTStructured* me = (HTStructured*)malloc(sizeof(*me));
     if (me == NULL)
@@ -708,7 +708,7 @@ PUBLIC HTStructured * HTMLGenerator ARGS1(
 **	It is officially a structured strem but only the stream bits exist.
 **	This is just the easiest way of typecasting all the routines.
 */
-PRIVATE CONST HTStructuredClass PlainToHTMLConversion =
+static const HTStructuredClass PlainToHTMLConversion =
 {
 	"plaintexttoHTML",
 	HTMLGen_free,
@@ -724,15 +724,15 @@ PRIVATE CONST HTStructuredClass PlainToHTMLConversion =
 /*	HTConverter from plain text to HTML Stream
 **	------------------------------------------
 */
-PUBLIC HTStream* HTPlainToHTML ARGS3(
-	HTPresentation *,	pres GCC_UNUSED,
-	HTParentAnchor *,	anchor GCC_UNUSED,
-	HTStream *,		sink)
+HTStream* HTPlainToHTML (
+	HTPresentation *	pres GCC_UNUSED,
+	HTParentAnchor *	anchor GCC_UNUSED,
+	HTStream *		sink)
 {
     HTStructured *me = (HTStructured *)malloc(sizeof(*me));
     if (me == NULL)
 	outofmem(__FILE__, "PlainToHTML");
-    me->isa = (CONST HTStructuredClass *)&PlainToHTMLConversion;
+    me->isa = (const HTStructuredClass *)&PlainToHTMLConversion;
 
     /*
      *	Copy pointers to routines for speed.
diff --git a/WWW/Library/Implementation/HTMLGen.h b/WWW/Library/Implementation/HTMLGen.h
index ee484078..133e3c3d 100644
--- a/WWW/Library/Implementation/HTMLGen.h
+++ b/WWW/Library/Implementation/HTMLGen.h
@@ -13,15 +13,15 @@
 
 /* Subclass:
 */
-/* extern CONST HTStructuredClass HTMLGeneration; */
+/* extern const HTStructuredClass HTMLGeneration; */
 
 /* Special Creation:
 */
-extern HTStructured * HTMLGenerator PARAMS((HTStream * output));
+extern HTStructured * HTMLGenerator (HTStream * output);
 
-extern HTStream * HTPlainToHTML PARAMS((
+extern HTStream * HTPlainToHTML (
         HTPresentation *        pres,
         HTParentAnchor *        anchor,
-        HTStream *              sink));
+        HTStream *              sink);
 
 #endif /* HTMLGEN_H */
diff --git a/WWW/Library/Implementation/HTNews.c b/WWW/Library/Implementation/HTNews.c
index 651e66ad..e214596e 100644
--- a/WWW/Library/Implementation/HTNews.c
+++ b/WWW/Library/Implementation/HTNews.c
@@ -25,8 +25,8 @@
 #define NEWS_PORT 119		/* See rfc977 */
 #define SNEWS_PORT 563		/* See Lou Montulli */
 #define APPEND			/* Use append methods */
-PUBLIC int HTNewsChunkSize = 30;/* Number of articles for quick display */
-PUBLIC int HTNewsMaxChunk = 40; /* Largest number of articles in one window */
+int HTNewsChunkSize = 30;/* Number of articles for quick display */
+int HTNewsMaxChunk = 40; /* Largest number of articles in one window */
 
 #ifndef DEFAULT_NEWS_HOST
 #define DEFAULT_NEWS_HOST "news"
@@ -37,13 +37,13 @@ PUBLIC int HTNewsMaxChunk = 40; /* Largest number of articles in one window */
 
 #ifdef USE_SSL
 extern SSL_CTX * ssl_ctx;
-PRIVATE SSL * Handle = NULL;
-PRIVATE int channel_s = 1;
+static SSL * Handle = NULL;
+static int channel_s = 1;
 #define NEWS_NETWRITE(sock, buff, size) \
 	(Handle ? SSL_write(Handle, buff, size) : NETWRITE(sock, buff, size))
 #define NEWS_NETCLOSE(sock) \
 	{ (void)NETCLOSE(sock); if (Handle) SSL_free(Handle); Handle = NULL; }
-PRIVATE char HTNewsGetCharacter NOPARAMS;
+static char HTNewsGetCharacter (void);
 #define NEXT_CHAR HTNewsGetCharacter()
 #else
 #define NEWS_NETWRITE  NETWRITE
@@ -65,7 +65,7 @@ PRIVATE char HTNewsGetCharacter NOPARAMS;
 #define SnipIn2(d,fmt,tag,len,s) sprintf(d, fmt, tag, (int)sizeof(d)-len, s)
 
 struct _HTStructured {
-	CONST HTStructuredClass *	isa;
+	const HTStructuredClass *	isa;
 	/* ... */
 };
 struct _HTStream
@@ -79,24 +79,24 @@ struct _HTStream
 /*
 **  Module-wide variables.
 */
-PUBLIC	char * HTNewsHost = NULL;		/* Default host */
-PRIVATE char * NewsHost = NULL;			/* Current host */
-PRIVATE char * NewsHREF = NULL;			/* Current HREF prefix */
-PRIVATE int s;					/* Socket for NewsHost */
-PRIVATE int HTCanPost = FALSE;			/* Current POST permission */
-PRIVATE char response_text[LINE_LENGTH+1];	/* Last response */
-/* PRIVATE HText *	HT;	*/		/* the new hypertext */
-PRIVATE HTStructured * target;			/* The output sink */
-PRIVATE HTStructuredClass targetClass;		/* Copy of fn addresses */
-PRIVATE HTStream * rawtarget = NULL;		/* The output sink for rawtext */
-PRIVATE HTStreamClass rawtargetClass;		/* Copy of fn addresses */
-PRIVATE HTParentAnchor *node_anchor;		/* Its anchor */
-PRIVATE int	diagnostic;			/* level: 0=none 2=source */
-PRIVATE BOOL rawtext = NO;			/* Flag: HEAD or -mime_headers */
-PRIVATE HTList *NNTP_AuthInfo = NULL;		/* AUTHINFO database */
-PRIVATE char *name = NULL;
-PRIVATE char *address = NULL;
-PRIVATE char *dbuf = NULL;	/* dynamic buffer for long messages etc. */
+char * HTNewsHost = NULL;		/* Default host */
+static char * NewsHost = NULL;			/* Current host */
+static char * NewsHREF = NULL;			/* Current HREF prefix */
+static int s;					/* Socket for NewsHost */
+static int HTCanPost = FALSE;			/* Current POST permission */
+static char response_text[LINE_LENGTH+1];	/* Last response */
+/* static HText *	HT;	*/		/* the new hypertext */
+static HTStructured * target;			/* The output sink */
+static HTStructuredClass targetClass;		/* Copy of fn addresses */
+static HTStream * rawtarget = NULL;		/* The output sink for rawtext */
+static HTStreamClass rawtargetClass;		/* Copy of fn addresses */
+static HTParentAnchor *node_anchor;		/* Its anchor */
+static int	diagnostic;			/* level: 0=none 2=source */
+static BOOL rawtext = NO;			/* Flag: HEAD or -mime_headers */
+static HTList *NNTP_AuthInfo = NULL;		/* AUTHINFO database */
+static char *name = NULL;
+static char *address = NULL;
+static char *dbuf = NULL;	/* dynamic buffer for long messages etc. */
 
 #define PUTC(c) (*targetClass.put_character)(target, c)
 #define PUTS(s) (*targetClass.put_string)(target, s)
@@ -117,7 +117,7 @@ typedef struct _NNTPAuth {
 } NNTPAuth;
 
 #ifdef LY_FIND_LEAKS
-PRIVATE void free_news_globals NOARGS
+static void free_news_globals (void)
 {
     if (s >= 0) {
 	NEWS_NETCLOSE(s);
@@ -132,7 +132,7 @@ PRIVATE void free_news_globals NOARGS
 }
 #endif /* LY_FIND_LEAKS */
 
-PRIVATE void free_NNTP_AuthInfo NOARGS
+static void free_NNTP_AuthInfo (void)
 {
     HTList *cur = NNTP_AuthInfo;
     NNTPAuth *auth = NULL;
@@ -151,12 +151,12 @@ PRIVATE void free_NNTP_AuthInfo NOARGS
     return;
 }
 
-PUBLIC CONST char * HTGetNewsHost NOARGS
+const char * HTGetNewsHost (void)
 {
 	return HTNewsHost;
 }
 
-PUBLIC void HTSetNewsHost ARGS1(CONST char *, value)
+void HTSetNewsHost (const char *  value)
 {
 	StrAllocCopy(HTNewsHost, value);
 }
@@ -179,8 +179,8 @@ PUBLIC void HTSetNewsHost ARGS1(CONST char *, value)
 **	4.	Compilation time macro DEFAULT_NEWS_HOST
 **	5.	Default to "news"
 */
-PRIVATE BOOL initialized = NO;
-PRIVATE BOOL initialize NOARGS
+static BOOL initialized = NO;
+static BOOL initialize (void)
 {
 #ifdef NeXTStep
     char *cp = NULL;
@@ -240,7 +240,7 @@ PRIVATE BOOL initialize NOARGS
 **	Negative status indicates transmission error, socket closed.
 **	Positive status is an NNTP status.
 */
-PRIVATE int response ARGS1(char *,command)
+static int response (char * command)
 {
     int result;
     char * p = response_text;
@@ -252,7 +252,7 @@ PRIVATE int response ARGS1(char *,command)
 	CTRACE((tfp, "NNTP command to be sent: %s", command));
 #ifdef NOT_ASCII
 	{
-	    CONST char	* p;
+	    const char	* p;
 	    char	* q;
 	    char ascii[LINE_LENGTH+1];
 	    for(p = command, q=ascii; *p; p++, q++) {
@@ -308,10 +308,10 @@ PRIVATE int response ARGS1(char *,command)
 **	template must be already un upper case.
 **	unknown may be in upper or lower or mixed case to match.
 */
-PRIVATE BOOL match ARGS2 (CONST char *,unknown, CONST char *,template)
+static BOOL match (const char * unknown, const char * template)
 {
-    CONST char * u = unknown;
-    CONST char * t = template;
+    const char * u = unknown;
+    const char * t = template;
     for (; *u && *t && (TOUPPER(*u) == *t); u++, t++)
 	; /* Find mismatch or end */
     return (BOOL)(*t == 0);		/* OK if end of template */
@@ -325,8 +325,8 @@ typedef enum {
 /*
 **  This function handles nntp authentication. - FM
 */
-PRIVATE NNTPAuthResult HTHandleAuthInfo ARGS1(
-	char *,		host)
+static NNTPAuthResult HTHandleAuthInfo (
+	char *		host)
 {
     HTList *cur = NULL;
     NNTPAuth *auth = NULL;
@@ -562,7 +562,7 @@ PRIVATE NNTPAuthResult HTHandleAuthInfo ARGS1(
 **	" Tim Berners-Lee <tim@online.cern.ch> "
 **  or	" tim@online.cern.ch ( Tim Berners-Lee ) "
 */
-PRIVATE char * author_name ARGS1 (char *,email)
+static char * author_name (char * email)
 {
     char *p, *e;
 
@@ -599,7 +599,7 @@ PRIVATE char * author_name ARGS1 (char *,email)
 **	" Lou Montulli <montulli@spaced.out.galaxy.net> "
 **  or	" montulli@spaced.out.galaxy.net ( Lou "The Stud" Montulli ) "
 */
-PRIVATE char * author_address ARGS1(char *,email)
+static char * author_address (char * email)
 {
     char *p, *at, *e;
 
@@ -651,10 +651,10 @@ PRIVATE char * author_address ARGS1(char *,email)
 /*	Start anchor element
 **	--------------------
 */
-PRIVATE void start_anchor ARGS1(CONST char *,  href)
+static void start_anchor (const char *   href)
 {
     BOOL		present[HTML_A_ATTRIBUTES];
-    CONST char*		value[HTML_A_ATTRIBUTES];
+    const char*		value[HTML_A_ATTRIBUTES];
     int i;
 
     for(i=0; i < HTML_A_ATTRIBUTES; i++)
@@ -666,10 +666,10 @@ PRIVATE void start_anchor ARGS1(CONST char *,  href)
 /*	Start link element
 **	------------------
 */
-PRIVATE void start_link ARGS2(CONST char *,  href, CONST char *, rev)
+static void start_link (const char *   href, const char *  rev)
 {
     BOOL		present[HTML_LINK_ATTRIBUTES];
-    CONST char*		value[HTML_LINK_ATTRIBUTES];
+    const char*		value[HTML_LINK_ATTRIBUTES];
     int i;
 
     for(i=0; i < HTML_LINK_ATTRIBUTES; i++)
@@ -682,10 +682,10 @@ PRIVATE void start_link ARGS2(CONST char *,  href, CONST char *, rev)
 /*	Start list element
 **	------------------
 */
-PRIVATE void start_list ARGS1(int, seqnum)
+static void start_list (int  seqnum)
 {
     BOOL		present[HTML_OL_ATTRIBUTES];
-    CONST char*		value[HTML_OL_ATTRIBUTES];
+    const char*		value[HTML_OL_ATTRIBUTES];
     char SeqNum[20];
     int i;
 
@@ -707,10 +707,10 @@ PRIVATE void start_list ARGS1(int, seqnum)
 **	addr	points to the hypertext reference address,
 **		terminated by white space, comma, NULL or '>'
 */
-PRIVATE void write_anchor ARGS2(CONST char *,text, CONST char *,addr)
+static void write_anchor (const char * text, const char * addr)
 {
     char href[LINE_LENGTH+1];
-    CONST char * p;
+    const char * p;
     char *q;
 
     for (p = addr; *p && (*p != '>') && !WHITE(*p) && (*p!=','); p++)
@@ -744,7 +744,7 @@ PRIVATE void write_anchor ARGS2(CONST char *,text, CONST char *,addr)
 ** On exit,
 **	*text	is NOT any more chopped up into substrings.
 */
-PRIVATE void write_anchors ARGS1 (char *,text)
+static void write_anchors (char * text)
 {
     char * start = text;
     char * end;
@@ -774,7 +774,7 @@ PRIVATE void write_anchors ARGS1 (char *,text)
 /*	Abort the connection					abort_socket
 **	--------------------
 */
-PRIVATE void abort_socket NOARGS
+static void abort_socket (void)
 {
     CTRACE((tfp, "HTNews: EOF on read, closing socket %d\n", s));
     NEWS_NETCLOSE(s);	/* End of file, close socket */
@@ -791,8 +791,8 @@ PRIVATE void abort_socket NOARGS
 **  Determine if a line is a valid header line.			valid_header
 **  -------------------------------------------
 */
-PRIVATE BOOLEAN valid_header ARGS1(
-	char *,		line)
+static BOOLEAN valid_header (
+	char *		line)
 {
     char *colon, *space;
 
@@ -828,8 +828,8 @@ PRIVATE BOOLEAN valid_header ARGS1(
 **	s		Global socket number is OK
 **	postfile	file with header and article to post.
 */
-PRIVATE void post_article ARGS1(
-	char *,		postfile)
+static void post_article (
+	char *		postfile)
 {
     char line[512];
     char buf[512];
@@ -993,7 +993,7 @@ static char *decode_mime(char *str)
     return str;
 }
 #else /* !SH_EX */
-static char *decode_mime ARGS1(char *, str)
+static char *decode_mime (char *  str)
 {
     HTmmdecode(str, str);
     HTrjis(str, str);
@@ -1013,8 +1013,8 @@ static char *decode_mime ARGS1(char *, str)
 **	s	Global socket number is OK
 **	HT	Global hypertext object is ready for appending text
 */
-PRIVATE int read_article ARGS1(
-	HTParentAnchor *,	thisanchor)
+static int read_article (
+	HTParentAnchor *	thisanchor)
 {
     char line[LINE_LENGTH+1];
     char *full_line = NULL;
@@ -1029,7 +1029,7 @@ PRIVATE int read_article ARGS1(
     char *href = NULL;
     char *p = line;
     char *cp;
-    CONST char *ccp;
+    const char *ccp;
     BOOL done = NO;
 
     /*
@@ -1526,7 +1526,7 @@ PRIVATE int read_article ARGS1(
 **  RFC 977 specifies that the line "folding" of RFC850 is not used,
 **  so we do not handle it here.
 */
-PRIVATE int read_list ARGS1(char *, arg)
+static int read_list (char *  arg)
 {
     char line[LINE_LENGTH+1];
     char *p;
@@ -1705,10 +1705,10 @@ PRIVATE int read_list ARGS1(char *, arg)
 **  want more than one field.
 **
 */
-PRIVATE int read_group ARGS3(
-	CONST char *,	groupName,
-	int,		first_required,
-	int,		last_required)
+static int read_group (
+	const char *	groupName,
+	int		first_required,
+	int		last_required)
 {
     char line[LINE_LENGTH+1];
     char author[LINE_LENGTH+1];
@@ -2115,11 +2115,11 @@ add_post:
 /*	Load by name.						HTLoadNews
 **	=============
 */
-PRIVATE int HTLoadNews ARGS4(
-	CONST char *,		arg,
-	HTParentAnchor *,	anAnchor,
-	HTFormat,		format_out,
-	HTStream*,		stream)
+static int HTLoadNews (
+	const char *		arg,
+	HTParentAnchor *	anAnchor,
+	HTFormat		format_out,
+	HTStream*		stream)
 {
     char command[262];			/* The whole command */
     char proxycmd[260];			/* The proxy command */
@@ -2163,7 +2163,7 @@ PRIVATE int HTLoadNews ARGS4(
     proxycmd[sizeof(proxycmd)-1] = '\0';
 
     {
-	CONST char * p1 = arg;
+	const char * p1 = arg;
 
 	/*
 	**  We will ask for the document, omitting the host name & anchor.
@@ -3005,7 +3005,7 @@ Send_NNTP_command:
 **  the terminal for a period of time, but does not want
 **  to end the current session.  - FM
 */
-PUBLIC void HTClearNNTPAuthInfo NOARGS
+void HTClearNNTPAuthInfo (void)
 {
     /*
     **	Need code to check cached documents and do
@@ -3021,7 +3021,7 @@ PUBLIC void HTClearNNTPAuthInfo NOARGS
 }
 
 #ifdef USE_SSL
-PRIVATE char HTNewsGetCharacter NOARGS
+static char HTNewsGetCharacter (void)
 {
     if (!Handle)
 	return HTGetCharacter();
@@ -3029,15 +3029,15 @@ PRIVATE char HTNewsGetCharacter NOARGS
 	return HTGetSSLCharacter((void *)Handle);
 }
 
-PUBLIC int HTNewsProxyConnect ARGS5 (
-    int,		sock,
-    CONST char *,	url,
-    HTParentAnchor *,	anAnchor,
-    HTFormat,		format_out,
-    HTStream *,		sink)
+int HTNewsProxyConnect (
+    int		sock,
+    const char *	url,
+    HTParentAnchor *	anAnchor,
+    HTFormat		format_out,
+    HTStream *		sink)
 {
     int status;
-    CONST char * arg = url;
+    const char * arg = url;
     char SSLprogress[256];
 
     s = channel_s = sock;
@@ -3086,13 +3086,13 @@ GLOBALDEF (HTProtocol,HTSNewsPost,_HTNEWS_C_6_INIT);
 #define _HTNEWS_C_7_INIT { "snewsreply", HTLoadNews, NULL }
 GLOBALDEF (HTProtocol,HTSNewsReply,_HTNEWS_C_7_INIT);
 #else
-GLOBALDEF PUBLIC HTProtocol HTNews = { "news", HTLoadNews, NULL };
-GLOBALDEF PUBLIC HTProtocol HTNNTP = { "nntp", HTLoadNews, NULL };
-GLOBALDEF PUBLIC HTProtocol HTNewsPost = { "newspost", HTLoadNews, NULL };
-GLOBALDEF PUBLIC HTProtocol HTNewsReply = { "newsreply", HTLoadNews, NULL };
-GLOBALDEF PUBLIC HTProtocol HTSNews = { "snews", HTLoadNews, NULL };
-GLOBALDEF PUBLIC HTProtocol HTSNewsPost = { "snewspost", HTLoadNews, NULL };
-GLOBALDEF PUBLIC HTProtocol HTSNewsReply = { "snewsreply", HTLoadNews, NULL };
+GLOBALDEF HTProtocol HTNews = { "news", HTLoadNews, NULL };
+GLOBALDEF HTProtocol HTNNTP = { "nntp", HTLoadNews, NULL };
+GLOBALDEF HTProtocol HTNewsPost = { "newspost", HTLoadNews, NULL };
+GLOBALDEF HTProtocol HTNewsReply = { "newsreply", HTLoadNews, NULL };
+GLOBALDEF HTProtocol HTSNews = { "snews", HTLoadNews, NULL };
+GLOBALDEF HTProtocol HTSNewsPost = { "snewspost", HTLoadNews, NULL };
+GLOBALDEF HTProtocol HTSNewsReply = { "snewsreply", HTLoadNews, NULL };
 #endif /* GLOBALDEF_IS_MACRO */
 
 #endif /* not DISABLE_NEWS */
diff --git a/WWW/Library/Implementation/HTNews.h b/WWW/Library/Implementation/HTNews.h
index 92bf7f33..b1efb4c0 100644
--- a/WWW/Library/Implementation/HTNews.h
+++ b/WWW/Library/Implementation/HTNews.h
@@ -34,20 +34,20 @@ GLOBALREF HTProtocol HTSNewsPost;
 GLOBALREF HTProtocol HTSNewsReply;
 #endif /* GLOBALREF_IS_MACRO */
 
-extern void HTSetNewsHost PARAMS((
-	CONST char *	value));
-extern CONST char * HTGetNewsHost NOPARAMS;
+extern void HTSetNewsHost (
+	const char *	value);
+extern const char * HTGetNewsHost (void);
 extern char * HTNewsHost;
 
-extern void HTClearNNTPAuthInfo NOPARAMS;
+extern void HTClearNNTPAuthInfo (void);
 
 #ifdef USE_SSL
-extern int HTNewsProxyConnect PARAMS ((
+extern int HTNewsProxyConnect (
 	int		sock,
-	CONST char *	url,
+	const char *	url,
 	HTParentAnchor *anAnchor,
 	HTFormat	format_out,
-	HTStream *	sink));
+	HTStream *	sink);
 #endif
 
 #endif /* HTNEWS_H */
diff --git a/WWW/Library/Implementation/HTParse.c b/WWW/Library/Implementation/HTParse.c
index d3eaf3a8..3bf69b13 100644
--- a/WWW/Library/Implementation/HTParse.c
+++ b/WWW/Library/Implementation/HTParse.c
@@ -37,8 +37,8 @@ struct struct_parts {
 **	Return value points to first non-white character, or to 0 if none.
 **	All trailing white space is OVERWRITTEN with zero.
 */
-PUBLIC char * HTStrip ARGS1(
-	char *,		s)
+char * HTStrip (
+	char *		s)
 {
 #define SPACE(c) ((c == ' ') || (c == '\t') || (c == '\n'))
     char * p = s;
@@ -65,9 +65,9 @@ PUBLIC char * HTStrip ARGS1(
 **	host, anchor and access may be nonzero if they were specified.
 **	Any which are nonzero point to zero terminated strings.
 */
-PRIVATE void scan ARGS2(
-	char *,			name,
-	struct struct_parts *,	parts)
+static void scan (
+	char *			name,
+	struct struct_parts *	parts)
 {
     char * after_access;
     char * p;
@@ -180,10 +180,10 @@ PRIVATE void scan ARGS2(
 ** On exit,
 **     returns         A pointer to a malloc'd string which MUST BE FREED
 */
-PUBLIC char * HTParse ARGS3(
-	CONST char *,	aName,
-	CONST char *,	relatedName,
-	int,		wanted)
+char * HTParse (
+	const char *	aName,
+	const char *	relatedName,
+	int		wanted)
 {
     char * result = NULL;
     char * tail = NULL;  /* a pointer to the end of the 'result' string */
@@ -578,10 +578,10 @@ PUBLIC char * HTParse ARGS3(
 ** On exit,
 **	returns		A pointer within input string (probably to its end '\0')
 */
-PUBLIC CONST char * HTParseAnchor ARGS1(
-	CONST char *,	aName)
+const char * HTParseAnchor (
+	const char *	aName)
 {
-    CONST char* p = aName;
+    const char* p = aName;
     for ( ; *p && *p != '#'; p++)
 	;
     if (*p == '#') {
@@ -622,8 +622,8 @@ PUBLIC CONST char * HTParseAnchor ARGS1(
 **
 **	or	../../albert.html
 */
-PUBLIC void HTSimplify ARGS1(
-	char *,		filename)
+void HTSimplify (
+	char *		filename)
 {
     char *p;
     char *q, *q1;
@@ -774,16 +774,16 @@ PUBLIC void HTSimplify ARGS1(
 **	The caller is responsible for freeing the resulting name later.
 **
 */
-PUBLIC char * HTRelative ARGS2(
-	CONST char *,	aName,
-	CONST char *,	relatedName)
+char * HTRelative (
+	const char *	aName,
+	const char *	relatedName)
 {
     char * result = NULL;
-    CONST char *p = aName;
-    CONST char *q = relatedName;
-    CONST char * after_access = NULL;
-    CONST char * path = NULL;
-    CONST char * last_slash = NULL;
+    const char *p = aName;
+    const char *q = relatedName;
+    const char * after_access = NULL;
+    const char * path = NULL;
+    const char * last_slash = NULL;
     int slashes = 0;
 
     for (; *p; p++, q++) {	/* Find extent of match */
@@ -836,7 +836,7 @@ PUBLIC char * HTRelative ARGS2(
 **
 **	Unlike HTUnEscape(), this routine returns a calloc'd string.
 */
-PRIVATE CONST unsigned char isAcceptable[96] =
+static const unsigned char isAcceptable[96] =
 
 /*	Bit 0		xalpha		-- see HTFile.h
 **	Bit 1		xpalpha		-- as xalpha but with plus.
@@ -850,14 +850,14 @@ PRIVATE CONST unsigned char isAcceptable[96] =
 	 0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,	/* 6x  `abcdefghijklmno  */
 	 7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0 };	/* 7X  pqrstuvwxyz{|}~	DEL */
 
-PRIVATE char *hex = "0123456789ABCDEF";
+static char *hex = "0123456789ABCDEF";
 #define ACCEPTABLE(a)	( a>=32 && a<128 && ((isAcceptable[a-32]) & mask))
 
-PUBLIC char * HTEscape ARGS2(
-	CONST char *,	str,
-	unsigned char,	mask)
+char * HTEscape (
+	const char *	str,
+	unsigned char	mask)
 {
-    CONST char * p;
+    const char * p;
     char * q;
     char * result;
     int unacceptable = 0;
@@ -892,10 +892,10 @@ PUBLIC char * HTEscape ARGS2(
 */
 #define UNSAFE(ch) (((ch) <= 32) || ((ch) >= 127))
 
-PUBLIC char *HTEscapeUnsafe ARGS1(
-	CONST char *,	str)
+char *HTEscapeUnsafe (
+	const char *	str)
 {
-    CONST char * p;
+    const char * p;
     char * q;
     char * result;
     int unacceptable = 0;
@@ -929,11 +929,11 @@ PUBLIC char *HTEscapeUnsafe ARGS1(
 **
 **	Unlike HTUnEscape(), this routine returns a calloced string.
 */
-PUBLIC char * HTEscapeSP ARGS2(
-	CONST char *,	str,
-	unsigned char,	mask)
+char * HTEscapeSP (
+	const char *	str,
+	unsigned char	mask)
 {
-    CONST char * p;
+    const char * p;
     char * q;
     char * result;
     int unacceptable = 0;
@@ -967,16 +967,16 @@ PUBLIC char * HTEscapeSP ARGS2(
 **	the ASCII hex code for character 16x+y.
 **	The string is converted in place, as it will never grow.
 */
-PRIVATE char from_hex ARGS1(
-	char,		c)
+static char from_hex (
+	char		c)
 {
     return (char) ( c >= '0' && c <= '9' ?  c - '0'
 	    : c >= 'A' && c <= 'F'? c - 'A' + 10
 	    : c - 'a' + 10);     /* accept small letters just in case */
 }
 
-PUBLIC char * HTUnEscape ARGS1(
-	char *,		str)
+char * HTUnEscape (
+	char *		str)
 {
     char * p = str;
     char * q = str;
@@ -1023,9 +1023,9 @@ PUBLIC char * HTUnEscape ARGS1(
 **	should be unescaped if escaped in the first string.
 **	The first string is converted in place, as it will never grow.
 */
-PUBLIC char * HTUnEscapeSome ARGS2(
-	char *,		str,
-	CONST char *,	do_trans)
+char * HTUnEscapeSome (
+	char *		str,
+	const char *	do_trans)
 {
     char * p = str;
     char * q = str;
@@ -1054,7 +1054,7 @@ PUBLIC char * HTUnEscapeSome ARGS2(
 
 } /* HTUnEscapeSome */
 
-PRIVATE CONST unsigned char crfc[96] =
+static const unsigned char crfc[96] =
 
 /*	Bit 0		xalpha		-- need "quoting"
 **	Bit 1		xpalpha		-- need \escape if quoted
@@ -1072,11 +1072,11 @@ PRIVATE CONST unsigned char crfc[96] =
 **  The "quoted" parameter tells whether we need the beginning/ending quote
 **  marks.  If not, the caller will provide them -TD
 */
-PUBLIC void HTMake822Word ARGS2(
-	char **,	str,
-	int,		quoted)
+void HTMake822Word (
+	char **	str,
+	int		quoted)
 {
-    CONST char * p;
+    const char * p;
     char * q;
     char * result;
     unsigned char a;
diff --git a/WWW/Library/Implementation/HTParse.h b/WWW/Library/Implementation/HTParse.h
index 4131e0fc..1fa9599e 100644
--- a/WWW/Library/Implementation/HTParse.h
+++ b/WWW/Library/Implementation/HTParse.h
@@ -51,8 +51,8 @@
 **	Return value points to first non-white character, or to 0 if none.
 **	All trailing white space is OVERWRITTEN with zero.
 */
-extern char * HTStrip PARAMS((
-	char *		s));
+extern char * HTStrip (
+	char *		s);
 
 /*	Parse a Name relative to another name.			HTParse()
 **	--------------------------------------
@@ -68,10 +68,10 @@ extern char * HTStrip PARAMS((
 ** On exit,
 **	returns		A pointer to a malloc'd string which MUST BE FREED
 */
-extern char * HTParse PARAMS((
-	CONST char *	aName,
-	CONST char *	relatedName,
-	int		wanted));
+extern char * HTParse (
+	const char *	aName,
+	const char *	relatedName,
+	int		wanted);
 
 /*	HTParseAnchor(), fast HTParse() specialization
 **	----------------------------------------------
@@ -79,8 +79,8 @@ extern char * HTParse PARAMS((
 ** On exit,
 **	returns		A pointer within input string (probably to its end '\0')
 */
-extern CONST char * HTParseAnchor PARAMS((
-	CONST char *	aName));
+extern const char * HTParseAnchor (
+	const char *	aName);
 
 /*	Simplify a filename.				HTSimplify()
 **	--------------------
@@ -97,8 +97,8 @@ extern CONST char * HTParseAnchor PARAMS((
 **
 **	or	../../albert.html
 */
-extern void HTSimplify PARAMS((
-	char *		filename));
+extern void HTSimplify (
+	char *		filename);
 
 /*	Make Relative Name.					HTRelative()
 **	-------------------
@@ -117,9 +117,9 @@ extern void HTSimplify PARAMS((
 **	The caller is responsible for freeing the resulting name later.
 **
 */
-extern char * HTRelative PARAMS((
-	CONST char *	aName,
-	CONST char *	relatedName));
+extern char * HTRelative (
+	const char *	aName,
+	const char *	relatedName);
 
 /*		Escape undesirable characters using %		HTEscape()
 **		-------------------------------------
@@ -131,9 +131,9 @@ extern char * HTRelative PARAMS((
 **
 **	Unlike HTUnEscape(), this routine returns a malloc'd string.
 */
-extern char * HTEscape PARAMS((
-	CONST char *	str,
-	unsigned char	mask));
+extern char * HTEscape (
+	const char *	str,
+	unsigned char	mask);
 
 /*		Escape unsafe characters using %		HTEscapeUnsafe()
 **		--------------------------------
@@ -145,8 +145,8 @@ extern char * HTEscape PARAMS((
 **
 **	Unlike HTUnEscape(), this routine returns a malloc'd string.
 */
-extern char * HTEscapeUnsafe PARAMS((
-	CONST char *	str));
+extern char * HTEscapeUnsafe (
+	const char *	str);
 
 /*	Escape undesirable characters using % but space to +.	HTEscapeSP()
 **	-----------------------------------------------------
@@ -159,9 +159,9 @@ extern char * HTEscapeUnsafe PARAMS((
 **
 **	Unlike HTUnEscape(), this routine returns a malloc'd string.
 */
-extern char * HTEscapeSP PARAMS((
-	CONST char *	str,
-	unsigned char	mask));
+extern char * HTEscapeSP (
+	const char *	str,
+	unsigned char	mask);
 
 /*	Decode %xx escaped characters.				HTUnEscape()
 **	------------------------------
@@ -171,8 +171,8 @@ extern char * HTEscapeSP PARAMS((
 **	the acsii hex code for character 16x+y.
 **	The string is converted in place, as it will never grow.
 */
-extern char * HTUnEscape PARAMS((
-	char *		str));
+extern char * HTUnEscape (
+	char *		str);
 
 /*	Decode some %xx escaped characters.		      HTUnEscapeSome()
 **	-----------------------------------			Klaus Weide
@@ -184,15 +184,15 @@ extern char * HTUnEscape PARAMS((
 **	should be unescaped if escaped in the first string.
 **	The first string is converted in place, as it will never grow.
 */
-extern char * HTUnEscapeSome PARAMS((
+extern char * HTUnEscapeSome (
 	char *		str,
-	CONST char *	do_trans));
+	const char *	do_trans);
 
 /*
 **  Turn a string which is not a RFC 822 token into a quoted-string. - KW
 */
-extern void HTMake822Word PARAMS((
+extern void HTMake822Word (
 	char **		str,
-	int		quoted));
+	int		quoted);
 
 #endif  /* HTPARSE_H */
diff --git a/WWW/Library/Implementation/HTPlain.c b/WWW/Library/Implementation/HTPlain.c
index 333697e3..bc0e72f5 100644
--- a/WWW/Library/Implementation/HTPlain.c
+++ b/WWW/Library/Implementation/HTPlain.c
@@ -30,14 +30,14 @@
 #include <LYCharSets.h>
 #include <LYLeaks.h>
 
-PUBLIC int HTPlain_lastraw = -1;
-PRIVATE int HTPlain_bs_pending = 0; /* 1:bs 2:underline 3:underline+bs - kw */
+int HTPlain_lastraw = -1;
+static int HTPlain_bs_pending = 0; /* 1:bs 2:underline 3:underline+bs - kw */
 
 /*		HTML Object
 **		-----------
 */
 struct _HTStream {
-    CONST HTStreamClass *	isa;
+    const HTStreamClass *	isa;
     HText *			text;
     /*
     **	The node_anchor UCInfo and handle for the input (PARSER) stage. - FM
@@ -62,11 +62,11 @@ struct _HTStream {
     UCTransParams		T;
 };
 
-PRIVATE char replace_buf [64];	      /* buffer for replacement strings */
+static char replace_buf [64];	      /* buffer for replacement strings */
 
-PRIVATE void HTPlain_getChartransInfo ARGS2(
-	HTStream *,		me,
-	HTParentAnchor *,	anchor)
+static void HTPlain_getChartransInfo (
+	HTStream *		me,
+	HTParentAnchor *	anchor)
 {
     if (me->inUCLYhndl < 0) {
 	HTAnchor_copyUCInfoStage(anchor, UCT_STAGE_PARSER, UCT_STAGE_MIME,
@@ -97,17 +97,17 @@ PRIVATE void HTPlain_getChartransInfo ARGS2(
 **			A C T I O N	R O U T I N E S
 */
 
-PRIVATE void HTPlain_write PARAMS((
+static void HTPlain_write (
 	HTStream *		me,
-	CONST char *		s,
-	int			l));
+	const char *		s,
+	int			l);
 
 /*	Character handling
 **	------------------
 */
-PRIVATE void HTPlain_put_character ARGS2(
-	HTStream *,		me,
-	char,			c)
+static void HTPlain_put_character (
+	HTStream *		me,
+	char			c)
 {
 #ifdef REMOVE_CR_ONLY
     /*
@@ -158,7 +158,7 @@ PRIVATE void HTPlain_put_character ARGS2(
 	    !((me->outUCLYhndl == LATIN1) ||
 	      (me->outUCI->enc & (UCT_CP_SUPERSETOF_LAT1)))) {
 	    int len, high, low, i, diff = 1;
-	    CONST char * name;
+	    const char * name;
 	    UCode_t value = (UCode_t)FROMASCII((TOASCII(UCH(c)) - 160));
 
 	    name = HTMLGetEntityName(value);
@@ -190,12 +190,12 @@ PRIVATE void HTPlain_put_character ARGS2(
 **	---------------
 **
 */
-PRIVATE void HTPlain_put_string ARGS2(HTStream *, me, CONST char*, s)
+static void HTPlain_put_string (HTStream *  me, const char*  s)
 {
 #ifdef REMOVE_CR_ONLY
     HText_appendText(me->text, s);
 #else
-    CONST char * p;
+    const char * p;
 
     if (s == NULL)
 	return;
@@ -210,10 +210,10 @@ PRIVATE void HTPlain_put_string ARGS2(HTStream *, me, CONST char*, s)
 **	Entry function for displayed text/plain and WWW_SOURCE strings. - FM
 **	---------------------------------------------------------------
 */
-PRIVATE void HTPlain_write ARGS3(HTStream *, me, CONST char*, s, int, l)
+static void HTPlain_write (HTStream * me, const char* s, int l)
 {
-    CONST char * p;
-    CONST char * e = s+l;
+    const char * p;
+    const char * e = s+l;
     char c;
     unsigned c_unsign;
     BOOL chk;
@@ -661,8 +661,8 @@ PRIVATE void HTPlain_write ARGS3(HTStream *, me, CONST char*, s, int, l)
 **	Note that the SGML parsing context is freed, but the created object is
 **	not, as it takes on an existence of its own unless explicitly freed.
 */
-PRIVATE void HTPlain_free ARGS1(
-	HTStream *,	me)
+static void HTPlain_free (
+	HTStream *	me)
 {
     if (HTPlain_bs_pending >= 2)
 	HText_appendCharacter(me->text, '_');
@@ -671,9 +671,9 @@ PRIVATE void HTPlain_free ARGS1(
 
 /*	End writing
 */
-PRIVATE void HTPlain_abort ARGS2(
-	HTStream *,	me,
-	HTError,	e GCC_UNUSED)
+static void HTPlain_abort (
+	HTStream *	me,
+	HTError	e GCC_UNUSED)
 {
     HTPlain_free(me);
 }
@@ -681,7 +681,7 @@ PRIVATE void HTPlain_abort ARGS2(
 /*		Structured Object Class
 **		-----------------------
 */
-PUBLIC CONST HTStreamClass HTPlain =
+const HTStreamClass HTPlain =
 {
 	"PlainPresenter",
 	HTPlain_free,
@@ -692,10 +692,10 @@ PUBLIC CONST HTStreamClass HTPlain =
 /*		New object
 **		----------
 */
-PUBLIC HTStream* HTPlainPresent ARGS3(
-	HTPresentation *,	pres GCC_UNUSED,
-	HTParentAnchor *,	anchor,
-	HTStream *,		sink GCC_UNUSED)
+HTStream* HTPlainPresent (
+	HTPresentation *	pres GCC_UNUSED,
+	HTParentAnchor *	anchor,
+	HTStream *		sink GCC_UNUSED)
 {
 
     HTStream* me = (HTStream*)malloc(sizeof(*me));
diff --git a/WWW/Library/Implementation/HTPlain.h b/WWW/Library/Implementation/HTPlain.h
index ed9a590f..163b48e1 100644
--- a/WWW/Library/Implementation/HTPlain.h
+++ b/WWW/Library/Implementation/HTPlain.h
@@ -8,9 +8,9 @@
 #include <HTStream.h>
 #include <HTAnchor.h>
 
-extern HTStream* HTPlainPresent PARAMS((
+extern HTStream* HTPlainPresent (
         HTPresentation *        pres,
         HTParentAnchor *        anchor,
-        HTStream *              sink));
+        HTStream *              sink);
 
 #endif /* HTPLAIN_H */
diff --git a/WWW/Library/Implementation/HTRules.c b/WWW/Library/Implementation/HTRules.c
index c11eb966..3ba959d9 100644
--- a/WWW/Library/Implementation/HTRules.c
+++ b/WWW/Library/Implementation/HTRules.c
@@ -50,18 +50,18 @@ typedef struct _rule {
 /*	Global variables
 **	----------------
 */
-PUBLIC char *HTBinDir = NULL;	/* Physical /htbin directory path.	*/
+char *HTBinDir = NULL;	/* Physical /htbin directory path.	*/
 				/* In future this should not be global. */
-PUBLIC char *HTSearchScript = NULL;	/* Search script name.		*/
+char *HTSearchScript = NULL;	/* Search script name.		*/
 
 
 /*	Module-wide variables
 **	---------------------
 */
 
-PRIVATE rule * rules = 0;	/* Pointer to first on list */
+static rule * rules = 0;	/* Pointer to first on list */
 #ifndef PUT_ON_HEAD
-PRIVATE rule * rule_tail = 0;	/* Pointer to last on list */
+static rule * rule_tail = 0;	/* Pointer to last on list */
 #endif
 
 
@@ -76,12 +76,12 @@ PRIVATE rule * rule_tail = 0;	/* Pointer to last on list */
 **	returns		0 if success, -1 if error.
 */
 
-PUBLIC int HTAddRule ARGS5(
-    HTRuleOp,		op,
-    CONST char *,	pattern,
-    CONST char *,	equiv,
-    CONST char *,	cond_op,
-    CONST char *,	cond)
+int HTAddRule (
+    HTRuleOp		op,
+    const char *	pattern,
+    const char *	equiv,
+    const char *	cond_op,
+    const char *	cond)
 { /* BYTE_ADDRESSING removed and memory check - AS - 1 Sep 93 */
     rule *	temp;
     char *	pPattern = NULL;
@@ -144,7 +144,7 @@ PUBLIC int HTAddRule ARGS5(
 ** See also
 **	HTAddRule()
 */
-void HTClearRules NOARGS
+void HTClearRules (void)
 {
     while (rules) {
 	rule * temp = rules;
@@ -160,8 +160,8 @@ void HTClearRules NOARGS
 #endif
 }
 
-PRIVATE BOOL rule_cond_ok ARGS1(
-    rule *,	 r)
+static BOOL rule_cond_ok (
+    rule *	 r)
 {
     BOOL result;
     if (!r->condition_op)
@@ -205,8 +205,8 @@ PRIVATE BOOL rule_cond_ok ARGS1(
 **			protected, and so it knows how to handle it.
 **								-- AL
 */
-char * HTTranslate ARGS1(
-    CONST char *,	required)
+char * HTTranslate (
+    const char *	required)
 {
     rule * r;
     char *current = NULL;
@@ -221,7 +221,7 @@ char * HTTranslate ARGS1(
     for(r = rules; r; r = r->next) {
 	char * p = r->pattern;
 	int m=0;   /* Number of characters matched against wildcard */
-	CONST char * q = current;
+	const char * q = current;
 	for(;*p && *q; p++, q++) {   /* Find first mismatch */
 	    if (*p!=*q) break;
 	}
@@ -423,8 +423,8 @@ char * HTTranslate ARGS1(
 **
 ** returns	0 OK, < 0 syntax error.
 */
-PUBLIC int  HTSetConfiguration ARGS1(
-    char *,		config)
+int  HTSetConfiguration (
+    char *		config)
 {
     HTRuleOp op;
     char * line = NULL;
@@ -626,8 +626,8 @@ PUBLIC int  HTSetConfiguration ARGS1(
 **	The strings may not contain spaces.
 */
 
-int HTLoadRules ARGS1(
-    CONST char *,	filename)
+int HTLoadRules (
+    const char *	filename)
 {
     FILE * fp = fopen(filename, TXT_R);
     char line[LINE_LENGTH+1];
diff --git a/WWW/Library/Implementation/HTRules.h b/WWW/Library/Implementation/HTRules.h
index fb4a05d8..c9b299df 100644
--- a/WWW/Library/Implementation/HTRules.h
+++ b/WWW/Library/Implementation/HTRules.h
@@ -84,12 +84,12 @@ HTAddRule:  Add rule to the list
    large.
 
  */
-extern int HTAddRule PARAMS((
+extern int HTAddRule (
     HTRuleOp op,
-    CONST char * pattern,
-    CONST char * equiv,
-    CONST char * cond_op,
-    CONST char * cond));
+    const char * pattern,
+    const char * equiv,
+    const char * cond_op,
+    const char * cond);
 
 
 /*
@@ -102,7 +102,7 @@ HTClearRules: Clear all rules
 
  */
 
-extern void HTClearRules PARAMS((void));
+extern void HTClearRules (void);
 
 /*
 
@@ -123,7 +123,7 @@ HTTranslate: Translate by rules
                          a copy of the original.
 
  */
-extern char * HTTranslate PARAMS((CONST char * required));
+extern char * HTTranslate (const char * required);
 
 /*
 
@@ -137,7 +137,7 @@ HTSetConfiguration:  Load one line of configuration information
    the  rule file, for example INI files for X resources.
 
  */
-extern int HTSetConfiguration PARAMS((char * config));
+extern int HTSetConfiguration (char * config);
 
 
 /*
@@ -157,7 +157,7 @@ HtLoadRules:  Load the rules from a file
 
  */
 
-extern int HTLoadRules PARAMS((CONST char * filename));
+extern int HTLoadRules (const char * filename);
 /*
 
  */
diff --git a/WWW/Library/Implementation/HTStream.h b/WWW/Library/Implementation/HTStream.h
index cf0a4bf3..25e62570 100644
--- a/WWW/Library/Implementation/HTStream.h
+++ b/WWW/Library/Implementation/HTStream.h
@@ -32,25 +32,25 @@ typedef struct _HTStreamClass {
 
         char*  name;                            /* Just for diagnostics */
                 
-        void (*_free) PARAMS((
-                HTStream*       me));
+        void (*_free) (
+                HTStream*       me);
 
-        void (*_abort) PARAMS((
+        void (*_abort) (
                 HTStream*       me,
-                HTError         e));
+                HTError         e);
                 
-        void (*put_character) PARAMS((
+        void (*put_character) (
                 HTStream*       me,
-                char            ch));
+                char            ch);
                                 
-        void (*put_string) PARAMS((
+        void (*put_string) (
                 HTStream*       me,
-                CONST char *    str));
+                const char *    str);
                 
-        void (*put_block) PARAMS((
+        void (*put_block) (
                 HTStream*       me,
-                CONST char *    str,
-                int             len));
+                const char *    str,
+                int             len);
 
 }HTStreamClass;
 
@@ -63,6 +63,6 @@ typedef struct _HTStreamClass {
    example from the network.
 
  */
-extern HTStream * HTErrorStream NOPARAMS;
+extern HTStream * HTErrorStream (void);
 
 #endif /* HTSTREAM_H */
diff --git a/WWW/Library/Implementation/HTString.c b/WWW/Library/Implementation/HTString.c
index 6b4a9c3b..898d7504 100644
--- a/WWW/Library/Implementation/HTString.c
+++ b/WWW/Library/Implementation/HTString.c
@@ -14,8 +14,8 @@
 #include <LYStrings.h>
 
 #ifndef NO_LYNX_TRACE
-PUBLIC BOOLEAN WWW_TraceFlag = 0;	/* Global trace flag for ALL W3 code */
-PUBLIC int WWW_TraceMask = 0;		/* Global trace flag for ALL W3 code */
+BOOLEAN WWW_TraceFlag = 0;	/* Global trace flag for ALL W3 code */
+int WWW_TraceMask = 0;		/* Global trace flag for ALL W3 code */
 #endif
 
 #ifndef VC
@@ -23,9 +23,9 @@ PUBLIC int WWW_TraceMask = 0;		/* Global trace flag for ALL W3 code */
 #endif /* !VC */
 
 #ifdef _WINDOWS
-CONST char * HTLibraryVersion = "2.14FM"; /* String for help screen etc */
+const char * HTLibraryVersion = "2.14FM"; /* String for help screen etc */
 #else
-PUBLIC CONST char * HTLibraryVersion = VC; /* String for help screen etc */
+const char * HTLibraryVersion = VC; /* String for help screen etc */
 #endif
 
 /*
@@ -35,12 +35,12 @@ PUBLIC CONST char * HTLibraryVersion = VC; /* String for help screen etc */
 **     from the current display charset.
 **     It returns 0 if exact match.
 */
-PUBLIC int strcasecomp8 ARGS2(
-       CONST char*,    a,
-       CONST char *,   b)
+int strcasecomp8 (
+       const char*    a,
+       const char *   b)
 {
-    CONST char *p = a;
-    CONST char *q = b;
+    const char *p = a;
+    const char *q = b;
 
     for ( ; *p && *q; p++, q++) {
 	int diff = UPPER8(*p, *q);
@@ -60,13 +60,13 @@ PUBLIC int strcasecomp8 ARGS2(
 **     from the current display charset.
 **     It returns 0 if exact match.
 */
-PUBLIC int strncasecomp8 ARGS3(
-	CONST char*,	a,
-	CONST char *,	b,
-	int,		n)
+int strncasecomp8 (
+	const char*	a,
+	const char *	b,
+	int		n)
 {
-    CONST char *p = a;
-    CONST char *q = b;
+    const char *p = a;
+    const char *q = b;
 
     for ( ; ; p++, q++) {
 	int diff;
@@ -125,9 +125,9 @@ static unsigned char charmap[] = {
 	'\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377',
 };
 
-PUBLIC int strcasecomp ARGS2(
-	CONST char*,	s1,
-	CONST char*,	s2)
+int strcasecomp (
+	const char*	s1,
+	const char*	s2)
 {
     register unsigned char *cm = charmap;
     register unsigned char *us1 = (unsigned char *)s1;
@@ -139,10 +139,10 @@ PUBLIC int strcasecomp ARGS2(
     return (cm[*us1] - cm[*--us2]);
 }
 
-PUBLIC int strncasecomp ARGS3(
-	CONST char*,	a,
-	CONST char*,	b,
-	int,		n)
+int strncasecomp (
+	const char*	a,
+	const char*	b,
+	int		n)
 {
     register unsigned char *cm = charmap;
     register unsigned char *us1 = (unsigned char *)a;
@@ -159,12 +159,12 @@ PUBLIC int strncasecomp ARGS3(
 /*	Strings of any length
 **	---------------------
 */
-PUBLIC int strcasecomp ARGS2(
-	CONST char*,	a,
-	CONST char *,	b)
+int strcasecomp (
+	const char*	a,
+	const char *	b)
 {
-    CONST char *p = a;
-    CONST char *q = b;
+    const char *p = a;
+    const char *q = b;
 
     for ( ; *p && *q; p++, q++) {
 	int diff = TOLOWER(*p) - TOLOWER(*q);
@@ -181,13 +181,13 @@ PUBLIC int strcasecomp ARGS2(
 /*	With count limit
 **	----------------
 */
-PUBLIC int strncasecomp ARGS3(
-	CONST char*,	a,
-	CONST char *,	b,
-	int,		n)
+int strncasecomp (
+	const char*	a,
+	const char *	b,
+	int		n)
 {
-    CONST char *p = a;
-    CONST char *q = b;
+    const char *p = a;
+    const char *q = b;
 
     for ( ; ; p++, q++) {
 	int diff;
@@ -210,9 +210,9 @@ PUBLIC int strncasecomp ARGS3(
 /*	Case-insensitive with ASCII collating sequence
 **	----------------
 */
-PUBLIC int AS_casecomp ARGS2(
-	CONST char*,	p,
-	CONST char*,	q)
+int AS_casecomp (
+	const char*	p,
+	const char*	q)
 {
     int diff;
 
@@ -232,12 +232,12 @@ PUBLIC int AS_casecomp ARGS2(
 **	----------------
 **	AS_cmp uses n == -1 to compare indefinite length.
 */
-PUBLIC int AS_ncmp ARGS3(
-	CONST char *,	p,
-	CONST char *,	q,
-	unsigned int,	n)
+int AS_ncmp (
+	const char *	p,
+	const char *	q,
+	unsigned int	n)
 {
-    CONST char *a = p;
+    const char *a = p;
     int diff;
 
     for ( ; (p-a) < n; p++, q++) {
@@ -255,9 +255,9 @@ PUBLIC int AS_ncmp ARGS3(
 /*	With ASCII collating sequence
 **	----------------
 */
-PUBLIC int AS_cmp ARGS2(
-	CONST char *,	p,
-	CONST char *,	q)
+int AS_cmp (
+	const char *	p,
+	const char *	q)
 {
     return( AS_ncmp( p, q, -1 ) );
 }
@@ -266,9 +266,9 @@ PUBLIC int AS_cmp ARGS2(
 
 /*	Allocate a new copy of a string, and returns it
 */
-PUBLIC char * HTSACopy ARGS2(
-	char **,	dest,
-	CONST char *,	src)
+char * HTSACopy (
+	char **	dest,
+	const char *	src)
 {
     if (src != 0) {
 	if (src != *dest) {
@@ -287,9 +287,9 @@ PUBLIC char * HTSACopy ARGS2(
 
 /*	String Allocate and Concatenate
 */
-PUBLIC char * HTSACat ARGS2(
-	char **,	dest,
-	CONST char *,	src)
+char * HTSACat (
+	char **	dest,
+	const char *	src)
 {
     if (src && *src && (src != *dest)) {
 	if (*dest) {
@@ -314,16 +314,16 @@ PUBLIC char * HTSACat ARGS2(
 #define EXTRA_TYPE size_t		/* type we use for length */
 #define EXTRA_SIZE sizeof(void *)	/* alignment >= sizeof(EXTRA_TYPE) */
 
-PUBLIC void   HTSAFree_extra ARGS1(
-	char *,		s)
+void   HTSAFree_extra (
+	char *		s)
 {
     free(s - EXTRA_SIZE);
 }
 
 /* never shrink */
-PUBLIC char * HTSACopy_extra ARGS2(
-	char **,	dest,
-	CONST char *,	src)
+char * HTSACopy_extra (
+	char **	dest,
+	const char *	src)
 {
     if (src != 0) {
 	size_t srcsize = strlen(src) + 1;
@@ -362,8 +362,8 @@ PUBLIC char * HTSACopy_extra ARGS2(
 **
 **	returns a pointer to the first field
 */
-PUBLIC char * HTNextField ARGS1(
-	char **,	pstr)
+char * HTNextField (
+	char **	pstr)
 {
     char * p = *pstr;
     char * start;			/* start of field */
@@ -417,11 +417,11 @@ PUBLIC char * HTNextField ARGS1(
 **	found	points to the delimiter found unless it was NULL.
 **	Returns a pointer to the first word or NULL on error
 */
-PUBLIC char * HTNextTok ARGS4(
-	char **,	pstr,
-	CONST char *,	delims,
-	CONST char *,	bracks,
-	char *,		found)
+char * HTNextTok (
+	char **	pstr,
+	const char *	delims,
+	const char *	bracks,
+	char *		found)
 {
     char * p = *pstr;
     char * start = NULL;
@@ -521,7 +521,7 @@ PUBLIC char * HTNextTok ARGS4(
     return start;
 }
 
-PRIVATE char *HTAlloc ARGS2(char *, ptr, size_t, length)
+static char *HTAlloc (char *  ptr, size_t  length)
 {
     if (ptr != 0)
 	ptr = (char *)realloc(ptr, length);
@@ -560,11 +560,11 @@ typedef enum { Flags, Width, Prec, Type, Format } PRINTF;
 #define GROW_EXPR(n) (((n) * 3) / 2)
 #define GROW_SIZE 256
 
-PUBLIC_IF_FIND_LEAKS char * StrAllocVsprintf ARGS4(
-	char **,	pstr,
-	size_t,		dst_len,
-	CONST char *,	fmt,
-	va_list *,	ap)
+PUBLIC_IF_FIND_LEAKS char * StrAllocVsprintf (
+	char **	pstr,
+	size_t		dst_len,
+	const char *	fmt,
+	va_list *	ap)
 {
 #ifdef SAVE_TIME_NOT_SPACE
     static size_t tmp_len = 0;
@@ -578,7 +578,7 @@ PUBLIC_IF_FIND_LEAKS char * StrAllocVsprintf ARGS4(
 #endif /* SAVE_TIME_NOT_SPACE */
     size_t have, need;
     char *dst_ptr = *pstr;
-    CONST char *format = fmt;
+    const char *format = fmt;
 
     if (fmt == 0 || *fmt == '\0')
 	return 0;
@@ -799,9 +799,9 @@ PUBLIC_IF_FIND_LEAKS char * StrAllocVsprintf ARGS4(
 #undef HTSprintf
 #endif
 #if ANSI_VARARGS
-PUBLIC char * HTSprintf (char ** pstr, CONST char * fmt, ...)
+char * HTSprintf (char ** pstr, const char * fmt, ...)
 #else
-PUBLIC char * HTSprintf (va_alist)
+char * HTSprintf (va_alist)
     va_dcl
 #endif
 {
@@ -813,7 +813,7 @@ PUBLIC char * HTSprintf (va_alist)
     {
 #if !ANSI_VARARGS
 	char **		pstr = va_arg(ap, char **);
-	CONST char *	fmt  = va_arg(ap, CONST char *);
+	const char *	fmt  = va_arg(ap, const char *);
 #endif
 	if (pstr != 0 && *pstr != 0)
 	    inuse = strlen(*pstr);
@@ -835,9 +835,9 @@ PUBLIC char * HTSprintf (va_alist)
 #undef HTSprintf0
 #endif
 #if ANSI_VARARGS
-PUBLIC char * HTSprintf0 (char ** pstr, CONST char * fmt, ...)
+char * HTSprintf0 (char ** pstr, const char * fmt, ...)
 #else
-PUBLIC char * HTSprintf0 (va_alist)
+char * HTSprintf0 (va_alist)
     va_dcl
 #endif
 {
@@ -848,7 +848,7 @@ PUBLIC char * HTSprintf0 (va_alist)
     {
 #if !ANSI_VARARGS
 	char **		pstr = va_arg(ap, char **);
-	CONST char *	fmt  = va_arg(ap, CONST char *);
+	const char *	fmt  = va_arg(ap, const char *);
 #endif
 #ifdef USE_VASPRINTF
 	if (pstr) {
@@ -873,8 +873,8 @@ PUBLIC char * HTSprintf0 (va_alist)
 #if USE_QUOTED_PARAMETER
 #define S_QUOTE '\''
 #define D_QUOTE '"'
-PUBLIC char *HTQuoteParameter ARGS1(
-    CONST char *,	parameter)
+char *HTQuoteParameter (
+    const char *	parameter)
 {
     size_t i;
     size_t last;
@@ -928,8 +928,8 @@ PUBLIC char *HTQuoteParameter ARGS1(
 /*
  * Returns the number of "%s" tokens in a system command-template.
  */
-PUBLIC int HTCountCommandArgs ARGS1(
-    CONST char *,	command)
+int HTCountCommandArgs (
+    const char *	command)
 {
     int number = 0;
     while (command[0] != 0) {
@@ -943,9 +943,9 @@ PUBLIC int HTCountCommandArgs ARGS1(
 /*
  * Returns a pointer into the given string after the given parameter number
  */
-PRIVATE CONST char *HTAfterCommandArg ARGS2(
-    CONST char *,	command,
-    int,		number)
+static const char *HTAfterCommandArg (
+    const char *	command,
+    int		number)
 {
     while (number > 0) {
 	if (command[0] != 0) {
@@ -972,15 +972,15 @@ PRIVATE CONST char *HTAfterCommandArg ARGS2(
  * This is useful only when we quote parameters, of course.
  */
 #if USE_QUOTED_PARAMETER
-PUBLIC void HTAddXpand ARGS4(
-    char **,		result,
-    CONST char *,	command,
-    int,		number,
-    CONST char *,	parameter)
+void HTAddXpand (
+    char **		result,
+    const char *	command,
+    int		number,
+    const char *	parameter)
 {
     if (number > 0) {
-	CONST char *last = HTAfterCommandArg(command, number - 1);
-	CONST char *next = last;
+	const char *last = HTAfterCommandArg(command, number - 1);
+	const char *next = last;
 
 	if (number <= 1) {
 	    FREE(*result);
@@ -1014,15 +1014,15 @@ PUBLIC void HTAddXpand ARGS4(
  * Parameters are substituted at "%s" tokens, like printf.  Other printf-style
  * tokens are not substituted; they are passed through without change.
  */
-PUBLIC void HTAddToCmd ARGS4(
-    char **,		result,
-    CONST char *,	command,
-    int,		number,
-    CONST char *,	string)
+void HTAddToCmd (
+    char **		result,
+    const char *	command,
+    int		number,
+    const char *	string)
 {
     if (number > 0) {
-	CONST char *last = HTAfterCommandArg(command, number - 1);
-	CONST char *next = last;
+	const char *last = HTAfterCommandArg(command, number - 1);
+	const char *next = last;
 
 	if (number <= 1) {
 	    FREE(*result);
@@ -1051,11 +1051,11 @@ PUBLIC void HTAddToCmd ARGS4(
  * string is a complete parameter (which is a necessary assumption so we can
  * quote it properly).
  */
-PUBLIC void HTAddParam ARGS4(
-    char **,		result,
-    CONST char *,	command,
-    int,		number,
-    CONST char *,	parameter)
+void HTAddParam (
+    char **		result,
+    const char *	command,
+    int		number,
+    const char *	parameter)
 {
     if (number > 0) {
 #if USE_QUOTED_PARAMETER
@@ -1072,12 +1072,12 @@ PUBLIC void HTAddParam ARGS4(
  * Append the remaining command-string to a system command (compare with
  * HTAddParam).  Any remaining "%s" tokens are copied as empty strings.
  */
-PUBLIC void HTEndParam ARGS3(
-    char **,		result,
-    CONST char *,	command,
-    int,		number)
+void HTEndParam (
+    char **		result,
+    const char *	command,
+    int		number)
 {
-    CONST char *last;
+    const char *last;
     int count;
 
     count = HTCountCommandArgs (command);
@@ -1097,10 +1097,10 @@ PUBLIC void HTEndParam ARGS3(
 
 /*	Allocate a new bstring, and return it.
 */
-PUBLIC void HTSABCopy ARGS3(
-	bstring**,	dest,
-	CONST char *,	src,
-	int,		len)
+void HTSABCopy (
+	bstring**	dest,
+	const char *	src,
+	int		len)
 {
     bstring *t;
     unsigned need = len + 1;
@@ -1132,9 +1132,9 @@ PUBLIC void HTSABCopy ARGS3(
 /*
  * Initialize with a null-terminated string (discards the null).
  */
-PUBLIC void HTSABCopy0 ARGS2(
-	bstring**,	dest,
-	CONST char *,	src)
+void HTSABCopy0 (
+	bstring**	dest,
+	const char *	src)
 {
     HTSABCopy(dest, src, strlen(src));
 }
@@ -1142,10 +1142,10 @@ PUBLIC void HTSABCopy0 ARGS2(
 /*
  * Append a block of memory to a bstring.
  */
-PUBLIC void HTSABCat ARGS3(
-	bstring **,	dest,
-	CONST char *,	src,
-	int,		len)
+void HTSABCat (
+	bstring **	dest,
+	const char *	src,
+	int		len)
 {
     bstring *t = *dest;
 
@@ -1184,9 +1184,9 @@ PUBLIC void HTSABCat ARGS3(
 /*
  * Append a null-terminated string (discards the null).
  */
-PUBLIC void HTSABCat0 ARGS2(
-	bstring**,	dest,
-	CONST char *,	src)
+void HTSABCat0 (
+	bstring**	dest,
+	const char *	src)
 {
     HTSABCat(dest, src, strlen(src));
 }
@@ -1194,9 +1194,9 @@ PUBLIC void HTSABCat0 ARGS2(
 /*
  * Compare two bstring's for equality
  */
-PUBLIC BOOL HTSABEql   ARGS2(
-	bstring *,	a,
-	bstring *,	b)
+BOOL HTSABEql   (
+	bstring *	a,
+	bstring *	b)
 {
     unsigned len_a = (a != 0) ? a->len : 0;
     unsigned len_b = (b != 0) ? b->len : 0;
@@ -1212,8 +1212,8 @@ PUBLIC BOOL HTSABEql   ARGS2(
 /*
  * Deallocate a bstring.
  */
-PUBLIC void HTSABFree ARGS1(
-	bstring **,	ptr)
+void HTSABFree (
+	bstring **	ptr)
 {
     if (*ptr != NULL) {
 	FREE((*ptr)->str);
@@ -1227,9 +1227,9 @@ PUBLIC void HTSABFree ARGS1(
  * The bstring may contain embedded nulls; the formatted portions must not.
  */
 #ifdef ANSI_VARARGS
-PUBLIC bstring * HTBprintf (bstring ** pstr, CONST char * fmt, ...)
+bstring * HTBprintf (bstring ** pstr, const char * fmt, ...)
 #else
-PUBLIC bstring * HTBprintf (va_alist)
+bstring * HTBprintf (va_alist)
     va_dcl
 #endif
 {
@@ -1241,7 +1241,7 @@ PUBLIC bstring * HTBprintf (va_alist)
     {
 #if !ANSI_VARARGS
 	bstring **	pstr = va_arg(ap, char **);
-	CONST char *	fmt  = va_arg(ap, CONST char *);
+	const char *	fmt  = va_arg(ap, const char *);
 #endif
 	temp = StrAllocVsprintf(&temp, 0, fmt, &ap);
 	if (!isEmpty(temp)) {
@@ -1260,9 +1260,9 @@ PUBLIC bstring * HTBprintf (va_alist)
  * That is most, since we do not restrict line-length.  Nulls and other
  * non-printing characters are addressed.
  */
-PUBLIC void trace_bstring2 ARGS2(
-	CONST char *,	text,
-	int,		size)
+void trace_bstring2 (
+	const char *	text,
+	int		size)
 {
     int n;
 
@@ -1294,8 +1294,8 @@ PUBLIC void trace_bstring2 ARGS2(
     }
 }
 
-PUBLIC void trace_bstring ARGS1(
-	bstring *,	data)
+void trace_bstring (
+	bstring *	data)
 {
     trace_bstring2(BStrData(data), BStrLen(data));
 }
diff --git a/WWW/Library/Implementation/HTString.h b/WWW/Library/Implementation/HTString.h
index af994c86..cb118e58 100644
--- a/WWW/Library/Implementation/HTString.h
+++ b/WWW/Library/Implementation/HTString.h
@@ -11,16 +11,16 @@
 #include <HTUtils.h>
 #endif /* HTUTILS_H */
 
-extern CONST char * HTLibraryVersion;   /* String for help screen etc */
+extern const char * HTLibraryVersion;   /* String for help screen etc */
 
 /*
     EBCDIC string comparison using ASCII collating sequence
 */
 #ifdef    NOT_ASCII
-extern int AS_casecomp  PARAMS((CONST char *a, CONST char *b));
-extern int AS_ncmp PARAMS((CONST char *a, CONST char *b, unsigned int n));
+extern int AS_casecomp  (const char *a, const char *b);
+extern int AS_ncmp (const char *a, const char *b, unsigned int n);
 #define    AS_cmp( a, b )  ( AS_ncmp( ( a ), ( b ), -1 ) )
-extern int AS_cmp PARAMS((CONST char *a, CONST char *b));
+extern int AS_cmp (const char *a, const char *b);
 
 #else
 #define AS_casecomp( a, b ) ( strcasecomp( ( a ), ( b ) ) )
@@ -36,11 +36,11 @@ Case-insensitive string comparison
    The usual routines (comp instead of cmp) had some problem.
    
  */
-extern int strcasecomp  PARAMS((CONST char *a, CONST char *b));
-extern int strncasecomp PARAMS((CONST char *a, CONST char *b, int n));
+extern int strcasecomp  (const char *a, const char *b);
+extern int strncasecomp (const char *a, const char *b, int n);
 
-extern int strcasecomp8  PARAMS((CONST char *a, CONST char *b));
-extern int strncasecomp8 PARAMS((CONST char *a, CONST char *b, int n));
+extern int strcasecomp8  (const char *a, const char *b);
+extern int strncasecomp8 (const char *a, const char *b, int n);
        /*
        **  strcasecomp8 and strncasecomp8 are variants of strcasecomp
        **  and strncasecomp, but use 8bit upper/lower case information
@@ -55,8 +55,8 @@ Malloced string manipulation
  */
 #define StrAllocCopy(dest, src) HTSACopy (&(dest), src)
 #define StrAllocCat(dest, src)  HTSACat  (&(dest), src)
-extern char * HTSACopy PARAMS ((char **dest, CONST char *src));
-extern char * HTSACat  PARAMS ((char **dest, CONST char *src));
+extern char * HTSACopy (char **dest, const char *src);
+extern char * HTSACat  (char **dest, const char *src);
 
 /*
 optimized for heavily realloc'd strings in temp objects
@@ -64,24 +64,24 @@ optimized for heavily realloc'd strings in temp objects
 #define StrAllocCopy_extra(dest, src) HTSACopy_extra (&(dest), src)
 #define FREE_extra(x)   {if (x != NULL) {HTSAFree_extra(x); x = NULL;}}
 #define Clear_extra(x)  {if (x != NULL) {*x = '\0';}}
-extern char * HTSACopy_extra PARAMS ((char **dest, CONST char *src));
-extern void   HTSAFree_extra PARAMS ((char *s));
+extern char * HTSACopy_extra (char **dest, const char *src);
+extern void   HTSAFree_extra (char *s);
 
 /*
 
 Next word or quoted string
 
  */
-extern char * HTNextField PARAMS ((char** pstr));
+extern char * HTNextField (char** pstr);
 
 /* A more general parser - kw */
-extern char * HTNextTok PARAMS((char ** pstr,
-		      CONST char * delims, CONST char * bracks, char * found));
+extern char * HTNextTok (char ** pstr,
+		      const char * delims, const char * bracks, char * found);
 
 #ifdef ANSI_VARARGS
-extern char * HTSprintf (char ** pstr, CONST char * fmt, ...)
+extern char * HTSprintf (char ** pstr, const char * fmt, ...)
 			GCC_PRINTFLIKE(2,3);
-extern char * HTSprintf0 (char ** pstr, CONST char * fmt, ...)
+extern char * HTSprintf0 (char ** pstr, const char * fmt, ...)
 			 GCC_PRINTFLIKE(2,3);
 #else
 extern char * HTSprintf () GCC_PRINTFLIKE(2,3);
@@ -89,11 +89,11 @@ extern char * HTSprintf0 () GCC_PRINTFLIKE(2,3);
 #endif
 
 #if defined(LY_FIND_LEAKS)	/* private otherwise */
-extern char * StrAllocVsprintf PARAMS((
+extern char * StrAllocVsprintf (
         char **		pstr,
         size_t		len,
-        CONST char *	fmt,
-        va_list *	ap));
+        const char *	fmt,
+        va_list *	ap);
 #endif
 
 #if (defined(VMS) || defined(DOSPATH) || defined(__EMX__)) && !defined(__CYGWIN__)
@@ -103,17 +103,17 @@ extern char * StrAllocVsprintf PARAMS((
 #endif
 
 #if USE_QUOTED_PARAMETER
-extern char *HTQuoteParameter PARAMS((CONST char *parameter));
-extern void HTAddXpand PARAMS((char ** result, CONST char * command, int number, CONST char * parameter));
+extern char *HTQuoteParameter (const char *parameter);
+extern void HTAddXpand (char ** result, const char * command, int number, const char * parameter);
 #else
 #define HTQuoteParameter(parameter) parameter	/* simplify ifdef'ing */
 #define HTAddXpand(result,command,number,parameter)  HTAddParam(result,command,number,parameter)
 #endif
 
-extern int HTCountCommandArgs PARAMS((CONST char * command));
-extern void HTAddToCmd PARAMS((char ** result, CONST char * command, int number, CONST char * string));
-extern void HTAddParam PARAMS((char ** result, CONST char * command, int number, CONST char * parameter));
-extern void HTEndParam PARAMS((char ** result, CONST char * command, int number));
+extern int HTCountCommandArgs (const char * command);
+extern void HTAddToCmd (char ** result, const char * command, int number, const char * string);
+extern void HTAddParam (char ** result, const char * command, int number, const char * parameter);
+extern void HTEndParam (char ** result, const char * command, int number);
 
 /* Force an option, with leading blanks, to be appended without quoting them */
 #define HTOptParam(result, command, number, parameter) HTSACat(result, parameter)
@@ -124,12 +124,12 @@ typedef struct {
 	int len;
 } bstring;
 
-extern void HTSABCopy  PARAMS((bstring ** dest, CONST char * src, int len));
-extern void HTSABCopy0 PARAMS((bstring ** dest, CONST char * src));
-extern void HTSABCat   PARAMS((bstring ** dest, CONST char * src, int len));
-extern void HTSABCat0  PARAMS((bstring ** dest, CONST char * src));
-extern BOOL HTSABEql   PARAMS((bstring * a, bstring * b));
-extern void HTSABFree  PARAMS((bstring ** ptr));
+extern void HTSABCopy  (bstring ** dest, const char * src, int len);
+extern void HTSABCopy0 (bstring ** dest, const char * src);
+extern void HTSABCat   (bstring ** dest, const char * src, int len);
+extern void HTSABCat0  (bstring ** dest, const char * src);
+extern BOOL HTSABEql   (bstring * a, bstring * b);
+extern void HTSABFree  (bstring ** ptr);
 
 #define BStrLen(s)    (((s) != 0) ? (s)->len : 0)
 #define BStrData(s)   (((s) != 0) ? (s)->str : 0)
@@ -145,13 +145,13 @@ extern void HTSABFree  PARAMS((bstring ** ptr));
 #define BStrFree(d)    HTSABFree(  &(d))
 
 #ifdef ANSI_VARARGS
-extern bstring * HTBprintf (bstring ** pstr, CONST char * fmt, ...)
+extern bstring * HTBprintf (bstring ** pstr, const char * fmt, ...)
 			    GCC_PRINTFLIKE(2,3);
 #else
 extern bstring * HTBprintf () GCC_PRINTFLIKE(2,3);
 #endif
 
-extern void trace_bstring PARAMS((bstring *data));
-extern void trace_bstring2 PARAMS((CONST char *text, int size));
+extern void trace_bstring (bstring *data);
+extern void trace_bstring2 (const char *text, int size);
 
 #endif /* HTSTRING_H */
diff --git a/WWW/Library/Implementation/HTStyle.c b/WWW/Library/Implementation/HTStyle.c
index 9e3bc8a5..200c766d 100644
--- a/WWW/Library/Implementation/HTStyle.c
+++ b/WWW/Library/Implementation/HTStyle.c
@@ -16,7 +16,7 @@
 
 /*	Create a new style
 */
-PUBLIC HTStyle* HTStyleNew NOARGS
+HTStyle* HTStyleNew (void)
 {
     HTStyle * self = typecalloc(HTStyle);
     if (self == NULL)
@@ -26,7 +26,7 @@ PUBLIC HTStyle* HTStyleNew NOARGS
 
 /*	Create a new style with a name
 */
-PUBLIC HTStyle* HTStyleNewNamed ARGS1 (CONST char *,name)
+HTStyle* HTStyleNewNamed (const char * name)
 {
     HTStyle * self = HTStyleNew();
     StrAllocCopy(self->name, name);
@@ -37,7 +37,7 @@ PUBLIC HTStyle* HTStyleNewNamed ARGS1 (CONST char *,name)
 
 /*	Free a style
 */
-PUBLIC HTStyle * HTStyleFree ARGS1 (HTStyle *,self)
+HTStyle * HTStyleFree (HTStyle * self)
 {
     FREE(self->name);
     FREE(self->SGMLTag);
@@ -181,7 +181,7 @@ HTStyle * HTStyleDump (HTStyle * style)
 
 /*	Searching for styles:
 */
-HTStyle * HTStyleNamed ARGS2 (HTStyleSheet *,self, CONST char *,name)
+HTStyle * HTStyleNamed (HTStyleSheet * self, const char * name)
 {
     HTStyle * scan;
     for (scan=self->styles; scan; scan=scan->next)
@@ -247,8 +247,7 @@ HTStyle * HTStyleForRun (HTStyleSheet *self, NXRun *run)
 /*	Add a style to a sheet
 **	----------------------
 */
-HTStyleSheet * HTStyleSheetAddStyle ARGS2
-  (HTStyleSheet *,self, HTStyle *,style)
+HTStyleSheet * HTStyleSheetAddStyle (HTStyleSheet * self, HTStyle * style)
 {
     style->next = 0;		/* The style will go on the end */
     if (!self->styles) {
@@ -264,8 +263,7 @@ HTStyleSheet * HTStyleSheetAddStyle ARGS2
 
 /*	Remove the given object from a style sheet if it exists
 */
-HTStyleSheet * HTStyleSheetRemoveStyle ARGS2
-  (HTStyleSheet *,self, HTStyle *,style)
+HTStyleSheet * HTStyleSheetRemoveStyle (HTStyleSheet * self, HTStyle * style)
 {
     if (self->styles == style) {
 	self->styles = style->next;
@@ -285,7 +283,7 @@ HTStyleSheet * HTStyleSheetRemoveStyle ARGS2
 /*	Create new style sheet
 */
 
-HTStyleSheet * HTStyleSheetNew NOARGS
+HTStyleSheet * HTStyleSheetNew (void)
 {
     HTStyleSheet * self = typecalloc(HTStyleSheet);
     if (self == NULL)
@@ -296,7 +294,7 @@ HTStyleSheet * HTStyleSheetNew NOARGS
 
 /*	Free off a style sheet pointer
 */
-HTStyleSheet * HTStyleSheetFree ARGS1 (HTStyleSheet *,self)
+HTStyleSheet * HTStyleSheetFree (HTStyleSheet * self)
 {
     HTStyle * style;
     while((style=self->styles)!=0) {
diff --git a/WWW/Library/Implementation/HTStyle.h b/WWW/Library/Implementation/HTStyle.h
index cc23dd05..2c3096f0 100644
--- a/WWW/Library/Implementation/HTStyle.h
+++ b/WWW/Library/Implementation/HTStyle.h
@@ -99,7 +99,7 @@ typedef struct _HTStyle {
     short               alignment;      /* quad justification */
     HTCoord             lineHt;         /* line height */
     HTCoord             descentLine;    /* descender bottom from baseline */
-    CONST HTTabStop     *tabs;          /* array of tab stops, 0 terminated */
+    const HTTabStop     *tabs;          /* array of tab stops, 0 terminated */
 
     BOOL                wordWrap;       /* Yes means wrap at space not char */
     BOOL                freeFormat;     /* Yes means \n is just white space */
@@ -121,12 +121,12 @@ typedef struct _HTStyle {
 
 /*      Style functions:
 */
-extern HTStyle * HTStyleNew NOPARAMS;
-extern HTStyle * HTStyleNewNamed PARAMS ((CONST char * name));
-extern HTStyle * HTStyleFree PARAMS((HTStyle * self));
+extern HTStyle * HTStyleNew (void);
+extern HTStyle * HTStyleNewNamed (const char * name);
+extern HTStyle * HTStyleFree (HTStyle * self);
 #ifdef SUPRESS
-extern HTStyle * HTStyleRead PARAMS((HTStyle * self, HTStream * stream));
-extern HTStyle * HTStyleWrite PARAMS((HTStyle * self, HTStream * stream));
+extern HTStyle * HTStyleRead (HTStyle * self, HTStream * stream);
+extern HTStyle * HTStyleWrite (HTStyle * self, HTStream * stream);
 #endif
 /*              Style Sheet
 **              -----------
@@ -139,27 +139,27 @@ typedef struct _HTStyleSheet {
 
 /*      Stylesheet functions:
 */
-extern HTStyleSheet * HTStyleSheetNew NOPARAMS;
-extern HTStyleSheet * HTStyleSheetFree PARAMS((HTStyleSheet * self));
-extern HTStyle * HTStyleNamed PARAMS((HTStyleSheet * self, CONST char * name));
-extern HTStyle * HTStyleForParagraph PARAMS((HTStyleSheet * self,
-        HTParagraphStyle * paraStyle));
-extern HTStyle * HTStyleMatching PARAMS((HTStyleSheet *self, HTStyle * style));
-/* extern HTStyle * HTStyleForRun PARAMS((HTStyleSheet *self, NXRun * run)); */
-extern HTStyleSheet * HTStyleSheetAddStyle PARAMS((HTStyleSheet * self,
-        HTStyle * style));
-extern HTStyleSheet * HTStyleSheetRemoveStyle PARAMS((HTStyleSheet * self,
-        HTStyle * style));
+extern HTStyleSheet * HTStyleSheetNew (void);
+extern HTStyleSheet * HTStyleSheetFree (HTStyleSheet * self);
+extern HTStyle * HTStyleNamed (HTStyleSheet * self, const char * name);
+extern HTStyle * HTStyleForParagraph (HTStyleSheet * self,
+        HTParagraphStyle * paraStyle);
+extern HTStyle * HTStyleMatching (HTStyleSheet *self, HTStyle * style);
+/* extern HTStyle * HTStyleForRun (HTStyleSheet *self, NXRun * run); */
+extern HTStyleSheet * HTStyleSheetAddStyle (HTStyleSheet * self,
+        HTStyle * style);
+extern HTStyleSheet * HTStyleSheetRemoveStyle (HTStyleSheet * self,
+        HTStyle * style);
 #ifdef SUPPRESS
-extern HTStyleSheet * HTStyleSheetRead PARAMS((HTStyleSheet * self,
-                                                HTStream * stream));
-extern HTStyleSheet * HTStyleSheetWrite PARAMS((HTStyleSheet * self,
-                                                HTStream * stream));
+extern HTStyleSheet * HTStyleSheetRead (HTStyleSheet * self,
+                                                HTStream * stream);
+extern HTStyleSheet * HTStyleSheetWrite (HTStyleSheet * self,
+                                                HTStream * stream);
 #endif
 #define CLEAR_POINTER ((void *)-1)      /* Pointer value means "clear me" */
 
 /* DefaultStyle.c */
-extern HTStyleSheet * DefaultStyle PARAMS((HTStyle*** result_array));
+extern HTStyleSheet * DefaultStyle (HTStyle*** result_array);
 
 /* enum, use this instead of HTStyle name comparisons */
 enum HTStyle_Enum {
diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c
index 658d2040..e11f8070 100644
--- a/WWW/Library/Implementation/HTTCP.c
+++ b/WWW/Library/Implementation/HTTCP.c
@@ -39,12 +39,12 @@
 #define OK_HOST(p) ((p) != 0 && ((p)->h_length) != 0)
 
 #ifdef SVR4_BSDSELECT
-PUBLIC int BSDselect PARAMS((
+int BSDselect (
 	int		 nfds,
 	fd_set *	 readfds,
 	fd_set *	 writefds,
 	fd_set *	 exceptfds,
-	struct timeval * select_timeout));
+	struct timeval * select_timeout);
 #ifdef select
 #undef select
 #endif /* select */
@@ -62,13 +62,13 @@ PUBLIC int BSDselect PARAMS((
 /*
 **  Module-Wide variables
 */
-PRIVATE char *hostname = NULL;		/* The name of this host */
+static char *hostname = NULL;		/* The name of this host */
 
 /*
 **  PUBLIC VARIABLES
 */
 #ifdef SOCKS
-PUBLIC unsigned long socks_bind_remoteAddr; /* for long Rbind */
+unsigned long socks_bind_remoteAddr; /* for long Rbind */
 #endif /* SOCKS */
 
 /* PUBLIC SockA HTHostAddress; */	/* The internet address of the host */
@@ -129,10 +129,10 @@ static unsigned long _fork_func (void *arglist GCC_UNUSED)
 */
 #include <HTioctl.h>
 
-PUBLIC int HTioctl ARGS3(
-	int,		d,
-	int,		request,
-	int *,		argp)
+int HTioctl (
+	int		d,
+	int		request,
+	int *		argp)
 {
     int sdc, status;
     unsigned short fun, iosb[4];
@@ -184,8 +184,8 @@ PUBLIC int HTioctl ARGS3(
 /*	Report Internet Error
 **	---------------------
 */
-PUBLIC int HTInetStatus ARGS1(
-	char *,		where)
+int HTInetStatus (
+	char *		where)
 {
     int status;
     int saved_errno = errno;
@@ -266,10 +266,10 @@ PUBLIC int HTInetStatus ARGS1(
 **	*pp	    points to first unread character
 **	*pstatus    points to status updated iff bad
 */
-PUBLIC unsigned int HTCardinal ARGS3(
-	int *,		pstatus,
-	char **,	pp,
-	unsigned int,	max_value)
+unsigned int HTCardinal (
+	int *		pstatus,
+	char **	pp,
+	unsigned int	max_value)
 {
     unsigned int n;
     if ((**pp<'0') || (**pp>'9')) {	    /* Null string is error */
@@ -297,8 +297,8 @@ PUBLIC unsigned int HTCardinal ARGS3(
 **	returns a pointer to a static string which must be copied if
 **		it is to be kept.
 */
-PUBLIC CONST char * HTInetString ARGS1(
-	SockA*,		soc_in)
+const char * HTInetString (
+	SockA*		soc_in)
 {
 #ifdef INET6
     static char hostbuf[MAXHOSTNAMELEN];
@@ -338,8 +338,8 @@ PUBLIC CONST char * HTInetString ARGS1(
 **  On exit,
 **	returns 1 if valid, otherwise 0.
 */
-PUBLIC BOOL valid_hostname ARGS1(
-	char *,	name)
+BOOL valid_hostname (
+	char *	name)
 {
     int i=1, iseg = 0;
     char *cp = name;
@@ -373,14 +373,14 @@ PUBLIC BOOL valid_hostname ARGS1(
 **  SIGKILL), but don't go through normal libc exit() processing, which
 **  would screw up parent's stdio.  -BL
 */
-PRIVATE void quench ARGS1(
-	int,	sig GCC_UNUSED)
+static void quench (
+	int	sig GCC_UNUSED)
 {
     _exit(2);
 }
 #endif /* NSL_FORK */
 
-PUBLIC int lynx_nsl_status = HT_OK;
+int lynx_nsl_status = HT_OK;
 
 #define DEBUG_HOSTENT		/* disable in case of problems */
 #define DEBUG_HOSTENT_CHILD  /* for NSL_FORK, may screw up trace file */
@@ -392,9 +392,9 @@ PUBLIC int lynx_nsl_status = HT_OK;
 **  trace log or stderr, including all pointer values, strings, and
 **  addresses, in a format inspired by gdb's print format. - kw
 */
-PRIVATE void dump_hostent ARGS2(
-    CONST char *,		msgprefix,
-    CONST struct hostent *,	phost)
+static void dump_hostent (
+    const char *		msgprefix,
+    const struct hostent *	phost)
 {
     if (TRACE) {
 	int i;
@@ -466,10 +466,10 @@ typedef struct {
 	char		rest[REHOSTENT_SIZE];
     } AlignedHOSTENT;
 
-PRIVATE size_t fill_rehostent ARGS3(
-    char *,			rehostent,
-    size_t,			rehostentsize,
-    CONST struct hostent *,	phost)
+static size_t fill_rehostent (
+    char *			rehostent,
+    size_t			rehostentsize,
+    const struct hostent *	phost)
 {
     AlignedHOSTENT *data = (AlignedHOSTENT *)rehostent;
     int num_addrs = 0;
@@ -636,8 +636,8 @@ extern int h_errno;
 **	HT_ERROR		Resolver error, reason not known
 **	HT_INTERNAL		Internal error
 */
-PUBLIC struct hostent * LYGetHostByName ARGS1(
-	char *,	str)
+struct hostent * LYGetHostByName (
+	char *	str)
 {
 #ifndef _WINDOWS_NSL
     char *host = str;
@@ -1181,9 +1181,9 @@ failed:
 **		field is left unchanged in *soc_in.
 */
 #ifndef INET6
-PRIVATE int HTParseInet ARGS2(
-	SockA *,	soc_in,
-	CONST char *,	str)
+static int HTParseInet (
+	SockA *	soc_in,
+	const char *	str)
 {
     char *port;
     int dotcount_ip = 0;	/* for dotted decimal IP addr */
@@ -1364,10 +1364,10 @@ failed:
 #endif /* !INET6 */
 
 #ifdef INET6
-PRIVATE struct addrinfo *
-HTGetAddrInfo ARGS2(
-    CONST char *, str,
-    CONST int, defport)
+static struct addrinfo *
+HTGetAddrInfo (
+    const char * str,
+    const int defport)
 {
     struct addrinfo hints, *res;
     int error;
@@ -1412,7 +1412,7 @@ HTGetAddrInfo ARGS2(
 **	-------------------------------------------
 **
 */
-PRIVATE void free_HTTCP_hostname NOARGS
+static void free_HTTCP_hostname (void)
 {
     FREE(hostname);
 }
@@ -1422,7 +1422,7 @@ PRIVATE void free_HTTCP_hostname NOARGS
 **	-------------------------------------------
 **
 */
-PRIVATE void get_host_details NOARGS
+static void get_host_details (void)
 {
     char name[MAXHOSTNAMELEN+1];	/* The name of this host */
 #ifdef UCX
@@ -1496,7 +1496,7 @@ PRIVATE void get_host_details NOARGS
 #endif /* !DECNET */
 }
 
-PUBLIC CONST char * HTHostName NOARGS
+const char * HTHostName (void)
 {
     get_host_details();
     return hostname;
@@ -1512,11 +1512,11 @@ PUBLIC CONST char * HTHostName NOARGS
 **  and hacked in for Lynx years ago by Lou Montulli, and further
 **  modified over the years by numerous Lynx lovers. - FM
 */
-PUBLIC int HTDoConnect ARGS4(
-	CONST char *,	url,
-	char *,		protocol,
-	int,		default_port,
-	int *,		s)
+int HTDoConnect (
+	const char *	url,
+	char *		protocol,
+	int		default_port,
+	int *		s)
 {
     int status = 0;
     char *line = NULL;
@@ -1910,10 +1910,10 @@ PUBLIC int HTDoConnect ARGS4(
 /*
 **  This is so interruptible reads can be implemented cleanly.
 */
-PUBLIC int HTDoRead ARGS3(
-	int,		fildes,
-	void *,		buf,
-	unsigned,	nbyte)
+int HTDoRead (
+	int		fildes,
+	void *		buf,
+	unsigned	nbyte)
 {
     int ready, ret;
     fd_set readfds;
@@ -2083,12 +2083,12 @@ PUBLIC int HTDoRead ARGS3(
 #include <sys/time.h>
 #include <sys/select.h>
 
-PUBLIC int BSDselect ARGS5(
-	int,			nfds,
-	fd_set *,		readfds,
-	fd_set *,		writefds,
-	fd_set *,		exceptfds,
-	struct timeval *,	select_timeout)
+int BSDselect (
+	int			nfds,
+	fd_set *		readfds,
+	fd_set *		writefds,
+	fd_set *		exceptfds,
+	struct timeval *	select_timeout)
 {
     int rval,
     i;
diff --git a/WWW/Library/Implementation/HTTCP.h b/WWW/Library/Implementation/HTTCP.h
index 363ab15d..0bc9915a 100644
--- a/WWW/Library/Implementation/HTTCP.h
+++ b/WWW/Library/Implementation/HTTCP.h
@@ -19,9 +19,9 @@
 **                it is to be kept.
 */
 #ifdef INET6
-extern CONST char * HTInetString PARAMS((SockA* mysin));
+extern const char * HTInetString (SockA* mysin);
 #else
-extern CONST char * HTInetString PARAMS((struct sockaddr_in* mysin));
+extern const char * HTInetString (struct sockaddr_in* mysin);
 #endif /* INET6 */
 
 /*      Encode INET status (as in sys/errno.h)                    inet_status()
@@ -34,11 +34,7 @@ extern CONST char * HTInetString PARAMS((struct sockaddr_in* mysin));
 ** On return:
 **      returns a negative status in the unix way.
 */
-#if defined(__STDC__) || defined(__BORLANDC__) || defined(_MSC_VER)
-        extern int HTInetStatus(char *where);
-#else
-        extern int HTInetStatus();
-#endif
+extern int HTInetStatus(char *where);
 
 /*      Publicly accessible variables
 */
@@ -61,15 +57,15 @@ extern CONST char * HTInetString PARAMS((struct sockaddr_in* mysin));
 **      *pstatus points to status updated iff bad
 */
 
-extern unsigned int HTCardinal PARAMS((int *pstatus,
+extern unsigned int HTCardinal (int *pstatus,
                 char            **pp,
-                unsigned int    max_value));
+                unsigned int    max_value);
 
 /*	Check whether string is a valid Internet hostname
 **	-------------------------------------------------
 */
 
-extern BOOL valid_hostname PARAMS((char * name));
+extern BOOL valid_hostname (char * name);
 
 /*	Resolve an internet hostname, like gethostbyname
 **	------------------------------------------------
@@ -87,24 +83,24 @@ extern BOOL valid_hostname PARAMS((char * name));
 */
 extern int lynx_nsl_status;
 
-extern struct hostent * LYGetHostByName PARAMS((char * str));
+extern struct hostent * LYGetHostByName (char * str);
 
 /*      Get Name of This Machine
 **      ------------------------
 **
 */
 
-extern CONST char * HTHostName NOPARAMS;
+extern const char * HTHostName (void);
 
-extern int HTDoConnect PARAMS((
-	CONST char *	url,
+extern int HTDoConnect (
+	const char *	url,
 	char *		protocol,
 	int		default_port,
-	int *		s));
+	int *		s);
 
-extern int HTDoRead PARAMS((
+extern int HTDoRead (
 	int		fildes,
 	void *		buf,
-	unsigned	nbyte));
+	unsigned	nbyte);
 
 #endif   /* HTTCP_H */
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c
index 93fe4bb4..dde86e66 100644
--- a/WWW/Library/Implementation/HTTP.c
+++ b/WWW/Library/Implementation/HTTP.c
@@ -49,23 +49,23 @@ struct _HTStream
 extern char * HTAppName;	/* Application name: please supply */
 extern char * HTAppVersion;	/* Application version: please supply */
 
-PUBLIC BOOL reloading = FALSE;	/* Reloading => send no-cache pragma to proxy */
-PUBLIC char * redirecting_url = NULL;	    /* Location: value. */
-PUBLIC BOOL permanent_redirection = FALSE;  /* Got 301 status? */
-PUBLIC BOOL redirect_post_content = FALSE;  /* Don't convert to GET? */
+BOOL reloading = FALSE;	/* Reloading => send no-cache pragma to proxy */
+char * redirecting_url = NULL;	    /* Location: value. */
+BOOL permanent_redirection = FALSE;  /* Got 301 status? */
+BOOL redirect_post_content = FALSE;  /* Don't convert to GET? */
 
 #ifdef USE_SSL
-PUBLIC SSL_CTX * ssl_ctx = NULL;	/* SSL ctx */
-PUBLIC SSL * SSL_handle = NULL;
-PUBLIC int ssl_okay;
+SSL_CTX * ssl_ctx = NULL;	/* SSL ctx */
+SSL * SSL_handle = NULL;
+int ssl_okay;
 
-PRIVATE void free_ssl_ctx NOARGS
+static void free_ssl_ctx (void)
 {
     if (ssl_ctx != NULL)
 	SSL_CTX_free(ssl_ctx);
 }
 
-PRIVATE int HTSSLCallback(int preverify_ok, X509_STORE_CTX *x509_ctx)
+static int HTSSLCallback(int preverify_ok, X509_STORE_CTX *x509_ctx)
 {
     char *msg = NULL;
     int result = 1;
@@ -85,7 +85,7 @@ PRIVATE int HTSSLCallback(int preverify_ok, X509_STORE_CTX *x509_ctx)
     return result;
 }
 
-PUBLIC SSL * HTGetSSLHandle NOARGS
+SSL * HTGetSSLHandle (void)
 {
     if (ssl_ctx == NULL) {
 	/*
@@ -107,7 +107,7 @@ PUBLIC SSL * HTGetSSLHandle NOARGS
     return(SSL_new(ssl_ctx));
 }
 
-PUBLIC void HTSSLInitPRNG NOARGS
+void HTSSLInitPRNG (void)
 {
 #if SSLEAY_VERSION_NUMBER >= 0x00905100
     if (RAND_status() == 0) {
@@ -169,14 +169,14 @@ typedef struct {
 	int len;
 } recv_data_t;
 
-PUBLIC int ws_read_per_sec = 0;
-PRIVATE int ws_errno = 0;
+int ws_read_per_sec = 0;
+static int ws_errno = 0;
 
-PRIVATE DWORD g_total_times = 0;
-PRIVATE DWORD g_total_bytes = 0;
+static DWORD g_total_times = 0;
+static DWORD g_total_bytes = 0;
 
 
-PUBLIC char * str_speed(void)
+char * str_speed(void)
 {
     static char buff[32];
 
@@ -192,7 +192,7 @@ PUBLIC char * str_speed(void)
 /* The same like read, but takes care of EINTR and uses select to
    timeout the stale connections.  */
 
-PRIVATE int ws_read(int fd, char *buf, int len)
+static int ws_read(int fd, char *buf, int len)
 {
      int res;
      int retry = 3;
@@ -209,7 +209,7 @@ PRIVATE int ws_read(int fd, char *buf, int len)
      return res;
 }
 
-PRIVATE void _thread_func (void *p)
+static void _thread_func (void *p)
 {
     int i, val, ret;
     recv_data_t *q = (recv_data_t *)p;
@@ -237,7 +237,7 @@ PRIVATE void _thread_func (void *p)
 /* The same like read, but takes care of EINTR and uses select to
    timeout the stale connections.  */
 
-PUBLIC int ws_netread(int fd, char *buf, int len)
+int ws_netread(int fd, char *buf, int len)
 {
     int i;
     char buff[256];
@@ -334,8 +334,8 @@ PUBLIC int ws_netread(int fd, char *buf, int len)
  * Strip any username from the given string so we retain only the host.
  * If the
  */
-PRIVATE void strip_userid ARGS1(
-	char *,		host)
+static void strip_userid (
+	char *		host)
 {
     char *p1 = host;
     char *p2 = strchr(host, '@');
@@ -374,14 +374,14 @@ PRIVATE void strip_userid ARGS1(
 **	read.
 **
 */
-PRIVATE int HTLoadHTTP ARGS4 (
-	CONST char *,		arg,
-	HTParentAnchor *,	anAnchor,
-	HTFormat,		format_out,
-	HTStream*,		sink)
+static int HTLoadHTTP (
+	const char *		arg,
+	HTParentAnchor *	anAnchor,
+	HTFormat		format_out,
+	HTStream*		sink)
 {
   int s;			/* Socket number for returned data */
-  CONST char *url = arg;	/* The URL which get_physical() returned */
+  const char *url = arg;	/* The URL which get_physical() returned */
   bstring *command = NULL;	/* The whole command */
   char *eol;			/* End of line if found */
   char *start_of_data;		/* Start of body of reply */
@@ -414,7 +414,7 @@ PRIVATE int HTLoadHTTP ARGS4 (
 #ifdef USE_SSL
   BOOL do_connect = FALSE;	/* ARE WE going to use a proxy tunnel ? */
   BOOL did_connect = FALSE;	/* ARE WE actually using a proxy tunnel ? */
-  CONST char *connect_url = NULL; /* The URL being proxied */
+  const char *connect_url = NULL; /* The URL being proxied */
   char *connect_host = NULL;	/* The host being proxied */
   SSL * handle = NULL;		/* The SSL handle */
   char ssl_dn[256];
@@ -2133,6 +2133,6 @@ GLOBALDEF (HTProtocol,HTTP,_HTTP_C_GLOBALDEF_1_INIT);
 #define _HTTP_C_GLOBALDEF_2_INIT { "https", HTLoadHTTP, 0}
 GLOBALDEF (HTProtocol,HTTPS,_HTTP_C_GLOBALDEF_2_INIT);
 #else
-GLOBALDEF PUBLIC HTProtocol HTTP = { "http", HTLoadHTTP, 0 };
-GLOBALDEF PUBLIC HTProtocol HTTPS = { "https", HTLoadHTTP, 0 };
+GLOBALDEF HTProtocol HTTP = { "http", HTLoadHTTP, 0 };
+GLOBALDEF HTProtocol HTTPS = { "https", HTLoadHTTP, 0 };
 #endif /* GLOBALDEF_IS_MACRO */
diff --git a/WWW/Library/Implementation/HTTelnet.c b/WWW/Library/Implementation/HTTelnet.c
index 2fbb1565..347739d3 100644
--- a/WWW/Library/Implementation/HTTelnet.c
+++ b/WWW/Library/Implementation/HTTelnet.c
@@ -35,7 +35,7 @@
 #include <LYClean.h>
 #include <LYLeaks.h>
 
-PRIVATE void do_system ARGS1(char *, command)
+static void do_system (char *  command)
 {
     if (!isEmpty(command)) {
 	CTRACE((tfp, "HTTelnet: Command is: %s\n\n", command));
@@ -47,9 +47,9 @@ PRIVATE void do_system ARGS1(char *, command)
 /*	Telnet or "rlogin" access
 **	-------------------------
 */
-PRIVATE int remote_session ARGS2(char *, acc_method, char *, host)
+static int remote_session (char *  acc_method, char *  host)
 {
-    CONST char *program;
+    const char *program;
 	char * user = host;
 	char * password = NULL;
 	char * cp;
@@ -504,13 +504,12 @@ PRIVATE int remote_session ARGS2(char *, acc_method, char *, host)
 **			(See WWW.h)
 **
 */
-PRIVATE int HTLoadTelnet
-ARGS4
+static int HTLoadTelnet
 (
- CONST char *,		addr,
- HTParentAnchor *,	anchor GCC_UNUSED,
- HTFormat,		format_out GCC_UNUSED,
- HTStream *,		sink			/* Ignored */
+ const char *		addr,
+ HTParentAnchor *	anchor GCC_UNUSED,
+ HTFormat		format_out GCC_UNUSED,
+ HTStream *		sink			/* Ignored */
 )
 {
     char * acc_method;
@@ -545,7 +544,7 @@ GLOBALDEF (HTProtocol, HTTelnet, _HTTELNET_C_1_INIT );
 GLOBALDEF (HTProtocol, HTRlogin, _HTTELNET_C_2_INIT );
 GLOBALDEF (HTProtocol, HTTn3270, _HTTELNET_C_3_INIT );
 #else
-GLOBALDEF PUBLIC HTProtocol HTTelnet = { "telnet", HTLoadTelnet, NULL };
-GLOBALDEF PUBLIC HTProtocol HTRlogin = { "rlogin", HTLoadTelnet, NULL };
-GLOBALDEF PUBLIC HTProtocol HTTn3270 = { "tn3270", HTLoadTelnet, NULL };
+GLOBALDEF HTProtocol HTTelnet = { "telnet", HTLoadTelnet, NULL };
+GLOBALDEF HTProtocol HTRlogin = { "rlogin", HTLoadTelnet, NULL };
+GLOBALDEF HTProtocol HTTn3270 = { "tn3270", HTLoadTelnet, NULL };
 #endif /* GLOBALDEF_IS_MACRO */
diff --git a/WWW/Library/Implementation/HTUU.c b/WWW/Library/Implementation/HTUU.c
index 580be9da..24cf4588 100644
--- a/WWW/Library/Implementation/HTUU.c
+++ b/WWW/Library/Implementation/HTUU.c
@@ -39,7 +39,7 @@
 
 #include <LYLeaks.h>
 
-PRIVATE char six2pr[64] = {
+static char six2pr[64] = {
     'A','B','C','D','E','F','G','H','I','J','K','L','M',
     'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
     'a','b','c','d','e','f','g','h','i','j','k','l','m',
@@ -47,7 +47,7 @@ PRIVATE char six2pr[64] = {
     '0','1','2','3','4','5','6','7','8','9','+','/'
 };
 
-PRIVATE unsigned char pr2six[256];
+static unsigned char pr2six[256];
 
 
 /*--- function HTUU_encode -----------------------------------------------
@@ -70,9 +70,9 @@ PRIVATE unsigned char pr2six[256];
  *                      The last byte is a zero byte.
  *             Returns the number of ASCII characters in "bufcoded".
  */
-PUBLIC int HTUU_encode ARGS3(unsigned char *,	bufin,
-			     unsigned int,	nbytes,
-			     char *,		bufcoded)
+int HTUU_encode (unsigned char *	bufin,
+			     unsigned int	nbytes,
+			     char *		bufcoded)
 {
 /* ENC is the basic 1 character encoding function to make a char printing */
 #define ENC(c) six2pr[c]
@@ -125,9 +125,9 @@ PUBLIC int HTUU_encode ARGS3(unsigned char *,	bufin,
  *    Exit     Returns the number of binary bytes decoded.
  *             bufplain    contains these bytes.
  */
-PUBLIC int HTUU_decode ARGS3(char *,		bufcoded,
-			     unsigned char *,	bufplain,
-			     int,		outbufsize)
+int HTUU_decode (char *		bufcoded,
+			     unsigned char *	bufplain,
+			     int		outbufsize)
 {
 /* single character decode */
 #define DEC(c) pr2six[(int)c]
diff --git a/WWW/Library/Implementation/HTUU.h b/WWW/Library/Implementation/HTUU.h
index 8e06394e..e3cc02f9 100644
--- a/WWW/Library/Implementation/HTUU.h
+++ b/WWW/Library/Implementation/HTUU.h
@@ -15,12 +15,12 @@
 #include <HTUtils.h>
 #endif
  
-PUBLIC int HTUU_encode PARAMS((unsigned char *bufin,
+extern int HTUU_encode (unsigned char *bufin,
                                unsigned int nbytes,
-                               char *bufcoded));
+                               char *bufcoded);
 
-PUBLIC int HTUU_decode PARAMS((char *bufcoded,
+extern int HTUU_decode (char *bufcoded,
                                unsigned char *bufplain,
-                               int outbufsize));
+                               int outbufsize);
 
 #endif /* HTUU_H */
diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index bea5ef49..0b6cbee8 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -66,11 +66,10 @@ char *alloca ();
 #define DISP_PARTIAL	/* experimental */
 #endif
 
-#if defined(__STDC__) || defined(VMS) || defined(_WINDOWS)
+/* since 2.8.6dev.1, Lynx requires an ANSI C (c89) compiler */
 #define ANSI_VARARGS 1
 #undef HAVE_STDARG_H
 #define HAVE_STDARG_H 1
-#endif
 
 #if defined(VMS) || defined(_WINDOWS)
 #define HAVE_STDLIB_H 1
@@ -154,10 +153,8 @@ char *alloca ();
 #define	GCC_UNUSED /* nothing */
 #endif
 
-/* FIXME: need a configure-test */
-#if defined(__STDC__) || defined(__DECC) || defined(_WINDOWS) || _WIN_CC
+/* since 2.8.6dev.1, Lynx requires an ANSI C (c89) compiler */
 #define ANSI_PREPRO 1
-#endif
 
 #if defined(__CYGWIN32__) && ! defined(__CYGWIN__)
 #define __CYGWIN__ 1
@@ -283,72 +280,6 @@ Standard C library for malloc() etc
 
 #endif /* !VMS */
 
-/*
-
-Macros for declarations
-
- */
-#define PUBLIC                  /* Accessible outside this module     */
-#define PRIVATE static          /* Accessible only within this module */
-
-#if defined(__STDC__) || defined(__BORLANDC__) || defined(_MSC_VER)
-#define CONST const             /* "const" only exists in STDC */
-#define NOPARAMS (void)
-#define PARAMS(parameter_list) parameter_list
-#define NOARGS (void)
-#define ARGS1(t,a) \
-                (t a)
-#define ARGS2(t,a,u,b) \
-                (t a, u b)
-#define ARGS3(t,a,u,b,v,c) \
-                (t a, u b, v c)
-#define ARGS4(t,a,u,b,v,c,w,d) \
-                (t a, u b, v c, w d)
-#define ARGS5(t,a,u,b,v,c,w,d,x,e) \
-                (t a, u b, v c, w d, x e)
-#define ARGS6(t,a,u,b,v,c,w,d,x,e,y,f) \
-                (t a, u b, v c, w d, x e, y f)
-#define ARGS7(t,a,u,b,v,c,w,d,x,e,y,f,z,g) \
-                (t a, u b, v c, w d, x e, y f, z g)
-#define ARGS8(t,a,u,b,v,c,w,d,x,e,y,f,z,g,s,h) \
-                (t a, u b, v c, w d, x e, y f, z g, s h)
-#define ARGS9(t,a,u,b,v,c,w,d,x,e,y,f,z,g,s,h,r,i) \
-                (t a, u b, v c, w d, x e, y f, z g, s h, r i)
-#define ARGS10(t,a,u,b,v,c,w,d,x,e,y,f,z,g,s,h,r,i,q,j) \
-                (t a, u b, v c, w d, x e, y f, z g, s h, r i, q j)
-
-#else  /* not ANSI */
-
-#ifndef _WINDOWS
-#define CONST
-#endif
-#define NOPARAMS ()
-#define PARAMS(parameter_list) ()
-#define NOARGS ()
-#define ARGS1(t,a) (a) \
-                t a;
-#define ARGS2(t,a,u,b) (a,b) \
-                t a; u b;
-#define ARGS3(t,a,u,b,v,c) (a,b,c) \
-                t a; u b; v c;
-#define ARGS4(t,a,u,b,v,c,w,d) (a,b,c,d) \
-                t a; u b; v c; w d;
-#define ARGS5(t,a,u,b,v,c,w,d,x,e) (a,b,c,d,e) \
-                t a; u b; v c; w d; x e;
-#define ARGS6(t,a,u,b,v,c,w,d,x,e,y,f) (a,b,c,d,e,f) \
-                t a; u b; v c; w d; x e; y f;
-#define ARGS7(t,a,u,b,v,c,w,d,x,e,y,f,z,g) (a,b,c,d,e,f,g) \
-                t a; u b; v c; w d; x e; y f; z g;
-#define ARGS8(t,a,u,b,v,c,w,d,x,e,y,f,z,g,s,h) (a,b,c,d,e,f,g,h) \
-                t a; u b; v c; w d; x e; y f; z g; s h;
-#define ARGS9(t,a,u,b,v,c,w,d,x,e,y,f,z,g,s,h,r,i) (a,b,c,d,e,f,g,h,i) \
-                t a; u b; v c; w d; x e; y f; z g; s h; r i;
-#define ARGS10(t,a,u,b,v,c,w,d,x,e,y,f,z,g,s,h,r,i,q,j) (a,b,c,d,e,f,g,h,i,j) \
-                t a; u b; v c; w d; x e; y f; z g; s h; r i; q j;
-
-
-#endif /* __STDC__ (ANSI) */
-
 #ifndef NULL
 #define NULL ((void *)0)
 #endif
@@ -501,7 +432,7 @@ Out Of Memory checking for malloc() return:
 
 #include <LYexit.h>
 
-extern void outofmem PARAMS((CONST char *fname, CONST char *func));
+extern void outofmem (const char *fname, const char *func);
 
 /*
  * Upper- and Lowercase macros
@@ -523,9 +454,9 @@ extern void outofmem PARAMS((CONST char *fname, CONST char *func));
 #define TOUPPER(c) ascii_toupper(UCH(c))
 #define ISUPPER(c) ascii_isupper(UCH(c))
 
-extern int ascii_toupper PARAMS((int));
-extern int ascii_tolower PARAMS((int));
-extern int ascii_isupper PARAMS((int));
+extern int ascii_toupper (int);
+extern int ascii_tolower (int);
+extern int ascii_isupper (int);
 
 #else
 
@@ -587,7 +518,7 @@ extern int WWW_TraceMask;
 #define CTRACE_SLEEP(secs) if (TRACE && LYTraceLogFP == 0) sleep(secs)
 #define CTRACE_FLUSH(fp)   if (TRACE) fflush(fp)
 
-extern FILE *TraceFP NOPARAMS;
+extern FILE *TraceFP (void);
 
 #include <www_tcp.h>
 
@@ -670,9 +601,9 @@ extern FILE *TraceFP NOPARAMS;
 
 #undef free_func
 
-extern SSL * HTGetSSLHandle NOPARAMS;
-extern void HTSSLInitPRNG NOPARAMS;
-extern char HTGetSSLCharacter PARAMS((void * handle));
+extern SSL * HTGetSSLHandle (void);
+extern void HTSSLInitPRNG (void);
+extern char HTGetSSLCharacter (void * handle);
 
 #endif /* USE_SSL */
 
diff --git a/WWW/Library/Implementation/HTVMSUtils.c b/WWW/Library/Implementation/HTVMSUtils.c
index b9f50e3d..3a918646 100644
--- a/WWW/Library/Implementation/HTVMSUtils.c
+++ b/WWW/Library/Implementation/HTVMSUtils.c
@@ -37,7 +37,7 @@
 #include <LYLeaks.h>
 #include <LYStrings.h>
 
-PUBLIC BOOL HTVMSFileVersions = FALSE; /* Include version numbers in listing? */
+BOOL HTVMSFileVersions = FALSE; /* Include version numbers in listing? */
 
 typedef struct {
    unsigned long BufferLength : 16;
@@ -54,7 +54,7 @@ typedef struct {
 ** ON EXIT:
 **	returns	YES if SYSPRV is authorized
 */
-PUBLIC BOOL HTVMS_authSysPrv NOARGS
+BOOL HTVMS_authSysPrv (void)
 {
 unsigned long Result;
 ItemStruct ItemList[2];
@@ -93,7 +93,7 @@ unsigned long Buffer[2];
 ** ON EXIT:
 **
 */
-PUBLIC void HTVMS_enableSysPrv NOARGS
+void HTVMS_enableSysPrv (void)
 {
 unsigned long Result;
 unsigned long Prv[2], PreviousPrv[2];
@@ -119,7 +119,7 @@ unsigned long Prv[2], PreviousPrv[2];
 ** ON EXIT:
 **
 */
-PUBLIC void HTVMS_disableSysPrv NOARGS
+void HTVMS_disableSysPrv (void)
 {
 unsigned long Result;
 unsigned long Prv[2], PreviousPrv[2];
@@ -149,10 +149,10 @@ unsigned long Prv[2], PreviousPrv[2];
 **	returns YES if access is allowed
 **
 */
-PUBLIC BOOL HTVMS_checkAccess ARGS3(
-	CONST char *, FileName,
-	CONST char *, UserName,
-	CONST char *, Method)
+BOOL HTVMS_checkAccess (
+	const char * FileName,
+	const char * UserName,
+	const char * Method)
 {
 unsigned long Result;
 ItemStruct ItemList[2];
@@ -242,11 +242,10 @@ char *colon;
 **
 **
 */
-PUBLIC char * HTVMS_wwwName ARGS1(
-	CONST char *,	vmsname)
+char * HTVMS_wwwName (const char *	vmsname)
 {
 static char wwwname[LY_MAXPATH];
-CONST char *src;
+const char *src;
 char *dst;
 int dir;
    dst = wwwname;
@@ -302,9 +301,9 @@ int dir;
 **	The code below is for directory browsing by VMS Curses clients.
 **	It is based on the newer WWWLib's HTDirBrw.c. - Foteos Macrides
 */
-PUBLIC int HTStat ARGS2(
-	CONST char *, filename,
-	struct stat *, info)
+int HTStat (
+	const char * filename,
+	struct stat * info)
 {
    /*
       the following stuff does not work in VMS with a normal stat...
@@ -388,9 +387,9 @@ typedef	struct __dirdesc {
 	struct dsc$descriptor_s dirname_desc;	/* descriptor of dirname */
 } DIR;
 
-PRIVATE	DIR *HTVMSopendir(char *dirname);
-PRIVATE	struct dirent *HTVMSreaddir(DIR *dirp);
-PRIVATE	int HTVMSclosedir(DIR *dirp);
+static	DIR *HTVMSopendir(char *dirname);
+static	struct dirent *HTVMSreaddir(DIR *dirp);
+static	int HTVMSclosedir(DIR *dirp);
 
 /*** #include <sys_dirent.h> ***/
 /*** "sys_dirent.h" ***/
@@ -419,7 +418,7 @@ struct	dirent {
 #endif	/* !_POSIX_SOURCE */
 
 
-PRIVATE DIR *HTVMSopendir(char *dirname)
+static DIR *HTVMSopendir(char *dirname)
 {
 static DIR dir;
 char *closebracket;
@@ -514,7 +513,7 @@ char *dot;
    return(&dir);
 }
 
-PRIVATE struct dirent *HTVMSreaddir(DIR *dirp)
+static struct dirent *HTVMSreaddir(DIR *dirp)
 {
 static struct dirent entry;
 long status;
@@ -556,7 +555,7 @@ char *UnixEntry;
    }
 }
 
-PRIVATE int HTVMSclosedir(DIR *dirp)
+static int HTVMSclosedir(DIR *dirp)
 {
 long status;
 
@@ -582,13 +581,13 @@ long status;
 #define FREE_TARGET (*targetClass._free)(target)
 #define ABORT_TARGET (*targetClass._free)(target)
 struct _HTStructured {
-	CONST HTStructuredClass *	isa;
+	const HTStructuredClass *	isa;
 	/* ... */
 };
 
 #define STRUCT_DIRENT struct dirent
 
-PRIVATE char * months[12] = {
+static char * months[12] = {
     "Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"
 };
 
@@ -600,7 +599,7 @@ typedef struct _VMSEntryInfo {
     BOOLEAN      display;  /* show this entry? */
 } VMSEntryInfo;
 
-PRIVATE void free_VMSEntryInfo_contents ARGS1(VMSEntryInfo *,entry_info)
+static void free_VMSEntryInfo_contents (VMSEntryInfo * entry_info)
 {
     if (entry_info) {
 	FREE(entry_info->filename);
@@ -610,8 +609,8 @@ PRIVATE void free_VMSEntryInfo_contents ARGS1(VMSEntryInfo *,entry_info)
    /* dont free the struct */
 }
 
-PUBLIC int compare_VMSEntryInfo_structs ARGS2(VMSEntryInfo *,entry1,
-					      VMSEntryInfo *,entry2)
+int compare_VMSEntryInfo_structs (VMSEntryInfo * entry1,
+					      VMSEntryInfo * entry2)
 {
     int i, status;
     char date1[16], date2[16], time1[8], time2[8], month[4];
@@ -731,11 +730,11 @@ PUBLIC int compare_VMSEntryInfo_structs ARGS2(VMSEntryInfo *,entry1,
 **
 **	Developed for Lynx by Foteos Macrides (macrides@sci.wfeb.edu).
 */
-PUBLIC int HTVMSBrowseDir ARGS4(
-	CONST char *,		address,
-	HTParentAnchor *,	anchor,
-	HTFormat,		format_out,
-	HTStream *,		sink
+int HTVMSBrowseDir (
+	const char *		address,
+	HTParentAnchor *	anchor,
+	HTFormat		format_out,
+	HTStream *		sink
 )
 {
     HTStructured* target;
@@ -952,7 +951,7 @@ PUBLIC int HTVMSBrowseDir ARGS4(
 
 	    /* Get the type */
 	    format = HTFileFormat(dirbuf->d_name, &encoding,
-				  (CONST char **)&cp);
+				  (const char **)&cp);
 	    if (!cp) {
 		if(!strncmp(HTAtom_name(format), "application",11))
 		{
@@ -1002,7 +1001,7 @@ PUBLIC int HTVMSBrowseDir ARGS4(
 
 	    /* Get the date */
 	    {
-		char *t = (char *)ctime((CONST time_t *)&file_info.st_ctime);
+		char *t = (char *)ctime((const time_t *)&file_info.st_ctime);
 		*(t+24) = '\0';
 
 		StrAllocCopy(entry_info->date, (t+4));
diff --git a/WWW/Library/Implementation/HTVMSUtils.h b/WWW/Library/Implementation/HTVMSUtils.h
index 18bdb3b7..3efc9259 100644
--- a/WWW/Library/Implementation/HTVMSUtils.h
+++ b/WWW/Library/Implementation/HTVMSUtils.h
@@ -21,7 +21,7 @@ extern BOOL HTVMSFileVersions;	/* Include version numbers in listing? */
 ** ON EXIT:
 **	returns	YES if SYSPRV is authorized
 */
-PUBLIC BOOL HTVMS_authSysPrv NOPARAMS;
+extern BOOL HTVMS_authSysPrv (void);
 
 
 /* PUBLIC							HTVMS_enableSysPrv()
@@ -32,7 +32,7 @@ PUBLIC BOOL HTVMS_authSysPrv NOPARAMS;
 ** ON EXIT:
 **
 */
-PUBLIC void HTVMS_enableSysPrv NOPARAMS;
+extern void HTVMS_enableSysPrv (void);
 
 
 /* PUBLIC							HTVMS_disableSysPrv()
@@ -43,7 +43,7 @@ PUBLIC void HTVMS_enableSysPrv NOPARAMS;
 ** ON EXIT:
 **
 */
-PUBLIC void HTVMS_disableSysPrv NOPARAMS;
+extern void HTVMS_disableSysPrv (void);
 
 /* PUBLIC							HTVMS_checkAccess()
 **		CHECKS ACCESS TO FILE FOR CERTAIN USER
@@ -55,10 +55,10 @@ PUBLIC void HTVMS_disableSysPrv NOPARAMS;
 **	returns YES if access is allowed
 **
 */
-PUBLIC BOOL HTVMS_checkAccess PARAMS((
-	CONST char * FileName,
-	CONST char * UserName,
-	CONST char * Method));
+extern BOOL HTVMS_checkAccess (
+	const char * FileName,
+	const char * UserName,
+	const char * Method);
 
 
 /* PUBLIC							HTVMS_wwwName()
@@ -86,14 +86,14 @@ PUBLIC BOOL HTVMS_checkAccess PARAMS((
 **
 **
 */
-PUBLIC char * HTVMS_wwwName PARAMS((
-	CONST char *	vmsname));
+extern char * HTVMS_wwwName (
+	const char *	vmsname);
 
-PUBLIC int HTVMSBrowseDir PARAMS((
-	CONST char * address,
+extern int HTVMSBrowseDir (
+	const char * address,
 	HTParentAnchor * anchor,
 	HTFormat format_out,
-	HTStream * sink));
+	HTStream * sink);
 
 extern int HTVMS_remove(char *filename);
 extern void HTVMS_purge(char *filename);
diff --git a/WWW/Library/Implementation/HTVMS_WaisProt.c b/WWW/Library/Implementation/HTVMS_WaisProt.c
index 7ebe55a3..62a36a50 100644
--- a/WWW/Library/Implementation/HTVMS_WaisProt.c
+++ b/WWW/Library/Implementation/HTVMS_WaisProt.c
@@ -57,8 +57,8 @@
 
 /*----------------------------------------------------------------------*/
 
-static unsigned long userInfoTagSize PARAMS((data_tag tag,
-					  unsigned long length));
+static unsigned long userInfoTagSize (data_tag tag,
+					  unsigned long length);
 
 static unsigned long
 userInfoTagSize(tag,length)
@@ -126,8 +126,8 @@ long* len;
 
 /*----------------------------------------------------------------------*/
 
-static char* readUserInfoHeader PARAMS((data_tag* tag,unsigned long* num,
-				     char* buffer));
+static char* readUserInfoHeader (data_tag* tag,unsigned long* num,
+				     char* buffer);
 
 static char*
 readUserInfoHeader(tag,num,buffer)
@@ -435,7 +435,7 @@ DocObj* doc;
 
 /*----------------------------------------------------------------------*/
 
-static char* writeDocObj PARAMS((DocObj* doc,char* buffer,long* len));
+static char* writeDocObj (DocObj* doc,char* buffer,long* len);
 
 static char*
 writeDocObj(doc,buffer,len)
@@ -482,7 +482,7 @@ long* len;
 
 /*----------------------------------------------------------------------*/
 
-static char* readDocObj PARAMS((DocObj** doc,char* buffer));
+static char* readDocObj (DocObj** doc,char* buffer);
 
 static char*
 readDocObj(doc,buffer)
@@ -1397,14 +1397,14 @@ long* len;
 /*----------------------------------------------------------------------*/
 
 static void
-cleanUpWaisSearchResponse PARAMS((char* buf,char* seedWordsUsed,
+cleanUpWaisSearchResponse (char* buf,char* seedWordsUsed,
 			       WAISDocumentHeader** docHeaders,
 			       WAISDocumentShortHeader** shortHeaders,
 			       WAISDocumentLongHeader** longHeaders,
 			       WAISDocumentText** text,
 			       WAISDocumentHeadlines** headlines,
 			       WAISDocumentCodes** codes,
-			       diagnosticRecord**diags));
+			       diagnosticRecord**diags);
 
 static void
 cleanUpWaisSearchResponse (buf,seedWordsUsed,docHeaders,shortHeaders,
@@ -2046,7 +2046,7 @@ char* buffer;
 	( XXX return type could be in the element set)
 */
 
-static query_term** makeWAISQueryTerms PARAMS((DocObj** docs));
+static query_term** makeWAISQueryTerms (DocObj** docs);
 
 static query_term**
 makeWAISQueryTerms(docs)
@@ -2165,7 +2165,7 @@ DocObj** docs;
 
 /*----------------------------------------------------------------------*/
 
-static DocObj** makeWAISQueryDocs PARAMS((query_term** terms));
+static DocObj** makeWAISQueryDocs (query_term** terms);
 
 static DocObj**
 makeWAISQueryDocs(terms)
diff --git a/WWW/Library/Implementation/HTVMS_WaisProt.h b/WWW/Library/Implementation/HTVMS_WaisProt.h
index 4ff76cef..81b996f7 100644
--- a/WWW/Library/Implementation/HTVMS_WaisProt.h
+++ b/WWW/Library/Implementation/HTVMS_WaisProt.h
@@ -224,96 +224,96 @@ typedef struct WAISSearchResponse {
 /* Functions */
 
 char *
-generate_search_apdu PARAMS((char* buff,  /* buffer to hold the apdu */
+generate_search_apdu (char* buff,  /* buffer to hold the apdu */
 			  long *buff_len, /* number of bytes written to the buffer */
 			  char *seed_words, /* string of the seed words */
 			  char *database_name,
 			  DocObj** docobjs,
 			  long maxDocsRetrieved
-			  ));
+			  );
 
-DocObj* makeDocObjUsingWholeDocument PARAMS((any* aDocID,char* type));
-DocObj* makeDocObjUsingBytes PARAMS((any* aDocID,char* type,long start,long end));
-DocObj* makeDocObjUsingLines PARAMS((any* aDocID,char* type,long start,long end));
-DocObj* makeDocObjUsingParagraphs PARAMS((any* aDocID,char* type,any* start,any* end));
-void freeDocObj PARAMS((DocObj* doc));
+DocObj* makeDocObjUsingWholeDocument (any* aDocID,char* type);
+DocObj* makeDocObjUsingBytes (any* aDocID,char* type,long start,long end);
+DocObj* makeDocObjUsingLines (any* aDocID,char* type,long start,long end);
+DocObj* makeDocObjUsingParagraphs (any* aDocID,char* type,any* start,any* end);
+void freeDocObj (DocObj* doc);
 
-WAISInitResponse* makeWAISInitResponse PARAMS((long chunkCode,long chunkIDLen,
+WAISInitResponse* makeWAISInitResponse (long chunkCode,long chunkIDLen,
 					    char* chunkMarker,char* highlightMarker,
-					    char* deHighlightMarker,char* newLineChars));
-void freeWAISInitResponse PARAMS((WAISInitResponse* init));
+					    char* deHighlightMarker,char* newLineChars);
+void freeWAISInitResponse (WAISInitResponse* init);
 
-WAISSearch* makeWAISSearch PARAMS((
+WAISSearch* makeWAISSearch (
 	char* seedWords,DocObj** docs,char** textList,
 	long dateFactor,char* beginDateRange,char* endDateRange,
-	long maxDocsRetrieved));
-void freeWAISSearch PARAMS((WAISSearch* query));
+	long maxDocsRetrieved);
+void freeWAISSearch (WAISSearch* query);
 
-WAISDocumentHeader* makeWAISDocumentHeader PARAMS((
+WAISDocumentHeader* makeWAISDocumentHeader (
 	any* aDocID,long versionNumber,long score,long bestMatch,long docLen,
-	long lines,char** types,char* source,char* date,char* headline,char* originCity));
-void freeWAISDocumentHeader PARAMS((WAISDocumentHeader* header));
-char* writeWAISDocumentHeader PARAMS((WAISDocumentHeader* header,char* buffer,long* len));
-char* readWAISDocumentHeader PARAMS((WAISDocumentHeader** header,char* buffer));
-
-WAISDocumentShortHeader* makeWAISDocumentShortHeader PARAMS((
-	any* aDocID,long versionNumber,long score,long bestMatch,long docLen,long lines));
-void freeWAISDocumentShortHeader PARAMS((WAISDocumentShortHeader* header));
-char* writeWAISDocumentShortHeader PARAMS((WAISDocumentShortHeader* header,
-                                   char* buffer,long* len));
-char* readWAISDocumentShortHeader PARAMS((WAISDocumentShortHeader** header,char* buffer));
-
-WAISDocumentLongHeader* makeWAISDocumentLongHeader PARAMS((
+	long lines,char** types,char* source,char* date,char* headline,char* originCity);
+void freeWAISDocumentHeader (WAISDocumentHeader* header);
+char* writeWAISDocumentHeader (WAISDocumentHeader* header,char* buffer,long* len);
+char* readWAISDocumentHeader (WAISDocumentHeader** header,char* buffer);
+
+WAISDocumentShortHeader* makeWAISDocumentShortHeader (
+	any* aDocID,long versionNumber,long score,long bestMatch,long docLen,long lines);
+void freeWAISDocumentShortHeader (WAISDocumentShortHeader* header);
+char* writeWAISDocumentShortHeader (WAISDocumentShortHeader* header,
+                                   char* buffer,long* len);
+char* readWAISDocumentShortHeader (WAISDocumentShortHeader** header,char* buffer);
+
+WAISDocumentLongHeader* makeWAISDocumentLongHeader (
 	any* aDocID,long versionNumber,long score,long bestMatch,long docLen,
 	long lines,char** types,char* source,char* date, char* headline,char* originCity,
-	char* stockCodes,char* companyCodes,char* industryCodes));
-void freeWAISDocumentLongHeader PARAMS((WAISDocumentLongHeader* header));
-char* writeWAISDocumentLongHeader PARAMS((WAISDocumentLongHeader* header,char* buffer,long* len));
-char* readWAISDocumentLongHeader PARAMS((WAISDocumentLongHeader** header,char* buffer));
+	char* stockCodes,char* companyCodes,char* industryCodes);
+void freeWAISDocumentLongHeader (WAISDocumentLongHeader* header);
+char* writeWAISDocumentLongHeader (WAISDocumentLongHeader* header,char* buffer,long* len);
+char* readWAISDocumentLongHeader (WAISDocumentLongHeader** header,char* buffer);
 
-WAISSearchResponse* makeWAISSearchResponse PARAMS((
+WAISSearchResponse* makeWAISSearchResponse (
 	char* seedWordsUsed,WAISDocumentHeader** docHeaders,
 	WAISDocumentShortHeader** shortHeaders,
 	WAISDocumentLongHeader** longHeaders,
 	WAISDocumentText** text,WAISDocumentHeadlines** headlines,
 	WAISDocumentCodes** codes,
-	diagnosticRecord** diagnostics));
-void freeWAISSearchResponse PARAMS((WAISSearchResponse* response));
+	diagnosticRecord** diagnostics);
+void freeWAISSearchResponse (WAISSearchResponse* response);
 
-WAISDocumentText* makeWAISDocumentText PARAMS((any* aDocID,long versionNumber,
-				       any* documentText));
-void freeWAISDocumentText PARAMS((WAISDocumentText* docText));
-char* writeWAISDocumentText PARAMS((WAISDocumentText* docText,char* buffer,long* len));
-char* readWAISDocumentText PARAMS((WAISDocumentText** docText,char* buffer));
+WAISDocumentText* makeWAISDocumentText (any* aDocID,long versionNumber,
+				       any* documentText);
+void freeWAISDocumentText (WAISDocumentText* docText);
+char* writeWAISDocumentText (WAISDocumentText* docText,char* buffer,long* len);
+char* readWAISDocumentText (WAISDocumentText** docText,char* buffer);
 
-WAISDocumentHeadlines* makeWAISDocumentHeadlines PARAMS((
+WAISDocumentHeadlines* makeWAISDocumentHeadlines (
 	any* aDocID,long versionNumber,char* source,char* date,char* headline,
-	char* originCity));
-void freeWAISDocumentHeadlines PARAMS((WAISDocumentHeadlines* docHeadline));
-char* writeWAISDocumentHeadlines PARAMS((WAISDocumentHeadlines* docHeadline,char* buffer,long* len));
-char* readWAISDocumentHeadlines PARAMS((WAISDocumentHeadlines** docHeadline,char* buffer));
+	char* originCity);
+void freeWAISDocumentHeadlines (WAISDocumentHeadlines* docHeadline);
+char* writeWAISDocumentHeadlines (WAISDocumentHeadlines* docHeadline,char* buffer,long* len);
+char* readWAISDocumentHeadlines (WAISDocumentHeadlines** docHeadline,char* buffer);
 
-WAISDocumentCodes* makeWAISDocumentCodes PARAMS((
+WAISDocumentCodes* makeWAISDocumentCodes (
 	any* aDocID,long versionNumber,char* stockCodes,char* companyCodes,
-	char* industryCodes));
-void freeWAISDocumentCodes PARAMS((WAISDocumentCodes* docCodes));
-char* writeWAISDocumentCodes PARAMS((WAISDocumentCodes* docCodes,char* buffer,long* len));
-char* readWAISDocumentCodes PARAMS((WAISDocumentCodes** docCodes,char* buffer));
-
-any* makeWAISTextQuery PARAMS((DocObj** docs));
-DocObj** readWAISTextQuery PARAMS((any* terms));
-
-void CSTFreeWAISInitResponse PARAMS((WAISInitResponse* init));
-void CSTFreeWAISSearch PARAMS((WAISSearch* query));
-void CSTFreeDocObj PARAMS((DocObj* doc));
-void CSTFreeWAISDocumentHeader PARAMS((WAISDocumentHeader* header));
-void CSTFreeWAISDocumentShortHeader PARAMS((WAISDocumentShortHeader* header));
-void CSTFreeWAISDocumentLongHeader PARAMS((WAISDocumentLongHeader* header));
-void CSTFreeWAISSearchResponse PARAMS((WAISSearchResponse* response));
-void CSTFreeWAISDocumentText PARAMS((WAISDocumentText* docText));
-void CSTFreeWAISDocHeadlines PARAMS((WAISDocumentHeadlines* docHeadline));
-void CSTFreeWAISDocumentCodes PARAMS((WAISDocumentCodes* docCodes));
-void CSTFreeWAISTextQuery PARAMS(( any* query));
+	char* industryCodes);
+void freeWAISDocumentCodes (WAISDocumentCodes* docCodes);
+char* writeWAISDocumentCodes (WAISDocumentCodes* docCodes,char* buffer,long* len);
+char* readWAISDocumentCodes (WAISDocumentCodes** docCodes,char* buffer);
+
+any* makeWAISTextQuery (DocObj** docs);
+DocObj** readWAISTextQuery (any* terms);
+
+void CSTFreeWAISInitResponse (WAISInitResponse* init);
+void CSTFreeWAISSearch (WAISSearch* query);
+void CSTFreeDocObj (DocObj* doc);
+void CSTFreeWAISDocumentHeader (WAISDocumentHeader* header);
+void CSTFreeWAISDocumentShortHeader (WAISDocumentShortHeader* header);
+void CSTFreeWAISDocumentLongHeader (WAISDocumentLongHeader* header);
+void CSTFreeWAISSearchResponse (WAISSearchResponse* response);
+void CSTFreeWAISDocumentText (WAISDocumentText* docText);
+void CSTFreeWAISDocHeadlines (WAISDocumentHeadlines* docHeadline);
+void CSTFreeWAISDocumentCodes (WAISDocumentCodes* docCodes);
+void CSTFreeWAISTextQuery ( any* query);
 
 /*----------------------------------------------------------------------*/
 
@@ -387,10 +387,10 @@ typedef struct wais_header {
 #define UUENCODE		'u'
 
 
-void readWAISPacketHeader PARAMS((char* msgBuffer,WAISMessage *header_struct));
-long getWAISPacketLength PARAMS((WAISMessage* header));
-void writeWAISPacketHeader PARAMS((char* header,long dataLen,long type,
+void readWAISPacketHeader (char* msgBuffer,WAISMessage *header_struct);
+long getWAISPacketLength (WAISMessage* header);
+void writeWAISPacketHeader (char* header,long dataLen,long type,
 				char* server,long compression,
-				long encoding,long version));
+				long encoding,long version);
 
 #endif /* ndef WMESSAGE_H */
diff --git a/WWW/Library/Implementation/HTVMS_WaisUI.c b/WWW/Library/Implementation/HTVMS_WaisUI.c
index 5aaa9e69..0c703acf 100644
--- a/WWW/Library/Implementation/HTVMS_WaisUI.c
+++ b/WWW/Library/Implementation/HTVMS_WaisUI.c
@@ -176,7 +176,7 @@ char *database_name)
  * to those trying to modify the transport code to use non-UNIX streams:
  *  This is the function to modify!
  */
-PRIVATE long read_from_stream(int d, char *buf, long nbytes)
+static long read_from_stream(int d, char *buf, long nbytes)
 {
   long didRead;
   long toRead = nbytes;
@@ -203,7 +203,7 @@ PRIVATE long read_from_stream(int d, char *buf, long nbytes)
 
 /* returns the length of the response, 0 if an error */
 
-PRIVATE long
+static long
 transport_message(
 	long connection,
 	char *request_message,
@@ -331,7 +331,7 @@ interpret_message(
 
 /* modifies the string to exclude all seeker codes. sets length to
    the new length. */
-PRIVATE char *delete_seeker_codes(char *string, long *length)
+static char *delete_seeker_codes(char *string, long *length)
 {
   long original_count; /* index into the original string */
   long new_count = 0; /* index into the collapsed string */
@@ -1955,7 +1955,7 @@ readQueryTerm(query_term** qt, char* buffer)
 
 /*----------------------------------------------------------------------*/
 
-static unsigned long getQueryTermSize PARAMS((query_term* qt));
+static unsigned long getQueryTermSize (query_term* qt);
 
 static unsigned long
 getQueryTermSize(query_term* qt)
@@ -2078,7 +2078,7 @@ readQuery(any *info)
 
 /*----------------------------------------------------------------------*/
 
-static void exitAction PARAMS((long error));
+static void exitAction (long error);
 
 static void
 exitAction(long error GCC_UNUSED)
diff --git a/WWW/Library/Implementation/HTVMS_WaisUI.h b/WWW/Library/Implementation/HTVMS_WaisUI.h
index 6bb2539e..9e8011d3 100644
--- a/WWW/Library/Implementation/HTVMS_WaisUI.h
+++ b/WWW/Library/Implementation/HTVMS_WaisUI.h
@@ -12,7 +12,7 @@
 #include <HTUtils.h>
 #endif
 
-void	log_write PARAMS((char *));
+void	log_write (char *);
 
 /*
 **	Routines originally from Panic.h -- FM
@@ -57,11 +57,11 @@ void	panic (char* format,...);
 
 /* enhanced memory handling functions - don't call them directly, use the
    macros below */
-void	fs_checkPtr PARAMS((void* ptr));
-void*	fs_malloc PARAMS((size_t size));
-void*	fs_realloc PARAMS((void* ptr,size_t size));
-void	fs_free PARAMS((void* ptr));
-char*	fs_strncat PARAMS((char* dst,char* src,size_t maxToAdd,size_t maxTotal));
+void	fs_checkPtr (void* ptr);
+void*	fs_malloc (size_t size);
+void*	fs_realloc (void* ptr,size_t size);
+void	fs_free (void* ptr);
+char*	fs_strncat (char* dst,char* src,size_t maxToAdd,size_t maxTotal);
 
 /* macros for memory functions.  call these in your program.  */
 #define s_checkPtr(ptr)		fs_checkPtr(ptr)
@@ -70,13 +70,13 @@ char*	fs_strncat PARAMS((char* dst,char* src,size_t maxToAdd,size_t maxTotal));
 #define s_free(ptr)		{ fs_free((char*)ptr); ptr = NULL; }
 #define s_strncat(dst,src,maxToAdd,maxTotal)	fs_strncat((dst),(src),(maxToAdd),(maxTotal))
 
-char*	s_strdup PARAMS((char* s));
+char*	s_strdup (char* s);
 
 #define IS_DELIMITER	1
 #define	NOT_DELIMITER	!IS_DELIMITER
 
-char char_downcase PARAMS((unsigned long ch));
-char *string_downcase PARAMS((char* word));
+char char_downcase (unsigned long ch);
+char *string_downcase (char* word);
 
 /*----------------------------------------------------------------------*/
 
@@ -277,71 +277,71 @@ extern char* readErrorPosition;		/* pos where buf stoped making sense */
 
 /*----------------------------------------------------------------------*/
 
-diagnosticRecord* makeDiag PARAMS((boolean surrogate,char* code,char* addInfo));
-void freeDiag PARAMS((diagnosticRecord* diag));
-char* writeDiag PARAMS((diagnosticRecord* diag,char* buffer,long* len));
-char* readDiag PARAMS((diagnosticRecord** diag,char* buffer));
+diagnosticRecord* makeDiag (boolean surrogate,char* code,char* addInfo);
+void freeDiag (diagnosticRecord* diag);
+char* writeDiag (diagnosticRecord* diag,char* buffer,long* len);
+char* readDiag (diagnosticRecord** diag,char* buffer);
 
-char* writeCompressedInteger PARAMS((unsigned long num,char* buf,long* len));
-char* readCompressedInteger PARAMS((unsigned long *num,char* buf));
-char* writeCompressedIntWithPadding PARAMS((unsigned long num,unsigned long size,
-					 char* buffer,long* len));
-unsigned long writtenCompressedIntSize PARAMS((unsigned long num));
+char* writeCompressedInteger (unsigned long num,char* buf,long* len);
+char* readCompressedInteger (unsigned long *num,char* buf);
+char* writeCompressedIntWithPadding (unsigned long num,unsigned long size,
+					 char* buffer,long* len);
+unsigned long writtenCompressedIntSize (unsigned long num);
 
-char* writeTag PARAMS((data_tag tag,char* buf,long* len));
-char* readTag PARAMS((data_tag* tag,char* buf));
-data_tag peekTag PARAMS((char* buf));
-unsigned long writtenTagSize PARAMS((data_tag tag));
+char* writeTag (data_tag tag,char* buf,long* len);
+char* readTag (data_tag* tag,char* buf);
+data_tag peekTag (char* buf);
+unsigned long writtenTagSize (data_tag tag);
 
-any* makeAny PARAMS((unsigned long size,char* data));
-void freeAny PARAMS((any* a));
-any* duplicateAny PARAMS((any* a));
-char* writeAny PARAMS((any* a,data_tag tag,char* buffer,long* len));
-char* readAny PARAMS((any** anAny,char* buffer));
-unsigned long writtenAnySize PARAMS((data_tag tag,any* a));
+any* makeAny (unsigned long size,char* data);
+void freeAny (any* a);
+any* duplicateAny (any* a);
+char* writeAny (any* a,data_tag tag,char* buffer,long* len);
+char* readAny (any** anAny,char* buffer);
+unsigned long writtenAnySize (data_tag tag,any* a);
 
-any* stringToAny PARAMS((char* s));
-char* anyToString PARAMS((any* a));
-unsigned long writtenStringSize PARAMS((data_tag tag,char* s));
+any* stringToAny (char* s);
+char* anyToString (any* a);
+unsigned long writtenStringSize (data_tag tag,char* s);
 
-any* longToAny PARAMS((long Num));
-long anyToLong PARAMS((any* a));
+any* longToAny (long Num);
+long anyToLong (any* a);
 
-char* writeString PARAMS((char* s,data_tag tag,char* buffer,long* len));
-char* readString PARAMS((char** s,char* buffer));
+char* writeString (char* s,data_tag tag,char* buffer,long* len);
+char* readString (char** s,char* buffer);
 
 bit_map* makeBitMap (unsigned long numBits,...);
 
-void freeBitMap PARAMS((bit_map* bm));
-boolean bitAtPos PARAMS((unsigned long pos,bit_map* bm));
-char* writeBitMap PARAMS((bit_map* bm,data_tag tag,char* buffer,long* len));
-char* readBitMap PARAMS((bit_map** bm,char* buffer));
+void freeBitMap (bit_map* bm);
+boolean bitAtPos (unsigned long pos,bit_map* bm);
+char* writeBitMap (bit_map* bm,data_tag tag,char* buffer,long* len);
+char* readBitMap (bit_map** bm,char* buffer);
 
-char* writeByte PARAMS((unsigned long byte,char* buf,long* len));
-char* readByte PARAMS((unsigned char* byte,char* buf));
+char* writeByte (unsigned long byte,char* buf,long* len);
+char* readByte (unsigned char* byte,char* buf);
 
-char* writeBoolean PARAMS((boolean flag,char* buf,long* len));
-char* readBoolean PARAMS((boolean* flag,char* buf));
+char* writeBoolean (boolean flag,char* buf,long* len);
+char* readBoolean (boolean* flag,char* buf);
 
-char* writePDUType PARAMS((pdu_type pduType,char* buf,long* len));
-char* readPDUType PARAMS((pdu_type* pduType,char* buf));
-pdu_type peekPDUType PARAMS((char* buf));
+char* writePDUType (pdu_type pduType,char* buf,long* len);
+char* readPDUType (pdu_type* pduType,char* buf);
+pdu_type peekPDUType (char* buf);
 
-char* writeBinaryInteger PARAMS((long num,unsigned long size,
-			      char* buf,long* len));
-char* readBinaryInteger PARAMS((long* num,unsigned long size,char* buf));
-unsigned long writtenCompressedBinIntSize PARAMS((long num));
+char* writeBinaryInteger (long num,unsigned long size,
+			      char* buf,long* len);
+char* readBinaryInteger (long* num,unsigned long size,char* buf);
+unsigned long writtenCompressedBinIntSize (long num);
 
-char* writeNum PARAMS((long num,data_tag tag,char* buffer,long* len));
-char* readNum PARAMS((long* num,char* buffer));
-unsigned long  writtenNumSize PARAMS((data_tag tag,long num));
+char* writeNum (long num,data_tag tag,char* buffer,long* len);
+char* readNum (long* num,char* buffer);
+unsigned long  writtenNumSize (data_tag tag,long num);
 
-void doList PARAMS((void** list,void (*func)(void *)));
+void doList (void** list,void (*func)(void *));
 
-char* writeProtocolVersion PARAMS((char* buf,long* len));
-char* defaultImplementationID PARAMS((void));
-char* defaultImplementationName PARAMS((void));
-char* defaultImplementationVersion PARAMS((void));
+char* writeProtocolVersion (char* buf,long* len);
+char* defaultImplementationID (void);
+char* defaultImplementationName (void);
+char* defaultImplementationVersion (void);
 
 /*----------------------------------------------------------------------*/
 
@@ -456,16 +456,16 @@ typedef struct query_term {
 /*----------------------------------------------------------------------*/
 /* functions */
 
-query_term* makeAttributeTerm PARAMS((
+query_term* makeAttributeTerm (
         char* use,char* relation,char* position,char* structure,
-	char* truncation,char* completeness,any* term));
-query_term* makeResultSetTerm PARAMS((any* resultSet));
-query_term* makeOperatorTerm PARAMS((char* operatorCode));
-void freeTerm PARAMS((void* qt));
-char* writeQueryTerm PARAMS((query_term* qt,char* buffer,long* len));
-char* readQueryTerm PARAMS((query_term** qt,char* buffer));
-any* writeQuery PARAMS((query_term** terms));
-query_term** readQuery PARAMS((any* info));
+	char* truncation,char* completeness,any* term);
+query_term* makeResultSetTerm (any* resultSet);
+query_term* makeOperatorTerm (char* operatorCode);
+void freeTerm (void* qt);
+char* writeQueryTerm (query_term* qt,char* buffer,long* len);
+char* readQueryTerm (query_term** qt,char* buffer);
+any* writeQuery (query_term** terms);
+query_term** readQuery (any* info);
 
 /*----------------------------------------------------------------------*/
 
@@ -476,24 +476,24 @@ query_term** readQuery PARAMS((any* info));
 **----------------------------------------------------------------------*/
 
 char *
-generate_retrieval_apdu PARAMS((char *buff,
+generate_retrieval_apdu (char *buff,
 			     long *buff_len,
 			     any *docID,
 			     long chunk_type,
 			     long start_line, long end_line,
 			     char *type,
-			     char *database_name));
+			     char *database_name);
 
 
 long
-interpret_message PARAMS((char *request_message,
+interpret_message (char *request_message,
 		       long request_length,
 		       char *response_message,
 		       long response_buffer_length, /* length of the buffer (modified)*/
 		       long connection,
-		       boolean verbose));
+		       boolean verbose);
 
-char *trim_junk PARAMS((char *headline));
+char *trim_junk (char *headline);
 
 
 
@@ -581,74 +581,74 @@ typedef struct PresentResponseAPDU {
 /*----------------------------------------------------------------------*/
 /* Functions */
 
-InitAPDU* makeInitAPDU PARAMS((boolean search,boolean present,boolean deleteIt,
+InitAPDU* makeInitAPDU (boolean search,boolean present,boolean deleteIt,
 			    boolean accessControl,boolean resourceControl,
 			    long prefMsgSize,long maxMsgSize,
 			    char* auth,char* id,char* name, char* version,
-			    any* refID,void* userInfo));
-void freeInitAPDU PARAMS((InitAPDU* init));
-char* writeInitAPDU PARAMS((InitAPDU* init,char* buffer,long* len));
-char* readInitAPDU PARAMS((InitAPDU** init,char* buffer));
+			    any* refID,void* userInfo);
+void freeInitAPDU (InitAPDU* init);
+char* writeInitAPDU (InitAPDU* init,char* buffer,long* len);
+char* readInitAPDU (InitAPDU** init,char* buffer);
 
-InitResponseAPDU* makeInitResponseAPDU PARAMS((boolean result,
+InitResponseAPDU* makeInitResponseAPDU (boolean result,
 					    boolean search,boolean present,boolean deleteIt,
 					    boolean accessControl,boolean resourceControl,
 					    long prefMsgSize,long maxMsgSize,
 					    char* auth,char* id,char* name, char* version,
-					    any* refID,void* userInfo));
-void freeInitResponseAPDU PARAMS((InitResponseAPDU* init));
-char* writeInitResponseAPDU PARAMS((InitResponseAPDU* init,char* buffer,long* len));
-char* readInitResponseAPDU PARAMS((InitResponseAPDU** init,char* buffer));
-InitResponseAPDU* replyToInitAPDU PARAMS((InitAPDU* init,boolean result,void* userInfo));
+					    any* refID,void* userInfo);
+void freeInitResponseAPDU (InitResponseAPDU* init);
+char* writeInitResponseAPDU (InitResponseAPDU* init,char* buffer,long* len);
+char* readInitResponseAPDU (InitResponseAPDU** init,char* buffer);
+InitResponseAPDU* replyToInitAPDU (InitAPDU* init,boolean result,void* userInfo);
 
-SearchAPDU* makeSearchAPDU PARAMS((long small,long large, long medium,
+SearchAPDU* makeSearchAPDU (long small,long large, long medium,
 				boolean replace,char* name,char** databases,
-				char* type,char** elements,any* refID,void* queryInfo));
-void freeSearchAPDU PARAMS((SearchAPDU* query));
-char* writeSearchAPDU PARAMS((SearchAPDU* query,char* buffer,long* len));
-char* readSearchAPDU PARAMS((SearchAPDU** query,char* buffer));
+				char* type,char** elements,any* refID,void* queryInfo);
+void freeSearchAPDU (SearchAPDU* query);
+char* writeSearchAPDU (SearchAPDU* query,char* buffer,long* len);
+char* readSearchAPDU (SearchAPDU** query,char* buffer);
 
-SearchResponseAPDU* makeSearchResponseAPDU PARAMS((long result,long count,
+SearchResponseAPDU* makeSearchResponseAPDU (long result,long count,
 						long recordsReturned,long nextPos,
 						long resultStatus,long presentStatus,
-						any* refID,void* records));
-void freeSearchResponseAPDU PARAMS((SearchResponseAPDU* queryResponse));
-char* writeSearchResponseAPDU PARAMS((SearchResponseAPDU* queryResponse,char* buffer,long* len));
-char* readSearchResponseAPDU PARAMS((SearchResponseAPDU** queryResponse,char* buffer));
-
-PresentAPDU* makePresentAPDU PARAMS((long recsReq, long startPos,
-				  char* resultID,any* refID,void* info));
-void freePresentAPDU PARAMS((PresentAPDU* present));
-char* writePresentAPDU PARAMS((PresentAPDU* present,char* buffer,long* len));
-char* readPresentAPDU PARAMS((PresentAPDU** present,char* buffer));
-
-PresentResponseAPDU* makePresentResponseAPDU PARAMS((boolean status,long recsRet,
+						any* refID,void* records);
+void freeSearchResponseAPDU (SearchResponseAPDU* queryResponse);
+char* writeSearchResponseAPDU (SearchResponseAPDU* queryResponse,char* buffer,long* len);
+char* readSearchResponseAPDU (SearchResponseAPDU** queryResponse,char* buffer);
+
+PresentAPDU* makePresentAPDU (long recsReq, long startPos,
+				  char* resultID,any* refID,void* info);
+void freePresentAPDU (PresentAPDU* present);
+char* writePresentAPDU (PresentAPDU* present,char* buffer,long* len);
+char* readPresentAPDU (PresentAPDU** present,char* buffer);
+
+PresentResponseAPDU* makePresentResponseAPDU (boolean status,long recsRet,
 						  long nextPos,any* refID,
-						  void* records));
-void freePresentResponseAPDU PARAMS((PresentResponseAPDU* present));
-char* writePresentResponseAPDU PARAMS((PresentResponseAPDU* present,char* buffer,long* len));
-char* readPresentResponseAPDU PARAMS((PresentResponseAPDU** present,char* buffer));
+						  void* records);
+void freePresentResponseAPDU (PresentResponseAPDU* present);
+char* writePresentResponseAPDU (PresentResponseAPDU* present,char* buffer,long* len);
+char* readPresentResponseAPDU (PresentResponseAPDU** present,char* buffer);
 
 /*----------------------------------------------------------------------*/
 /* user extension hooks: */
 
-extern char* writeInitInfo PARAMS((InitAPDU* init,char* buffer,long* len));
-extern char* readInitInfo PARAMS((void** info,char* buffer));
+extern char* writeInitInfo (InitAPDU* init,char* buffer,long* len);
+extern char* readInitInfo (void** info,char* buffer);
 
-extern char* writeInitResponseInfo PARAMS((InitResponseAPDU* init,char* buffer,long* len));
-extern char* readInitResponseInfo PARAMS((void** info,char* buffer));
+extern char* writeInitResponseInfo (InitResponseAPDU* init,char* buffer,long* len);
+extern char* readInitResponseInfo (void** info,char* buffer);
 
-extern char* writeSearchInfo PARAMS((SearchAPDU* query,char* buffer,long* len));
-extern char* readSearchInfo PARAMS((void** info,char* buffer));
+extern char* writeSearchInfo (SearchAPDU* query,char* buffer,long* len);
+extern char* readSearchInfo (void** info,char* buffer);
 
-extern char* writeSearchResponseInfo PARAMS((SearchResponseAPDU* query,char* buffer,long* len));
-extern char* readSearchResponseInfo PARAMS((void** info,char* buffer));
+extern char* writeSearchResponseInfo (SearchResponseAPDU* query,char* buffer,long* len);
+extern char* readSearchResponseInfo (void** info,char* buffer);
 
-extern char* writePresentInfo PARAMS((PresentAPDU* present,char* buffer,long* len));
-extern char* readPresentInfo PARAMS((void** info,char* buffer));
+extern char* writePresentInfo (PresentAPDU* present,char* buffer,long* len);
+extern char* readPresentInfo (void** info,char* buffer);
 
-extern char* writePresentResponseInfo PARAMS((PresentResponseAPDU* present,char* buffer,long* len));
-extern char* readPresentResponseInfo PARAMS((void** info,char* buffer));
+extern char* writePresentResponseInfo (PresentResponseAPDU* present,char* buffer,long* len);
+extern char* readPresentResponseInfo (void** info,char* buffer);
 
 
 #endif /* HTVMSWAIS_H */
diff --git a/WWW/Library/Implementation/HTWAIS.c b/WWW/Library/Implementation/HTWAIS.c
index e9269af2..49696b23 100644
--- a/WWW/Library/Implementation/HTWAIS.c
+++ b/WWW/Library/Implementation/HTWAIS.c
@@ -87,9 +87,9 @@
 
 #define HEX_ESCAPE '%'
 
-PRIVATE BOOL	as_gate;	/* Client is using us as gateway */
+static BOOL	as_gate;	/* Client is using us as gateway */
 
-PRIVATE char	line[2048];	/* For building strings to display */
+static char	line[2048];	/* For building strings to display */
 				/* Must be able to take id */
 
 #define PUTC(c) (*target->isa->put_character)(target, c)
@@ -101,12 +101,12 @@ PRIVATE char	line[2048];	/* For building strings to display */
 #define FREE_TARGET (*target->isa->_free)(target)
 
 struct _HTStructured {
-	CONST HTStructuredClass *	isa;
+	const HTStructuredClass *	isa;
 	/* ... */
 };
 
 struct _HTStream {
-	CONST HTStreamClass *	isa;
+	const HTStreamClass *	isa;
 	/* ... */
 };
 
@@ -114,10 +114,10 @@ struct _HTStream {
 /* ---------------- Local copy of connect_to_server calls ----------------- */
 /* ------------------------------------------------------------------------ */
 /* Returns 1 on success, 0 on fail, -1 on interrupt. */
-PRIVATE int fd_mosaic_connect_to_server ARGS3(
-	char *,		host_name,
-	long,		port,
-	long *,		fd)
+static int fd_mosaic_connect_to_server (
+	char *		host_name,
+	long		port,
+	long *		fd)
 {
     char *dummy = NULL;
     int status;
@@ -139,15 +139,15 @@ PRIVATE int fd_mosaic_connect_to_server ARGS3(
 
 /* Returns 1 on success, 0 on fail, -1 on interrupt. */
 #ifdef VMS
-PRIVATE int mosaic_connect_to_server ARGS3(
-	char *,		host_name,
-	long,		port,
-	long *,		fdp)
+static int mosaic_connect_to_server (
+	char *		host_name,
+	long		port,
+	long *		fdp)
 #else
-PRIVATE int mosaic_connect_to_server ARGS3(
-	char *,		host_name,
-	long,		port,
-	FILE **,	fp)
+static int mosaic_connect_to_server (
+	char *		host_name,
+	long		port,
+	FILE **	fp)
 #endif /* VMS */
 {
 #ifndef VMS
@@ -183,9 +183,9 @@ PRIVATE int mosaic_connect_to_server ARGS3(
 /*								showDiags
 */
 /* modified from Jonny G's version in ui/question.c */
-PRIVATE void showDiags ARGS2(
-	HTStream *,		target,
-	diagnosticRecord **,	d)
+static void showDiags (
+	HTStream *		target,
+	diagnosticRecord **	d)
 {
     long i;
 
@@ -204,10 +204,10 @@ PRIVATE void showDiags ARGS2(
 **	-----------------------------------------
 */
 
-PRIVATE BOOL acceptable[256];
-PRIVATE BOOL acceptable_inited = NO;
+static BOOL acceptable[256];
+static BOOL acceptable_inited = NO;
 
-PRIVATE void init_acceptable NOARGS
+static void init_acceptable (void)
 {
     unsigned int i;
     char * good =
@@ -225,8 +225,8 @@ PRIVATE void init_acceptable NOARGS
 **	returns		nil if error
 **			pointer to malloced string (must be freed) if ok
 */
-PRIVATE char * WWW_from_archie ARGS1(
-	char *,		file)
+static char * WWW_from_archie (
+	char *		file)
 {
     char * end;
     char * result;
@@ -253,10 +253,10 @@ PRIVATE char * WWW_from_archie ARGS1(
 **	returns		nil if error
 **			pointer to malloced string (must be freed) if ok
 */
-PRIVATE char hex [17] = "0123456789ABCDEF";
+static char hex [17] = "0123456789ABCDEF";
 
-PRIVATE char * WWW_from_WAIS ARGS1(
-	any *,		docid)
+static char * WWW_from_WAIS (
+	any *		docid)
 {
     static char buf[BIG];
     char * q = buf;
@@ -323,9 +323,9 @@ PRIVATE char * WWW_from_WAIS ARGS1(
 **	docid->size	is valid
 **	docid->bytes	is malloced and must later be freed.
 */
-PRIVATE any * WAIS_from_WWW ARGS2(
-	any *,		docid,
-	char *,		docname)
+static any * WAIS_from_WWW (
+	any *		docid,
+	char *		docname)
 {
     char *z;	/* Output pointer */
     char *sor;	/* Start of record - points to size field. */
@@ -406,11 +406,11 @@ PRIVATE any * WAIS_from_WWW ARGS2(
 /*	Send a plain text record to the client		output_text_record()
 **	--------------------------------------
 */
-PRIVATE void output_text_record ARGS4(
-    HTStream *,			target,
-    WAISDocumentText *,		record,
-    boolean,			quote_string_quotes,
-    boolean,			binary)
+static void output_text_record (
+    HTStream *			target,
+    WAISDocumentText *		record,
+    boolean			quote_string_quotes,
+    boolean			binary)
 {
   long count;
   /* printf(" Text\n");
@@ -448,11 +448,11 @@ PRIVATE void output_text_record ARGS4(
 /* modified from tracy shen's version in wutil.c
  * displays either a text record or a set of headlines.
  */
-PRIVATE void display_search_response ARGS4(
-    HTStructured *,		target,
-    SearchResponseAPDU *,	response,
-    char *,			database,
-    char *,			keywords)
+static void display_search_response (
+    HTStructured *		target,
+    SearchResponseAPDU *	response,
+    char *			database,
+    char *			keywords)
 {
     WAISSearchResponse	*info;
     long i, k;
@@ -600,11 +600,11 @@ PRIVATE void display_search_response ARGS4(
 **
 **  This renders any object or search as required.
 */
-PUBLIC int HTLoadWAIS ARGS4(
-	CONST char *,		arg,
-	HTParentAnchor *,	anAnchor,
-	HTFormat,		format_out,
-	HTStream*,		sink)
+int HTLoadWAIS (
+	const char *		arg,
+	HTParentAnchor *	anAnchor,
+	HTFormat		format_out,
+	HTStream*		sink)
 
 #define MAX_KEYWORDS_LENGTH 1000
 #define MAX_SERVER_LENGTH 1000
@@ -1065,5 +1065,5 @@ CleanUp:
 #define _HTWAIS_C_1_INIT { "wais", HTLoadWAIS, NULL }
 GLOBALDEF(HTProtocol, HTWAIS, _HTWAIS_C_1_INIT);
 #else
-GLOBALDEF PUBLIC HTProtocol HTWAIS = { "wais", HTLoadWAIS, NULL };
+GLOBALDEF HTProtocol HTWAIS = { "wais", HTLoadWAIS, NULL };
 #endif /* GLOBALDEF_IS_MACRO */
diff --git a/WWW/Library/Implementation/HTWSRC.c b/WWW/Library/Implementation/HTWSRC.c
index 75e3934b..55d6dea6 100644
--- a/WWW/Library/Implementation/HTWSRC.c
+++ b/WWW/Library/Implementation/HTWSRC.c
@@ -23,7 +23,7 @@
 #define CACHE_PERIOD (7*86400)	/* Time to keep .src file in seconds */
 
 struct _HTStructured {
-	CONST HTStructuredClass *	isa;
+	const HTStructuredClass *	isa;
 	/* ... */
 };
 
@@ -37,7 +37,7 @@ struct _HTStructured {
 
 /*	Here are the parameters which can be specified in a  source file
 */
-PRIVATE CONST char* par_name[] = {
+static const char* par_name[] = {
 	"version",
 	"ip-address",
 #define PAR_IP_NAME 2
@@ -89,7 +89,7 @@ enum tokenstate { beginning, before_tag, colon, before_value,
 */
 
 struct _HTStream {
-	CONST HTStreamClass *	isa;
+	const HTStreamClass *	isa;
 	HTStructured *		target;
 	char *			par_value[PAR_COUNT];
 	enum tokenstate		state;
@@ -101,12 +101,12 @@ struct _HTStream {
 
 
 
-PUBLIC CONST char * hex = "0123456789ABCDEF";
+const char * hex = "0123456789ABCDEF";
 
 /*	Decode one hex character
 */
 
-PUBLIC char from_hex ARGS1(char, c)
+char from_hex (char  c)
 {
     return  (char) (      (c>='0')&&(c<='9') ? c-'0'
 			: (c>='A')&&(c<='F') ? c-'A'+10
@@ -131,7 +131,7 @@ PUBLIC char from_hex ARGS1(char, c)
 /*		Treat One Character
 **		-------------------
 */
-PRIVATE void WSRCParser_put_character ARGS2(HTStream*, me, char, c)
+static void WSRCParser_put_character (HTStream*  me, char  c)
 {
     switch (me->state) {
     case beginning:
@@ -239,7 +239,7 @@ PRIVATE void WSRCParser_put_character ARGS2(HTStream*, me, char, c)
 */
 
 #ifdef CACHE_FILE_PREFIX
-PRIVATE BOOL write_cache ARGS1(HTStream *, me)
+static BOOL write_cache (HTStream *  me)
 {
     FILE * fp;
     char * cache_file_name = NULL;
@@ -276,7 +276,7 @@ PRIVATE BOOL write_cache ARGS1(HTStream *, me)
 **
 */
 
-PRIVATE void give_parameter ARGS2(HTStream *, me, int, p)
+static void give_parameter (HTStream *  me, int  p)
 {
     PUTS(par_name[p]);
     if (me->par_value[p]) {
@@ -292,7 +292,7 @@ PRIVATE void give_parameter ARGS2(HTStream *, me, int, p)
 /*			Generate Outout
 **			===============
 */
-PRIVATE void WSRC_gen_html ARGS2(HTStream *, me, BOOL, source_file)
+static void WSRC_gen_html (HTStream *  me, BOOL  source_file)
 
 {
     if (me->par_value[PAR_DATABASE_NAME]) {
@@ -390,27 +390,27 @@ PRIVATE void WSRC_gen_html ARGS2(HTStream *, me, BOOL, source_file)
 } /* generate html */
 
 
-PRIVATE void WSRCParser_put_string ARGS2(HTStream *, context, CONST char*, str)
+static void WSRCParser_put_string (HTStream *  context, const char*  str)
 {
-    CONST char *p;
+    const char *p;
     for(p=str; *p; p++)
 	WSRCParser_put_character(context, *p);
 }
 
 
-PRIVATE void WSRCParser_write ARGS3(
-		HTStream *,	context,
-		CONST char*,	str,
-		int,		l)
+static void WSRCParser_write (
+		HTStream *	context,
+		const char*	str,
+		int		l)
 {
-    CONST char *p;
-    CONST char *e = str+l;
+    const char *p;
+    const char *e = str+l;
     for(p=str; p<e; p++)
 	WSRCParser_put_character(context, *p);
 }
 
 
-PRIVATE void WSRCParser_free ARGS1(HTStream *, me)
+static void WSRCParser_free (HTStream *  me)
 {
     WSRC_gen_html(me, YES);
 #ifdef CACHE_FILE_PREFIX
@@ -425,7 +425,7 @@ PRIVATE void WSRCParser_free ARGS1(HTStream *, me)
     FREE(me);
 }
 
-PRIVATE void WSRCParser_abort ARGS2(HTStream *, me, HTError, e GCC_UNUSED)
+static void WSRCParser_abort (HTStream *  me, HTError  e GCC_UNUSED)
 {
     WSRCParser_free(me);
 }
@@ -449,10 +449,10 @@ HTStreamClass WSRCParserClass = {
 /*		Converter from WAIS Source to whatever
 **		--------------------------------------
 */
-PUBLIC HTStream* HTWSRCConvert ARGS3(
-	HTPresentation *,	pres,
-	HTParentAnchor *,	anchor,
-	HTStream *,		sink)
+HTStream* HTWSRCConvert (
+	HTPresentation *	pres,
+	HTParentAnchor *	anchor,
+	HTStream *		sink)
 {
     HTStream * me = (HTStream*) malloc(sizeof(*me));
     if (!me) outofmem(__FILE__, "HTWSRCConvert");
diff --git a/WWW/Library/Implementation/HTWSRC.h b/WWW/Library/Implementation/HTWSRC.h
index bae6e123..4cfe4ee7 100644
--- a/WWW/Library/Implementation/HTWSRC.h
+++ b/WWW/Library/Implementation/HTWSRC.h
@@ -13,12 +13,12 @@
 
 #include <HTFormat.h>
 
-extern  char from_hex PARAMS((char c));
+extern  char from_hex (char c);
 
-extern  HTStream* HTWSRCConvert PARAMS((
+extern  HTStream* HTWSRCConvert (
         HTPresentation *        pres,
         HTParentAnchor *        anchor,
-        HTStream *              sink));
+        HTStream *              sink);
 
 /*
 
@@ -31,8 +31,8 @@ Escaping Strings
    the caller.
 
  */
-extern char * HTDeSlash PARAMS((CONST char * str));
+extern char * HTDeSlash (const char * str);
 
-extern char * HTEnSlash PARAMS((CONST char * str));
+extern char * HTEnSlash (const char * str);
 
 #endif /* HTWSRC_H */
diff --git a/WWW/Library/Implementation/HText.h b/WWW/Library/Implementation/HText.h
index b3e03fac..bd2cc541 100644
--- a/WWW/Library/Implementation/HText.h
+++ b/WWW/Library/Implementation/HText.h
@@ -40,21 +40,21 @@ Creation and deletion
    for objects which need to refer to the structure which is kep by the creating stream.
 
  */
- extern HText * HText_new PARAMS((HTParentAnchor * anchor));
+ extern HText * HText_new (HTParentAnchor * anchor);
 
- extern HText * HText_new2 PARAMS((HTParentAnchor * anchor,
-                                HTStream * output_stream));
+ extern HText * HText_new2 (HTParentAnchor * anchor,
+                                HTStream * output_stream);
 
- extern HText * HText_new3 PARAMS((HTParentAnchor * anchor,
+ extern HText * HText_new3 (HTParentAnchor * anchor,
                                 HTStream * output_stream,
-                                HTStructured * structure));
+                                HTStructured * structure);
 
 /*
 
   FREE HYPERTEXT OBJECT
 
  */
-extern void     HText_free PARAMS((HText * me));
+extern void     HText_free (HText * me);
 
 
 /*
@@ -66,9 +66,9 @@ Object Building methods
    optimised handling using buffers and caches which are flushed at the end.
 
  */
-extern void HText_beginAppend PARAMS((HText * text));
+extern void HText_beginAppend (HText * text);
 
-extern void HText_endAppend PARAMS((HText * text));
+extern void HText_endAppend (HText * text);
 
 /*
 
@@ -76,14 +76,14 @@ extern void HText_endAppend PARAMS((HText * text));
 
  */
 
-extern void HText_setStyle PARAMS((HText * text, HTStyle * style));
+extern void HText_setStyle (HText * text, HTStyle * style);
 
 /*
 
   ADD ONE CHARACTER
 
  */
-extern void HText_appendCharacter PARAMS((HText * text, int ch));
+extern void HText_appendCharacter (HText * text, int ch);
 
 /*
 
@@ -91,7 +91,7 @@ extern void HText_appendCharacter PARAMS((HText * text, int ch));
 
  */
 
-extern void HText_appendText PARAMS((HText * text, CONST char * str));
+extern void HText_appendText (HText * text, const char * str);
 
 /*
 
@@ -100,11 +100,11 @@ extern void HText_appendText PARAMS((HText * text, CONST char * str));
    and similar things
 
  */
-extern void HText_appendParagraph PARAMS((HText * text));
+extern void HText_appendParagraph (HText * text);
 
-extern void HText_appendLineBreak PARAMS((HText * text));
+extern void HText_appendLineBreak (HText * text);
 
-extern void HText_appendHorizontalRule PARAMS((HText * text));
+extern void HText_appendHorizontalRule (HText * text);
 
 
 
@@ -121,12 +121,12 @@ extern void HText_appendHorizontalRule PARAMS((HText * text));
    nested.
 
  */
-extern int HText_beginAnchor PARAMS((
+extern int HText_beginAnchor (
 	HText *		text,
 	BOOL		underline,
-	HTChildAnchor *	anc));
-extern void HText_endAnchor PARAMS((HText * text, int number));
-extern BOOL HText_isAnchorBlank PARAMS((HText * text, int number));
+	HTChildAnchor *	anc);
+extern void HText_endAnchor (HText * text, int number);
+extern BOOL HText_isAnchorBlank (HText * text, int number);
 
 /*
 
@@ -140,19 +140,19 @@ extern BOOL HText_isAnchorBlank PARAMS((HText * text, int number));
    linked to the image itself as a separate document.
 
  */
-extern void HText_appendImage PARAMS((
+extern void HText_appendImage (
         HText *         text,
         HTChildAnchor * anc,
-        CONST char *    alternative_text,
+        const char *    alternative_text,
         int             alignment,
-        BOOL            isMap));
+        BOOL            isMap);
 
 /*
 
   RETURN THE ANCHOR ASSOCIATED WITH THIS NODE
 
  */
-extern HTParentAnchor * HText_nodeAnchor PARAMS((HText * me));
+extern HTParentAnchor * HText_nodeAnchor (HText * me);
 
 
 /*
@@ -169,8 +169,8 @@ Browsing functions
  */
 
 
-extern BOOL HText_select PARAMS((HText * text));
-extern BOOL HText_selectAnchor PARAMS((HText * text, HTChildAnchor* anchor));
+extern BOOL HText_select (HText * text);
+extern BOOL HText_selectAnchor (HText * text, HTChildAnchor* anchor);
 
 /*
 
@@ -185,39 +185,39 @@ Editing functions
 */
 /*      Apply this style to the selection
 */
-extern void HText_applyStyle PARAMS((HText * me, HTStyle *style));
+extern void HText_applyStyle (HText * me, HTStyle *style);
 
 /*      Update all text with changed style.
 */
-extern void HText_updateStyle PARAMS((HText * me, HTStyle *style));
+extern void HText_updateStyle (HText * me, HTStyle *style);
 
 /*      Return style of  selection
 */
-extern HTStyle * HText_selectionStyle PARAMS((
+extern HTStyle * HText_selectionStyle (
         HText * me,
-        HTStyleSheet* sheet));
+        HTStyleSheet* sheet);
 
 /*      Paste in styled text
 */
-extern void HText_replaceSel PARAMS((HText * me,
-        CONST char *aString,
-        HTStyle* aStyle));
+extern void HText_replaceSel (HText * me,
+        const char *aString,
+        HTStyle* aStyle);
 
 /*      Apply this style to the selection and all similarly formatted text
 **      (style recovery only)
 */
-extern void HTextApplyToSimilar PARAMS((HText * me, HTStyle *style));
+extern void HTextApplyToSimilar (HText * me, HTStyle *style);
 
 /*      Select the first unstyled run.
 **      (style recovery only)
 */
-extern void HTextSelectUnstyled PARAMS((HText * me, HTStyleSheet *sheet));
+extern void HTextSelectUnstyled (HText * me, HTStyleSheet *sheet);
 
 
 /*      Anchor handling:
 */
-extern void             HText_unlinkSelection PARAMS((HText * me));
-extern HTAnchor *       HText_referenceSelected PARAMS((HText * me));
-extern HTAnchor *       HText_linkSelTo PARAMS((HText * me, HTAnchor* anchor));
+extern void             HText_unlinkSelection (HText * me);
+extern HTAnchor *       HText_referenceSelected (HText * me);
+extern HTAnchor *       HText_linkSelTo (HText * me, HTAnchor* anchor);
 
 #endif /* HTEXT_H */
diff --git a/WWW/Library/Implementation/LYLeaks.h b/WWW/Library/Implementation/LYLeaks.h
index 99c0f4d0..19dc526b 100644
--- a/WWW/Library/Implementation/LYLeaks.h
+++ b/WWW/Library/Implementation/LYLeaks.h
@@ -74,7 +74,7 @@ typedef struct SourceLocation_tag	{
 	/*
 	 *	The file name and line number of where an event took place.
 	 */
-	CONST char *cp_FileName;
+	const char *cp_FileName;
 	short ssi_LineNumber;
 }
 SourceLocation;
@@ -187,9 +187,9 @@ typedef struct AllocationList_tag	{
 #endif /* LY_FIND_LEAKS && !NO_MEMORY_TRACKING */
 
 #if defined(LY_FIND_LEAKS)
-#define PUBLIC_IF_FIND_LEAKS PUBLIC
+#define PUBLIC_IF_FIND_LEAKS /* nothing */
 #else
-#define PUBLIC_IF_FIND_LEAKS PRIVATE
+#define PUBLIC_IF_FIND_LEAKS static
 #endif
 
 /*
@@ -197,56 +197,56 @@ typedef struct AllocationList_tag	{
 **	See the appropriate source file for usage.
 */
 #ifndef LYLeakSequence 
-extern long LYLeakSequence NOPARAMS;
+extern long LYLeakSequence (void);
 #endif
-extern void LYLeaks NOPARAMS;
+extern void LYLeaks (void);
 #ifdef LY_FIND_LEAKS_EXTENDED
-extern AllocationList *LYLeak_mark_malloced PARAMS((
+extern AllocationList *LYLeak_mark_malloced (
 	void *		vp_alloced,
 	size_t		st_bytes,
-	CONST char *	cp_File,
-	CONST short	ssi_Line));
+	const char *	cp_File,
+	const short	ssi_Line);
 #endif /* LY_FIND_LEAKS_EXTENDED */
-extern void *LYLeakMalloc PARAMS((
+extern void *LYLeakMalloc (
 	size_t		st_bytes,
-	CONST char *	cp_File,
-	CONST short	ssi_Line));
-extern void *LYLeakCalloc PARAMS((
+	const char *	cp_File,
+	const short	ssi_Line);
+extern void *LYLeakCalloc (
 	size_t		st_number,
 	size_t		st_bytes,
-	CONST char *	cp_File,
-	CONST short	ssi_Line));
-extern void *LYLeakRealloc PARAMS((
+	const char *	cp_File,
+	const short	ssi_Line);
+extern void *LYLeakRealloc (
 	void *		vp_alloced,
 	size_t		st_newbytes,
-	CONST char *	cp_File,
-	CONST short	ssi_Line));
-extern void LYLeakFree PARAMS((
+	const char *	cp_File,
+	const short	ssi_Line);
+extern void LYLeakFree (
 	void *		vp_alloced,
-	CONST char *	cp_File,
-	CONST short	ssi_Line));
-extern char * LYLeakSACopy PARAMS((
+	const char *	cp_File,
+	const short	ssi_Line);
+extern char * LYLeakSACopy (
 	char **		dest,
-	CONST char *	src,
-	CONST char *	cp_File,
-	CONST short	ssi_Line));
-extern char * LYLeakSACat PARAMS((
+	const char *	src,
+	const char *	cp_File,
+	const short	ssi_Line);
+extern char * LYLeakSACat (
 	char **		dest,
-	CONST char *	src,
-	CONST char *	cp_File,
-	CONST short	ssi_Line));
+	const char *	src,
+	const char *	cp_File,
+	const short	ssi_Line);
 
 #ifdef LY_FIND_LEAKS_EXTENDED
 /* Trick to get tracking of var arg functions without relying
    on var arg preprocessor macros: */
 
-typedef char * HTSprintflike PARAMS((char **, CONST char *, ...));
-extern HTSprintflike *Get_htsprintf_fn PARAMS((
-			   CONST char *	cp_File,
-			   CONST short	ssi_Line));
-extern HTSprintflike *Get_htsprintf0_fn PARAMS((
-			   CONST char *	cp_File,
-			   CONST short	ssi_Line));
+typedef char * HTSprintflike (char **, const char *, ...);
+extern HTSprintflike *Get_htsprintf_fn (
+			   const char *	cp_File,
+			   const short	ssi_Line);
+extern HTSprintflike *Get_htsprintf0_fn (
+			   const char *	cp_File,
+			   const short	ssi_Line);
 #endif /* LY_FIND_LEAKS_EXTENDED */
 
 #endif /* __LYLEAKS_H */
diff --git a/WWW/Library/Implementation/LYexit.h b/WWW/Library/Implementation/LYexit.h
index 005e13d9..6e6bb043 100644
--- a/WWW/Library/Implementation/LYexit.h
+++ b/WWW/Library/Implementation/LYexit.h
@@ -51,8 +51,8 @@
 /*
  *	Function declarations
  */
-extern void exit_immediately PARAMS((int status)) GCC_NORETURN;
-extern void LYexit PARAMS((int status)) GCC_NORETURN;
-extern int LYatexit PARAMS((void (*function)(void)));
+extern void exit_immediately (int status) GCC_NORETURN;
+extern void LYexit (int status) GCC_NORETURN;
+extern int LYatexit (void (*function)(void));
 
 #endif /* __LYEXIT_H */
diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c
index 5204b0db..c8172f4d 100644
--- a/WWW/Library/Implementation/SGML.c
+++ b/WWW/Library/Implementation/SGML.c
@@ -47,9 +47,9 @@
 char* entity_string; /* this is used for printing entity name.
     Unconditionally added since redundant assigments don't hurt much*/
 
-PRIVATE void fake_put_character ARGS2(
-		    void*, p GCC_UNUSED,
-		    char,  c GCC_UNUSED)
+static void fake_put_character (
+		    void* p GCC_UNUSED,
+		    char  c GCC_UNUSED)
 {
 }
 
@@ -109,11 +109,11 @@ PRIVATE void fake_put_character ARGS2(
 /*the following macros are used for pretty source view. */
 #define IS_C(attr) (attr.type == HTMLA_CLASS)
 
-PUBLIC HTCJKlang HTCJK = NOCJK;		/* CJK enum value.		*/
-PUBLIC BOOL HTPassEightBitRaw = FALSE;	/* Pass 161-172,174-255 raw.	*/
-PUBLIC BOOL HTPassEightBitNum = FALSE;	/* Pass ^ numeric entities raw. */
-PUBLIC BOOL HTPassHighCtrlRaw = FALSE;	/* Pass 127-160,173,&#127; raw. */
-PUBLIC BOOL HTPassHighCtrlNum = FALSE;	/* Pass &#128;-&#159; raw.	*/
+HTCJKlang HTCJK = NOCJK;		/* CJK enum value.		*/
+BOOL HTPassEightBitRaw = FALSE;	/* Pass 161-172,174-255 raw.	*/
+BOOL HTPassEightBitNum = FALSE;	/* Pass ^ numeric entities raw. */
+BOOL HTPassHighCtrlRaw = FALSE;	/* Pass 127-160,173,&#127; raw. */
+BOOL HTPassHighCtrlNum = FALSE;	/* Pass &#128;-&#159; raw.	*/
 
 /*	The State (context) of the parser
 **
@@ -186,15 +186,15 @@ typedef enum {
 */
 struct _HTStream {
 
-    CONST HTStreamClass *	isa;		/* inherited from HTStream */
+    const HTStreamClass *	isa;		/* inherited from HTStream */
 
-    CONST SGML_dtd		*dtd;
-    CONST HTStructuredClass	*actions;	/* target class	 */
+    const SGML_dtd		*dtd;
+    const HTStructuredClass	*actions;	/* target class	 */
     HTStructured		*target;	/* target object */
 
     HTTag			*current_tag;
     HTTag			*slashedtag;
-    CONST HTTag			*unknown_tag;
+    const HTTag			*unknown_tag;
     BOOL			inSELECT;
     BOOL			no_lynx_specialcodes;
     int				current_attribute_number;
@@ -246,7 +246,7 @@ struct _HTStream {
 };
 
 #ifndef NO_LYNX_TRACE
-PRIVATE char *state_name ARGS1(sgml_state, n)
+static char *state_name (sgml_state  n)
 {
     char *result = "?";
     switch (n) {
@@ -303,7 +303,7 @@ PRIVATE char *state_name ARGS1(sgml_state, n)
 static HTElement pool[DEPTH];
 static int depth = 0;
 
-PRIVATE HTElement* pool_alloc NOARGS
+static HTElement* pool_alloc (void)
 {
     depth++;
     if (depth > DEPTH)
@@ -311,7 +311,7 @@ PRIVATE HTElement* pool_alloc NOARGS
     return (pool + depth - 1);
 }
 
-PRIVATE void pool_free ARGS1(HTElement*, e)
+static void pool_free (HTElement*  e)
 {
     if (depth > DEPTH)
 	FREE(e);
@@ -321,10 +321,10 @@ PRIVATE void pool_free ARGS1(HTElement*, e)
 
 #ifdef USE_PRETTYSRC
 
-PRIVATE void HTMLSRC_apply_markup ARGS3(
-	    HTStream *,	      context,
-	    HTlexeme,	      lexeme,
-	    BOOL,	      start)
+static void HTMLSRC_apply_markup (
+	    HTStream *	      context,
+	    HTlexeme	      lexeme,
+	    BOOL	      start)
 {
     HT_tagspec* ts = *( ( start ? lexeme_start : lexeme_end ) + lexeme);
 
@@ -343,7 +343,7 @@ PRIVATE void HTMLSRC_apply_markup ARGS3(
 		context->target,
 		ts->element,
 		ts->present,
-		(CONST char **)ts->value,
+		(const char **)ts->value,
 		context->current_tag_charset,
 		(char **)&context->include);
 	else
@@ -367,10 +367,10 @@ PRIVATE void HTMLSRC_apply_markup ARGS3(
 #define attr_is_name context->cur_attr_is_name
 #endif
 
-PRIVATE void set_chartrans_handling ARGS3(
-	HTStream *,		context,
-	HTParentAnchor *,	anchor,
-	int,			chndl)
+static void set_chartrans_handling (
+	HTStream *		context,
+	HTParentAnchor *	anchor,
+	int			chndl)
 {
     if (chndl < 0) {
 	/*
@@ -440,8 +440,8 @@ PRIVATE void set_chartrans_handling ARGS3(
     }
 }
 
-PRIVATE void change_chartrans_handling ARGS1(
-	HTStream *,		context)
+static void change_chartrans_handling (
+	HTStream *		context)
 {
     int new_LYhndl = HTAnchor_getUCLYhndl(context->node_anchor,
 					  UCT_STAGE_PARSER);
@@ -477,11 +477,11 @@ static int current_is_class = 0;
 /*	Handle Attribute
 **	----------------
 */
-/* PUBLIC CONST char * SGML_default = "";   ?? */
+/* PUBLIC const char * SGML_default = "";   ?? */
 
-PRIVATE void handle_attribute_name ARGS2(
-	HTStream *,	context,
-	CONST char *,	s)
+static void handle_attribute_name (
+	HTStream *	context,
+	const char *	s)
 {
     HTTag * tag = context->current_tag;
     attr * attributes = tag->attributes;
@@ -546,9 +546,9 @@ PRIVATE void handle_attribute_name ARGS2(
 /*	Handle attribute value
 **	----------------------
 */
-PRIVATE void handle_attribute_value ARGS2(
-	HTStream *,	context,
-	CONST char *,	s)
+static void handle_attribute_value (
+	HTStream *	context,
+	const char *	s)
 {
     if (context->current_attribute_number != INVALID) {
 	StrAllocCopy_extra(context->value[context->current_attribute_number], s);
@@ -580,9 +580,9 @@ PRIVATE void handle_attribute_value ARGS2(
 **  but also in UCdomap.c because they are non printable...
 **
 */
-PRIVATE BOOL put_special_unicodes ARGS2(
-	HTStream *,	context,
-	UCode_t,	code)
+static BOOL put_special_unicodes (
+	HTStream *	context,
+	UCode_t	code)
 {
     /* (Tgf_nolyspcl) */
     if (context->no_lynx_specialcodes) {
@@ -651,7 +651,7 @@ PRIVATE BOOL put_special_unicodes ARGS2(
 }
 
 #ifdef USE_PRETTYSRC
-PRIVATE void put_pretty_entity ARGS2(HTStream *, context, int, term)
+static void put_pretty_entity (HTStream *  context, int  term)
 {
     PSRCSTART(entity);
     PUTC('&');
@@ -661,7 +661,7 @@ PRIVATE void put_pretty_entity ARGS2(HTStream *, context, int, term)
     PSRCSTOP(entity);
 }
 
-PRIVATE void put_pretty_number ARGS1(HTStream *, context)
+static void put_pretty_number (HTStream *  context)
 {
     PSRCSTART(entity);
     PUTS( (context->isHex ? "&#x" : "&#") );
@@ -685,16 +685,16 @@ PRIVATE void put_pretty_number ARGS1(HTStream *, context)
 **
 ** Modified more (for use with Lynx character translation code):
 */
-PRIVATE char replace_buf [64];	      /* buffer for replacement strings */
-PRIVATE BOOL FoundEntity = FALSE;
+static char replace_buf [64];	      /* buffer for replacement strings */
+static BOOL FoundEntity = FALSE;
 
-PRIVATE void handle_entity ARGS2(
-	HTStream *,	context,
-	char,		term)
+static void handle_entity (
+	HTStream *	context,
+	char		term)
 {
     UCode_t code;
     long uck = -1;
-    CONST char *s = context->string->data;
+    const char *s = context->string->data;
 
     /*
     **	Handle all entities normally. - FM
@@ -837,10 +837,10 @@ PRIVATE void handle_entity ARGS2(
 /*	Handle comment
 **	--------------
 */
-PRIVATE void handle_comment ARGS1(
-	HTStream *,		context)
+static void handle_comment (
+	HTStream *		context)
 {
-    CONST char *s = context->string->data;
+    const char *s = context->string->data;
 
     CTRACE((tfp, "SGML Comment:\n<%s>\n", s));
 
@@ -859,10 +859,10 @@ PRIVATE void handle_comment ARGS1(
 /*	Handle identifier
 **	-----------------
 */
-PRIVATE void handle_identifier ARGS1(
-	HTStream *,		context)
+static void handle_identifier (
+	HTStream *		context)
 {
-    CONST char *s = context->string->data;
+    const char *s = context->string->data;
 
     CTRACE((tfp, "SGML Identifier:\n<%s>\n", s));
 
@@ -873,28 +873,28 @@ PRIVATE void handle_identifier ARGS1(
 /*	Handle doctype
 **	--------------
 */
-PRIVATE void handle_doctype ARGS1(
-	HTStream *,		context)
+static void handle_doctype (
+	HTStream *		context)
 {
-    CONST char *s = context->string->data;
+    const char *s = context->string->data;
 
     CTRACE((tfp, "SGML Doctype:\n<%s>\n", s));
 
     return;
 }
 
-PRIVATE void SGML_write PARAMS((
+static void SGML_write (
 	HTStream *		me,
-	CONST char *		s,
-	int			l));
+	const char *		s,
+	int			l);
 
 /*	Handle marked
 **	-------------
 */
-PRIVATE void handle_marked ARGS1(
-	HTStream *,		context)
+static void handle_marked (
+	HTStream *		context)
 {
-    CONST char *s = context->string->data;
+    const char *s = context->string->data;
 
     CTRACE((tfp, "SGML Marked Section:\n<%s>\n", s));
 
@@ -918,10 +918,10 @@ PRIVATE void handle_marked ARGS1(
 /*	Handle sgmlent
 **	--------------
 */
-PRIVATE void handle_sgmlent ARGS1(
-	HTStream *,		context)
+static void handle_sgmlent (
+	HTStream *		context)
 {
-    CONST char *s = context->string->data;
+    const char *s = context->string->data;
 
     CTRACE((tfp, "SGML Entity Declaration:\n<%s>\n", s));
 
@@ -932,10 +932,10 @@ PRIVATE void handle_sgmlent ARGS1(
 /*	Handle sgmlent
 **	--------------
 */
-PRIVATE void handle_sgmlele ARGS1(
-	HTStream *,		context)
+static void handle_sgmlele (
+	HTStream *		context)
 {
-    CONST char *s = context->string->data;
+    const char *s = context->string->data;
 
     CTRACE((tfp, "SGML Element Declaration:\n<%s>\n", s));
 
@@ -946,10 +946,10 @@ PRIVATE void handle_sgmlele ARGS1(
 /*	Handle sgmlatt
 **	--------------
 */
-PRIVATE void handle_sgmlatt ARGS1(
-	HTStream *,		context)
+static void handle_sgmlatt (
+	HTStream *		context)
 {
-    CONST char *s = context->string->data;
+    const char *s = context->string->data;
 
     CTRACE((tfp, "SGML Attribute Declaration:\n<%s>\n", s));
 
@@ -988,10 +988,10 @@ PRIVATE void handle_sgmlatt ARGS1(
 
 #ifdef EXTENDED_HTMLDTD
 
-PRIVATE BOOL element_valid_within ARGS3(
-    HTTag *,	new_tag,
-    HTTag *,	stacked_tag,
-    BOOL,	direct)
+static BOOL element_valid_within (
+    HTTag *	new_tag,
+    HTTag *	stacked_tag,
+    BOOL	direct)
 {
     TagClass usecontains, usecontained;
     if (!stacked_tag || !new_tag)
@@ -1012,9 +1012,9 @@ typedef enum {
     close_valid = 2
 } canclose_t;
 
-PRIVATE canclose_t can_close ARGS2(
-    HTTag *,	new_tag,
-    HTTag *,	stacked_tag)
+static canclose_t can_close (
+    HTTag *	new_tag,
+    HTTag *	stacked_tag)
 {
     if (!stacked_tag)
 	return close_NO;
@@ -1027,8 +1027,8 @@ PRIVATE canclose_t can_close ARGS2(
 		close_error : close_NO);
 }
 
-PRIVATE void do_close_stacked ARGS1(
-    HTStream *, context)
+static void do_close_stacked (
+    HTStream * context)
 {
     HTElement * stacked = context->element_stack;
     HTMLElement e;
@@ -1051,9 +1051,9 @@ PRIVATE void do_close_stacked ARGS1(
 	(context->element_stack->tag->flags & Tgf_nolyspcl) : NO;
 }
 
-PRIVATE int is_on_stack ARGS2(
-	HTStream *,	context,
-	HTTag *,	old_tag)
+static int is_on_stack (
+	HTStream *	context,
+	HTTag *	old_tag)
 {
    HTElement * stacked = context->element_stack;
     int i = 1;
@@ -1069,9 +1069,9 @@ PRIVATE int is_on_stack ARGS2(
 /*	End element
 **	-----------
 */
-PRIVATE void end_element ARGS2(
-	HTStream *,	context,
-	HTTag *,	old_tag)
+static void end_element (
+	HTStream *	context,
+	HTTag *	old_tag)
 {
 #ifdef EXTENDED_HTMLDTD
 
@@ -1212,8 +1212,8 @@ PRIVATE void end_element ARGS2(
 
 /*	Start a element
 */
-PRIVATE void start_element ARGS1(
-	HTStream *,	context)
+static void start_element (
+	HTStream *	context)
 {
     int status;
     HTTag * new_tag = context->current_tag;
@@ -1354,7 +1354,7 @@ PRIVATE void start_element ARGS1(
 	context->target,
 	TAGNUM_OF_TAGP(new_tag),
 	context->present,
-	(CONST char**) context->value,	/* coerce type for think c */
+	(const char**) context->value,	/* coerce type for think c */
 	context->current_tag_charset,
 	(char **)&context->include);
     if (status == HT_PARSER_OTHER_CONTENT)
@@ -1389,9 +1389,9 @@ PRIVATE void start_element ARGS1(
 **		NULL		tag not found
 **		else		address of tag structure in dtd
 */
-PUBLIC HTTag * SGMLFindTag ARGS2(
-	CONST SGML_dtd*,	dtd,
-	CONST char *,		s)
+HTTag * SGMLFindTag (
+	const SGML_dtd*	dtd,
+	const char *		s)
 {
     int high, low, i, diff;
     static HTTag* last[64] = {NULL};  /*optimize using the previous results*/
@@ -1428,8 +1428,8 @@ PUBLIC HTTag * SGMLFindTag ARGS2(
 /*	Could check that we are back to bottom of stack! @@  */
 /*	Do check! - FM					     */
 /*							     */
-PRIVATE void SGML_free ARGS1(
-	HTStream *,	context)
+static void SGML_free (
+	HTStream *	context)
 {
     int i;
     HTElement * cur;
@@ -1479,9 +1479,9 @@ PRIVATE void SGML_free ARGS1(
 #endif
 }
 
-PRIVATE void SGML_abort ARGS2(
-	HTStream *,	context,
-	HTError,	e)
+static void SGML_abort (
+	HTStream *	context,
+	HTError	e)
 {
     int i;
     HTElement * cur;
@@ -1532,27 +1532,27 @@ PRIVATE void SGML_abort ARGS2(
 */
 
 #ifdef CALLERDATA
-PUBLIC void* SGML_callerData ARGS1(
-	HTStream *,	context)
+void* SGML_callerData (
+	HTStream *	context)
 {
     return context->callerData;
 }
 
-PUBLIC void SGML_setCallerData ARGS2(
-	HTStream *,	context,
-	void*,		data)
+void SGML_setCallerData (
+	HTStream *	context,
+	void*		data)
 {
     context->callerData = data;
 }
 #endif /* CALLERDATA */
 
-PRIVATE void SGML_character ARGS2(
-	HTStream *,	context,
-	char,		c_in)
+static void SGML_character (
+	HTStream *	context,
+	char		c_in)
 {
-    CONST SGML_dtd *dtd =	context->dtd;
+    const SGML_dtd *dtd =	context->dtd;
     HTChunk	*string =	context->string;
-    CONST char * EntityName;
+    const char * EntityName;
     HTTag * testtag = NULL;
     BOOLEAN chk;	/* Helps (?) walk through all the else ifs... */
     UCode_t clong, uck = 0; /* Enough bits for UCS4 ... */
@@ -3686,7 +3686,7 @@ top1:
 		  if (string->data[1] == 'B' || string->data[1] == '@') {
 		    jis_buf[0] = '\033';
 		    strcpy(jis_buf + 1, string->data);
-		    TO_EUC((CONST unsigned char *)jis_buf, (unsigned char *)string->data);
+		    TO_EUC((const unsigned char *)jis_buf, (unsigned char *)string->data);
 		  }
 		}
 	    }
@@ -4390,23 +4390,23 @@ after_switch:
 }  /* SGML_character */
 
 
-PRIVATE void SGML_string ARGS2(
-	HTStream *,	context,
-	CONST char*,	str)
+static void SGML_string (
+	HTStream *	context,
+	const char*	str)
 {
-    CONST char *p;
+    const char *p;
     for (p = str; *p; p++)
 	SGML_character(context, *p);
 }
 
 
-PRIVATE void SGML_write ARGS3(
-	HTStream *,	context,
-	CONST char*,	str,
-	int,		l)
+static void SGML_write (
+	HTStream *	context,
+	const char*	str,
+	int		l)
 {
-    CONST char *p;
-    CONST char *e = str+l;
+    const char *p;
+    const char *e = str+l;
     for (p = str; p < e; p++)
 	SGML_character(context, *p);
 }
@@ -4417,7 +4417,7 @@ PRIVATE void SGML_write ARGS3(
 /*	Structured Object Class
 **	-----------------------
 */
-PUBLIC CONST HTStreamClass SGMLParser =
+const HTStreamClass SGMLParser =
 {
 	"SGMLParser",
 	SGML_free,
@@ -4436,10 +4436,10 @@ PUBLIC CONST HTStreamClass SGMLParser =
 **
 */
 
-PUBLIC HTStream* SGML_new  ARGS3(
-	CONST SGML_dtd *,	dtd,
-	HTParentAnchor *,	anchor,
-	HTStructured *,		target)
+HTStream* SGML_new  (
+	const SGML_dtd *	dtd,
+	HTParentAnchor *	anchor,
+	HTStructured *		target)
 {
     int i;
     HTStream* context = (HTStream *) malloc(sizeof(*context));
@@ -4452,7 +4452,7 @@ PUBLIC HTStream* SGML_new  ARGS3(
     context->trailing_spaces = 0;
     context->dtd = dtd;
     context->target = target;
-    context->actions = (CONST HTStructuredClass*)(((HTStream*)target)->isa);
+    context->actions = (const HTStructuredClass*)(((HTStream*)target)->isa);
 					/* Ugh: no OO */
     context->unknown_tag = &HTTag_unrecognized;
     context->current_tag = context->slashedtag = NULL;
@@ -4561,13 +4561,13 @@ History:
 ///////////////////////////////////////////////////////////////////////
 */
 
-PUBLIC int TREAT_SJIS = 1;
+int TREAT_SJIS = 1;
 
-PUBLIC void JISx0201TO0208_EUC ARGS4(
-	register unsigned char,		IHI,
-	register unsigned char,		ILO,
-	register unsigned char *,	OHI,
-	register unsigned char *,	OLO)
+void JISx0201TO0208_EUC (
+	register unsigned char		IHI,
+	register unsigned char		ILO,
+	register unsigned char *	OHI,
+	register unsigned char *	OLO)
 {
     static char *table[] = {
 	"\241\243",	/* A1,A3 */
@@ -4644,9 +4644,9 @@ PUBLIC void JISx0201TO0208_EUC ARGS4(
     }
 }
 
-PRIVATE int IS_SJIS_STR ARGS1(CONST unsigned char *, str)
+static int IS_SJIS_STR (const unsigned char *  str)
 {
-    CONST unsigned char *s;
+    const unsigned char *s;
     unsigned char ch;
     int is_sjis = 0;
 
@@ -4659,10 +4659,10 @@ PRIVATE int IS_SJIS_STR ARGS1(CONST unsigned char *, str)
     return 0;
 }
 
-PUBLIC unsigned char * SJIS_TO_JIS1 ARGS3(
-	register unsigned char,		HI,
-	register unsigned char,		LO,
-	register unsigned char *,	JCODE)
+unsigned char * SJIS_TO_JIS1 (
+	register unsigned char		HI,
+	register unsigned char		LO,
+	register unsigned char *	JCODE)
 {
     HI -= UCH((HI <= 0x9F) ? 0x71 : 0xB1);
     HI = UCH((HI << 1) + 1);
@@ -4679,10 +4679,10 @@ PUBLIC unsigned char * SJIS_TO_JIS1 ARGS3(
     return JCODE;
 }
 
-PUBLIC unsigned char * JIS_TO_SJIS1 ARGS3(
-	register unsigned char,		HI,
-	register unsigned char,		LO,
-	register unsigned char *,	SJCODE)
+unsigned char * JIS_TO_SJIS1 (
+	register unsigned char		HI,
+	register unsigned char		LO,
+	register unsigned char *	SJCODE)
 {
     if (HI & 1)
 	LO += UCH(0x1F);
@@ -4699,10 +4699,10 @@ PUBLIC unsigned char * JIS_TO_SJIS1 ARGS3(
     return SJCODE;
 }
 
-PUBLIC unsigned char * EUC_TO_SJIS1 ARGS3(
-	unsigned char,			HI,
-	unsigned char,			LO,
-	register unsigned char *,	SJCODE)
+unsigned char * EUC_TO_SJIS1 (
+	unsigned char			HI,
+	unsigned char			LO,
+	register unsigned char *	SJCODE)
 {
     if (HI == 0x8E)
 	JISx0201TO0208_EUC(HI, LO, &HI, &LO);
@@ -4710,10 +4710,10 @@ PUBLIC unsigned char * EUC_TO_SJIS1 ARGS3(
     return SJCODE;
 }
 
-PUBLIC void JISx0201TO0208_SJIS ARGS3(
-	register unsigned char,		I,
-	register unsigned char *,	OHI,
-	register unsigned char *,	OLO)
+void JISx0201TO0208_SJIS (
+	register unsigned char		I,
+	register unsigned char *	OHI,
+	register unsigned char *	OLO)
 {
     unsigned char SJCODE[2];
 
@@ -4723,10 +4723,10 @@ PUBLIC void JISx0201TO0208_SJIS ARGS3(
     *OLO = SJCODE[1];
 }
 
-PUBLIC unsigned char * SJIS_TO_EUC1 ARGS3(
-	unsigned char,		HI,
-	unsigned char,		LO,
-	unsigned char *,	data)
+unsigned char * SJIS_TO_EUC1 (
+	unsigned char		HI,
+	unsigned char		LO,
+	unsigned char *	data)
 {
     SJIS_TO_JIS1(HI, LO, data);
     data[0] |= 0x80;
@@ -4734,9 +4734,9 @@ PUBLIC unsigned char * SJIS_TO_EUC1 ARGS3(
     return data;
 }
 
-PUBLIC unsigned char * SJIS_TO_EUC ARGS2(
-	unsigned char *,	src,
-	unsigned char *,	dst)
+unsigned char * SJIS_TO_EUC (
+	unsigned char *	src,
+	unsigned char *	dst)
 {
     register unsigned char hi, lo, *sp, *dp;
     register int in_sjis = 0;
@@ -4757,9 +4757,9 @@ PUBLIC unsigned char * SJIS_TO_EUC ARGS2(
     return dst;
 }
 
-PUBLIC unsigned char * EUC_TO_SJIS ARGS2(
-	unsigned char *,	src,
-	unsigned char *,	dst)
+unsigned char * EUC_TO_SJIS (
+	unsigned char *	src,
+	unsigned char *	dst)
 {
     register unsigned char *sp, *dp;
 
@@ -4780,13 +4780,13 @@ PUBLIC unsigned char * EUC_TO_SJIS ARGS2(
     return dst;
 }
 
-#define Strcpy(a,b)	(strcpy((char*)a,(CONST char*)b),&a[strlen((CONST char*)a)])
+#define Strcpy(a,b)	(strcpy((char*)a,(const char*)b),&a[strlen((const char*)a)])
 
-PUBLIC unsigned char *EUC_TO_JIS ARGS4(
-	unsigned char *,	src,
-	unsigned char *,	dst,
-	CONST char *,		toK,
-	CONST char *,		toA)
+unsigned char *EUC_TO_JIS (
+	unsigned char *	src,
+	unsigned char *	dst,
+	const char *		toK,
+	const char *		toA)
 {
     register unsigned char kana_mode = 0;
     register unsigned char cch;
@@ -4831,13 +4831,13 @@ PUBLIC unsigned char *EUC_TO_JIS ARGS4(
 #define SO		('N'-0x40)
 #define SI		('O'-0x40)
 
-PUBLIC int repair_JIS = 0;
+int repair_JIS = 0;
 
-PRIVATE CONST unsigned char *repairJIStoEUC ARGS2(
-	CONST unsigned char *,	src,
-	unsigned char **,	dstp)
+static const unsigned char *repairJIStoEUC (
+	const unsigned char *	src,
+	unsigned char **	dstp)
 {
-    CONST unsigned char *s;
+    const unsigned char *s;
     unsigned char *d, ch1, ch2;
 
     d = *dstp;
@@ -4858,11 +4858,11 @@ PRIVATE CONST unsigned char *repairJIStoEUC ARGS2(
     return 0;
 }
 
-PUBLIC unsigned char *TO_EUC ARGS2(
-	CONST unsigned char *,	jis,
-	unsigned char *,	euc)
+unsigned char *TO_EUC (
+	const unsigned char *	jis,
+	unsigned char *	euc)
 {
-    register CONST unsigned char *s;
+    register const unsigned char *s;
     register unsigned char c, jis_stat;
     unsigned char *d;
     register int to1B, to2B;
@@ -4889,7 +4889,7 @@ PUBLIC unsigned char *TO_EUC ARGS2(
 
 	if (c == to2B && jis_stat == 0 && repair_JIS) {
 	    if (*s == 'B' || *s == '@') {
-		CONST unsigned char *ts;
+		const unsigned char *ts;
 		if ((ts = repairJIStoEUC(s + 1, &d)) != NULL) {
 		    s = ts;
 		    continue;
@@ -4948,7 +4948,7 @@ PUBLIC unsigned char *TO_EUC ARGS2(
 
 #define non94(ch) ((ch) <= 0x20 || (ch) == 0x7F)
 
-PRIVATE int is_EUC_JP ARGS1(unsigned char *, euc)
+static int is_EUC_JP (unsigned char *  euc)
 {
     unsigned char *cp;
     int ch1, ch2;
@@ -4970,13 +4970,13 @@ PRIVATE int is_EUC_JP ARGS1(unsigned char *, euc)
     return 1;
 }
 
-PUBLIC void TO_SJIS ARGS2(
-	CONST unsigned char *,	any,
-	unsigned char *,	sjis)
+void TO_SJIS (
+	const unsigned char *	any,
+	unsigned char *	sjis)
 {
     unsigned char *euc;
 
-    euc = malloc(strlen((CONST char *) any) + 1);
+    euc = malloc(strlen((const char *) any) + 1);
 #ifdef CJK_EX
     if (!euc)
 	outofmem(__FILE__, "TO_SJIS");
@@ -4985,13 +4985,13 @@ PUBLIC void TO_SJIS ARGS2(
     if (is_EUC_JP(euc))
 	EUC_TO_SJIS(euc, sjis);
     else
-	strcpy((char *) sjis, (CONST char *) any);
+	strcpy((char *) sjis, (const char *) any);
     free(euc);
 }
 
-PUBLIC void TO_JIS ARGS2(
-	CONST unsigned char *,	any,
-	unsigned char *,	jis)
+void TO_JIS (
+	const unsigned char *	any,
+	unsigned char *	jis)
 {
     unsigned char *euc;
 
@@ -4999,7 +4999,7 @@ PUBLIC void TO_JIS ARGS2(
 	jis[0] = 0;
 	return;
     }
-    euc = malloc(strlen((CONST char *) any) + 1);
+    euc = malloc(strlen((const char *) any) + 1);
 #ifdef CJK_EX
     if (!euc)
 	outofmem(__FILE__, "TO_JIS");
diff --git a/WWW/Library/Implementation/SGML.h b/WWW/Library/Implementation/SGML.h
index 11b011d4..1ecf18f5 100644
--- a/WWW/Library/Implementation/SGML.h
+++ b/WWW/Library/Implementation/SGML.h
@@ -154,7 +154,7 @@ struct _tag{
 typedef struct {
     HTTag *		tags;		/* Must be in strcmp order by name */
     int			number_of_tags;
-    CONST char **	entity_names;	/* Must be in strcmp order by name */
+    const char **	entity_names;	/* Must be in strcmp order by name */
     size_t		number_of_entities;
 				/*  "entity_names" table probably unused,
 				**  see comments in HTMLDTD.c near the top
@@ -195,42 +195,42 @@ typedef struct _HTStructuredClass{
 
 	char*  name;				/* Just for diagnostics */
 
-	void (*_free) PARAMS((
-		HTStructured*	me));
+	void (*_free) (
+		HTStructured*	me);
 
-	void (*_abort) PARAMS((
+	void (*_abort) (
 		HTStructured*	me,
-		HTError		e));
+		HTError		e);
 
-	void (*put_character) PARAMS((
+	void (*put_character) (
 		HTStructured*	me,
-		char		ch));
+		char		ch);
 
-	void (*put_string) PARAMS((
+	void (*put_string) (
 		HTStructured*	me,
-		CONST char *	str));
+		const char *	str);
 
-	void (*_write) PARAMS((
+	void (*_write) (
 		HTStructured*	me,
-		CONST char *	str,
-		int		len));
+		const char *	str,
+		int		len);
 
-	int (*start_element) PARAMS((
+	int (*start_element) (
 		HTStructured*	me,
 		int		element_number,
-		CONST BOOL*	attribute_present,
-		CONST char**	attribute_value,
+		const BOOL*	attribute_present,
+		const char**	attribute_value,
 		int		charset,
-		char **		include));
+		char **		include);
 
-	int (*end_element) PARAMS((
+	int (*end_element) (
 		HTStructured*	me,
 		int		element_number,
-		char **		include));
+		char **		include);
 
-	int (*put_entity) PARAMS((
+	int (*put_entity) (
 		HTStructured*	me,
-		int		entity_number));
+		int		entity_number);
 
 } HTStructuredClass;
 
@@ -239,9 +239,9 @@ typedef struct _HTStructuredClass{
   into additional HTStructuredClass members.  For now they don't do
   anything target-specific. - kw
   */
-extern BOOLEAN LYCheckForCSI PARAMS((HTParentAnchor *anchor, char **url));
-extern void LYDoCSI PARAMS((char *url, CONST char *comment, char **csi));
-extern BOOLEAN LYCommentHacks PARAMS((HTParentAnchor *anchor, CONST char *comment));
+extern BOOLEAN LYCheckForCSI (HTParentAnchor *anchor, char **url);
+extern void LYDoCSI (char *url, const char *comment, char **csi);
+extern BOOLEAN LYCommentHacks (HTParentAnchor *anchor, const char *comment);
 
 /*
 
@@ -250,9 +250,9 @@ Find a Tag by Name
    Returns a pointer to the tag within the DTD.
 
  */
-extern HTTag * SGMLFindTag PARAMS((
-	CONST SGML_dtd *	dtd,
-	CONST char *		string));
+extern HTTag * SGMLFindTag (
+	const SGML_dtd *	dtd,
+	const char *		string);
 
 
 /*
@@ -268,11 +268,11 @@ Create an SGML parser
 ** On exit,
 **		The default tag starter has been processed.
 */
-extern HTStream * SGML_new PARAMS((
-	CONST SGML_dtd *	dtd,
+extern HTStream * SGML_new (
+	const SGML_dtd *	dtd,
 	HTParentAnchor *	anchor,
-	HTStructured *		target));
+	HTStructured *		target);
 
-extern CONST HTStreamClass SGMLParser;
+extern const HTStreamClass SGMLParser;
 
 #endif	/* SGML_H */
diff --git a/WWW/Library/Implementation/UCAux.h b/WWW/Library/Implementation/UCAux.h
index 44c9e881..44598b0e 100644
--- a/WWW/Library/Implementation/UCAux.h
+++ b/WWW/Library/Implementation/UCAux.h
@@ -5,12 +5,12 @@
 #include <HTUtils.h>
 #endif
 
-extern BOOL UCCanUniTranslateFrom PARAMS((int from));
-extern BOOL UCCanTranslateUniTo PARAMS((int to));
-extern BOOL UCCanTranslateFromTo PARAMS((int from, int to));
-extern BOOL UCNeedNotTranslate PARAMS((
+extern BOOL UCCanUniTranslateFrom (int from);
+extern BOOL UCCanTranslateUniTo (int to);
+extern BOOL UCCanTranslateFromTo (int from, int to);
+extern BOOL UCNeedNotTranslate (
 	int		from,
-	int		to));
+	int		to);
 
 struct _UCTransParams
 {
@@ -33,44 +33,44 @@ typedef struct _UCTransParams UCTransParams;
 #include <UCDefs.h>
 #endif /* UCDEFS_H */
 
-extern void UCSetTransParams PARAMS((
+extern void UCSetTransParams (
 	UCTransParams *		pT,
 	int			cs_in,
-	CONST LYUCcharset *	p_in,
+	const LYUCcharset *	p_in,
 	int			cs_out,
-	CONST LYUCcharset *	p_out));
+	const LYUCcharset *	p_out);
 
-extern void UCTransParams_clear PARAMS((
-	UCTransParams *		pT));
+extern void UCTransParams_clear (
+	UCTransParams *		pT);
 
-extern void UCSetBoxChars PARAMS((
+extern void UCSetBoxChars (
     int		cset,
     int *	pvert_out,
     int *	phori_out,
     int		vert_in,
-    int		hori_in));
+    int		hori_in);
 
 #ifndef HTSTREAM_H
 #include <HTStream.h>
 #endif /* HTSTREAM_H */
 
-typedef void putc_func_t PARAMS((
+typedef void putc_func_t (
 	HTStream *	me,
-	char		ch));
+	char		ch);
 
 #ifndef UCMAP_H
 #include <UCMap.h>
 #endif /* UCMAP_H */
 
-extern BOOL UCPutUtf8_charstring PARAMS((
+extern BOOL UCPutUtf8_charstring (
 	HTStream *	target,
 	putc_func_t *	actions,
-	UCode_t		code));
+	UCode_t		code);
 
-extern BOOL UCConvertUniToUtf8 PARAMS((
+extern BOOL UCConvertUniToUtf8 (
 	UCode_t		code,
-	char *		buffer));
+	char *		buffer);
 
-extern UCode_t UCGetUniFromUtf8String PARAMS((char ** ppuni));
+extern UCode_t UCGetUniFromUtf8String (char ** ppuni);
 
 #endif /* UCAUX_H */
diff --git a/WWW/Library/Implementation/UCDefs.h b/WWW/Library/Implementation/UCDefs.h
index b548d337..48b45533 100644
--- a/WWW/Library/Implementation/UCDefs.h
+++ b/WWW/Library/Implementation/UCDefs.h
@@ -10,7 +10,7 @@
 typedef struct _LYUCcharset {
     int UChndl;		/* -1 for "old" charsets, >= 0 for chartrans tables */
 
-    CONST char * MIMEname;
+    const char * MIMEname;
     int enc;
     int codepage;	/* if positive, an IBM OS/2 specific number;
 			   if negative, flag for no table translation */
diff --git a/WWW/Library/Implementation/UCMap.h b/WWW/Library/Implementation/UCMap.h
index 5c096141..66c24f0f 100644
--- a/WWW/Library/Implementation/UCMap.h
+++ b/WWW/Library/Implementation/UCMap.h
@@ -7,42 +7,42 @@
 
 typedef long UCode_t;
 
-extern int UCTransUniChar PARAMS((
+extern int UCTransUniChar (
 	UCode_t		unicode,
-	int		charset_out));
-extern int UCTransUniCharStr PARAMS((
+	int		charset_out);
+extern int UCTransUniCharStr (
 	char *		outbuf,
 	int		buflen,
 	UCode_t		unicode,
 	int		charset_out,
-	int		chk_single_flag));
-extern int UCTransChar PARAMS((
+	int		chk_single_flag);
+extern int UCTransChar (
 	char		ch_in,
 	int		charset_in,
-	int		charset_out));
-extern int UCReverseTransChar PARAMS((
+	int		charset_out);
+extern int UCReverseTransChar (
 	char		ch_out,
 	int		charset_in,
-	int		charset_out));
-extern int UCTransCharStr PARAMS((
+	int		charset_out);
+extern int UCTransCharStr (
 	char *		outbuf,
 	int		buflen,
 	char		ch_in,
 	int		charset_in,
 	int		charset_out,
-	int		chk_single_flag));
-extern UCode_t UCTransToUni PARAMS((
+	int		chk_single_flag);
+extern UCode_t UCTransToUni (
 	char		ch_in,
-	int		charset_in));
-extern int UCGetRawUniMode_byLYhndl PARAMS((
-	int		i));
-extern int UCGetLYhndl_byMIME PARAMS((
-	CONST char *	p)); /* returns -1 if name not recognized */
-extern int safeUCGetLYhndl_byMIME PARAMS((
-	CONST char *	p)); /* returns LATIN1 if name not recognized */
+	int		charset_in);
+extern int UCGetRawUniMode_byLYhndl (
+	int		i);
+extern int UCGetLYhndl_byMIME (
+	const char *	p); /* returns -1 if name not recognized */
+extern int safeUCGetLYhndl_byMIME (
+	const char *	p); /* returns LATIN1 if name not recognized */
 
 #ifdef EXP_LOCALE_CHARSET
-extern void LYFindLocaleCharset NOPARAMS;
+extern void LYFindLocaleCharset (void);
 #endif
 
 extern int UCLYhndl_for_unspec;
diff --git a/aclocal.m4 b/aclocal.m4
index 6adf90b4..ce39cdc6 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -822,7 +822,7 @@ if test "$cf_cv_bool_defs" = no ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_BUILD_CC version: 2 updated: 2004/01/19 16:20:54
+dnl CF_BUILD_CC version: 3 updated: 2004/02/17 20:55:59
 dnl -----------
 dnl If we're cross-compiling, allow the user to override the tools and their
 dnl options.  The configure script is oriented toward identifying the host
@@ -2204,43 +2204,61 @@ make an error
 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GNUTLS version: 3 updated: 2003/10/05 17:34:54
+dnl CF_GNUTLS version: 4 updated: 2004/04/26 20:08:48
 dnl ---------
 dnl Check for gnutls library (TLS "is" SSL)
 dnl $1 = the [optional] directory in which the library may be found
 AC_DEFUN([CF_GNUTLS],[
-cf_ssl_library="-lgnutls-extra -lgnutls -lcrypt"
+cf_ssl_library="-lgnutls -lcrypt"
+AC_MSG_CHECKING(if we know what directory gnutls is in)
 case "$1" in #(vi
 no) #(vi
-  ;;
+	cf_ssl_root=no
+	;;
 yes) #(vi
-  AC_CHECK_LIB(gnutls, SSL_connect,[],[
-  	if test -d /usr/local/gnutls ; then
-		CF_VERBOSE(assume it is in /usr/local/gnutls)
-		cf_ssl_library="-L/usr/local/gnutls/lib $cf_ssl_library"
-		CPPFLAGS="-I/usr/local/gnutls/include $CPPFLAGS"
-	else
-		AC_MSG_ERROR(cannot find gnutls library)
-	fi
+	AC_CHECK_LIB(gnutls, gnutls_init,[],[
+		cf_ssl_root=/usr/local/gnutls
+		if test -d $cf_ssl_root ; then
+			CF_VERBOSE(assume it is in $cf_ssl_root)
+		else
+			AC_MSG_ERROR(cannot find gnutls library)
+		fi
 	],
 	[-lgnutls-extra -lgnutls -lcrypt])
-  ;;
+	;;
 *)
-  if test -d $1 ; then
-    if test -d $1/include ; then
-      CPPFLAGS="$CPPFLAGS -I$1/include"
-      cf_ssl_library="-L$1/lib $cf_ssl_library"
-    else
-      cf_ssl_library="-L$1 $cf_ssl_library"
-      test -d $1/../include && CPPFLAGS="$CPPFLAGS -I$1/../include"
-    fi
-  else
-    AC_MSG_WARN(expected a directory: $1)
-  fi
-  ;;
+	if test -d $1 ; then
+		if test -d $1/include ; then
+			cf_ssl_root=$1
+		elif test -d $1/../include ; then
+			cf_ssl_root=$1/..
+		else
+			AC_MSG_ERROR(cannot find ssl library under $1)
+		fi
+	else
+		AC_MSG_WARN(expected a directory: $1)
+	fi
+	;;
 esac
+AC_MSG_RESULT($cf_ssl_root)
 LIBS="$cf_ssl_library $LIBS"
 
+cf_ssl_subincs=yes
+if test "$cf_ssl_root" != no ; then
+	cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
+	if test -d $cf_ssl_root/include ; then
+		CF_ADD_CFLAGS(-I$cf_ssl_root/include)
+		test -d $cf_ssl_root/include/gnutls || cf_ssl_subincs=no
+	fi
+fi
+
+AC_CHECK_LIB(gnutls-openssl,SSL_connect,
+	[LIBS="-lgnutls-openssl $LIBS"],
+	[AC_CHECK_LIB(gnutls-extra,SSL_connect,
+		[LIBS="-lgnutls-extra $LIBS"],
+		[AC_MSG_ERROR(cannot find gnutls openssl functions)])])
+
+if test "$cf_ssl_subincs" = yes ; then
 AC_MSG_CHECKING(for gnutls include directory)
 AC_TRY_COMPILE([
 #include <stdio.h>
@@ -2250,6 +2268,7 @@ AC_TRY_COMPILE([
 	[cf_openssl_incl=no])
 AC_MSG_RESULT($cf_openssl_incl)
 test "$cf_openssl_incl" = yes && AC_DEFINE(USE_GNUTLS_INCL)
+fi
 
 AC_MSG_CHECKING(if we can link to gnutls library)
 AC_TRY_LINK([
@@ -2619,7 +2638,9 @@ case $host_os in #(vi
 freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
-	AC_CHECK_LIB(mytinfo,tgoto,[cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"])
+	if test "$cf_nculib_root" = ncurses ; then
+		AC_CHECK_LIB(mytinfo,tgoto,[cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"])
+	fi
 	;;
 esac
 
@@ -3410,43 +3431,54 @@ if test "$cf_cv_srand_func" != unknown ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SSL version: 3 updated: 2003/10/05 17:34:54
+dnl CF_SSL version: 5 updated: 2004/04/26 20:08:48
 dnl ------
 dnl Check for ssl library
 dnl $1 = the [optional] directory in which the library may be found
 AC_DEFUN([CF_SSL],[
+cf_ssl_root=
 cf_ssl_library="-lssl -lcrypto"
 case "$1" in #(vi
 no) #(vi
-  ;;
+	;;
 yes) #(vi
-  AC_CHECK_LIB(ssl, SSL_get_version,[],[
-  	if test -d /usr/local/ssl ; then
-		CF_VERBOSE(assume it is in /usr/local/ssl)
-		cf_ssl_library="-L/usr/local/ssl/lib $cf_ssl_library"
-		CPPFLAGS="-I/usr/local/ssl/include $CPPFLAGS"
-	else
-		AC_MSG_ERROR(cannot find ssl library)
-	fi
+	AC_CHECK_LIB(ssl, SSL_get_version,[],[
+		cf_ssl_root=/usr/local/ssl
+		if test -d $cf_ssl_root ; then
+			CF_VERBOSE(assume it is in $cf_ssl_root)
+			cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
+		else
+			AC_MSG_ERROR(cannot find ssl library)
+		fi
 	],
 	[-lcrypto])
-  ;;
+	;;
 *)
-  if test -d $1 ; then
-    if test -d $1/include ; then
-      CPPFLAGS="$CPPFLAGS -I$1/include"
-      cf_ssl_library="-L$1/lib $cf_ssl_library"
-    else
-      cf_ssl_library="-L$1 $cf_ssl_library"
-      test -d $1/../include && CPPFLAGS="$CPPFLAGS -I$1/../include"
-    fi
-  else
-    AC_MSG_WARN(expected a directory: $1)
-  fi
-  ;;
+	if test -d $1 ; then
+		if test -d $1/include ; then
+			cf_ssl_root=$1
+		elif test -d $1/../include ; then
+			cf_ssl_root=$1/..
+		else
+			AC_MSG_ERROR(cannot find ssl library under $1)
+		fi
+		cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
+	else
+		AC_MSG_WARN(expected a directory: $1)
+	fi
+	;;
 esac
 LIBS="$cf_ssl_library $LIBS"
 
+cf_ssl_subincs=yes
+if test -n "$cf_ssl_root" ; then
+	if test -d $cf_ssl_root/include ; then
+		CF_ADD_CFLAGS(-I$cf_ssl_root/include)
+		test -d $cf_ssl_root/include/openssl || cf_ssl_subincs=no
+	fi
+fi
+
+if test "$cf_ssl_subincs" = yes ; then
 AC_MSG_CHECKING(for openssl include directory)
 AC_TRY_COMPILE([
 #include <stdio.h>
@@ -3456,6 +3488,7 @@ AC_TRY_COMPILE([
 	[cf_openssl_incl=no])
 AC_MSG_RESULT($cf_openssl_incl)
 test "$cf_openssl_incl" = yes && AC_DEFINE(USE_OPENSSL_INCL)
+fi
 
 AC_MSG_CHECKING(if we can link to ssl library)
 AC_TRY_LINK([
@@ -4514,59 +4547,33 @@ CF_UPPER(cf_x_athena_LIBS,HAVE_LIB_$cf_x_athena)
 AC_DEFINE_UNQUOTED($cf_x_athena_LIBS)
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_X_TOOLKIT version: 9 updated: 2001/12/30 19:09:58
+dnl CF_X_TOOLKIT version: 10 updated: 2004/04/25 15:37:17
 dnl ------------
 dnl Check for X Toolkit libraries
 dnl
 AC_DEFUN([CF_X_TOOLKIT],
 [
+AC_REQUIRE([AC_PATH_XTRA])
 AC_REQUIRE([CF_CHECK_CACHE])
-# We need to check for -lsocket and -lnsl here in order to work around an
-# autoconf bug.  autoconf-2.12 is not checking for these prior to checking for
-# the X11R6 -lSM and -lICE libraries.  The resultant failures cascade...
-# 	(tested on Solaris 2.5 w/ X11R6)
-SYSTEM_NAME=`echo "$cf_cv_system_name"|tr ' ' -`
+
+# SYSTEM_NAME=`echo "$cf_cv_system_name"|tr ' ' -`
+
 cf_have_X_LIBS=no
-case $SYSTEM_NAME in
-irix[[56]]*) ;;
-clix*)
-	# FIXME: modify the library lookup in autoconf to
-	# allow _s.a suffix ahead of .a
-	AC_CHECK_LIB(c_s,open,
-		[LIBS="-lc_s $LIBS"
-	AC_CHECK_LIB(bsd,gethostname,
-		[LIBS="-lbsd $LIBS"
-	AC_CHECK_LIB(nsl_s,gethostname,
-		[LIBS="-lnsl_s $LIBS"
-	AC_CHECK_LIB(X11_s,XOpenDisplay,
-		[LIBS="-lX11_s $LIBS"
-	AC_CHECK_LIB(Xt_s,XtAppInitialize,
-		[LIBS="-lXt_s $LIBS"
-		 cf_have_X_LIBS=Xt
-		]) ]) ]) ]) ])
-	;;
-*)
-	AC_CHECK_LIB(socket,socket)
-	AC_CHECK_LIB(nsl,gethostname)
-	;;
-esac
 
-if test $cf_have_X_LIBS = no ; then
-	AC_PATH_XTRA
-	LDFLAGS="$LDFLAGS $X_LIBS"
-	CF_CHECK_CFLAGS($X_CFLAGS)
-	AC_CHECK_LIB(X11,XOpenDisplay,
-		[LIBS="-lX11 $LIBS"],,
-		[$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])
-	AC_CHECK_LIB(Xt, XtAppInitialize,
-		[AC_DEFINE(HAVE_LIBXT)
-		 cf_have_X_LIBS=Xt
-		 LIBS="-lXt $X_PRE_LIBS $LIBS"],,
-		[$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])
-else
-	LDFLAGS="$LDFLAGS $X_LIBS"
-	CF_CHECK_CFLAGS($X_CFLAGS)
-fi
+LDFLAGS="$X_LIBS $LDFLAGS"
+CF_CHECK_CFLAGS($X_CFLAGS)
+
+AC_CHECK_FUNC(XOpenDisplay,,[
+AC_CHECK_LIB(X11,XOpenDisplay,
+	[LIBS="-lX11 $LIBS"],,
+	[$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])])
+
+AC_CHECK_FUNC(XtAppInitialize,,[
+AC_CHECK_LIB(Xt, XtAppInitialize,
+	[AC_DEFINE(HAVE_LIBXT)
+	 cf_have_X_LIBS=Xt
+	 LIBS="-lXt $X_PRE_LIBS $LIBS"],,
+	[$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])])
 
 if test $cf_have_X_LIBS = no ; then
 	AC_WARN(
diff --git a/cfg_defs.sh b/cfg_defs.sh
index 1be17106..44bd4cef 100755
--- a/cfg_defs.sh
+++ b/cfg_defs.sh
@@ -12,9 +12,9 @@ cat >$OUT <<EOF
 #ifndef CFG_DEFS_H
 #define CFG_DEFS_H 1
 
-static CONST struct {
-	CONST char *name;
-	CONST char *value;
+static const struct {
+	const char *name;
+	const char *value;
 } config_cache[] = {
 EOF
 
@@ -28,9 +28,9 @@ sed \
 cat >>$OUT <<EOF
 };
 
-static CONST struct {
-	CONST char *name;
-	CONST char *value;
+static const struct {
+	const char *name;
+	const char *value;
 } config_defines[] = {
 EOF
 fgrep	'#define' lynx_cfg.h |
diff --git a/config.guess b/config.guess
index c033ee21..2b3086b5 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2004-01-05'
+timestamp='2004-02-16'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -197,12 +197,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
+    amd64:OpenBSD:*:*)
+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     arc:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    cats:OpenBSD:*:*)
+	echo arm-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -239,6 +245,15 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:MirBSD:*:*)
+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
     alpha:OSF1:*:*)
 	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -405,6 +420,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
@@ -1230,8 +1248,8 @@ EOF
     SEI:*:*:SEIUX)
 	echo mips-sei-seiux${UNAME_RELEASE}
 	exit 0 ;;
-    *:DRAGONFLY:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE}
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
 esac
 
diff --git a/config.sub b/config.sub
index 6b6c9d6d..99527bce 100755
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2004-01-05'
+timestamp='2004-02-23'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -363,6 +363,9 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+	abacus)
+		basic_machine=abacus-unknown
+		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -442,12 +445,20 @@ case $basic_machine in
 		basic_machine=j90-cray
 		os=-unicos
 		;;
+	cr16c)
+		basic_machine=cr16c-unknown
+		os=-elf
+		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -1143,8 +1154,9 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
diff --git a/configure b/configure
index 66833621..92eb4dd4 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in 2.8.5rel.1.
+# From configure.in 2.8.6dev.1.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20030208.
 #
@@ -1183,7 +1183,7 @@ fi
 
 PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.6dev.1
+VERSION=2.8.6dev.2
 
 test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
 
@@ -2239,6 +2239,54 @@ fi
   test -n "$LINT" && break
 done
 
+echo "$as_me:2242: checking for AIX" >&5
+echo $ECHO_N "checking for AIX... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line 2245 "configure"
+#include "confdefs.h"
+#ifdef _AIX
+  yes
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "yes" >/dev/null 2>&1; then
+  echo "$as_me:2254: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+cat >>confdefs.h <<\EOF
+#define _ALL_SOURCE 1
+EOF
+
+else
+  echo "$as_me:2261: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+rm -f conftest*
+
+echo "$as_me:2266: checking for POSIXized ISC" >&5
+echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
+if test -d /etc/conf/kconfig.d &&
+   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
+then
+  echo "$as_me:2271: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  ISC=yes # If later tests want to check for ISC.
+
+cat >>confdefs.h <<\EOF
+#define _POSIX_SOURCE 1
+EOF
+
+  if test "$GCC" = yes; then
+    CC="$CC -posix"
+  else
+    CC="$CC -Xp"
+  fi
+else
+  echo "$as_me:2285: result: no" >&5
+echo "${ECHO_T}no" >&6
+  ISC=
+fi
+
 case $cf_cv_system_name in
 os2*)
     CFLAGS="$CFLAGS -Zmt"
@@ -2276,7 +2324,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2279: checking for $ac_word" >&5
+echo "$as_me:2327: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_BUILD_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2291,7 +2339,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:2294: found $ac_dir/$ac_word" >&5
+echo "$as_me:2342: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2299,10 +2347,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:2302: result: $BUILD_CC" >&5
+  echo "$as_me:2350: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:2305: result: no" >&5
+  echo "$as_me:2353: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2359,7 +2407,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:2362: checking for $ac_word" >&5
+echo "$as_me:2410: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2374,7 +2422,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:2377: found $ac_dir/$ac_word" >&5
+echo "$as_me:2425: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2382,10 +2430,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:2385: result: $RANLIB" >&5
+  echo "$as_me:2433: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:2388: result: no" >&5
+  echo "$as_me:2436: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2394,7 +2442,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:2397: checking for $ac_word" >&5
+echo "$as_me:2445: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2409,7 +2457,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:2412: found $ac_dir/$ac_word" >&5
+echo "$as_me:2460: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2418,10 +2466,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:2421: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:2469: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:2424: result: no" >&5
+  echo "$as_me:2472: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2433,7 +2481,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:2436: checking for $ac_word" >&5
+echo "$as_me:2484: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2448,7 +2496,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:2451: found $ac_dir/$ac_word" >&5
+echo "$as_me:2499: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2456,10 +2504,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:2459: result: $AR" >&5
+  echo "$as_me:2507: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:2462: result: no" >&5
+  echo "$as_me:2510: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2468,7 +2516,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:2471: checking for $ac_word" >&5
+echo "$as_me:2519: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2483,7 +2531,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:2486: found $ac_dir/$ac_word" >&5
+echo "$as_me:2534: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2492,10 +2540,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:2495: result: $ac_ct_AR" >&5
+  echo "$as_me:2543: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:2498: result: no" >&5
+  echo "$as_me:2546: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2508,10 +2556,10 @@ if test "${cf_cv_subst_AR_OPTS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "$as_me:2511: checking for archiver options (symbol AR_OPTS)" >&5
+echo "$as_me:2559: checking for archiver options (symbol AR_OPTS)" >&5
 echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
 test -z "$AR_OPTS" && AR_OPTS=rv
-echo "$as_me:2514: result: $AR_OPTS" >&5
+echo "$as_me:2562: result: $AR_OPTS" >&5
 echo "${ECHO_T}$AR_OPTS" >&6
 
 cf_cv_subst_AR_OPTS=$AR_OPTS
@@ -2519,54 +2567,6 @@ fi
 
 AR_OPTS=${cf_cv_subst_AR_OPTS}
 
-echo "$as_me:2522: checking for AIX" >&5
-echo $ECHO_N "checking for AIX... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 2525 "configure"
-#include "confdefs.h"
-#ifdef _AIX
-  yes
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "yes" >/dev/null 2>&1; then
-  echo "$as_me:2534: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-cat >>confdefs.h <<\EOF
-#define _ALL_SOURCE 1
-EOF
-
-else
-  echo "$as_me:2541: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-rm -f conftest*
-
-echo "$as_me:2546: checking for POSIXized ISC" >&5
-echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
-if test -d /etc/conf/kconfig.d &&
-   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
-then
-  echo "$as_me:2551: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-  ISC=yes # If later tests want to check for ISC.
-
-cat >>confdefs.h <<\EOF
-#define _POSIX_SOURCE 1
-EOF
-
-  if test "$GCC" = yes; then
-    CC="$CC -posix"
-  else
-    CC="$CC -Xp"
-  fi
-else
-  echo "$as_me:2565: result: no" >&5
-echo "${ECHO_T}no" >&6
-  ISC=
-fi
-
 echo "$as_me:2570: checking if you want to see long compiling messages" >&5
 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
 
@@ -7683,13 +7683,14 @@ fi
 
 if test "x$cf_cv_use_libssl"  != xno ; then
 
+cf_ssl_root=
 cf_ssl_library="-lssl -lcrypto"
 case "$cf_cv_use_libssl" in #(vi
 no) #(vi
-  ;;
+	;;
 yes) #(vi
 
-echo "$as_me:7692: checking for SSL_get_version in -lssl" >&5
+echo "$as_me:7693: checking for SSL_get_version in -lssl" >&5
 echo $ECHO_N "checking for SSL_get_version in -lssl... $ECHO_C" >&6
 if test "${ac_cv_lib_ssl_SSL_get_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7697,7 +7698,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lssl -lcrypto $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7700 "configure"
+#line 7701 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7716,16 +7717,16 @@ SSL_get_version ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7719: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7720: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7722: \$? = $ac_status" >&5
+  echo "$as_me:7723: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7726: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7728: \$? = $ac_status" >&5
+  echo "$as_me:7729: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ssl_SSL_get_version=yes
 else
@@ -7736,7 +7737,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7739: result: $ac_cv_lib_ssl_SSL_get_version" >&5
+echo "$as_me:7740: result: $ac_cv_lib_ssl_SSL_get_version" >&5
 echo "${ECHO_T}$ac_cv_lib_ssl_SSL_get_version" >&6
 if test $ac_cv_lib_ssl_SSL_get_version = yes; then
   cat >>confdefs.h <<EOF
@@ -7747,41 +7748,83 @@ EOF
 
 else
 
-  	if test -d /usr/local/ssl ; then
-		test -n "$verbose" && echo "	assume it is in /usr/local/ssl" 1>&6
+		cf_ssl_root=/usr/local/ssl
+		if test -d $cf_ssl_root ; then
+			test -n "$verbose" && echo "	assume it is in $cf_ssl_root" 1>&6
 
-		cf_ssl_library="-L/usr/local/ssl/lib $cf_ssl_library"
-		CPPFLAGS="-I/usr/local/ssl/include $CPPFLAGS"
-	else
-		{ { echo "$as_me:7756: error: cannot find ssl library" >&5
+			cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
+		else
+			{ { echo "$as_me:7757: error: cannot find ssl library" >&5
 echo "$as_me: error: cannot find ssl library" >&2;}
    { (exit 1); exit 1; }; }
-	fi
+		fi
 
 fi
 
-  ;;
+	;;
 *)
-  if test -d $cf_cv_use_libssl ; then
-    if test -d $cf_cv_use_libssl/include ; then
-      CPPFLAGS="$CPPFLAGS -I$cf_cv_use_libssl/include"
-      cf_ssl_library="-L$cf_cv_use_libssl/lib $cf_ssl_library"
-    else
-      cf_ssl_library="-L$cf_cv_use_libssl $cf_ssl_library"
-      test -d $cf_cv_use_libssl/../include && CPPFLAGS="$CPPFLAGS -I$cf_cv_use_libssl/../include"
-    fi
-  else
-    { echo "$as_me:7774: WARNING: expected a directory: $cf_cv_use_libssl" >&5
+	if test -d $cf_cv_use_libssl ; then
+		if test -d $cf_cv_use_libssl/include ; then
+			cf_ssl_root=$cf_cv_use_libssl
+		elif test -d $cf_cv_use_libssl/../include ; then
+			cf_ssl_root=$cf_cv_use_libssl/..
+		else
+			{ { echo "$as_me:7772: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+echo "$as_me: error: cannot find ssl library under $cf_cv_use_libssl" >&2;}
+   { (exit 1); exit 1; }; }
+		fi
+		cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
+	else
+		{ echo "$as_me:7778: WARNING: expected a directory: $cf_cv_use_libssl" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libssl" >&2;}
-  fi
-  ;;
+	fi
+	;;
 esac
 LIBS="$cf_ssl_library $LIBS"
 
-echo "$as_me:7781: checking for openssl include directory" >&5
+cf_ssl_subincs=yes
+if test -n "$cf_ssl_root" ; then
+	if test -d $cf_ssl_root/include ; then
+
+cf_new_cflags=
+cf_new_cppflags=
+for cf_add_cflags in -I$cf_ssl_root/include
+do
+	case $cf_add_cflags in #(vi
+	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+		case "$CPPFLAGS" in
+		*$cf_add_cflags) #(vi
+			;;
+		*) #(vi
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+			;;
+		esac
+		;;
+	*)
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+		;;
+	esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+fi
+
+		test -d $cf_ssl_root/include/openssl || cf_ssl_subincs=no
+	fi
+fi
+
+if test "$cf_ssl_subincs" = yes ; then
+echo "$as_me:7824: checking for openssl include directory" >&5
 echo $ECHO_N "checking for openssl include directory... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 7784 "configure"
+#line 7827 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -7795,16 +7838,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7798: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7841: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7801: \$? = $ac_status" >&5
+  echo "$as_me:7844: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7807: \$? = $ac_status" >&5
+  echo "$as_me:7850: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_openssl_incl=yes
 else
@@ -7813,16 +7856,18 @@ cat conftest.$ac_ext >&5
 cf_openssl_incl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:7816: result: $cf_openssl_incl" >&5
+echo "$as_me:7859: result: $cf_openssl_incl" >&5
 echo "${ECHO_T}$cf_openssl_incl" >&6
 test "$cf_openssl_incl" = yes && cat >>confdefs.h <<\EOF
 #define USE_OPENSSL_INCL 1
 EOF
 
-echo "$as_me:7822: checking if we can link to ssl library" >&5
+fi
+
+echo "$as_me:7867: checking if we can link to ssl library" >&5
 echo $ECHO_N "checking if we can link to ssl library... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 7825 "configure"
+#line 7870 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -7841,16 +7886,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7844: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7889: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7847: \$? = $ac_status" >&5
+  echo "$as_me:7892: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7853: \$? = $ac_status" >&5
+  echo "$as_me:7898: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_library=yes
 else
@@ -7859,7 +7904,7 @@ cat conftest.$ac_ext >&5
 cf_ssl_library=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:7862: result: $cf_ssl_library" >&5
+echo "$as_me:7907: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -7871,28 +7916,31 @@ EOF
 EOF
 
 else
-	{ { echo "$as_me:7874: error: Cannot link with ssl library" >&5
+	{ { echo "$as_me:7919: error: Cannot link with ssl library" >&5
 echo "$as_me: error: Cannot link with ssl library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 elif test "x$cf_cv_use_libgnutls" != xno ; then
 
-cf_ssl_library="-lgnutls-extra -lgnutls -lcrypt"
+cf_ssl_library="-lgnutls -lcrypt"
+echo "$as_me:7927: checking if we know what directory gnutls is in" >&5
+echo $ECHO_N "checking if we know what directory gnutls is in... $ECHO_C" >&6
 case "$cf_cv_use_libgnutls" in #(vi
 no) #(vi
-  ;;
+	cf_ssl_root=no
+	;;
 yes) #(vi
 
-echo "$as_me:7887: checking for SSL_connect in -lgnutls" >&5
-echo $ECHO_N "checking for SSL_connect in -lgnutls... $ECHO_C" >&6
-if test "${ac_cv_lib_gnutls_SSL_connect+set}" = set; then
+echo "$as_me:7935: checking for gnutls_init in -lgnutls" >&5
+echo $ECHO_N "checking for gnutls_init in -lgnutls... $ECHO_C" >&6
+if test "${ac_cv_lib_gnutls_gnutls_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls -lgnutls-extra -lgnutls -lcrypt $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7895 "configure"
+#line 7943 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7901,39 +7949,39 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char SSL_connect ();
+char gnutls_init ();
 int
 main ()
 {
-SSL_connect ();
+gnutls_init ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7914: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7962: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7917: \$? = $ac_status" >&5
+  echo "$as_me:7965: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7923: \$? = $ac_status" >&5
+  echo "$as_me:7971: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_gnutls_SSL_connect=yes
+  ac_cv_lib_gnutls_gnutls_init=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-ac_cv_lib_gnutls_SSL_connect=no
+ac_cv_lib_gnutls_gnutls_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7934: result: $ac_cv_lib_gnutls_SSL_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_gnutls_SSL_connect" >&6
-if test $ac_cv_lib_gnutls_SSL_connect = yes; then
+echo "$as_me:7982: result: $ac_cv_lib_gnutls_gnutls_init" >&5
+echo "${ECHO_T}$ac_cv_lib_gnutls_gnutls_init" >&6
+if test $ac_cv_lib_gnutls_gnutls_init = yes; then
   cat >>confdefs.h <<EOF
 #define HAVE_LIBGNUTLS 1
 EOF
@@ -7942,41 +7990,195 @@ EOF
 
 else
 
-  	if test -d /usr/local/gnutls ; then
-		test -n "$verbose" && echo "	assume it is in /usr/local/gnutls" 1>&6
+		cf_ssl_root=/usr/local/gnutls
+		if test -d $cf_ssl_root ; then
+			test -n "$verbose" && echo "	assume it is in $cf_ssl_root" 1>&6
 
-		cf_ssl_library="-L/usr/local/gnutls/lib $cf_ssl_library"
-		CPPFLAGS="-I/usr/local/gnutls/include $CPPFLAGS"
-	else
-		{ { echo "$as_me:7951: error: cannot find gnutls library" >&5
+		else
+			{ { echo "$as_me:7998: error: cannot find gnutls library" >&5
 echo "$as_me: error: cannot find gnutls library" >&2;}
    { (exit 1); exit 1; }; }
-	fi
+		fi
 
 fi
 
-  ;;
+	;;
 *)
-  if test -d $cf_cv_use_libgnutls ; then
-    if test -d $cf_cv_use_libgnutls/include ; then
-      CPPFLAGS="$CPPFLAGS -I$cf_cv_use_libgnutls/include"
-      cf_ssl_library="-L$cf_cv_use_libgnutls/lib $cf_ssl_library"
-    else
-      cf_ssl_library="-L$cf_cv_use_libgnutls $cf_ssl_library"
-      test -d $cf_cv_use_libgnutls/../include && CPPFLAGS="$CPPFLAGS -I$cf_cv_use_libgnutls/../include"
-    fi
-  else
-    { echo "$as_me:7969: WARNING: expected a directory: $cf_cv_use_libgnutls" >&5
+	if test -d $cf_cv_use_libgnutls ; then
+		if test -d $cf_cv_use_libgnutls/include ; then
+			cf_ssl_root=$cf_cv_use_libgnutls
+		elif test -d $cf_cv_use_libgnutls/../include ; then
+			cf_ssl_root=$cf_cv_use_libgnutls/..
+		else
+			{ { echo "$as_me:8013: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
+   { (exit 1); exit 1; }; }
+		fi
+	else
+		{ echo "$as_me:8018: WARNING: expected a directory: $cf_cv_use_libgnutls" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libgnutls" >&2;}
-  fi
-  ;;
+	fi
+	;;
 esac
+echo "$as_me:8023: result: $cf_ssl_root" >&5
+echo "${ECHO_T}$cf_ssl_root" >&6
 LIBS="$cf_ssl_library $LIBS"
 
-echo "$as_me:7976: checking for gnutls include directory" >&5
+cf_ssl_subincs=yes
+if test "$cf_ssl_root" != no ; then
+	cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
+	if test -d $cf_ssl_root/include ; then
+
+cf_new_cflags=
+cf_new_cppflags=
+for cf_add_cflags in -I$cf_ssl_root/include
+do
+	case $cf_add_cflags in #(vi
+	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+		case "$CPPFLAGS" in
+		*$cf_add_cflags) #(vi
+			;;
+		*) #(vi
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+			;;
+		esac
+		;;
+	*)
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+		;;
+	esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+fi
+
+		test -d $cf_ssl_root/include/gnutls || cf_ssl_subincs=no
+	fi
+fi
+
+echo "$as_me:8066: checking for SSL_connect in -lgnutls-openssl" >&5
+echo $ECHO_N "checking for SSL_connect in -lgnutls-openssl... $ECHO_C" >&6
+if test "${ac_cv_lib_gnutls_openssl_SSL_connect+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgnutls-openssl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line 8074 "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char SSL_connect ();
+int
+main ()
+{
+SSL_connect ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:8093: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8096: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:8099: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8102: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_gnutls_openssl_SSL_connect=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_gnutls_openssl_SSL_connect=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:8113: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "${ECHO_T}$ac_cv_lib_gnutls_openssl_SSL_connect" >&6
+if test $ac_cv_lib_gnutls_openssl_SSL_connect = yes; then
+  LIBS="-lgnutls-openssl $LIBS"
+else
+  echo "$as_me:8118: checking for SSL_connect in -lgnutls-extra" >&5
+echo $ECHO_N "checking for SSL_connect in -lgnutls-extra... $ECHO_C" >&6
+if test "${ac_cv_lib_gnutls_extra_SSL_connect+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgnutls-extra  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line 8126 "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char SSL_connect ();
+int
+main ()
+{
+SSL_connect ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:8145: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8148: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:8151: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8154: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_gnutls_extra_SSL_connect=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_gnutls_extra_SSL_connect=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:8165: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "${ECHO_T}$ac_cv_lib_gnutls_extra_SSL_connect" >&6
+if test $ac_cv_lib_gnutls_extra_SSL_connect = yes; then
+  LIBS="-lgnutls-extra $LIBS"
+else
+  { { echo "$as_me:8170: error: cannot find gnutls openssl functions" >&5
+echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+fi
+
+if test "$cf_ssl_subincs" = yes ; then
+echo "$as_me:8178: checking for gnutls include directory" >&5
 echo $ECHO_N "checking for gnutls include directory... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 7979 "configure"
+#line 8181 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -7990,16 +8192,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7993: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8195: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7996: \$? = $ac_status" >&5
+  echo "$as_me:8198: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8002: \$? = $ac_status" >&5
+  echo "$as_me:8204: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_openssl_incl=yes
 else
@@ -8008,16 +8210,18 @@ cat conftest.$ac_ext >&5
 cf_openssl_incl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:8011: result: $cf_openssl_incl" >&5
+echo "$as_me:8213: result: $cf_openssl_incl" >&5
 echo "${ECHO_T}$cf_openssl_incl" >&6
 test "$cf_openssl_incl" = yes && cat >>confdefs.h <<\EOF
 #define USE_GNUTLS_INCL 1
 EOF
 
-echo "$as_me:8017: checking if we can link to gnutls library" >&5
+fi
+
+echo "$as_me:8221: checking if we can link to gnutls library" >&5
 echo $ECHO_N "checking if we can link to gnutls library... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 8020 "configure"
+#line 8224 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -8036,16 +8240,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8039: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8243: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8042: \$? = $ac_status" >&5
+  echo "$as_me:8246: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8048: \$? = $ac_status" >&5
+  echo "$as_me:8252: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_library=yes
 else
@@ -8054,7 +8258,7 @@ cat conftest.$ac_ext >&5
 cf_ssl_library=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:8057: result: $cf_ssl_library" >&5
+echo "$as_me:8261: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -8062,15 +8266,15 @@ if test "$cf_ssl_library" = yes ; then
 EOF
 
 else
-	{ { echo "$as_me:8065: error: Cannot link with gnutls library" >&5
+	{ { echo "$as_me:8269: error: Cannot link with gnutls library" >&5
 echo "$as_me: error: Cannot link with gnutls library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:8070: checking for X509 support" >&5
+echo "$as_me:8274: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 8073 "configure"
+#line 8277 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -8090,16 +8294,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(X509_STORE_CTX *0));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8093: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8297: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8096: \$? = $ac_status" >&5
+  echo "$as_me:8300: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8102: \$? = $ac_status" >&5
+  echo "$as_me:8306: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=no
 else
@@ -8107,7 +8311,7 @@ else
 cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:8110: result: $cf_x509_support" >&5
+echo "$as_me:8314: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 if test "$cf_x509_support" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -8118,7 +8322,7 @@ fi
 
 fi
 
-echo "$as_me:8121: checking for screen type" >&5
+echo "$as_me:8325: checking for screen type" >&5
 echo $ECHO_N "checking for screen type... $ECHO_C" >&6
 if test "${cf_cv_screen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8132,7 +8336,7 @@ case $withval in
 curses|ncurses|ncursesw|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
-*)	{ { echo "$as_me:8135: error: Unexpected value" >&5
+*)	{ { echo "$as_me:8339: error: Unexpected value" >&5
 echo "$as_me: error: Unexpected value" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -8141,7 +8345,7 @@ else
   cf_cv_screen=curses
 fi;
 fi
-echo "$as_me:8144: result: $cf_cv_screen" >&5
+echo "$as_me:8348: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
@@ -8170,7 +8374,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%`
   ;;
 *)
-  { { echo "$as_me:8173: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:8377: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -8187,7 +8391,7 @@ esac
 case $cf_cv_screen in
 curses)
 
-echo "$as_me:8190: checking for extra include directories" >&5
+echo "$as_me:8394: checking for extra include directories" >&5
 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
 if test "${cf_cv_curses_incdir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8207,11 +8411,11 @@ sunos3*|sunos4*)
 esac
 
 fi
-echo "$as_me:8210: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:8414: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS"
 
-echo "$as_me:8214: checking if we have identified curses headers" >&5
+echo "$as_me:8418: checking if we have identified curses headers" >&5
 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8225,7 +8429,7 @@ for cf_header in \
 	ncurses/ncurses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 8228 "configure"
+#line 8432 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -8237,16 +8441,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8240: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8444: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8243: \$? = $ac_status" >&5
+  echo "$as_me:8447: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8249: \$? = $ac_status" >&5
+  echo "$as_me:8453: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -8257,11 +8461,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:8260: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:8464: result: $cf_cv_ncurses_header" >&5
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
-	{ { echo "$as_me:8264: error: No curses header-files found" >&5
+	{ { echo "$as_me:8468: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8271,23 +8475,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8274: checking for $ac_header" >&5
+echo "$as_me:8478: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8280 "configure"
+#line 8484 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8284: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8488: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8290: \$? = $ac_status" >&5
+  echo "$as_me:8494: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8306,7 +8510,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8309: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8513: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8316,7 +8520,7 @@ EOF
 fi
 done
 
-echo "$as_me:8319: checking for ncurses version" >&5
+echo "$as_me:8523: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8342,10 +8546,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:8345: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:8549: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:8348: \$? = $ac_status" >&5
+  echo "$as_me:8552: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -8355,7 +8559,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8358 "configure"
+#line 8562 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -8380,15 +8584,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8383: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8587: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8386: \$? = $ac_status" >&5
+  echo "$as_me:8590: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8592: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8391: \$? = $ac_status" >&5
+  echo "$as_me:8595: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -8402,16 +8606,16 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:8405: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:8609: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:8411: checking if we have identified curses libraries" >&5
+echo "$as_me:8615: checking if we have identified curses libraries" >&5
 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 8414 "configure"
+#line 8618 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -8423,16 +8627,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8426: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8630: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8429: \$? = $ac_status" >&5
+  echo "$as_me:8633: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8636: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8435: \$? = $ac_status" >&5
+  echo "$as_me:8639: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -8441,13 +8645,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:8444: result: $cf_result" >&5
+echo "$as_me:8648: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case $host_os in #(vi
 freebsd*) #(vi
-	echo "$as_me:8450: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:8654: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8455,7 +8659,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8458 "configure"
+#line 8662 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8474,16 +8678,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8477: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8681: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8480: \$? = $ac_status" >&5
+  echo "$as_me:8684: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8486: \$? = $ac_status" >&5
+  echo "$as_me:8690: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -8494,7 +8698,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8497: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:8701: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   LIBS="-lmytinfo $LIBS"
@@ -8502,7 +8706,7 @@ fi
 
 	;;
 hpux10.*|hpux11.*) #(vi
-	echo "$as_me:8505: checking for initscr in -lcur_colr" >&5
+	echo "$as_me:8709: checking for initscr in -lcur_colr" >&5
 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8510,7 +8714,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8513 "configure"
+#line 8717 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8529,16 +8733,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8532: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8736: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8535: \$? = $ac_status" >&5
+  echo "$as_me:8739: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8538: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8742: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8541: \$? = $ac_status" >&5
+  echo "$as_me:8745: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -8549,7 +8753,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8552: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:8756: result: $ac_cv_lib_cur_colr_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
 if test $ac_cv_lib_cur_colr_initscr = yes; then
 
@@ -8558,7 +8762,7 @@ if test $ac_cv_lib_cur_colr_initscr = yes; then
 
 else
 
-	echo "$as_me:8561: checking for initscr in -lHcurses" >&5
+	echo "$as_me:8765: checking for initscr in -lHcurses" >&5
 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8566,7 +8770,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8569 "configure"
+#line 8773 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8585,16 +8789,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8588: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8792: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8591: \$? = $ac_status" >&5
+  echo "$as_me:8795: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8594: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8798: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8597: \$? = $ac_status" >&5
+  echo "$as_me:8801: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -8605,7 +8809,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8608: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:8812: result: $ac_cv_lib_Hcurses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
 if test $ac_cv_lib_Hcurses_initscr = yes; then
 
@@ -8643,13 +8847,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 
 	# Check for library containing tgoto.  Do this before curses library
 	# because it may be needed to link the test-case for initscr.
-	echo "$as_me:8646: checking for tgoto" >&5
+	echo "$as_me:8850: checking for tgoto" >&5
 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
 if test "${ac_cv_func_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8652 "configure"
+#line 8856 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -8680,16 +8884,16 @@ f = tgoto;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8683: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8887: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8686: \$? = $ac_status" >&5
+  echo "$as_me:8890: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8692: \$? = $ac_status" >&5
+  echo "$as_me:8896: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -8699,7 +8903,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8702: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:8906: result: $ac_cv_func_tgoto" >&5
 echo "${ECHO_T}$ac_cv_func_tgoto" >&6
 if test $ac_cv_func_tgoto = yes; then
   cf_term_lib=predefined
@@ -8708,7 +8912,7 @@ else
 		for cf_term_lib in $cf_check_list termcap termlib unknown
 		do
 			as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:8711: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:8915: checking for tgoto in -l$cf_term_lib" >&5
 echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8716,7 +8920,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8719 "configure"
+#line 8923 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8735,16 +8939,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8738: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8942: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8741: \$? = $ac_status" >&5
+  echo "$as_me:8945: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8744: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8948: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8747: \$? = $ac_status" >&5
+  echo "$as_me:8951: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -8755,7 +8959,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8758: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:8962: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   break
@@ -8770,7 +8974,7 @@ fi
 	for cf_curs_lib in $cf_check_list xcurses jcurses unknown
 	do
 		as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
-echo "$as_me:8773: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:8977: checking for initscr in -l$cf_curs_lib" >&5
 echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8778,7 +8982,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8781 "configure"
+#line 8985 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8797,16 +9001,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8800: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9004: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8803: \$? = $ac_status" >&5
+  echo "$as_me:9007: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8806: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9010: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8809: \$? = $ac_status" >&5
+  echo "$as_me:9013: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -8817,23 +9021,23 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8820: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:9024: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   break
 fi
 
 	done
-	test $cf_curs_lib = unknown && { { echo "$as_me:8827: error: no curses library found" >&5
+	test $cf_curs_lib = unknown && { { echo "$as_me:9031: error: no curses library found" >&5
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 
 	LIBS="-l$cf_curs_lib $cf_save_LIBS"
 	if test "$cf_term_lib" = unknown ; then
-		echo "$as_me:8833: checking if we can link with $cf_curs_lib library" >&5
+		echo "$as_me:9037: checking if we can link with $cf_curs_lib library" >&5
 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 8836 "configure"
+#line 9040 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -8845,16 +9049,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8848: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9052: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8851: \$? = $ac_status" >&5
+  echo "$as_me:9055: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9058: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8857: \$? = $ac_status" >&5
+  echo "$as_me:9061: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -8863,18 +9067,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:8866: result: $cf_result" >&5
+		echo "$as_me:9070: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-		test $cf_result = no && { { echo "$as_me:8868: error: Cannot link curses library" >&5
+		test $cf_result = no && { { echo "$as_me:9072: error: Cannot link curses library" >&5
 echo "$as_me: error: Cannot link curses library" >&2;}
    { (exit 1); exit 1; }; }
 	elif test "$cf_curs_lib" = "$cf_term_lib" ; then
 		:
 	elif test "$cf_term_lib" != predefined ; then
-		echo "$as_me:8874: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+		echo "$as_me:9078: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 8877 "configure"
+#line 9081 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -8886,16 +9090,16 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8889: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9093: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8892: \$? = $ac_status" >&5
+  echo "$as_me:9096: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9099: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8898: \$? = $ac_status" >&5
+  echo "$as_me:9102: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -8904,7 +9108,7 @@ cat conftest.$ac_ext >&5
 
 			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 8907 "configure"
+#line 9111 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -8916,16 +9120,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8919: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9123: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8922: \$? = $ac_status" >&5
+  echo "$as_me:9126: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9129: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8928: \$? = $ac_status" >&5
+  echo "$as_me:9132: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -8937,13 +9141,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:8940: result: $cf_result" >&5
+		echo "$as_me:9144: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	fi
 fi
 fi
 
-echo "$as_me:8946: checking for curses performance tradeoff" >&5
+echo "$as_me:9150: checking for curses performance tradeoff" >&5
 echo $ECHO_N "checking for curses performance tradeoff... $ECHO_C" >&6
 if test "${cf_cv_curs_performance+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8951,7 +9155,7 @@ else
 
     cf_cv_curs_performance=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 8954 "configure"
+#line 9158 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -8970,20 +9174,20 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8973: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9177: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8976: \$? = $ac_status" >&5
+  echo "$as_me:9180: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8979: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9183: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8982: \$? = $ac_status" >&5
+  echo "$as_me:9186: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 8986 "configure"
+#line 9190 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -9003,16 +9207,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9006: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9210: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9009: \$? = $ac_status" >&5
+  echo "$as_me:9213: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9216: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9015: \$? = $ac_status" >&5
+  echo "$as_me:9219: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -9027,20 +9231,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:9030: result: $cf_cv_curs_performance" >&5
+echo "$as_me:9234: result: $cf_cv_curs_performance" >&5
 echo "${ECHO_T}$cf_cv_curs_performance" >&6
 test $cf_cv_curs_performance = yes && cat >>confdefs.h <<\EOF
 #define CURS_PERFORMANCE 1
 EOF
 
-echo "$as_me:9036: checking for curses touchline function" >&5
+echo "$as_me:9240: checking for curses touchline function" >&5
 echo $ECHO_N "checking for curses touchline function... $ECHO_C" >&6
 if test "${cf_cv_curs_touchline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9043 "configure"
+#line 9247 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -9053,23 +9257,23 @@ touchline(stdscr, 1,2,3);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9056: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9260: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9059: \$? = $ac_status" >&5
+  echo "$as_me:9263: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9266: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9065: \$? = $ac_status" >&5
+  echo "$as_me:9269: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=bsd
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 9072 "configure"
+#line 9276 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -9082,16 +9286,16 @@ touchline(stdscr, 1,2);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9085: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9289: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9088: \$? = $ac_status" >&5
+  echo "$as_me:9292: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9295: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9094: \$? = $ac_status" >&5
+  echo "$as_me:9298: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -9103,7 +9307,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9106: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:9310: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in #(vi
 bsd) #(vi
@@ -9129,7 +9333,7 @@ test -n "$cf_cv_curses_dir" && \
 test "$cf_cv_curses_dir" != "no" && \
 CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
 
-echo "$as_me:9132: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:9336: checking for $cf_ncuhdr_root header in include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9141,7 +9345,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9144 "configure"
+#line 9348 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9165,16 +9369,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9168: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9372: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9171: \$? = $ac_status" >&5
+  echo "$as_me:9375: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9174: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9378: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9177: \$? = $ac_status" >&5
+  echo "$as_me:9381: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -9189,13 +9393,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:9192: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:9396: result: $cf_cv_ncurses_h" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 
 if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
-echo "$as_me:9198: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:9402: checking for $cf_ncuhdr_root include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9290,7 +9494,7 @@ do
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 9293 "configure"
+#line 9497 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9302,16 +9506,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9305: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9509: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9308: \$? = $ac_status" >&5
+  echo "$as_me:9512: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9515: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9314: \$? = $ac_status" >&5
+  echo "$as_me:9518: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9338,7 +9542,7 @@ done
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9341 "configure"
+#line 9545 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9362,16 +9566,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9365: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9569: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9368: \$? = $ac_status" >&5
+  echo "$as_me:9572: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9371: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9374: \$? = $ac_status" >&5
+  echo "$as_me:9578: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -9392,12 +9596,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9395: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9599: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:9400: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:9604: result: $cf_cv_ncurses_h2" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
@@ -9419,7 +9623,7 @@ do
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 9422 "configure"
+#line 9626 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9431,16 +9635,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9434: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9638: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9437: \$? = $ac_status" >&5
+  echo "$as_me:9641: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9644: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9443: \$? = $ac_status" >&5
+  echo "$as_me:9647: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9491,7 +9695,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:9494: checking for ncurses version" >&5
+echo "$as_me:9698: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9517,10 +9721,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:9520: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:9724: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:9523: \$? = $ac_status" >&5
+  echo "$as_me:9727: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -9530,7 +9734,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9533 "configure"
+#line 9737 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -9555,15 +9759,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9558: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9762: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9561: \$? = $ac_status" >&5
+  echo "$as_me:9765: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9767: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9566: \$? = $ac_status" >&5
+  echo "$as_me:9770: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -9577,7 +9781,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:9580: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:9784: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
@@ -9589,7 +9793,7 @@ cf_nculib_root=ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:9592: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:9796: checking for Gpm_Open in -lgpm" >&5
 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9597,7 +9801,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9600 "configure"
+#line 9804 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9616,16 +9820,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9619: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9823: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9622: \$? = $ac_status" >&5
+  echo "$as_me:9826: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9829: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9628: \$? = $ac_status" >&5
+  echo "$as_me:9832: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -9636,10 +9840,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9639: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:9843: result: $ac_cv_lib_gpm_Gpm_Open" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:9642: checking for initscr in -lgpm" >&5
+  echo "$as_me:9846: checking for initscr in -lgpm" >&5
 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9647,7 +9851,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9650 "configure"
+#line 9854 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9666,16 +9870,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9669: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9873: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9672: \$? = $ac_status" >&5
+  echo "$as_me:9876: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9675: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9879: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9678: \$? = $ac_status" >&5
+  echo "$as_me:9882: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -9686,7 +9890,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9689: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:9893: result: $ac_cv_lib_gpm_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
@@ -9700,7 +9904,8 @@ case $host_os in #(vi
 freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
-	echo "$as_me:9703: checking for tgoto in -lmytinfo" >&5
+	if test "$cf_nculib_root" = ncurses ; then
+		echo "$as_me:9908: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9708,7 +9913,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9711 "configure"
+#line 9916 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9727,16 +9932,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9730: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9935: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9733: \$? = $ac_status" >&5
+  echo "$as_me:9938: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9736: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9739: \$? = $ac_status" >&5
+  echo "$as_me:9944: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -9747,12 +9952,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9750: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:9955: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
 fi
 
+	fi
 	;;
 esac
 
@@ -9765,13 +9971,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:9768: checking for initscr" >&5
+	echo "$as_me:9974: checking for initscr" >&5
 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 if test "${ac_cv_func_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9774 "configure"
+#line 9980 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -9802,16 +10008,16 @@ f = initscr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9805: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10011: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9808: \$? = $ac_status" >&5
+  echo "$as_me:10014: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9814: \$? = $ac_status" >&5
+  echo "$as_me:10020: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -9821,18 +10027,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9824: result: $ac_cv_func_initscr" >&5
+echo "$as_me:10030: result: $ac_cv_func_initscr" >&5
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:9831: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:10037: checking for initscr in -l$cf_nculib_root" >&5
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
 		LIBS="-l$cf_nculib_root $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9835 "configure"
+#line 10041 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -9844,25 +10050,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9847: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10053: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9850: \$? = $ac_status" >&5
+  echo "$as_me:10056: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9856: \$? = $ac_status" >&5
+  echo "$as_me:10062: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:9858: result: yes" >&5
+  echo "$as_me:10064: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:9865: result: no" >&5
+echo "$as_me:10071: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -9922,11 +10128,11 @@ test -d /usr && {
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:9925: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:10131: checking for -l$cf_nculib_root in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 9929 "configure"
+#line 10135 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -9938,25 +10144,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9941: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10147: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9944: \$? = $ac_status" >&5
+  echo "$as_me:10150: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9947: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9950: \$? = $ac_status" >&5
+  echo "$as_me:10156: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:9952: result: yes" >&5
+  echo "$as_me:10158: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:9959: result: no" >&5
+echo "$as_me:10165: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -9971,7 +10177,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:9974: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:10180: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9979,7 +10185,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:9982: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:10188: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
@@ -9989,7 +10195,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9992 "configure"
+#line 10198 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10001,23 +10207,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10004: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10210: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10007: \$? = $ac_status" >&5
+  echo "$as_me:10213: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10010: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10216: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10013: \$? = $ac_status" >&5
+  echo "$as_me:10219: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:10015: result: yes" >&5
+  echo "$as_me:10221: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:10020: result: no" >&5
+echo "$as_me:10226: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -10030,7 +10236,7 @@ cat >>confdefs.h <<EOF
 #define $cf_nculib_ROOT 1
 EOF
 
-echo "$as_me:10033: checking for ncurses version" >&5
+echo "$as_me:10239: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10056,10 +10262,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:10059: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:10265: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:10062: \$? = $ac_status" >&5
+  echo "$as_me:10268: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -10069,7 +10275,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10072 "configure"
+#line 10278 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10094,15 +10300,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10097: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10303: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10100: \$? = $ac_status" >&5
+  echo "$as_me:10306: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10105: \$? = $ac_status" >&5
+  echo "$as_me:10311: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10116,7 +10322,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:10119: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10325: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
@@ -10125,7 +10331,7 @@ EOF
 	;;
 ncursesw)
 
-echo "$as_me:10128: checking for multibyte character support" >&5
+echo "$as_me:10334: checking for multibyte character support" >&5
 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
 if test "${cf_cv_utf8_lib+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10133,7 +10339,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10136 "configure"
+#line 10342 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10146,16 +10352,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10149: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10355: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10152: \$? = $ac_status" >&5
+  echo "$as_me:10358: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10155: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10158: \$? = $ac_status" >&5
+  echo "$as_me:10364: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -10163,7 +10369,7 @@ else
 cat conftest.$ac_ext >&5
 LIBS="-lutf8 $LIBS"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 10166 "configure"
+#line 10372 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -10176,16 +10382,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10179: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10385: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10182: \$? = $ac_status" >&5
+  echo "$as_me:10388: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10185: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10391: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10188: \$? = $ac_status" >&5
+  echo "$as_me:10394: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=add-on
 else
@@ -10199,7 +10405,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10202: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:10408: result: $cf_cv_utf8_lib" >&5
 echo "${ECHO_T}$cf_cv_utf8_lib" >&6
 
 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
@@ -10218,7 +10424,7 @@ test -n "$cf_cv_curses_dir" && \
 test "$cf_cv_curses_dir" != "no" && \
 CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
 
-echo "$as_me:10221: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:10427: checking for $cf_ncuhdr_root header in include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10230,7 +10436,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10233 "configure"
+#line 10439 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -10262,16 +10468,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10265: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10471: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10268: \$? = $ac_status" >&5
+  echo "$as_me:10474: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10477: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10274: \$? = $ac_status" >&5
+  echo "$as_me:10480: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -10286,13 +10492,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:10289: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:10495: result: $cf_cv_ncurses_h" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 
 if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
-echo "$as_me:10295: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:10501: checking for $cf_ncuhdr_root include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10387,7 +10593,7 @@ do
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 10390 "configure"
+#line 10596 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10399,16 +10605,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10402: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10608: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10405: \$? = $ac_status" >&5
+  echo "$as_me:10611: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10411: \$? = $ac_status" >&5
+  echo "$as_me:10617: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10435,7 +10641,7 @@ done
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10438 "configure"
+#line 10644 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -10467,16 +10673,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10470: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10676: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10473: \$? = $ac_status" >&5
+  echo "$as_me:10679: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10682: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10479: \$? = $ac_status" >&5
+  echo "$as_me:10685: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -10497,12 +10703,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10500: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10706: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:10505: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:10711: result: $cf_cv_ncurses_h2" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
@@ -10524,7 +10730,7 @@ do
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 10527 "configure"
+#line 10733 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10536,16 +10742,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10539: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10745: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10542: \$? = $ac_status" >&5
+  echo "$as_me:10748: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10751: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10548: \$? = $ac_status" >&5
+  echo "$as_me:10754: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10596,7 +10802,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:10599: checking for ncurses version" >&5
+echo "$as_me:10805: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10622,10 +10828,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:10625: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:10831: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:10628: \$? = $ac_status" >&5
+  echo "$as_me:10834: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -10635,7 +10841,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10638 "configure"
+#line 10844 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10660,15 +10866,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10663: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10869: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10666: \$? = $ac_status" >&5
+  echo "$as_me:10872: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10671: \$? = $ac_status" >&5
+  echo "$as_me:10877: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10682,7 +10888,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:10685: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10891: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
@@ -10694,7 +10900,7 @@ cf_nculib_root=ncursesw
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:10697: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:10903: checking for Gpm_Open in -lgpm" >&5
 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10702,7 +10908,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10705 "configure"
+#line 10911 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10721,16 +10927,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10724: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10930: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10727: \$? = $ac_status" >&5
+  echo "$as_me:10933: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10730: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10733: \$? = $ac_status" >&5
+  echo "$as_me:10939: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -10741,10 +10947,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10744: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:10950: result: $ac_cv_lib_gpm_Gpm_Open" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:10747: checking for initscr in -lgpm" >&5
+  echo "$as_me:10953: checking for initscr in -lgpm" >&5
 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10752,7 +10958,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10755 "configure"
+#line 10961 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10771,16 +10977,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10774: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10980: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10777: \$? = $ac_status" >&5
+  echo "$as_me:10983: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10783: \$? = $ac_status" >&5
+  echo "$as_me:10989: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -10791,7 +10997,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10794: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:11000: result: $ac_cv_lib_gpm_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
@@ -10805,7 +11011,8 @@ case $host_os in #(vi
 freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
-	echo "$as_me:10808: checking for tgoto in -lmytinfo" >&5
+	if test "$cf_nculib_root" = ncurses ; then
+		echo "$as_me:11015: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10813,7 +11020,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10816 "configure"
+#line 11023 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10832,16 +11039,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10835: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11042: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10838: \$? = $ac_status" >&5
+  echo "$as_me:11045: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10841: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10844: \$? = $ac_status" >&5
+  echo "$as_me:11051: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -10852,12 +11059,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10855: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:11062: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
 fi
 
+	fi
 	;;
 esac
 
@@ -10870,13 +11078,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:10873: checking for initscr" >&5
+	echo "$as_me:11081: checking for initscr" >&5
 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 if test "${ac_cv_func_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10879 "configure"
+#line 11087 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -10907,16 +11115,16 @@ f = initscr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10910: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11118: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10913: \$? = $ac_status" >&5
+  echo "$as_me:11121: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10919: \$? = $ac_status" >&5
+  echo "$as_me:11127: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -10926,18 +11134,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10929: result: $ac_cv_func_initscr" >&5
+echo "$as_me:11137: result: $ac_cv_func_initscr" >&5
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:10936: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:11144: checking for initscr in -l$cf_nculib_root" >&5
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
 		LIBS="-l$cf_nculib_root $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 10940 "configure"
+#line 11148 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10949,25 +11157,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10952: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11160: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10955: \$? = $ac_status" >&5
+  echo "$as_me:11163: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11166: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10961: \$? = $ac_status" >&5
+  echo "$as_me:11169: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:10963: result: yes" >&5
+  echo "$as_me:11171: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:10970: result: no" >&5
+echo "$as_me:11178: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -11027,11 +11235,11 @@ test -d /usr && {
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:11030: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:11238: checking for -l$cf_nculib_root in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 11034 "configure"
+#line 11242 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -11043,25 +11251,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11046: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11254: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11049: \$? = $ac_status" >&5
+  echo "$as_me:11257: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11260: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11055: \$? = $ac_status" >&5
+  echo "$as_me:11263: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:11057: result: yes" >&5
+  echo "$as_me:11265: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:11064: result: no" >&5
+echo "$as_me:11272: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -11076,7 +11284,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:11079: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:11287: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11084,7 +11292,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:11087: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:11295: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
@@ -11094,7 +11302,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11097 "configure"
+#line 11305 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -11106,23 +11314,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11109: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11317: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11112: \$? = $ac_status" >&5
+  echo "$as_me:11320: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11323: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11118: \$? = $ac_status" >&5
+  echo "$as_me:11326: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:11120: result: yes" >&5
+  echo "$as_me:11328: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:11125: result: no" >&5
+echo "$as_me:11333: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -11135,7 +11343,7 @@ cat >>confdefs.h <<EOF
 #define $cf_nculib_ROOT 1
 EOF
 
-echo "$as_me:11138: checking for ncurses version" >&5
+echo "$as_me:11346: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11161,10 +11369,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:11164: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:11372: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:11167: \$? = $ac_status" >&5
+  echo "$as_me:11375: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -11174,7 +11382,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11177 "configure"
+#line 11385 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -11199,15 +11407,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11202: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11410: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11205: \$? = $ac_status" >&5
+  echo "$as_me:11413: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11415: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11210: \$? = $ac_status" >&5
+  echo "$as_me:11418: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -11221,7 +11429,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:11224: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:11432: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
@@ -11234,14 +11442,14 @@ pdcurses)
 	;;
 slang)
 
-echo "$as_me:11237: checking for slang header file" >&5
+echo "$as_me:11445: checking for slang header file" >&5
 echo $ECHO_N "checking for slang header file... $ECHO_C" >&6
 if test "${cf_cv_slang_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11244 "configure"
+#line 11452 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -11253,16 +11461,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11256: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11464: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11259: \$? = $ac_status" >&5
+  echo "$as_me:11467: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11262: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11470: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11265: \$? = $ac_status" >&5
+  echo "$as_me:11473: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -11352,14 +11560,14 @@ test -d "$oldincludedir" && {
 		done
 		test -n "$cf_cv_slang_header" && break
 	done
-	test -z "$cf_cv_slang_header" && { { echo "$as_me:11355: error: not found" >&5
+	test -z "$cf_cv_slang_header" && { { echo "$as_me:11563: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11362: result: $cf_cv_slang_header" >&5
+echo "$as_me:11570: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 cat >>confdefs.h <<\EOF
 #define USE_SLANG 1
@@ -11385,7 +11593,7 @@ do
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 11388 "configure"
+#line 11596 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11397,16 +11605,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11400: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11608: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11403: \$? = $ac_status" >&5
+  echo "$as_me:11611: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11409: \$? = $ac_status" >&5
+  echo "$as_me:11617: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11432,14 +11640,14 @@ esac
 
 # There's an unofficial set of patches for slang that gives it some limited
 # UTF8 capability.  Unfortunately it won't compile unless one defines UTF8.
-echo "$as_me:11435: checking if we must define UTF8" >&5
+echo "$as_me:11643: checking if we must define UTF8" >&5
 echo $ECHO_N "checking if we must define UTF8... $ECHO_C" >&6
 if test "${cf_cv_slang_utf8+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11442 "configure"
+#line 11650 "configure"
 #include "confdefs.h"
 
 #include <slang.h>
@@ -11452,16 +11660,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11455: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11663: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11458: \$? = $ac_status" >&5
+  echo "$as_me:11666: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11669: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11464: \$? = $ac_status" >&5
+  echo "$as_me:11672: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -11469,7 +11677,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11472 "configure"
+#line 11680 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -11483,16 +11691,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11486: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11694: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11489: \$? = $ac_status" >&5
+  echo "$as_me:11697: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11492: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11700: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11495: \$? = $ac_status" >&5
+  echo "$as_me:11703: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -11505,7 +11713,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:11508: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:11716: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -11523,7 +11731,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 11526 "configure"
+#line 11734 "configure"
 #include "confdefs.h"
 
 int
@@ -11535,19 +11743,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11538: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11746: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11541: \$? = $ac_status" >&5
+  echo "$as_me:11749: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11544: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11752: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11547: \$? = $ac_status" >&5
+  echo "$as_me:11755: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 11550 "configure"
+#line 11758 "configure"
 #include "confdefs.h"
 
 int
@@ -11559,16 +11767,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11562: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11770: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11565: \$? = $ac_status" >&5
+  echo "$as_me:11773: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11568: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11571: \$? = $ac_status" >&5
+  echo "$as_me:11779: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -11592,10 +11800,10 @@ if test "$cf_cv_termlib" = none; then
 	LIBS="-l$cf_lib $cf_save_LIBS"
 	for cf_func in tigetstr tgetstr
 	do
-		echo "$as_me:11595: checking for $cf_func in -l$cf_lib" >&5
+		echo "$as_me:11803: checking for $cf_func in -l$cf_lib" >&5
 echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 11598 "configure"
+#line 11806 "configure"
 #include "confdefs.h"
 
 int
@@ -11607,16 +11815,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11610: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11818: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11613: \$? = $ac_status" >&5
+  echo "$as_me:11821: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11824: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11619: \$? = $ac_status" >&5
+  echo "$as_me:11827: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -11625,7 +11833,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:11628: result: $cf_result" >&5
+		echo "$as_me:11836: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			if test "$cf_func" = tigetstr ; then
@@ -11642,7 +11850,7 @@ echo "${ECHO_T}$cf_result" >&6
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:11645: checking for initscr in -lcurses" >&5
+	echo "$as_me:11853: checking for initscr in -lcurses" >&5
 echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_curses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11650,7 +11858,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11653 "configure"
+#line 11861 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11669,16 +11877,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11672: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11675: \$? = $ac_status" >&5
+  echo "$as_me:11883: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11678: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11681: \$? = $ac_status" >&5
+  echo "$as_me:11889: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -11689,13 +11897,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11692: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:11900: result: $ac_cv_lib_curses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6
 if test $ac_cv_lib_curses_initscr = yes; then
   LIBS="$LIBS -lcurses" cf_cv_termlib=termcap
 fi
 
-	echo "$as_me:11698: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:11906: checking for tgoto in -ltermcap" >&5
 echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6
 if test "${ac_cv_lib_termcap_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11703,7 +11911,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11706 "configure"
+#line 11914 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11722,16 +11930,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11725: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11933: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11728: \$? = $ac_status" >&5
+  echo "$as_me:11936: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11939: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11734: \$? = $ac_status" >&5
+  echo "$as_me:11942: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -11742,7 +11950,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11745: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:11953: result: $ac_cv_lib_termcap_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6
 if test $ac_cv_lib_termcap_tgoto = yes; then
   LIBS="$LIBS -ltermcap" cf_cv_termlib=termcap
@@ -11753,20 +11961,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:11756: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:11964: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
 fi
 
 fi
 
 cf_slang_LIBS2="$LIBS"
-echo "$as_me:11763: checking for acos" >&5
+echo "$as_me:11971: checking for acos" >&5
 echo $ECHO_N "checking for acos... $ECHO_C" >&6
 if test "${ac_cv_func_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11769 "configure"
+#line 11977 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -11797,16 +12005,16 @@ f = acos;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11800: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12008: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11803: \$? = $ac_status" >&5
+  echo "$as_me:12011: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11806: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12014: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11809: \$? = $ac_status" >&5
+  echo "$as_me:12017: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -11816,13 +12024,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11819: result: $ac_cv_func_acos" >&5
+echo "$as_me:12027: result: $ac_cv_func_acos" >&5
 echo "${ECHO_T}$ac_cv_func_acos" >&6
 if test $ac_cv_func_acos = yes; then
   :
 else
 
-echo "$as_me:11825: checking for acos in -lm" >&5
+echo "$as_me:12033: checking for acos in -lm" >&5
 echo $ECHO_N "checking for acos in -lm... $ECHO_C" >&6
 if test "${ac_cv_lib_m_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11830,7 +12038,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11833 "configure"
+#line 12041 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11849,16 +12057,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11852: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12060: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11855: \$? = $ac_status" >&5
+  echo "$as_me:12063: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11858: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11861: \$? = $ac_status" >&5
+  echo "$as_me:12069: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -11869,7 +12077,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11872: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:12080: result: $ac_cv_lib_m_acos" >&5
 echo "${ECHO_T}$ac_cv_lib_m_acos" >&6
 if test $ac_cv_lib_m_acos = yes; then
 
@@ -11895,13 +12103,13 @@ os2*)
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:11898: checking for v_init" >&5
+	echo "$as_me:12106: checking for v_init" >&5
 echo $ECHO_N "checking for v_init... $ECHO_C" >&6
 if test "${ac_cv_func_v_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11904 "configure"
+#line 12112 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -11932,16 +12140,16 @@ f = v_init;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11935: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12143: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11938: \$? = $ac_status" >&5
+  echo "$as_me:12146: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11944: \$? = $ac_status" >&5
+  echo "$as_me:12152: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -11951,18 +12159,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11954: result: $ac_cv_func_v_init" >&5
+echo "$as_me:12162: result: $ac_cv_func_v_init" >&5
 echo "${ECHO_T}$ac_cv_func_v_init" >&6
 if test $ac_cv_func_v_init = yes; then
   eval 'cf_cv_have_lib_'video'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:11961: checking for v_init in -lvideo" >&5
+		echo "$as_me:12169: checking for v_init in -lvideo" >&5
 echo $ECHO_N "checking for v_init in -lvideo... $ECHO_C" >&6
 		LIBS="-lvideo $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 11965 "configure"
+#line 12173 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -11974,25 +12182,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11977: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12185: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11980: \$? = $ac_status" >&5
+  echo "$as_me:12188: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12191: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11986: \$? = $ac_status" >&5
+  echo "$as_me:12194: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:11988: result: yes" >&5
+  echo "$as_me:12196: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'video'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:11995: result: no" >&5
+echo "$as_me:12203: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -12052,11 +12260,11 @@ test -d /usr && {
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:12055: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:12263: checking for -lvideo in $cf_libdir" >&5
 echo $ECHO_N "checking for -lvideo in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lvideo $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 12059 "configure"
+#line 12267 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -12068,25 +12276,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12279: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12074: \$? = $ac_status" >&5
+  echo "$as_me:12282: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12080: \$? = $ac_status" >&5
+  echo "$as_me:12288: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:12082: result: yes" >&5
+  echo "$as_me:12290: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'video'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:12089: result: no" >&5
+echo "$as_me:12297: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -12101,7 +12309,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:12104: error: Cannot link video library" >&5
+	{ { echo "$as_me:12312: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -12111,13 +12319,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang'=no'
 	cf_libdir=""
-	echo "$as_me:12114: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:12322: checking for SLtt_get_screen_size" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size... $ECHO_C" >&6
 if test "${ac_cv_func_SLtt_get_screen_size+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12120 "configure"
+#line 12328 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -12148,16 +12356,16 @@ f = SLtt_get_screen_size;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12151: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12359: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12154: \$? = $ac_status" >&5
+  echo "$as_me:12362: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12160: \$? = $ac_status" >&5
+  echo "$as_me:12368: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -12167,18 +12375,18 @@ ac_cv_func_SLtt_get_screen_size=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12170: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:12378: result: $ac_cv_func_SLtt_get_screen_size" >&5
 echo "${ECHO_T}$ac_cv_func_SLtt_get_screen_size" >&6
 if test $ac_cv_func_SLtt_get_screen_size = yes; then
   eval 'cf_cv_have_lib_'slang'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:12177: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:12385: checking for SLtt_get_screen_size in -lslang" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size in -lslang... $ECHO_C" >&6
 		LIBS="-lslang $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 12181 "configure"
+#line 12389 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -12190,25 +12398,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12193: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12401: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12196: \$? = $ac_status" >&5
+  echo "$as_me:12404: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12199: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12407: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12202: \$? = $ac_status" >&5
+  echo "$as_me:12410: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:12204: result: yes" >&5
+  echo "$as_me:12412: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'slang'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:12211: result: no" >&5
+echo "$as_me:12419: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -12268,11 +12476,11 @@ test -d /usr && {
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:12271: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:12479: checking for -lslang in $cf_libdir" >&5
 echo $ECHO_N "checking for -lslang in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lslang $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 12275 "configure"
+#line 12483 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -12284,25 +12492,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12287: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12495: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12290: \$? = $ac_status" >&5
+  echo "$as_me:12498: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12293: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12501: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12296: \$? = $ac_status" >&5
+  echo "$as_me:12504: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:12298: result: yes" >&5
+  echo "$as_me:12506: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'slang'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:12305: result: no" >&5
+echo "$as_me:12513: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -12317,13 +12525,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:12320: error: Cannot link slang library" >&5
+	{ { echo "$as_me:12528: error: Cannot link slang library" >&5
 echo "$as_me: error: Cannot link slang library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 cf_slang_LIBS3="$LIBS"
-echo "$as_me:12326: checking if we can link slang without termcap" >&5
+echo "$as_me:12534: checking if we can link slang without termcap" >&5
 echo $ECHO_N "checking if we can link slang without termcap... $ECHO_C" >&6
 if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then
 	cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s%$cf_slang_LIBS1%%" -e 's%^.%%'`
@@ -12332,7 +12540,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 12335 "configure"
+#line 12543 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -12344,16 +12552,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12347: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12555: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12350: \$? = $ac_status" >&5
+  echo "$as_me:12558: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12353: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12356: \$? = $ac_status" >&5
+  echo "$as_me:12564: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -12362,18 +12570,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:12365: result: $cf_result" >&5
+echo "$as_me:12573: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
-echo "$as_me:12369: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:12577: checking if we must tell slang this is UNIX" >&5
 echo $ECHO_N "checking if we must tell slang this is UNIX... $ECHO_C" >&6
 if test "${cf_cv_slang_unix+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 12376 "configure"
+#line 12584 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -12392,16 +12600,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12395: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12603: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12398: \$? = $ac_status" >&5
+  echo "$as_me:12606: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12401: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12404: \$? = $ac_status" >&5
+  echo "$as_me:12612: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -12412,7 +12620,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:12415: result: $cf_cv_slang_unix" >&5
+echo "$as_me:12623: result: $cf_cv_slang_unix" >&5
 echo "${ECHO_T}$cf_cv_slang_unix" >&6
 test $cf_cv_slang_unix = yes && cat >>confdefs.h <<\EOF
 #define REAL_UNIX_SYSTEM 1
@@ -12424,19 +12632,19 @@ esac
 eval cf_libdir=$libdir
 cf_libdir=`echo $cf_libdir | sed -e s%'^NONE/'%$prefix/% -e s%'^NONE/'%$ac_default_prefix/%`
 
-echo "$as_me:12427: checking for location of config-file" >&5
+echo "$as_me:12635: checking for location of config-file" >&5
 echo $ECHO_N "checking for location of config-file... $ECHO_C" >&6
 LYNX_CFG_FILE=$cf_libdir/lynx.cfg
 cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:12434: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:12642: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 CHARSET_DEFS=
 
-echo "$as_me:12439: checking if you want only a few charsets" >&5
+echo "$as_me:12647: checking if you want only a few charsets" >&5
 echo $ECHO_N "checking if you want only a few charsets... $ECHO_C" >&6
 
 # Check whether --with-charsets or --without-charsets was given.
@@ -12448,7 +12656,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:12451: result: yes" >&5
+	echo "$as_me:12659: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	cat >>confdefs.h <<\EOF
 #define ALL_CHARSETS 0
@@ -12493,17 +12701,17 @@ EOF
 		fi
 	done
 else
-	echo "$as_me:12496: result: no" >&5
+	echo "$as_me:12704: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12500: checking for ANSI C header files" >&5
+echo "$as_me:12708: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12506 "configure"
+#line 12714 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -12511,13 +12719,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:12514: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12722: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12520: \$? = $ac_status" >&5
+  echo "$as_me:12728: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12539,7 +12747,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 12542 "configure"
+#line 12750 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -12557,7 +12765,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 12560 "configure"
+#line 12768 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -12578,7 +12786,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12581 "configure"
+#line 12789 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -12604,15 +12812,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12607: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12815: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12610: \$? = $ac_status" >&5
+  echo "$as_me:12818: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12820: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12615: \$? = $ac_status" >&5
+  echo "$as_me:12823: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12625,7 +12833,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:12628: result: $ac_cv_header_stdc" >&5
+echo "$as_me:12836: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -12635,13 +12843,13 @@ EOF
 
 fi
 
-echo "$as_me:12638: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:12846: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12644 "configure"
+#line 12852 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -12657,16 +12865,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12660: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12868: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12663: \$? = $ac_status" >&5
+  echo "$as_me:12871: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12669: \$? = $ac_status" >&5
+  echo "$as_me:12877: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -12676,7 +12884,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12679: result: $ac_cv_header_time" >&5
+echo "$as_me:12887: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -12689,13 +12897,13 @@ fi
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:12692: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:12900: checking for $ac_hdr that defines DIR" >&5
 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12698 "configure"
+#line 12906 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -12710,16 +12918,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12713: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12921: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12716: \$? = $ac_status" >&5
+  echo "$as_me:12924: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12719: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12927: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12722: \$? = $ac_status" >&5
+  echo "$as_me:12930: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -12729,7 +12937,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12732: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12940: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -12742,7 +12950,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:12745: checking for opendir in -ldir" >&5
+  echo "$as_me:12953: checking for opendir in -ldir" >&5
 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
 if test "${ac_cv_lib_dir_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12750,7 +12958,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12753 "configure"
+#line 12961 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12769,16 +12977,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12772: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12980: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12775: \$? = $ac_status" >&5
+  echo "$as_me:12983: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12778: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12781: \$? = $ac_status" >&5
+  echo "$as_me:12989: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -12789,14 +12997,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12792: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:13000: result: $ac_cv_lib_dir_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
 if test $ac_cv_lib_dir_opendir = yes; then
   LIBS="$LIBS -ldir"
 fi
 
 else
-  echo "$as_me:12799: checking for opendir in -lx" >&5
+  echo "$as_me:13007: checking for opendir in -lx" >&5
 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
 if test "${ac_cv_lib_x_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12804,7 +13012,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12807 "configure"
+#line 13015 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12823,16 +13031,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12826: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13034: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12829: \$? = $ac_status" >&5
+  echo "$as_me:13037: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12832: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12835: \$? = $ac_status" >&5
+  echo "$as_me:13043: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -12843,7 +13051,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12846: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:13054: result: $ac_cv_lib_x_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 if test $ac_cv_lib_x_opendir = yes; then
   LIBS="$LIBS -lx"
@@ -12871,23 +13079,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12874: checking for $ac_header" >&5
+echo "$as_me:13082: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12880 "configure"
+#line 13088 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12884: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13092: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12890: \$? = $ac_status" >&5
+  echo "$as_me:13098: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12906,7 +13114,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:12909: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13117: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -12916,14 +13124,14 @@ EOF
 fi
 done
 
-echo "$as_me:12919: checking termio.h and termios.h" >&5
+echo "$as_me:13127: checking termio.h and termios.h" >&5
 echo $ECHO_N "checking termio.h and termios.h... $ECHO_C" >&6
 if test "${cf_cv_termio_and_termios+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 12926 "configure"
+#line 13134 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -12941,16 +13149,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12944: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13152: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12947: \$? = $ac_status" >&5
+  echo "$as_me:13155: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12950: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13158: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12953: \$? = $ac_status" >&5
+  echo "$as_me:13161: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -12961,20 +13169,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:12964: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:13172: result: $cf_cv_termio_and_termios" >&5
 echo "${ECHO_T}$cf_cv_termio_and_termios" >&6
 test $cf_cv_termio_and_termios = no && cat >>confdefs.h <<\EOF
 #define TERMIO_AND_TERMIOS 1
 EOF
 
-echo "$as_me:12970: checking for sigaction and structs" >&5
+echo "$as_me:13178: checking for sigaction and structs" >&5
 echo $ECHO_N "checking for sigaction and structs... $ECHO_C" >&6
 if test "${cf_cv_func_sigaction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 12977 "configure"
+#line 13185 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12994,16 +13202,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12997: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13205: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13000: \$? = $ac_status" >&5
+  echo "$as_me:13208: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13006: \$? = $ac_status" >&5
+  echo "$as_me:13214: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -13014,7 +13222,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:13017: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:13225: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_SIGACTION 1
@@ -13023,23 +13231,23 @@ EOF
 for ac_header in sys/wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13026: checking for $ac_header" >&5
+echo "$as_me:13234: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13032 "configure"
+#line 13240 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13036: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13244: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13042: \$? = $ac_status" >&5
+  echo "$as_me:13250: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13058,7 +13266,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:13061: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13269: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13079,23 +13287,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13082: checking for $ac_header" >&5
+echo "$as_me:13290: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13088 "configure"
+#line 13296 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13092: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13300: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13098: \$? = $ac_status" >&5
+  echo "$as_me:13306: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13114,7 +13322,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:13117: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13325: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13127,23 +13335,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13130: checking for $ac_header" >&5
+echo "$as_me:13338: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13136 "configure"
+#line 13344 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13140: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13348: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13146: \$? = $ac_status" >&5
+  echo "$as_me:13354: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13162,7 +13370,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:13165: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13373: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13184,14 +13392,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:13187: checking for union wait" >&5
+echo "$as_me:13395: checking for union wait" >&5
 echo $ECHO_N "checking for union wait... $ECHO_C" >&6
 if test "${cf_cv_type_unionwait+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13194 "configure"
+#line 13402 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -13207,16 +13415,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13210: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13418: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13213: \$? = $ac_status" >&5
+  echo "$as_me:13421: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13216: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13424: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13219: \$? = $ac_status" >&5
+  echo "$as_me:13427: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -13226,7 +13434,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13229 "configure"
+#line 13437 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -13246,16 +13454,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13249: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13457: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13252: \$? = $ac_status" >&5
+  echo "$as_me:13460: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13463: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13258: \$? = $ac_status" >&5
+  echo "$as_me:13466: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -13270,7 +13478,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:13273: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:13481: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test $cf_cv_type_unionwait = yes && cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_UNIONWAIT 1
@@ -13278,14 +13486,14 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:13281: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:13489: checking if union wait can be used as wait-arg" >&5
 echo $ECHO_N "checking if union wait can be used as wait-arg... $ECHO_C" >&6
 	if test "${cf_cv_arg_union_wait+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13288 "configure"
+#line 13496 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -13297,16 +13505,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13300: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13508: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13303: \$? = $ac_status" >&5
+  echo "$as_me:13511: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13306: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13309: \$? = $ac_status" >&5
+  echo "$as_me:13517: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -13318,20 +13526,20 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:13321: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:13529: result: $cf_cv_arg_union_wait" >&5
 echo "${ECHO_T}$cf_cv_arg_union_wait" >&6
 	test $cf_cv_arg_union_wait = yes && cat >>confdefs.h <<\EOF
 #define WAIT_USES_UNION 1
 EOF
 
-	echo "$as_me:13327: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:13535: checking if union wait can be used as waitpid-arg" >&5
 echo $ECHO_N "checking if union wait can be used as waitpid-arg... $ECHO_C" >&6
 	if test "${cf_cv_arg_union_waitpid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13334 "configure"
+#line 13542 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -13343,16 +13551,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13346: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13554: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13349: \$? = $ac_status" >&5
+  echo "$as_me:13557: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13352: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13560: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13355: \$? = $ac_status" >&5
+  echo "$as_me:13563: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -13364,7 +13572,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:13367: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:13575: result: $cf_cv_arg_union_waitpid" >&5
 echo "${ECHO_T}$cf_cv_arg_union_waitpid" >&6
 	test $cf_cv_arg_union_waitpid = yes && cat >>confdefs.h <<\EOF
 #define WAITPID_USES_UNION 1
@@ -13375,23 +13583,23 @@ fi
 for ac_header in stdarg.h varargs.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13378: checking for $ac_header" >&5
+echo "$as_me:13586: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13384 "configure"
+#line 13592 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13388: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13596: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13394: \$? = $ac_status" >&5
+  echo "$as_me:13602: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13410,7 +13618,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:13413: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13621: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13420,14 +13628,14 @@ EOF
 fi
 done
 
-echo "$as_me:13423: checking for standard varargs" >&5
+echo "$as_me:13631: checking for standard varargs" >&5
 echo $ECHO_N "checking for standard varargs... $ECHO_C" >&6
 if test "${cf_cv_ansi_varargs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13430 "configure"
+#line 13638 "configure"
 #include "confdefs.h"
 
 #if HAVE_STDARG_H
@@ -13447,16 +13655,16 @@ return 0;} int foo(char *fmt,...){va_list args;va_start(args,fmt);va_end(args)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13450: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13658: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13453: \$? = $ac_status" >&5
+  echo "$as_me:13661: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13456: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13459: \$? = $ac_status" >&5
+  echo "$as_me:13667: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ansi_varargs=yes
 else
@@ -13468,19 +13676,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:13471: result: $cf_cv_ansi_varargs" >&5
+echo "$as_me:13679: result: $cf_cv_ansi_varargs" >&5
 echo "${ECHO_T}$cf_cv_ansi_varargs" >&6
 test $cf_cv_ansi_varargs = yes && cat >>confdefs.h <<\EOF
 #define ANSI_VARARGS 1
 EOF
 
-echo "$as_me:13477: checking for uid_t in sys/types.h" >&5
+echo "$as_me:13685: checking for uid_t in sys/types.h" >&5
 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13483 "configure"
+#line 13691 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -13494,7 +13702,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:13497: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:13705: result: $ac_cv_type_uid_t" >&5
 echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
 
@@ -13508,7 +13716,7 @@ EOF
 
 fi
 
-echo "$as_me:13511: checking type of array argument to getgroups" >&5
+echo "$as_me:13719: checking type of array argument to getgroups" >&5
 echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6
 if test "${ac_cv_type_getgroups+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13517,7 +13725,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13520 "configure"
+#line 13728 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -13543,15 +13751,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13546: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13754: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13549: \$? = $ac_status" >&5
+  echo "$as_me:13757: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:13551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13759: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13554: \$? = $ac_status" >&5
+  echo "$as_me:13762: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -13564,7 +13772,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 if test $ac_cv_type_getgroups = cross; then
         cat >conftest.$ac_ext <<_ACEOF
-#line 13567 "configure"
+#line 13775 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -13579,20 +13787,20 @@ rm -f conftest*
 
 fi
 fi
-echo "$as_me:13582: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:13790: result: $ac_cv_type_getgroups" >&5
 echo "${ECHO_T}$ac_cv_type_getgroups" >&6
 
 cat >>confdefs.h <<EOF
 #define GETGROUPS_T $ac_cv_type_getgroups
 EOF
 
-echo "$as_me:13589: checking for pid_t" >&5
+echo "$as_me:13797: checking for pid_t" >&5
 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13595 "configure"
+#line 13803 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -13607,16 +13815,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13610: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13818: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13613: \$? = $ac_status" >&5
+  echo "$as_me:13821: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13824: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13619: \$? = $ac_status" >&5
+  echo "$as_me:13827: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -13626,7 +13834,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13629: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:13837: result: $ac_cv_type_pid_t" >&5
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 if test $ac_cv_type_pid_t = yes; then
   :
@@ -13638,13 +13846,13 @@ EOF
 
 fi
 
-echo "$as_me:13641: checking for uid_t in sys/types.h" >&5
+echo "$as_me:13849: checking for uid_t in sys/types.h" >&5
 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13647 "configure"
+#line 13855 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -13658,7 +13866,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:13661: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:13869: result: $ac_cv_type_uid_t" >&5
 echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
 
@@ -13672,13 +13880,13 @@ EOF
 
 fi
 
-echo "$as_me:13675: checking for mode_t" >&5
+echo "$as_me:13883: checking for mode_t" >&5
 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
 if test "${ac_cv_type_mode_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13681 "configure"
+#line 13889 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -13693,16 +13901,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13696: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13904: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13699: \$? = $ac_status" >&5
+  echo "$as_me:13907: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13910: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13705: \$? = $ac_status" >&5
+  echo "$as_me:13913: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -13712,7 +13920,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13715: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:13923: result: $ac_cv_type_mode_t" >&5
 echo "${ECHO_T}$ac_cv_type_mode_t" >&6
 if test $ac_cv_type_mode_t = yes; then
   :
@@ -13726,13 +13934,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:13729: checking for working alloca.h" >&5
+echo "$as_me:13937: checking for working alloca.h" >&5
 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
 if test "${ac_cv_working_alloca_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13735 "configure"
+#line 13943 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -13744,16 +13952,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13747: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13955: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13750: \$? = $ac_status" >&5
+  echo "$as_me:13958: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13756: \$? = $ac_status" >&5
+  echo "$as_me:13964: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -13763,7 +13971,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13766: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:13974: result: $ac_cv_working_alloca_h" >&5
 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
 if test $ac_cv_working_alloca_h = yes; then
 
@@ -13773,13 +13981,13 @@ EOF
 
 fi
 
-echo "$as_me:13776: checking for alloca" >&5
+echo "$as_me:13984: checking for alloca" >&5
 echo $ECHO_N "checking for alloca... $ECHO_C" >&6
 if test "${ac_cv_func_alloca_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13782 "configure"
+#line 13990 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -13811,16 +14019,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13814: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14022: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13817: \$? = $ac_status" >&5
+  echo "$as_me:14025: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13820: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13823: \$? = $ac_status" >&5
+  echo "$as_me:14031: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -13830,7 +14038,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13833: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:14041: result: $ac_cv_func_alloca_works" >&5
 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
 
 if test $ac_cv_func_alloca_works = yes; then
@@ -13851,13 +14059,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:13854: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:14062: checking whether \`alloca.c' needs Cray hooks" >&5
 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
 if test "${ac_cv_os_cray+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13860 "configure"
+#line 14068 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -13875,18 +14083,18 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:13878: result: $ac_cv_os_cray" >&5
+echo "$as_me:14086: result: $ac_cv_os_cray" >&5
 echo "${ECHO_T}$ac_cv_os_cray" >&6
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:13883: checking for $ac_func" >&5
+echo "$as_me:14091: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13889 "configure"
+#line 14097 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -13917,16 +14125,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13920: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14128: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13923: \$? = $ac_status" >&5
+  echo "$as_me:14131: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13929: \$? = $ac_status" >&5
+  echo "$as_me:14137: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -13936,7 +14144,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13939: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:14147: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
 
@@ -13950,7 +14158,7 @@ fi
   done
 fi
 
-echo "$as_me:13953: checking stack direction for C alloca" >&5
+echo "$as_me:14161: checking stack direction for C alloca" >&5
 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
 if test "${ac_cv_c_stack_direction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13959,7 +14167,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13962 "configure"
+#line 14170 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -13982,15 +14190,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13985: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14193: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13988: \$? = $ac_status" >&5
+  echo "$as_me:14196: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:13990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13993: \$? = $ac_status" >&5
+  echo "$as_me:14201: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -14002,7 +14210,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:14005: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:14213: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -14014,23 +14222,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:14017: checking for $ac_header" >&5
+echo "$as_me:14225: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14023 "configure"
+#line 14231 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:14027: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14235: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:14033: \$? = $ac_status" >&5
+  echo "$as_me:14241: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14049,7 +14257,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:14052: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:14260: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -14062,13 +14270,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:14065: checking for $ac_func" >&5
+echo "$as_me:14273: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14071 "configure"
+#line 14279 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -14099,16 +14307,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14102: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14310: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14105: \$? = $ac_status" >&5
+  echo "$as_me:14313: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14108: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14111: \$? = $ac_status" >&5
+  echo "$as_me:14319: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -14118,7 +14326,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14121: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:14329: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -14130,7 +14338,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:14133: checking for working fork" >&5
+  echo "$as_me:14341: checking for working fork" >&5
 echo $ECHO_N "checking for working fork... $ECHO_C" >&6
 if test "${ac_cv_func_fork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14153,15 +14361,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14156: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14364: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14159: \$? = $ac_status" >&5
+  echo "$as_me:14367: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14161: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14369: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14164: \$? = $ac_status" >&5
+  echo "$as_me:14372: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -14173,7 +14381,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:14176: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:14384: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -14187,12 +14395,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:14190: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:14398: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
 fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 if test "x$ac_cv_func_vfork" = xyes; then
-  echo "$as_me:14195: checking for working vfork" >&5
+  echo "$as_me:14403: checking for working vfork" >&5
 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
 if test "${ac_cv_func_vfork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14201,7 +14409,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14204 "configure"
+#line 14412 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -14298,15 +14506,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14301: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14509: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14304: \$? = $ac_status" >&5
+  echo "$as_me:14512: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14306: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14309: \$? = $ac_status" >&5
+  echo "$as_me:14517: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -14318,13 +14526,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:14321: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:14529: result: $ac_cv_func_vfork_works" >&5
 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
 
 fi;
 if test "x$ac_cv_func_fork_works" = xcross; then
   ac_cv_func_vfork_works=ac_cv_func_vfork
-  { echo "$as_me:14327: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:14535: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
 fi
 
@@ -14349,14 +14557,14 @@ EOF
 
 fi
 
-echo "$as_me:14352: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:14560: checking if we should use fcntl or ioctl" >&5
 echo $ECHO_N "checking if we should use fcntl or ioctl... $ECHO_C" >&6
 if test "${cf_cv_fionbio+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 14359 "configure"
+#line 14567 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14373,16 +14581,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14376: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14584: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14379: \$? = $ac_status" >&5
+  echo "$as_me:14587: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14382: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14590: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14385: \$? = $ac_status" >&5
+  echo "$as_me:14593: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -14390,7 +14598,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 14393 "configure"
+#line 14601 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14412,16 +14620,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14415: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14623: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14418: \$? = $ac_status" >&5
+  echo "$as_me:14626: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14424: \$? = $ac_status" >&5
+  echo "$as_me:14632: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -14434,20 +14642,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:14437: result: $cf_cv_fionbio" >&5
+echo "$as_me:14645: result: $cf_cv_fionbio" >&5
 echo "${ECHO_T}$cf_cv_fionbio" >&6
 test "$cf_cv_fionbio" = "fcntl" && cat >>confdefs.h <<\EOF
 #define USE_FCNTL 1
 EOF
 
-echo "$as_me:14443: checking for broken/missing definition of remove" >&5
+echo "$as_me:14651: checking for broken/missing definition of remove" >&5
 echo $ECHO_N "checking for broken/missing definition of remove... $ECHO_C" >&6
 if test "${cf_cv_baddef_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 14450 "configure"
+#line 14658 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14459,23 +14667,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14462: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14670: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14465: \$? = $ac_status" >&5
+  echo "$as_me:14673: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14471: \$? = $ac_status" >&5
+  echo "$as_me:14679: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 14478 "configure"
+#line 14686 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -14488,16 +14696,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14491: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14699: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14494: \$? = $ac_status" >&5
+  echo "$as_me:14702: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14705: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14500: \$? = $ac_status" >&5
+  echo "$as_me:14708: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -14512,20 +14720,20 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:14515: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:14723: result: $cf_cv_baddef_remove" >&5
 echo "${ECHO_T}$cf_cv_baddef_remove" >&6
 test "$cf_cv_baddef_remove" != no && cat >>confdefs.h <<\EOF
 #define NEED_REMOVE 1
 EOF
 
-echo "$as_me:14521: checking for lstat" >&5
+echo "$as_me:14729: checking for lstat" >&5
 echo $ECHO_N "checking for lstat... $ECHO_C" >&6
 if test "${ac_cv_func_lstat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 14528 "configure"
+#line 14736 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14539,16 +14747,16 @@ lstat(".", (struct stat *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14542: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14750: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14545: \$? = $ac_status" >&5
+  echo "$as_me:14753: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14548: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14551: \$? = $ac_status" >&5
+  echo "$as_me:14759: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -14560,7 +14768,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:14563: result: $ac_cv_func_lstat " >&5
+echo "$as_me:14771: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test $ac_cv_func_lstat = yes; then
 	cat >>confdefs.h <<\EOF
@@ -14591,13 +14799,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:14594: checking for $ac_func" >&5
+echo "$as_me:14802: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14600 "configure"
+#line 14808 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -14628,16 +14836,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14631: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14839: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14634: \$? = $ac_status" >&5
+  echo "$as_me:14842: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14637: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14640: \$? = $ac_status" >&5
+  echo "$as_me:14848: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -14647,7 +14855,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14650: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:14858: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -14663,13 +14871,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:14666: checking for $ac_func" >&5
+echo "$as_me:14874: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14672 "configure"
+#line 14880 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -14700,16 +14908,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14911: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14706: \$? = $ac_status" >&5
+  echo "$as_me:14914: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14917: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14712: \$? = $ac_status" >&5
+  echo "$as_me:14920: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -14719,7 +14927,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14722: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:14930: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -14731,7 +14939,7 @@ else
 fi
 done
 
-echo "$as_me:14734: checking for random-integer functions" >&5
+echo "$as_me:14942: checking for random-integer functions" >&5
 echo $ECHO_N "checking for random-integer functions... $ECHO_C" >&6
 if test "${cf_cv_srand_func+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14743,7 +14951,7 @@ do
 	cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'`
 	cf_rand_func=`echo  $cf_func | sed -e 's%.*/%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 14746 "configure"
+#line 14954 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -14762,16 +14970,16 @@ long seed = 1; $cf_srand_func(seed); seed = $cf_rand_func()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14765: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14973: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14768: \$? = $ac_status" >&5
+  echo "$as_me:14976: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14979: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14774: \$? = $ac_status" >&5
+  echo "$as_me:14982: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -14783,10 +14991,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:14786: result: $cf_cv_srand_func" >&5
+echo "$as_me:14994: result: $cf_cv_srand_func" >&5
 echo "${ECHO_T}$cf_cv_srand_func" >&6
 if test "$cf_cv_srand_func" != unknown ; then
-	echo "$as_me:14789: checking for range of random-integers" >&5
+	echo "$as_me:14997: checking for range of random-integers" >&5
 echo $ECHO_N "checking for range of random-integers... $ECHO_C" >&6
 if test "${cf_cv_rand_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14803,7 +15011,7 @@ else
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 14806 "configure"
+#line 15014 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -14822,16 +15030,16 @@ long x = $cf_cv_rand_max
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14825: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15033: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14828: \$? = $ac_status" >&5
+  echo "$as_me:15036: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14834: \$? = $ac_status" >&5
+  echo "$as_me:15042: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14842,7 +15050,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:14845: result: $cf_cv_rand_max" >&5
+echo "$as_me:15053: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 	cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'`
 	cf_rand_func=`echo  $cf_func | sed -e 's%.*/%%'`
@@ -14866,13 +15074,13 @@ fi
 for ac_func in strstr
 do
 
-echo "$as_me:14869: checking for $ac_func declaration" >&5
+echo "$as_me:15077: checking for $ac_func declaration" >&5
 echo $ECHO_N "checking for $ac_func declaration... $ECHO_C" >&6
 if eval "test \"\${ac_cv_func_decl_$ac_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14875 "configure"
+#line 15083 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -14886,20 +15094,20 @@ extern	int	${ac_func}();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14889: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15097: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14892: \$? = $ac_status" >&5
+  echo "$as_me:15100: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15103: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14898: \$? = $ac_status" >&5
+  echo "$as_me:15106: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 14902 "configure"
+#line 15110 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -14913,16 +15121,16 @@ int	(*p)() = ${ac_func};
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14916: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15124: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14919: \$? = $ac_status" >&5
+  echo "$as_me:15127: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14925: \$? = $ac_status" >&5
+  echo "$as_me:15133: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -14943,11 +15151,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
 if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
-  echo "$as_me:14946: result: yes" >&5
+  echo "$as_me:15154: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:14950: result: no" >&5
+  echo "$as_me:15158: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -14962,13 +15170,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:14965: checking for $ac_func declaration" >&5
+echo "$as_me:15173: checking for $ac_func declaration" >&5
 echo $ECHO_N "checking for $ac_func declaration... $ECHO_C" >&6
 if eval "test \"\${ac_cv_func_decl_$ac_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14971 "configure"
+#line 15179 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14984,20 +15192,20 @@ extern	int	${ac_func}();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14987: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15195: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14990: \$? = $ac_status" >&5
+  echo "$as_me:15198: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14996: \$? = $ac_status" >&5
+  echo "$as_me:15204: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15000 "configure"
+#line 15208 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15013,16 +15221,16 @@ int	(*p)() = ${ac_func};
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15016: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15224: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15019: \$? = $ac_status" >&5
+  echo "$as_me:15227: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15022: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15025: \$? = $ac_status" >&5
+  echo "$as_me:15233: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -15043,11 +15251,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
 if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
-  echo "$as_me:15046: result: yes" >&5
+  echo "$as_me:15254: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:15050: result: no" >&5
+  echo "$as_me:15258: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -15059,14 +15267,14 @@ EOF
 fi
 done
 
-echo "$as_me:15062: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:15270: checking if TRUE/FALSE are defined" >&5
 echo $ECHO_N "checking if TRUE/FALSE are defined... $ECHO_C" >&6
 if test "${cf_cv_bool_defs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15069 "configure"
+#line 15277 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -15080,16 +15288,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15083: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15291: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15086: \$? = $ac_status" >&5
+  echo "$as_me:15294: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15089: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15297: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15092: \$? = $ac_status" >&5
+  echo "$as_me:15300: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -15100,7 +15308,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:15103: result: $cf_cv_bool_defs" >&5
+echo "$as_me:15311: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 	cat >>confdefs.h <<\EOF
@@ -15113,14 +15321,14 @@ EOF
 
 fi
 
-echo "$as_me:15116: checking if external errno is declared" >&5
+echo "$as_me:15324: checking if external errno is declared" >&5
 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 15123 "configure"
+#line 15331 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -15138,16 +15346,16 @@ long x = (long) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15141: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15349: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15144: \$? = $ac_status" >&5
+  echo "$as_me:15352: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15355: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15150: \$? = $ac_status" >&5
+  echo "$as_me:15358: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -15158,7 +15366,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:15161: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:15369: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -15173,14 +15381,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:15176: checking if external errno exists" >&5
+echo "$as_me:15384: checking if external errno exists" >&5
 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
 if test "${cf_cv_have_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 15183 "configure"
+#line 15391 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -15195,16 +15403,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15406: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15201: \$? = $ac_status" >&5
+  echo "$as_me:15409: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15412: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15207: \$? = $ac_status" >&5
+  echo "$as_me:15415: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -15215,7 +15423,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:15218: result: $cf_cv_have_errno" >&5
+echo "$as_me:15426: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -15228,7 +15436,7 @@ EOF
 
 fi
 
-echo "$as_me:15231: checking if we can set errno" >&5
+echo "$as_me:15439: checking if we can set errno" >&5
 echo $ECHO_N "checking if we can set errno... $ECHO_C" >&6
 if test "${cf_cv_set_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15236,7 +15444,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 15239 "configure"
+#line 15447 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -15248,16 +15456,16 @@ errno = 255
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15251: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15459: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15254: \$? = $ac_status" >&5
+  echo "$as_me:15462: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15257: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15465: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15260: \$? = $ac_status" >&5
+  echo "$as_me:15468: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -15268,7 +15476,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15271 "configure"
+#line 15479 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -15279,15 +15487,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15282: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15490: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15285: \$? = $ac_status" >&5
+  echo "$as_me:15493: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15287: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15290: \$? = $ac_status" >&5
+  echo "$as_me:15498: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -15300,20 +15508,20 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:15303: result: $cf_cv_set_errno" >&5
+echo "$as_me:15511: result: $cf_cv_set_errno" >&5
 echo "${ECHO_T}$cf_cv_set_errno" >&6
 test "$cf_cv_set_errno" != no && cat >>confdefs.h <<\EOF
 #define CAN_SET_ERRNO 1
 EOF
 
-echo "$as_me:15309: checking for setlocale()" >&5
+echo "$as_me:15517: checking for setlocale()" >&5
 echo $ECHO_N "checking for setlocale()... $ECHO_C" >&6
 if test "${cf_cv_locale+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15316 "configure"
+#line 15524 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -15325,16 +15533,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15328: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15536: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15331: \$? = $ac_status" >&5
+  echo "$as_me:15539: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15542: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15337: \$? = $ac_status" >&5
+  echo "$as_me:15545: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -15346,21 +15554,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:15349: result: $cf_cv_locale" >&5
+echo "$as_me:15557: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test $cf_cv_locale = yes && { cat >>confdefs.h <<\EOF
 #define LOCALE 1
 EOF
  }
 
-echo "$as_me:15356: checking if NGROUPS is defined" >&5
+echo "$as_me:15564: checking if NGROUPS is defined" >&5
 echo $ECHO_N "checking if NGROUPS is defined... $ECHO_C" >&6
 if test "${cf_cv_ngroups+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15363 "configure"
+#line 15571 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -15379,23 +15587,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15382: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15590: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15385: \$? = $ac_status" >&5
+  echo "$as_me:15593: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15596: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15391: \$? = $ac_status" >&5
+  echo "$as_me:15599: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 15398 "configure"
+#line 15606 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -15414,16 +15622,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15417: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15625: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15420: \$? = $ac_status" >&5
+  echo "$as_me:15628: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15426: \$? = $ac_status" >&5
+  echo "$as_me:15634: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -15435,7 +15643,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:15438: result: $cf_cv_ngroups" >&5
+echo "$as_me:15646: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -15452,14 +15660,14 @@ EOF
 
 fi
 
-echo "$as_me:15455: checking if external sys_nerr is declared" >&5
+echo "$as_me:15663: checking if external sys_nerr is declared" >&5
 echo $ECHO_N "checking if external sys_nerr is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_sys_nerr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 15462 "configure"
+#line 15670 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -15477,16 +15685,16 @@ long x = (long) sys_nerr
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15480: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15688: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15483: \$? = $ac_status" >&5
+  echo "$as_me:15691: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15486: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15694: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15489: \$? = $ac_status" >&5
+  echo "$as_me:15697: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -15497,7 +15705,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:15500: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:15708: result: $cf_cv_dcl_sys_nerr" >&5
 echo "${ECHO_T}$cf_cv_dcl_sys_nerr" >&6
 
 if test "$cf_cv_dcl_sys_nerr" = no ; then
@@ -15512,14 +15720,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:15515: checking if external sys_nerr exists" >&5
+echo "$as_me:15723: checking if external sys_nerr exists" >&5
 echo $ECHO_N "checking if external sys_nerr exists... $ECHO_C" >&6
 if test "${cf_cv_have_sys_nerr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 15522 "configure"
+#line 15730 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -15534,16 +15742,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15537: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15745: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15540: \$? = $ac_status" >&5
+  echo "$as_me:15748: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15751: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15546: \$? = $ac_status" >&5
+  echo "$as_me:15754: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -15554,7 +15762,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:15557: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:15765: result: $cf_cv_have_sys_nerr" >&5
 echo "${ECHO_T}$cf_cv_have_sys_nerr" >&6
 
 if test "$cf_cv_have_sys_nerr" = yes ; then
@@ -15567,14 +15775,14 @@ EOF
 
 fi
 
-echo "$as_me:15570: checking if external sys_errlist is declared" >&5
+echo "$as_me:15778: checking if external sys_errlist is declared" >&5
 echo $ECHO_N "checking if external sys_errlist is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_sys_errlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 15577 "configure"
+#line 15785 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -15592,16 +15800,16 @@ long x = (long) sys_errlist
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15595: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15803: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15598: \$? = $ac_status" >&5
+  echo "$as_me:15806: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15601: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15809: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15604: \$? = $ac_status" >&5
+  echo "$as_me:15812: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -15612,7 +15820,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:15615: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:15823: result: $cf_cv_dcl_sys_errlist" >&5
 echo "${ECHO_T}$cf_cv_dcl_sys_errlist" >&6
 
 if test "$cf_cv_dcl_sys_errlist" = no ; then
@@ -15627,14 +15835,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:15630: checking if external sys_errlist exists" >&5
+echo "$as_me:15838: checking if external sys_errlist exists" >&5
 echo $ECHO_N "checking if external sys_errlist exists... $ECHO_C" >&6
 if test "${cf_cv_have_sys_errlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 15637 "configure"
+#line 15845 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -15649,16 +15857,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15652: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15860: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15655: \$? = $ac_status" >&5
+  echo "$as_me:15863: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15866: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15661: \$? = $ac_status" >&5
+  echo "$as_me:15869: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -15669,7 +15877,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:15672: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:15880: result: $cf_cv_have_sys_errlist" >&5
 echo "${ECHO_T}$cf_cv_have_sys_errlist" >&6
 
 if test "$cf_cv_have_sys_errlist" = yes ; then
@@ -15685,23 +15893,23 @@ fi
 for ac_header in lastlog.h paths.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:15688: checking for $ac_header" >&5
+echo "$as_me:15896: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15694 "configure"
+#line 15902 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:15698: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15906: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15704: \$? = $ac_status" >&5
+  echo "$as_me:15912: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15720,7 +15928,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15723: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15931: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -15730,14 +15938,14 @@ EOF
 fi
 done
 
-echo "$as_me:15733: checking for lastlog path" >&5
+echo "$as_me:15941: checking for lastlog path" >&5
 echo $ECHO_N "checking for lastlog path... $ECHO_C" >&6
 if test "${cf_cv_path_lastlog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15740 "configure"
+#line 15948 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -15757,16 +15965,16 @@ char *path = _PATH_LASTLOG
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15760: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15968: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15763: \$? = $ac_status" >&5
+  echo "$as_me:15971: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15974: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15769: \$? = $ac_status" >&5
+  echo "$as_me:15977: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -15781,13 +15989,13 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:15784: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:15992: result: $cf_cv_path_lastlog" >&5
 echo "${ECHO_T}$cf_cv_path_lastlog" >&6
 test $cf_cv_path_lastlog != no && cat >>confdefs.h <<\EOF
 #define USE_LASTLOG 1
 EOF
 
-echo "$as_me:15790: checking for utmp implementation" >&5
+echo "$as_me:15998: checking for utmp implementation" >&5
 echo $ECHO_N "checking for utmp implementation... $ECHO_C" >&6
 if test "${cf_cv_have_utmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15804,7 +16012,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 15807 "configure"
+#line 16015 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -15818,16 +16026,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15821: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16029: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15824: \$? = $ac_status" >&5
+  echo "$as_me:16032: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15830: \$? = $ac_status" >&5
+  echo "$as_me:16038: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -15836,7 +16044,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 15839 "configure"
+#line 16047 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -15850,16 +16058,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15853: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16061: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15856: \$? = $ac_status" >&5
+  echo "$as_me:16064: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15859: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15862: \$? = $ac_status" >&5
+  echo "$as_me:16070: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -15874,7 +16082,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:15877: result: $cf_cv_have_utmp" >&5
+echo "$as_me:16085: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -15887,14 +16095,14 @@ EOF
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:15890: checking if utmp.ut_host is declared" >&5
+echo "$as_me:16098: checking if utmp.ut_host is declared" >&5
 echo $ECHO_N "checking if utmp.ut_host is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 15897 "configure"
+#line 16105 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -15908,16 +16116,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15911: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16119: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15914: \$? = $ac_status" >&5
+  echo "$as_me:16122: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15917: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15920: \$? = $ac_status" >&5
+  echo "$as_me:16128: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -15929,7 +16137,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:15932: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:16140: result: $cf_cv_have_utmp_ut_host" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_host" >&6
 test $cf_cv_have_utmp_ut_host != no && cat >>confdefs.h <<\EOF
 #define HAVE_UTMP_UT_HOST 1
@@ -15938,7 +16146,7 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:15941: checking if utmp.ut_name is declared" >&5
+echo "$as_me:16149: checking if utmp.ut_name is declared" >&5
 echo $ECHO_N "checking if utmp.ut_name is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_name+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15955,7 +16163,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 15958 "configure"
+#line 16166 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -15969,16 +16177,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15972: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16180: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15975: \$? = $ac_status" >&5
+  echo "$as_me:16183: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15981: \$? = $ac_status" >&5
+  echo "$as_me:16189: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -15990,12 +16198,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:15993: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:16201: result: $cf_cv_have_utmp_ut_name" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6
 
 case $cf_cv_have_utmp_ut_name in #(vi
 no) #(vi
-	{ { echo "$as_me:15998: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:16206: error: Cannot find declaration for ut.ut_name" >&5
 echo "$as_me: error: Cannot find declaration for ut.ut_name" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -16009,7 +16217,7 @@ esac
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:16012: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:16220: checking for exit-status in $cf_cv_have_utmp" >&5
 echo $ECHO_N "checking for exit-status in $cf_cv_have_utmp... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_xstatus+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16022,7 +16230,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 16025 "configure"
+#line 16233 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16036,16 +16244,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16039: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16247: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16042: \$? = $ac_status" >&5
+  echo "$as_me:16250: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16253: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16048: \$? = $ac_status" >&5
+  echo "$as_me:16256: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -16058,7 +16266,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:16061: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:16269: result: $cf_cv_have_utmp_ut_xstatus" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xstatus" >&6
 if test $cf_cv_have_utmp_ut_xstatus != no ; then
 	cat >>confdefs.h <<\EOF
@@ -16073,14 +16281,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:16076: checking if utmp.ut_xtime is declared" >&5
+echo "$as_me:16284: checking if utmp.ut_xtime is declared" >&5
 echo $ECHO_N "checking if utmp.ut_xtime is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_xtime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16083 "configure"
+#line 16291 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16094,23 +16302,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16097: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16305: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16100: \$? = $ac_status" >&5
+  echo "$as_me:16308: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16106: \$? = $ac_status" >&5
+  echo "$as_me:16314: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 16113 "configure"
+#line 16321 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16124,16 +16332,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16127: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16335: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16130: \$? = $ac_status" >&5
+  echo "$as_me:16338: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16341: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16136: \$? = $ac_status" >&5
+  echo "$as_me:16344: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -16147,7 +16355,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:16150: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:16358: result: $cf_cv_have_utmp_ut_xtime" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xtime" >&6
 if test $cf_cv_have_utmp_ut_xtime != no ; then
 	cat >>confdefs.h <<\EOF
@@ -16164,14 +16372,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:16167: checking if utmp.ut_session is declared" >&5
+echo "$as_me:16375: checking if utmp.ut_session is declared" >&5
 echo $ECHO_N "checking if utmp.ut_session is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_session+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16174 "configure"
+#line 16382 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16185,16 +16393,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16188: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16396: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16191: \$? = $ac_status" >&5
+  echo "$as_me:16399: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16197: \$? = $ac_status" >&5
+  echo "$as_me:16405: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -16205,7 +16413,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:16208: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:16416: result: $cf_cv_have_utmp_ut_session" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_session" >&6
 if test $cf_cv_have_utmp_ut_session != no ; then
 	cat >>confdefs.h <<\EOF
@@ -16215,7 +16423,7 @@ EOF
 fi
 fi
 
-echo "$as_me:16218: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:16426: checking if $cf_cv_have_utmp is SYSV flavor" >&5
 echo $ECHO_N "checking if $cf_cv_have_utmp is SYSV flavor... $ECHO_C" >&6
 if test "${cf_cv_sysv_utmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16223,7 +16431,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16226 "configure"
+#line 16434 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16242,16 +16450,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16245: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16453: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16248: \$? = $ac_status" >&5
+  echo "$as_me:16456: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16459: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16254: \$? = $ac_status" >&5
+  echo "$as_me:16462: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -16262,7 +16470,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:16265: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:16473: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test $cf_cv_sysv_utmp = yes && cat >>confdefs.h <<\EOF
 #define USE_SYSV_UTMP 1
@@ -16270,14 +16478,14 @@ EOF
 
 fi
 
-echo "$as_me:16273: checking if external h_errno exists" >&5
+echo "$as_me:16481: checking if external h_errno exists" >&5
 echo $ECHO_N "checking if external h_errno exists... $ECHO_C" >&6
 if test "${cf_cv_have_h_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 16280 "configure"
+#line 16488 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -16292,16 +16500,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16295: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16503: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16298: \$? = $ac_status" >&5
+  echo "$as_me:16506: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16301: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16304: \$? = $ac_status" >&5
+  echo "$as_me:16512: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -16312,7 +16520,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:16315: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:16523: result: $cf_cv_have_h_errno" >&5
 echo "${ECHO_T}$cf_cv_have_h_errno" >&6
 
 if test "$cf_cv_have_h_errno" = yes ; then
@@ -16325,7 +16533,7 @@ EOF
 
 fi
 
-echo "$as_me:16328: checking if bibp: URLs should be supported" >&5
+echo "$as_me:16536: checking if bibp: URLs should be supported" >&5
 echo $ECHO_N "checking if bibp: URLs should be supported... $ECHO_C" >&6
 
 # Check whether --enable-bibp-urls or --disable-bibp-urls was given.
@@ -16342,13 +16550,13 @@ else
   use_bibp_urls=yes
 
 fi;
-echo "$as_me:16345: result: $use_bibp_urls" >&5
+echo "$as_me:16553: result: $use_bibp_urls" >&5
 echo "${ECHO_T}$use_bibp_urls" >&6
 test $use_bibp_urls = no && cat >>confdefs.h <<\EOF
 #define DISABLE_BIBP 1
 EOF
 
-echo "$as_me:16351: checking if configuration info should be browsable" >&5
+echo "$as_me:16559: checking if configuration info should be browsable" >&5
 echo $ECHO_N "checking if configuration info should be browsable... $ECHO_C" >&6
 
 # Check whether --enable-config-info or --disable-config-info was given.
@@ -16365,13 +16573,13 @@ else
   use_config_info=yes
 
 fi;
-echo "$as_me:16368: result: $use_config_info" >&5
+echo "$as_me:16576: result: $use_config_info" >&5
 echo "${ECHO_T}$use_config_info" >&6
 test $use_config_info = no && cat >>confdefs.h <<\EOF
 #define NO_CONFIG_INFO 1
 EOF
 
-echo "$as_me:16374: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:16582: checking if new-style forms-based options screen should be used" >&5
 echo $ECHO_N "checking if new-style forms-based options screen should be used... $ECHO_C" >&6
 
 # Check whether --enable-forms-options or --disable-forms-options was given.
@@ -16388,13 +16596,13 @@ else
   use_forms_options=yes
 
 fi;
-echo "$as_me:16391: result: $use_forms_options" >&5
+echo "$as_me:16599: result: $use_forms_options" >&5
 echo "${ECHO_T}$use_forms_options" >&6
 test $use_forms_options = no && cat >>confdefs.h <<\EOF
 #define NO_OPTION_FORMS 1
 EOF
 
-echo "$as_me:16397: checking if old-style options menu should be used" >&5
+echo "$as_me:16605: checking if old-style options menu should be used" >&5
 echo $ECHO_N "checking if old-style options menu should be used... $ECHO_C" >&6
 
 # Check whether --enable-menu-options or --disable-menu-options was given.
@@ -16411,13 +16619,13 @@ else
   use_menu_options=yes
 
 fi;
-echo "$as_me:16414: result: $use_menu_options" >&5
+echo "$as_me:16622: result: $use_menu_options" >&5
 echo "${ECHO_T}$use_menu_options" >&6
 test $use_menu_options = no && cat >>confdefs.h <<\EOF
 #define NO_OPTION_MENU 1
 EOF
 
-echo "$as_me:16420: checking if experimental address-list page should be used" >&5
+echo "$as_me:16628: checking if experimental address-list page should be used" >&5
 echo $ECHO_N "checking if experimental address-list page should be used... $ECHO_C" >&6
 
 # Check whether --enable-addrlist-page or --disable-addrlist-page was given.
@@ -16434,13 +16642,13 @@ else
   use_addrlist_page=no
 
 fi;
-echo "$as_me:16437: result: $use_addrlist_page" >&5
+echo "$as_me:16645: result: $use_addrlist_page" >&5
 echo "${ECHO_T}$use_addrlist_page" >&6
 test $use_addrlist_page != no && cat >>confdefs.h <<\EOF
 #define EXP_ADDRLIST_PAGE 1
 EOF
 
-echo "$as_me:16443: checking if experimental charset-selection logic should be used" >&5
+echo "$as_me:16651: checking if experimental charset-selection logic should be used" >&5
 echo $ECHO_N "checking if experimental charset-selection logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-charset-choice or --disable-charset-choice was given.
@@ -16457,13 +16665,13 @@ else
   use_charset_choice=no
 
 fi;
-echo "$as_me:16460: result: $use_charset_choice" >&5
+echo "$as_me:16668: result: $use_charset_choice" >&5
 echo "${ECHO_T}$use_charset_choice" >&6
 test $use_charset_choice != no && cat >>confdefs.h <<\EOF
 #define EXP_CHARSET_CHOICE 1
 EOF
 
-echo "$as_me:16466: checking if experimental CJK logic should be used" >&5
+echo "$as_me:16674: checking if experimental CJK logic should be used" >&5
 echo $ECHO_N "checking if experimental CJK logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-cjk or --disable-cjk was given.
@@ -16480,13 +16688,13 @@ else
   use_cjk=no
 
 fi;
-echo "$as_me:16483: result: $use_cjk" >&5
+echo "$as_me:16691: result: $use_cjk" >&5
 echo "${ECHO_T}$use_cjk" >&6
 test $use_cjk != no && cat >>confdefs.h <<\EOF
 #define CJK_EX 1
 EOF
 
-echo "$as_me:16489: checking if color-style code should be used" >&5
+echo "$as_me:16697: checking if color-style code should be used" >&5
 echo $ECHO_N "checking if color-style code should be used... $ECHO_C" >&6
 
 # Check whether --enable-color-style or --disable-color-style was given.
@@ -16506,7 +16714,7 @@ fi;
 
 case $use_color_style in
 no)
-	echo "$as_me:16509: result: no" >&5
+	echo "$as_me:16717: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -16515,17 +16723,17 @@ echo "${ECHO_T}no" >&6
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:16518: result: yes" >&5
+	echo "$as_me:16726: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:16521: checking for location of style-sheet file" >&5
+	echo "$as_me:16729: checking for location of style-sheet file" >&5
 echo $ECHO_N "checking for location of style-sheet file... $ECHO_C" >&6
 	LYNX_LSS_FILE=$cf_libdir/lynx.lss
 	cat >>confdefs.h <<EOF
 #define LYNX_LSS_FILE "$LYNX_LSS_FILE"
 EOF
 
-	echo "$as_me:16528: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:16736: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 	INSTALL_LSS=install-lss
 	;;
@@ -16539,7 +16747,7 @@ curses|slang|ncurses*)
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:16542: checking if you want to use default-colors" >&5
+echo "$as_me:16750: checking if you want to use default-colors" >&5
 echo $ECHO_N "checking if you want to use default-colors... $ECHO_C" >&6
 
 # Check whether --enable-default-colors or --disable-default-colors was given.
@@ -16556,7 +16764,7 @@ else
   use_dft_colors=no
 
 fi;
-echo "$as_me:16559: result: $use_dft_colors" >&5
+echo "$as_me:16767: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test $use_dft_colors = "yes" && cat >>confdefs.h <<\EOF
 #define USE_DEFAULT_COLORS 1
@@ -16564,7 +16772,7 @@ EOF
 
 fi
 
-echo "$as_me:16567: checking if experimental htmlized lynx.cfg should be built" >&5
+echo "$as_me:16775: checking if experimental htmlized lynx.cfg should be built" >&5
 echo $ECHO_N "checking if experimental htmlized lynx.cfg should be built... $ECHO_C" >&6
 
 # Check whether --enable-htmlized-cfg or --disable-htmlized-cfg was given.
@@ -16581,7 +16789,7 @@ else
   use_exp_htmlized_cfg=no
 
 fi;
-echo "$as_me:16584: result: $use_exp_htmlized_cfg" >&5
+echo "$as_me:16792: result: $use_exp_htmlized_cfg" >&5
 echo "${ECHO_T}$use_exp_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -16592,7 +16800,7 @@ if test $use_exp_htmlized_cfg = no ; then
 fi
 
 ### check for ipv6 support
-echo "$as_me:16595: checking whether to enable ipv6" >&5
+echo "$as_me:16803: checking whether to enable ipv6" >&5
 echo $ECHO_N "checking whether to enable ipv6... $ECHO_C" >&6
 
 # Check whether --enable-ipv6 or --disable-ipv6 was given.
@@ -16608,11 +16816,11 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:16611: result: $enableval" >&5
+echo "$as_me:16819: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" = "yes"; then
 
-echo "$as_me:16615: checking ipv6 stack type" >&5
+echo "$as_me:16823: checking ipv6 stack type" >&5
 echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6
 if test "${cf_cv_ipv6type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16633,7 +16841,7 @@ do
 		;;
 	inria) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 16636 "configure"
+#line 16844 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -16650,7 +16858,7 @@ rm -f conftest*
 		;;
 	kame) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 16653 "configure"
+#line 16861 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -16667,7 +16875,7 @@ rm -f conftest*
 		;;
 	linux-glibc) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 16670 "configure"
+#line 16878 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -16693,7 +16901,7 @@ rm -f conftest*
 		;;
 	toshiba) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 16696 "configure"
+#line 16904 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -16710,7 +16918,7 @@ rm -f conftest*
 		;;
 	v6d) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 16713 "configure"
+#line 16921 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -16727,7 +16935,7 @@ rm -f conftest*
 		;;
 	zeta)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 16730 "configure"
+#line 16938 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -16749,13 +16957,13 @@ rm -f conftest*
 done
 
 fi
-echo "$as_me:16752: result: $cf_cv_ipv6type" >&5
+echo "$as_me:16960: result: $cf_cv_ipv6type" >&5
 echo "${ECHO_T}$cf_cv_ipv6type" >&6
 
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo "$as_me:16758: checking for IPv6 library if required" >&5
+echo "$as_me:16966: checking for IPv6 library if required" >&5
 echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6
 case $cf_cv_ipv6type in #(vi
 solaris) #(vi
@@ -16785,13 +16993,13 @@ zeta)
 	cf_ipv6dir=v6
 	;;
 esac
-echo "$as_me:16788: result: $cf_ipv6lib" >&5
+echo "$as_me:16996: result: $cf_ipv6lib" >&5
 echo "${ECHO_T}$cf_ipv6lib" >&6
 
 if test "$cf_ipv6lib" != "none"; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16794 "configure"
+#line 17002 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16807,16 +17015,16 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16810: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17018: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16813: \$? = $ac_status" >&5
+  echo "$as_me:17021: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16816: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16819: \$? = $ac_status" >&5
+  echo "$as_me:17027: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16910,13 +17118,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 	eval 'cf_cv_have_lib_'$cf_ipv6lib'=no'
 	cf_libdir=""
-	echo "$as_me:16913: checking for getaddrinfo" >&5
+	echo "$as_me:17121: checking for getaddrinfo" >&5
 echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6
 if test "${ac_cv_func_getaddrinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16919 "configure"
+#line 17127 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getaddrinfo (); below.  */
@@ -16947,16 +17155,16 @@ f = getaddrinfo;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16950: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17158: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16953: \$? = $ac_status" >&5
+  echo "$as_me:17161: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16956: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16959: \$? = $ac_status" >&5
+  echo "$as_me:17167: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getaddrinfo=yes
 else
@@ -16966,18 +17174,18 @@ ac_cv_func_getaddrinfo=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16969: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:17177: result: $ac_cv_func_getaddrinfo" >&5
 echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6
 if test $ac_cv_func_getaddrinfo = yes; then
   eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:16976: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+		echo "$as_me:17184: checking for getaddrinfo in -l$cf_ipv6lib" >&5
 echo $ECHO_N "checking for getaddrinfo in -l$cf_ipv6lib... $ECHO_C" >&6
 		LIBS="-l$cf_ipv6lib $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 16980 "configure"
+#line 17188 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16993,25 +17201,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16996: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17204: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16999: \$? = $ac_status" >&5
+  echo "$as_me:17207: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17210: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17005: \$? = $ac_status" >&5
+  echo "$as_me:17213: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:17007: result: yes" >&5
+  echo "$as_me:17215: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:17014: result: no" >&5
+echo "$as_me:17222: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -17071,11 +17279,11 @@ test -d /usr && {
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:17074: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+				echo "$as_me:17282: checking for -l$cf_ipv6lib in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_ipv6lib in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17078 "configure"
+#line 17286 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17091,25 +17299,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17094: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17302: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17097: \$? = $ac_status" >&5
+  echo "$as_me:17305: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17100: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17103: \$? = $ac_status" >&5
+  echo "$as_me:17311: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:17105: result: yes" >&5
+  echo "$as_me:17313: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:17112: result: no" >&5
+echo "$as_me:17320: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -17124,7 +17332,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib
 
 	if test $cf_found_library = no ; then
-		{ { echo "$as_me:17127: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
+		{ { echo "$as_me:17335: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
 from an appropriate IPv6 kit and compile beforehand." >&5
 echo "$as_me: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
 from an appropriate IPv6 kit and compile beforehand." >&2;}
@@ -17132,7 +17340,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;}
 	fi
 fi
 
-echo "$as_me:17135: checking working getaddrinfo" >&5
+echo "$as_me:17343: checking working getaddrinfo" >&5
 echo $ECHO_N "checking working getaddrinfo... $ECHO_C" >&6
 if test "${cf_cv_getaddrinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17142,7 +17350,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17145 "configure"
+#line 17353 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17222,15 +17430,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:17225: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17433: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17228: \$? = $ac_status" >&5
+  echo "$as_me:17436: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:17230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17233: \$? = $ac_status" >&5
+  echo "$as_me:17441: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_getaddrinfo=yes
 else
@@ -17243,7 +17451,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:17246: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:17454: result: $cf_cv_getaddrinfo" >&5
 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
 if test "$cf_cv_getaddrinfo" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -17258,12 +17466,12 @@ fi
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "$as_me:17261: WARNING: You must get working getaddrinfo() function,
+		{ echo "$as_me:17469: WARNING: You must get working getaddrinfo() function,
 or you can specify \"--disable-ipv6\"" >&5
 echo "$as_me: WARNING: You must get working getaddrinfo() function,
 or you can specify \"--disable-ipv6\"" >&2;}
 	else
-		{ echo "$as_me:17266: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+		{ echo "$as_me:17474: WARNING: The getaddrinfo() implementation on your system seems be buggy.
 You should upgrade your system library to the newest version
 of GNU C library (aka glibc)." >&5
 echo "$as_me: WARNING: The getaddrinfo() implementation on your system seems be buggy.
@@ -17274,7 +17482,7 @@ fi
 
 fi
 
-echo "$as_me:17277: checking if experimental element-justification logic should be used" >&5
+echo "$as_me:17485: checking if experimental element-justification logic should be used" >&5
 echo $ECHO_N "checking if experimental element-justification logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-justify-elts or --disable-justify-elts was given.
@@ -17291,13 +17499,13 @@ else
   use_exp_justify_elts=no
 
 fi;
-echo "$as_me:17294: result: $use_exp_justify_elts" >&5
+echo "$as_me:17502: result: $use_exp_justify_elts" >&5
 echo "${ECHO_T}$use_exp_justify_elts" >&6
 test $use_exp_justify_elts != no && cat >>confdefs.h <<\EOF
 #define EXP_JUSTIFY_ELTS 1
 EOF
 
-echo "$as_me:17300: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:17508: checking if experimental keyboard-layout logic should be used" >&5
 echo $ECHO_N "checking if experimental keyboard-layout logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-kbd-layout or --disable-kbd-layout was given.
@@ -17314,13 +17522,13 @@ else
   use_kbd_layout=no
 
 fi;
-echo "$as_me:17317: result: $use_kbd_layout" >&5
+echo "$as_me:17525: result: $use_kbd_layout" >&5
 echo "${ECHO_T}$use_kbd_layout" >&6
 test $use_kbd_layout != no && cat >>confdefs.h <<\EOF
 #define EXP_KEYBOARD_LAYOUT 1
 EOF
 
-echo "$as_me:17323: checking if experimental locale-charset selection logic should be used" >&5
+echo "$as_me:17531: checking if experimental locale-charset selection logic should be used" >&5
 echo $ECHO_N "checking if experimental locale-charset selection logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-locale-charset or --disable-locale-charset was given.
@@ -17337,13 +17545,13 @@ else
   use_locale_charset=yes
 
 fi;
-echo "$as_me:17340: result: $use_locale_charset" >&5
+echo "$as_me:17548: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test $use_locale_charset != no && cat >>confdefs.h <<\EOF
 #define EXP_LOCALE_CHARSET 1
 EOF
 
-echo "$as_me:17346: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:17554: checking if experimental nested-table logic should be used" >&5
 echo $ECHO_N "checking if experimental nested-table logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-nested-tables or --disable-nested-tables was given.
@@ -17360,13 +17568,13 @@ else
   use_nested_tables=no
 
 fi;
-echo "$as_me:17363: result: $use_nested_tables" >&5
+echo "$as_me:17571: result: $use_nested_tables" >&5
 echo "${ECHO_T}$use_nested_tables" >&6
 test $use_nested_tables != no && cat >>confdefs.h <<\EOF
 #define EXP_NESTED_TABLES 1
 EOF
 
-echo "$as_me:17369: checking if scrollbar code should be used" >&5
+echo "$as_me:17577: checking if scrollbar code should be used" >&5
 echo $ECHO_N "checking if scrollbar code should be used... $ECHO_C" >&6
 
 # Check whether --enable-scrollbar or --disable-scrollbar was given.
@@ -17383,10 +17591,10 @@ else
   use_scrollbar=no
 
 fi;
-echo "$as_me:17386: result: $use_scrollbar" >&5
+echo "$as_me:17594: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:17389: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:17597: checking if alternative line-edit bindings should be used" >&5
 echo $ECHO_N "checking if alternative line-edit bindings should be used... $ECHO_C" >&6
 
 # Check whether --enable-alt-bindings or --disable-alt-bindings was given.
@@ -17403,13 +17611,13 @@ else
   use_alt_bindings=yes
 
 fi;
-echo "$as_me:17406: result: $use_alt_bindings" >&5
+echo "$as_me:17614: result: $use_alt_bindings" >&5
 echo "${ECHO_T}$use_alt_bindings" >&6
 test $use_alt_bindings != no && cat >>confdefs.h <<\EOF
 #define EXP_ALT_BINDINGS 1
 EOF
 
-echo "$as_me:17412: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:17620: checking if you want to use extended HTML DTD logic" >&5
 echo $ECHO_N "checking if you want to use extended HTML DTD logic... $ECHO_C" >&6
 
 # Check whether --enable-extended-dtd or --disable-extended-dtd was given.
@@ -17426,13 +17634,13 @@ else
   use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:17429: result: $use_ext_htmldtd" >&5
+echo "$as_me:17637: result: $use_ext_htmldtd" >&5
 echo "${ECHO_T}$use_ext_htmldtd" >&6
 test $use_ext_htmldtd = "no" && cat >>confdefs.h <<\EOF
 #define NO_EXTENDED_HTMLDTD 1
 EOF
 
-echo "$as_me:17435: checking if file-upload logic should be used" >&5
+echo "$as_me:17643: checking if file-upload logic should be used" >&5
 echo $ECHO_N "checking if file-upload logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-file-upload or --disable-file-upload was given.
@@ -17449,13 +17657,13 @@ else
   use_file_upload=yes
 
 fi;
-echo "$as_me:17452: result: $use_file_upload" >&5
+echo "$as_me:17660: result: $use_file_upload" >&5
 echo "${ECHO_T}$use_file_upload" >&6
 test $use_file_upload != no && cat >>confdefs.h <<\EOF
 #define USE_FILE_UPLOAD 1
 EOF
 
-echo "$as_me:17458: checking if partial-display should be used" >&5
+echo "$as_me:17666: checking if partial-display should be used" >&5
 echo $ECHO_N "checking if partial-display should be used... $ECHO_C" >&6
 
 # Check whether --enable-partial or --disable-partial was given.
@@ -17472,13 +17680,13 @@ else
   use_partial_display=yes
 
 fi;
-echo "$as_me:17475: result: $use_partial_display" >&5
+echo "$as_me:17683: result: $use_partial_display" >&5
 echo "${ECHO_T}$use_partial_display" >&6
 test $use_partial_display != no && cat >>confdefs.h <<\EOF
 #define DISP_PARTIAL 1
 EOF
 
-echo "$as_me:17481: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:17689: checking if persistent-cookie logic should be used" >&5
 echo $ECHO_N "checking if persistent-cookie logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-persistent-cookies or --disable-persistent-cookies was given.
@@ -17495,13 +17703,13 @@ else
   use_filed_cookies=yes
 
 fi;
-echo "$as_me:17498: result: $use_filed_cookies" >&5
+echo "$as_me:17706: result: $use_filed_cookies" >&5
 echo "${ECHO_T}$use_filed_cookies" >&6
 test $use_filed_cookies != no && cat >>confdefs.h <<\EOF
 #define USE_PERSISTENT_COOKIES 1
 EOF
 
-echo "$as_me:17504: checking if html source should be colorized" >&5
+echo "$as_me:17712: checking if html source should be colorized" >&5
 echo $ECHO_N "checking if html source should be colorized... $ECHO_C" >&6
 
 # Check whether --enable-prettysrc or --disable-prettysrc was given.
@@ -17518,13 +17726,13 @@ else
   use_prettysrc=yes
 
 fi;
-echo "$as_me:17521: result: $use_prettysrc" >&5
+echo "$as_me:17729: result: $use_prettysrc" >&5
 echo "${ECHO_T}$use_prettysrc" >&6
 test $use_prettysrc != no && cat >>confdefs.h <<\EOF
 #define USE_PRETTYSRC 1
 EOF
 
-echo "$as_me:17527: checking if read-progress message should show ETA" >&5
+echo "$as_me:17735: checking if read-progress message should show ETA" >&5
 echo $ECHO_N "checking if read-progress message should show ETA... $ECHO_C" >&6
 
 # Check whether --enable-read-eta or --disable-read-eta was given.
@@ -17541,13 +17749,13 @@ else
   use_read_eta=yes
 
 fi;
-echo "$as_me:17544: result: $use_read_eta" >&5
+echo "$as_me:17752: result: $use_read_eta" >&5
 echo "${ECHO_T}$use_read_eta" >&6
 test $use_read_eta != no && cat >>confdefs.h <<\EOF
 #define USE_READPROGRESS 1
 EOF
 
-echo "$as_me:17550: checking if source caching should be used" >&5
+echo "$as_me:17758: checking if source caching should be used" >&5
 echo $ECHO_N "checking if source caching should be used... $ECHO_C" >&6
 
 # Check whether --enable-source-cache or --disable-source-cache was given.
@@ -17564,13 +17772,13 @@ else
   use_source_cache=yes
 
 fi;
-echo "$as_me:17567: result: $use_source_cache" >&5
+echo "$as_me:17775: result: $use_source_cache" >&5
 echo "${ECHO_T}$use_source_cache" >&6
 test $use_source_cache != no && cat >>confdefs.h <<\EOF
 #define USE_SOURCE_CACHE 1
 EOF
 
-echo "$as_me:17573: checking if you want to use external commands" >&5
+echo "$as_me:17781: checking if you want to use external commands" >&5
 echo $ECHO_N "checking if you want to use external commands... $ECHO_C" >&6
 
 # Check whether --enable-externs or --disable-externs was given.
@@ -17587,7 +17795,7 @@ else
   use_externs=no
 
 fi;
-echo "$as_me:17590: result: $use_externs" >&5
+echo "$as_me:17798: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
 	cat >>confdefs.h <<\EOF
@@ -17597,7 +17805,7 @@ EOF
 	LIBOBJS="$LIBOBJS LYExtern\$o"
 fi
 
-echo "$as_me:17600: checking if you want to use setfont support" >&5
+echo "$as_me:17808: checking if you want to use setfont support" >&5
 echo $ECHO_N "checking if you want to use setfont support... $ECHO_C" >&6
 
 # Check whether --enable-font-switch or --disable-font-switch was given.
@@ -17614,13 +17822,13 @@ else
   use_setfont=no
 
 fi;
-echo "$as_me:17617: result: $use_setfont" >&5
+echo "$as_me:17825: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 test $use_setfont = yes && cat >>confdefs.h <<\EOF
 #define EXP_CHARTRANS_AUTOSWITCH 1
 EOF
 
-echo "$as_me:17623: checking if you want cgi-link support" >&5
+echo "$as_me:17831: checking if you want cgi-link support" >&5
 echo $ECHO_N "checking if you want cgi-link support... $ECHO_C" >&6
 
 # Check whether --enable-cgi-links or --disable-cgi-links was given.
@@ -17636,10 +17844,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:17639: result: $enableval" >&5
+echo "$as_me:17847: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:17642: checking if you want change-exec support" >&5
+echo "$as_me:17850: checking if you want change-exec support" >&5
 echo $ECHO_N "checking if you want change-exec support... $ECHO_C" >&6
 
 # Check whether --enable-change-exec or --disable-change-exec was given.
@@ -17656,13 +17864,13 @@ else
   use_change_exec=no
 
 fi;
-echo "$as_me:17659: result: $use_change_exec" >&5
+echo "$as_me:17867: result: $use_change_exec" >&5
 echo "${ECHO_T}$use_change_exec" >&6
 test $use_change_exec = yes && cat >>confdefs.h <<\EOF
 #define ENABLE_OPTS_CHANGE_EXEC 1
 EOF
 
-echo "$as_me:17665: checking if you want exec-links support" >&5
+echo "$as_me:17873: checking if you want exec-links support" >&5
 echo $ECHO_N "checking if you want exec-links support... $ECHO_C" >&6
 
 # Check whether --enable-exec-links or --disable-exec-links was given.
@@ -17679,13 +17887,13 @@ else
   use_exec_links=$enableval
 
 fi;
-echo "$as_me:17682: result: $use_exec_links" >&5
+echo "$as_me:17890: result: $use_exec_links" >&5
 echo "${ECHO_T}$use_exec_links" >&6
 test $use_exec_links = yes && cat >>confdefs.h <<\EOF
 #define EXEC_LINKS 1
 EOF
 
-echo "$as_me:17688: checking if you want exec-scripts support" >&5
+echo "$as_me:17896: checking if you want exec-scripts support" >&5
 echo $ECHO_N "checking if you want exec-scripts support... $ECHO_C" >&6
 
 # Check whether --enable-exec-scripts or --disable-exec-scripts was given.
@@ -17702,13 +17910,13 @@ else
   use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:17705: result: $use_exec_scripts" >&5
+echo "$as_me:17913: result: $use_exec_scripts" >&5
 echo "${ECHO_T}$use_exec_scripts" >&6
 test $use_exec_scripts = yes && cat >>confdefs.h <<\EOF
 #define EXEC_SCRIPTS 1
 EOF
 
-echo "$as_me:17711: checking if you want internal-links feature" >&5
+echo "$as_me:17919: checking if you want internal-links feature" >&5
 echo $ECHO_N "checking if you want internal-links feature... $ECHO_C" >&6
 
 # Check whether --enable-internal-links or --disable-internal-links was given.
@@ -17725,13 +17933,13 @@ else
   use_internal_links=no
 
 fi;
-echo "$as_me:17728: result: $use_internal_links" >&5
+echo "$as_me:17936: result: $use_internal_links" >&5
 echo "${ECHO_T}$use_internal_links" >&6
 test $use_internal_links = no && cat >>confdefs.h <<\EOF
 #define DONT_TRACK_INTERNAL_LINKS 1
 EOF
 
-echo "$as_me:17734: checking if you want to fork NSL requests" >&5
+echo "$as_me:17942: checking if you want to fork NSL requests" >&5
 echo $ECHO_N "checking if you want to fork NSL requests... $ECHO_C" >&6
 
 # Check whether --enable-nsl-fork or --disable-nsl-fork was given.
@@ -17748,13 +17956,13 @@ else
   use_nsl_fork=no
 
 fi;
-echo "$as_me:17751: result: $use_nsl_fork" >&5
+echo "$as_me:17959: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 test $use_nsl_fork = yes && cat >>confdefs.h <<\EOF
 #define NSL_FORK 1
 EOF
 
-echo "$as_me:17757: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:17965: checking if you want to log URL requests via syslog" >&5
 echo $ECHO_N "checking if you want to log URL requests via syslog... $ECHO_C" >&6
 
 # Check whether --enable-syslog or --disable-syslog was given.
@@ -17771,13 +17979,13 @@ else
   use_syslog=no
 
 fi;
-echo "$as_me:17774: result: $use_syslog" >&5
+echo "$as_me:17982: result: $use_syslog" >&5
 echo "${ECHO_T}$use_syslog" >&6
 test $use_syslog = yes && cat >>confdefs.h <<\EOF
 #define SYSLOG_REQUESTED_URLS 1
 EOF
 
-echo "$as_me:17780: checking if you want to underline links" >&5
+echo "$as_me:17988: checking if you want to underline links" >&5
 echo $ECHO_N "checking if you want to underline links... $ECHO_C" >&6
 
 # Check whether --enable-underlines or --disable-underlines was given.
@@ -17794,7 +18002,7 @@ else
   use_underline=no
 
 fi;
-echo "$as_me:17797: result: $use_underline" >&5
+echo "$as_me:18005: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test $use_underline = yes && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 1
@@ -17804,7 +18012,7 @@ test $use_underline = no  && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:17807: checking if help files should be gzip'ed" >&5
+echo "$as_me:18015: checking if help files should be gzip'ed" >&5
 echo $ECHO_N "checking if help files should be gzip'ed... $ECHO_C" >&6
 
 # Check whether --enable-gzip-help or --disable-gzip-help was given.
@@ -17821,10 +18029,10 @@ else
   use_gzip_help=no
 
 fi;
-echo "$as_me:17824: result: $use_gzip_help" >&5
+echo "$as_me:18032: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:17827: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:18035: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
 echo $ECHO_N "checking if you want to use libbz2 for decompression of some bzip2 files... $ECHO_C" >&6
 
 # Check whether --with-bzlib or --without-bzlib was given.
@@ -17834,15 +18042,15 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:17837: result: $use_bzlib" >&5
+echo "$as_me:18045: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
 
-echo "$as_me:17842: checking if we need to add -I option to get bzlib.h" >&5
+echo "$as_me:18050: checking if we need to add -I option to get bzlib.h" >&5
 echo $ECHO_N "checking if we need to add -I option to get bzlib.h... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 17845 "configure"
+#line 18053 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 int
@@ -17854,24 +18062,24 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17857: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18065: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17860: \$? = $ac_status" >&5
+  echo "$as_me:18068: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17863: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17866: \$? = $ac_status" >&5
+  echo "$as_me:18074: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:17868: result: no" >&5
+  echo "$as_me:18076: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-echo "$as_me:17874: result: yes" >&5
+echo "$as_me:18082: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 cf_search=""
 
@@ -17990,13 +18198,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	eval 'cf_cv_have_lib_'bz2'=no'
 	cf_libdir=""
-	echo "$as_me:17993: checking for BZ2_bzopen" >&5
+	echo "$as_me:18201: checking for BZ2_bzopen" >&5
 echo $ECHO_N "checking for BZ2_bzopen... $ECHO_C" >&6
 if test "${ac_cv_func_BZ2_bzopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17999 "configure"
+#line 18207 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char BZ2_bzopen (); below.  */
@@ -18027,16 +18235,16 @@ f = BZ2_bzopen;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18030: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18238: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18033: \$? = $ac_status" >&5
+  echo "$as_me:18241: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18244: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18039: \$? = $ac_status" >&5
+  echo "$as_me:18247: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_BZ2_bzopen=yes
 else
@@ -18046,18 +18254,18 @@ ac_cv_func_BZ2_bzopen=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18049: result: $ac_cv_func_BZ2_bzopen" >&5
+echo "$as_me:18257: result: $ac_cv_func_BZ2_bzopen" >&5
 echo "${ECHO_T}$ac_cv_func_BZ2_bzopen" >&6
 if test $ac_cv_func_BZ2_bzopen = yes; then
   eval 'cf_cv_have_lib_'bz2'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:18056: checking for BZ2_bzopen in -lbz2" >&5
+		echo "$as_me:18264: checking for BZ2_bzopen in -lbz2" >&5
 echo $ECHO_N "checking for BZ2_bzopen in -lbz2... $ECHO_C" >&6
 		LIBS="-lbz2 $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 18060 "configure"
+#line 18268 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18071,25 +18279,25 @@ BZ2_bzopen("name","mode")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18074: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18282: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18077: \$? = $ac_status" >&5
+  echo "$as_me:18285: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18288: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18083: \$? = $ac_status" >&5
+  echo "$as_me:18291: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18085: result: yes" >&5
+  echo "$as_me:18293: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'bz2'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:18092: result: no" >&5
+echo "$as_me:18300: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -18149,11 +18357,11 @@ test -d /usr && {
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:18152: checking for -lbz2 in $cf_libdir" >&5
+				echo "$as_me:18360: checking for -lbz2 in $cf_libdir" >&5
 echo $ECHO_N "checking for -lbz2 in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lbz2 $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 18156 "configure"
+#line 18364 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18167,25 +18375,25 @@ BZ2_bzopen("name","mode")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18170: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18378: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18173: \$? = $ac_status" >&5
+  echo "$as_me:18381: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18384: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18179: \$? = $ac_status" >&5
+  echo "$as_me:18387: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18181: result: yes" >&5
+  echo "$as_me:18389: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'bz2'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:18188: result: no" >&5
+echo "$as_me:18396: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -18200,7 +18408,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'bz2
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:18203: error: Cannot link bz2 library" >&5
+	{ { echo "$as_me:18411: error: Cannot link bz2 library" >&5
 echo "$as_me: error: Cannot link bz2 library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -18211,7 +18419,7 @@ EOF
 
 fi
 
-echo "$as_me:18214: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:18422: checking if you want to use zlib for decompression of some gzip files" >&5
 echo $ECHO_N "checking if you want to use zlib for decompression of some gzip files... $ECHO_C" >&6
 
 # Check whether --with-zlib or --without-zlib was given.
@@ -18221,15 +18429,15 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:18224: result: $use_zlib" >&5
+echo "$as_me:18432: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
 
-echo "$as_me:18229: checking if we need to add -I option to get zlib.h" >&5
+echo "$as_me:18437: checking if we need to add -I option to get zlib.h" >&5
 echo $ECHO_N "checking if we need to add -I option to get zlib.h... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 18232 "configure"
+#line 18440 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 int
@@ -18241,24 +18449,24 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18244: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18452: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18247: \$? = $ac_status" >&5
+  echo "$as_me:18455: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18250: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18458: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18253: \$? = $ac_status" >&5
+  echo "$as_me:18461: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18255: result: no" >&5
+  echo "$as_me:18463: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-echo "$as_me:18261: result: yes" >&5
+echo "$as_me:18469: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 cf_search=""
 
@@ -18377,13 +18585,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	eval 'cf_cv_have_lib_'z'=no'
 	cf_libdir=""
-	echo "$as_me:18380: checking for gzopen" >&5
+	echo "$as_me:18588: checking for gzopen" >&5
 echo $ECHO_N "checking for gzopen... $ECHO_C" >&6
 if test "${ac_cv_func_gzopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18386 "configure"
+#line 18594 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gzopen (); below.  */
@@ -18414,16 +18622,16 @@ f = gzopen;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18625: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18420: \$? = $ac_status" >&5
+  echo "$as_me:18628: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18426: \$? = $ac_status" >&5
+  echo "$as_me:18634: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gzopen=yes
 else
@@ -18433,18 +18641,18 @@ ac_cv_func_gzopen=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18436: result: $ac_cv_func_gzopen" >&5
+echo "$as_me:18644: result: $ac_cv_func_gzopen" >&5
 echo "${ECHO_T}$ac_cv_func_gzopen" >&6
 if test $ac_cv_func_gzopen = yes; then
   eval 'cf_cv_have_lib_'z'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:18443: checking for gzopen in -lz" >&5
+		echo "$as_me:18651: checking for gzopen in -lz" >&5
 echo $ECHO_N "checking for gzopen in -lz... $ECHO_C" >&6
 		LIBS="-lz $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 18447 "configure"
+#line 18655 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 int
@@ -18456,25 +18664,25 @@ gzopen("name","mode")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18459: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18667: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18462: \$? = $ac_status" >&5
+  echo "$as_me:18670: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18465: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18673: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18468: \$? = $ac_status" >&5
+  echo "$as_me:18676: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18470: result: yes" >&5
+  echo "$as_me:18678: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'z'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:18477: result: no" >&5
+echo "$as_me:18685: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -18534,11 +18742,11 @@ test -d /usr && {
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:18537: checking for -lz in $cf_libdir" >&5
+				echo "$as_me:18745: checking for -lz in $cf_libdir" >&5
 echo $ECHO_N "checking for -lz in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lz $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 18541 "configure"
+#line 18749 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 int
@@ -18550,25 +18758,25 @@ gzopen("name","mode")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18553: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18761: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18556: \$? = $ac_status" >&5
+  echo "$as_me:18764: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18767: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18562: \$? = $ac_status" >&5
+  echo "$as_me:18770: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18564: result: yes" >&5
+  echo "$as_me:18772: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'z'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:18571: result: no" >&5
+echo "$as_me:18779: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -18583,7 +18791,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'z
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:18586: error: Cannot link z library" >&5
+	{ { echo "$as_me:18794: error: Cannot link z library" >&5
 echo "$as_me: error: Cannot link z library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -18594,7 +18802,7 @@ EOF
 
 fi
 
-echo "$as_me:18597: checking if you want to exclude FINGER code" >&5
+echo "$as_me:18805: checking if you want to exclude FINGER code" >&5
 echo $ECHO_N "checking if you want to exclude FINGER code... $ECHO_C" >&6
 
 # Check whether --enable-finger or --disable-finger was given.
@@ -18611,13 +18819,13 @@ else
   use_finger=no
 
 fi;
-echo "$as_me:18614: result: $use_finger" >&5
+echo "$as_me:18822: result: $use_finger" >&5
 echo "${ECHO_T}$use_finger" >&6
 test $use_finger != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_FINGER 1
 EOF
 
-echo "$as_me:18620: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:18828: checking if you want to exclude GOPHER code" >&5
 echo $ECHO_N "checking if you want to exclude GOPHER code... $ECHO_C" >&6
 
 # Check whether --enable-gopher or --disable-gopher was given.
@@ -18634,13 +18842,13 @@ else
   use_gopher=no
 
 fi;
-echo "$as_me:18637: result: $use_gopher" >&5
+echo "$as_me:18845: result: $use_gopher" >&5
 echo "${ECHO_T}$use_gopher" >&6
 test $use_gopher != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_GOPHER 1
 EOF
 
-echo "$as_me:18643: checking if you want to exclude NEWS code" >&5
+echo "$as_me:18851: checking if you want to exclude NEWS code" >&5
 echo $ECHO_N "checking if you want to exclude NEWS code... $ECHO_C" >&6
 
 # Check whether --enable-news or --disable-news was given.
@@ -18657,13 +18865,13 @@ else
   use_news=no
 
 fi;
-echo "$as_me:18660: result: $use_news" >&5
+echo "$as_me:18868: result: $use_news" >&5
 echo "${ECHO_T}$use_news" >&6
 test $use_news != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_NEWS 1
 EOF
 
-echo "$as_me:18666: checking if you want to exclude FTP code" >&5
+echo "$as_me:18874: checking if you want to exclude FTP code" >&5
 echo $ECHO_N "checking if you want to exclude FTP code... $ECHO_C" >&6
 
 # Check whether --enable-ftp or --disable-ftp was given.
@@ -18680,7 +18888,7 @@ else
   use_ftp=no
 
 fi;
-echo "$as_me:18683: result: $use_ftp" >&5
+echo "$as_me:18891: result: $use_ftp" >&5
 echo "${ECHO_T}$use_ftp" >&6
 test $use_ftp != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_FTP 1
@@ -18688,7 +18896,7 @@ EOF
 
 # All DirEd functions that were enabled on compilation can be disabled
 # or modified at run time via DIRED_MENU symbols in lynx.cfg.
-echo "$as_me:18691: checking if directory-editor code should be used" >&5
+echo "$as_me:18899: checking if directory-editor code should be used" >&5
 echo $ECHO_N "checking if directory-editor code should be used... $ECHO_C" >&6
 
 # Check whether --enable-dired or --disable-dired was given.
@@ -18705,7 +18913,7 @@ else
   use_dired=yes
 
 fi;
-echo "$as_me:18708: result: $use_dired" >&5
+echo "$as_me:18916: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -18714,7 +18922,7 @@ if test ".$use_dired" != ".no" ; then
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:18717: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:18925: checking if you wish to allow extracting from archives via DirEd" >&5
 echo $ECHO_N "checking if you wish to allow extracting from archives via DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-dearchive or --disable-dired-dearchive was given.
@@ -18730,10 +18938,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:18733: result: $enableval" >&5
+	echo "$as_me:18941: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:18736: checking if DirEd mode should override keys" >&5
+	echo "$as_me:18944: checking if DirEd mode should override keys" >&5
 echo $ECHO_N "checking if DirEd mode should override keys... $ECHO_C" >&6
 
 # Check whether --enable-dired-override or --disable-dired-override was given.
@@ -18755,10 +18963,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:18758: result: $enableval" >&5
+	echo "$as_me:18966: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:18761: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:18969: checking if you wish to allow permissions commands via DirEd" >&5
 echo $ECHO_N "checking if you wish to allow permissions commands via DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-permit or --disable-dired-permit was given.
@@ -18780,10 +18988,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:18783: result: $enableval" >&5
+	echo "$as_me:18991: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:18786: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:18994: checking if you wish to allow executable-permission commands via DirEd" >&5
 echo $ECHO_N "checking if you wish to allow executable-permission commands via DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-xpermit or --disable-dired-xpermit was given.
@@ -18799,10 +19007,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:18802: result: $enableval" >&5
+	echo "$as_me:19010: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:18805: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:19013: checking if you wish to allow \"tar\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"tar\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-tar or --disable-dired-tar was given.
@@ -18824,10 +19032,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:18827: result: $enableval" >&5
+	echo "$as_me:19035: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:18830: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:19038: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"uudecode\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-uudecode or --disable-dired-uudecode was given.
@@ -18849,10 +19057,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:18852: result: $enableval" >&5
+	echo "$as_me:19060: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:18855: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:19063: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-zip or --disable-dired-zip was given.
@@ -18874,10 +19082,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:18877: result: $enableval" >&5
+	echo "$as_me:19085: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:18880: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:19088: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-gzip or --disable-dired-gzip was given.
@@ -18899,11 +19107,11 @@ else
 EOF
 
 fi;
-	echo "$as_me:18902: result: $enableval" >&5
+	echo "$as_me:19110: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:18906: checking if you want long-directory listings" >&5
+echo "$as_me:19114: checking if you want long-directory listings" >&5
 echo $ECHO_N "checking if you want long-directory listings... $ECHO_C" >&6
 
 # Check whether --enable-long-list or --disable-long-list was given.
@@ -18925,10 +19133,10 @@ else
 EOF
 
 fi;
-echo "$as_me:18928: result: $enableval" >&5
+echo "$as_me:19136: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:18931: checking if parent-directory references are permitted" >&5
+echo "$as_me:19139: checking if parent-directory references are permitted" >&5
 echo $ECHO_N "checking if parent-directory references are permitted... $ECHO_C" >&6
 
 # Check whether --enable-parent-dir-refs or --disable-parent-dir-refs was given.
@@ -18944,7 +19152,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:18947: result: $enableval" >&5
+echo "$as_me:19155: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -18952,7 +19160,7 @@ for ac_prog in $TELNET telnet
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:18955: checking for $ac_word" >&5
+echo "$as_me:19163: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TELNET+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18969,7 +19177,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TELNET="$ac_dir/$ac_word"
-   echo "$as_me:18972: found $ac_dir/$ac_word" >&5
+   echo "$as_me:19180: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -18980,10 +19188,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:18983: result: $TELNET" >&5
+  echo "$as_me:19191: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:18986: result: no" >&5
+  echo "$as_me:19194: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19045,7 +19253,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 19048) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 19256) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -19062,7 +19270,7 @@ for ac_prog in $TN3270 tn3270
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:19065: checking for $ac_word" >&5
+echo "$as_me:19273: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TN3270+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19079,7 +19287,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TN3270="$ac_dir/$ac_word"
-   echo "$as_me:19082: found $ac_dir/$ac_word" >&5
+   echo "$as_me:19290: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -19090,10 +19298,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:19093: result: $TN3270" >&5
+  echo "$as_me:19301: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:19096: result: no" >&5
+  echo "$as_me:19304: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19155,7 +19363,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 19158) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 19366) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -19172,7 +19380,7 @@ for ac_prog in $RLOGIN rlogin
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:19175: checking for $ac_word" >&5
+echo "$as_me:19383: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_RLOGIN+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19189,7 +19397,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_RLOGIN="$ac_dir/$ac_word"
-   echo "$as_me:19192: found $ac_dir/$ac_word" >&5
+   echo "$as_me:19400: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -19200,10 +19408,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:19203: result: $RLOGIN" >&5
+  echo "$as_me:19411: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:19206: result: no" >&5
+  echo "$as_me:19414: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19265,7 +19473,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 19268) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 19476) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -19282,7 +19490,7 @@ for ac_prog in $MV mv
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:19285: checking for $ac_word" >&5
+echo "$as_me:19493: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MV+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19299,7 +19507,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_MV="$ac_dir/$ac_word"
-   echo "$as_me:19302: found $ac_dir/$ac_word" >&5
+   echo "$as_me:19510: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -19310,10 +19518,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:19313: result: $MV" >&5
+  echo "$as_me:19521: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:19316: result: no" >&5
+  echo "$as_me:19524: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19375,7 +19583,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 19378) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 19586) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -19392,7 +19600,7 @@ for ac_prog in $GZIP gzip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:19395: checking for $ac_word" >&5
+echo "$as_me:19603: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19409,7 +19617,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GZIP="$ac_dir/$ac_word"
-   echo "$as_me:19412: found $ac_dir/$ac_word" >&5
+   echo "$as_me:19620: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -19420,10 +19628,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:19423: result: $GZIP" >&5
+  echo "$as_me:19631: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:19426: result: no" >&5
+  echo "$as_me:19634: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19485,7 +19693,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 19488) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 19696) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -19502,7 +19710,7 @@ for ac_prog in $UNCOMPRESS gunzip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:19505: checking for $ac_word" >&5
+echo "$as_me:19713: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_UNCOMPRESS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19519,7 +19727,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_UNCOMPRESS="$ac_dir/$ac_word"
-   echo "$as_me:19522: found $ac_dir/$ac_word" >&5
+   echo "$as_me:19730: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -19530,10 +19738,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:19533: result: $UNCOMPRESS" >&5
+  echo "$as_me:19741: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:19536: result: no" >&5
+  echo "$as_me:19744: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19595,7 +19803,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 19598) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 19806) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -19612,7 +19820,7 @@ for ac_prog in $UNZIP unzip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:19615: checking for $ac_word" >&5
+echo "$as_me:19823: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_UNZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19629,7 +19837,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_UNZIP="$ac_dir/$ac_word"
-   echo "$as_me:19632: found $ac_dir/$ac_word" >&5
+   echo "$as_me:19840: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -19640,10 +19848,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:19643: result: $UNZIP" >&5
+  echo "$as_me:19851: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:19646: result: no" >&5
+  echo "$as_me:19854: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19705,7 +19913,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 19708) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 19916) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -19722,7 +19930,7 @@ for ac_prog in $BZIP2 bzip2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:19725: checking for $ac_word" >&5
+echo "$as_me:19933: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_BZIP2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19739,7 +19947,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_BZIP2="$ac_dir/$ac_word"
-   echo "$as_me:19742: found $ac_dir/$ac_word" >&5
+   echo "$as_me:19950: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -19750,10 +19958,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:19753: result: $BZIP2" >&5
+  echo "$as_me:19961: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:19756: result: no" >&5
+  echo "$as_me:19964: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19815,7 +20023,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 19818) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 20026) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -19834,7 +20042,7 @@ for ac_prog in $COMPRESS compress
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:19837: checking for $ac_word" >&5
+echo "$as_me:20045: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_COMPRESS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19851,7 +20059,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_COMPRESS="$ac_dir/$ac_word"
-   echo "$as_me:19854: found $ac_dir/$ac_word" >&5
+   echo "$as_me:20062: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -19862,10 +20070,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:19865: result: $COMPRESS" >&5
+  echo "$as_me:20073: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:19868: result: no" >&5
+  echo "$as_me:20076: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19927,7 +20135,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 19930) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 20138) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -19944,7 +20152,7 @@ for ac_prog in $RM rm
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:19947: checking for $ac_word" >&5
+echo "$as_me:20155: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_RM+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19961,7 +20169,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_RM="$ac_dir/$ac_word"
-   echo "$as_me:19964: found $ac_dir/$ac_word" >&5
+   echo "$as_me:20172: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -19972,10 +20180,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:19975: result: $RM" >&5
+  echo "$as_me:20183: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:19978: result: no" >&5
+  echo "$as_me:20186: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20037,7 +20245,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 20040) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 20248) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -20054,7 +20262,7 @@ for ac_prog in $TAR tar pax gtar gnutar bsdtar star
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:20057: checking for $ac_word" >&5
+echo "$as_me:20265: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TAR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20071,7 +20279,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TAR="$ac_dir/$ac_word"
-   echo "$as_me:20074: found $ac_dir/$ac_word" >&5
+   echo "$as_me:20282: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -20082,10 +20290,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:20085: result: $TAR" >&5
+  echo "$as_me:20293: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:20088: result: no" >&5
+  echo "$as_me:20296: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20147,7 +20355,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 20150) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 20358) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -20164,7 +20372,7 @@ for ac_prog in $UUDECODE uudecode
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:20167: checking for $ac_word" >&5
+echo "$as_me:20375: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_UUDECODE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20181,7 +20389,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_UUDECODE="$ac_dir/$ac_word"
-   echo "$as_me:20184: found $ac_dir/$ac_word" >&5
+   echo "$as_me:20392: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -20192,10 +20400,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:20195: result: $UUDECODE" >&5
+  echo "$as_me:20403: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:20198: result: no" >&5
+  echo "$as_me:20406: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20257,7 +20465,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 20260) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 20468) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -20274,7 +20482,7 @@ for ac_prog in $ZCAT zcat
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:20277: checking for $ac_word" >&5
+echo "$as_me:20485: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ZCAT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20291,7 +20499,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ZCAT="$ac_dir/$ac_word"
-   echo "$as_me:20294: found $ac_dir/$ac_word" >&5
+   echo "$as_me:20502: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -20302,10 +20510,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:20305: result: $ZCAT" >&5
+  echo "$as_me:20513: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:20308: result: no" >&5
+  echo "$as_me:20516: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20367,7 +20575,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 20370) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 20578) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -20384,7 +20592,7 @@ for ac_prog in $ZIP zip
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:20387: checking for $ac_word" >&5
+echo "$as_me:20595: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20401,7 +20609,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ZIP="$ac_dir/$ac_word"
-   echo "$as_me:20404: found $ac_dir/$ac_word" >&5
+   echo "$as_me:20612: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -20412,10 +20620,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:20415: result: $ZIP" >&5
+  echo "$as_me:20623: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:20418: result: no" >&5
+  echo "$as_me:20626: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20477,7 +20685,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 20480) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 20688) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -20542,7 +20750,7 @@ for ac_prog in $INSTALL install
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:20545: checking for $ac_word" >&5
+echo "$as_me:20753: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_INSTALL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20559,7 +20767,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INSTALL="$ac_dir/$ac_word"
-   echo "$as_me:20562: found $ac_dir/$ac_word" >&5
+   echo "$as_me:20770: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -20570,10 +20778,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:20573: result: $INSTALL" >&5
+  echo "$as_me:20781: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:20576: result: no" >&5
+  echo "$as_me:20784: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20635,7 +20843,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 20638) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 20846) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -20661,7 +20869,7 @@ fi
 
 if test $cf_cv_screen = pdcurses ; then
 
-	echo "$as_me:20664: checking for X" >&5
+	echo "$as_me:20872: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -20758,17 +20966,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
-#line 20761 "configure"
+#line 20969 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:20765: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20973: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20771: \$? = $ac_status" >&5
+  echo "$as_me:20979: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20801,7 +21009,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 20804 "configure"
+#line 21012 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -20813,16 +21021,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20816: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21024: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20819: \$? = $ac_status" >&5
+  echo "$as_me:21027: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20822: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20825: \$? = $ac_status" >&5
+  echo "$as_me:21033: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -20860,7 +21068,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:20863: result: $have_x" >&5
+  echo "$as_me:21071: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -20870,412 +21078,11 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:20873: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:21081: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
-# We need to check for -lsocket and -lnsl here in order to work around an
-# autoconf bug.  autoconf-2.12 is not checking for these prior to checking for
-# the X11R6 -lSM and -lICE libraries.  The resultant failures cascade...
-# 	(tested on Solaris 2.5 w/ X11R6)
-SYSTEM_NAME=`echo "$cf_cv_system_name"|tr ' ' -`
-cf_have_X_LIBS=no
-case $SYSTEM_NAME in
-irix[56]*) ;;
-clix*)
-	# FIXME: modify the library lookup in autoconf to
-	# allow _s.a suffix ahead of .a
-	echo "$as_me:20888: checking for open in -lc_s" >&5
-echo $ECHO_N "checking for open in -lc_s... $ECHO_C" >&6
-if test "${ac_cv_lib_c_s_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc_s  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 20896 "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char open ();
-int
-main ()
-{
-open ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20915: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:20918: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20921: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:20924: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_c_s_open=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_c_s_open=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:20935: result: $ac_cv_lib_c_s_open" >&5
-echo "${ECHO_T}$ac_cv_lib_c_s_open" >&6
-if test $ac_cv_lib_c_s_open = yes; then
-  LIBS="-lc_s $LIBS"
-	echo "$as_me:20939: checking for gethostname in -lbsd" >&5
-echo $ECHO_N "checking for gethostname in -lbsd... $ECHO_C" >&6
-if test "${ac_cv_lib_bsd_gethostname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbsd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 20947 "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gethostname ();
-int
-main ()
-{
-gethostname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20966: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:20969: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20972: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:20975: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_bsd_gethostname=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_bsd_gethostname=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:20986: result: $ac_cv_lib_bsd_gethostname" >&5
-echo "${ECHO_T}$ac_cv_lib_bsd_gethostname" >&6
-if test $ac_cv_lib_bsd_gethostname = yes; then
-  LIBS="-lbsd $LIBS"
-	echo "$as_me:20990: checking for gethostname in -lnsl_s" >&5
-echo $ECHO_N "checking for gethostname in -lnsl_s... $ECHO_C" >&6
-if test "${ac_cv_lib_nsl_s_gethostname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl_s  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 20998 "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gethostname ();
-int
-main ()
-{
-gethostname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21017: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21020: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21023: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21026: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_nsl_s_gethostname=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_nsl_s_gethostname=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:21037: result: $ac_cv_lib_nsl_s_gethostname" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_s_gethostname" >&6
-if test $ac_cv_lib_nsl_s_gethostname = yes; then
-  LIBS="-lnsl_s $LIBS"
-	echo "$as_me:21041: checking for XOpenDisplay in -lX11_s" >&5
-echo $ECHO_N "checking for XOpenDisplay in -lX11_s... $ECHO_C" >&6
-if test "${ac_cv_lib_X11_s_XOpenDisplay+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lX11_s  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 21049 "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char XOpenDisplay ();
-int
-main ()
-{
-XOpenDisplay ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21068: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21071: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21074: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21077: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_X11_s_XOpenDisplay=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_X11_s_XOpenDisplay=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:21088: result: $ac_cv_lib_X11_s_XOpenDisplay" >&5
-echo "${ECHO_T}$ac_cv_lib_X11_s_XOpenDisplay" >&6
-if test $ac_cv_lib_X11_s_XOpenDisplay = yes; then
-  LIBS="-lX11_s $LIBS"
-	echo "$as_me:21092: checking for XtAppInitialize in -lXt_s" >&5
-echo $ECHO_N "checking for XtAppInitialize in -lXt_s... $ECHO_C" >&6
-if test "${ac_cv_lib_Xt_s_XtAppInitialize+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXt_s  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 21100 "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char XtAppInitialize ();
-int
-main ()
-{
-XtAppInitialize ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21119: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21122: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21125: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21128: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_Xt_s_XtAppInitialize=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_Xt_s_XtAppInitialize=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:21139: result: $ac_cv_lib_Xt_s_XtAppInitialize" >&5
-echo "${ECHO_T}$ac_cv_lib_Xt_s_XtAppInitialize" >&6
-if test $ac_cv_lib_Xt_s_XtAppInitialize = yes; then
-  LIBS="-lXt_s $LIBS"
-		 cf_have_X_LIBS=Xt
-
-fi
-
-fi
-
-fi
-
-fi
-
-fi
-
-	;;
-*)
-
-echo "$as_me:21158: checking for socket in -lsocket" >&5
-echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_socket+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 21166 "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char socket ();
-int
-main ()
-{
-socket ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21185: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21188: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21191: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21194: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket_socket=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_socket_socket=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:21205: result: $ac_cv_lib_socket_socket" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
-if test $ac_cv_lib_socket_socket = yes; then
-  cat >>confdefs.h <<EOF
-#define HAVE_LIBSOCKET 1
-EOF
-
-  LIBS="-lsocket $LIBS"
-
-fi
-
-echo "$as_me:21216: checking for gethostname in -lnsl" >&5
-echo $ECHO_N "checking for gethostname in -lnsl... $ECHO_C" >&6
-if test "${ac_cv_lib_nsl_gethostname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 21224 "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char gethostname ();
-int
-main ()
-{
-gethostname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21243: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21246: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21249: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21252: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_nsl_gethostname=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_nsl_gethostname=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:21263: result: $ac_cv_lib_nsl_gethostname" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostname" >&6
-if test $ac_cv_lib_nsl_gethostname = yes; then
-  cat >>confdefs.h <<EOF
-#define HAVE_LIBNSL 1
-EOF
-
-  LIBS="-lnsl $LIBS"
-
-fi
-
-	;;
-esac
-
-if test $cf_have_X_LIBS = no ; then
-	if test "$no_x" = yes; then
+if test "$no_x" = yes; then
   # Not all programs may use this symbol, but it does not hurt to define it.
 
 cat >>confdefs.h <<\EOF
@@ -21295,11 +21102,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:21298: checking whether -R must be followed by a space" >&5
+      echo "$as_me:21105: checking whether -R must be followed by a space" >&5
 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
       cat >conftest.$ac_ext <<_ACEOF
-#line 21302 "configure"
+#line 21109 "configure"
 #include "confdefs.h"
 
 int
@@ -21311,16 +21118,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21314: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21121: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21317: \$? = $ac_status" >&5
+  echo "$as_me:21124: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21320: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21127: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21323: \$? = $ac_status" >&5
+  echo "$as_me:21130: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -21330,13 +21137,13 @@ ac_R_nospace=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       if test $ac_R_nospace = yes; then
-	echo "$as_me:21333: result: no" >&5
+	echo "$as_me:21140: result: no" >&5
 echo "${ECHO_T}no" >&6
 	X_LIBS="$X_LIBS -R$x_libraries"
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21339 "configure"
+#line 21146 "configure"
 #include "confdefs.h"
 
 int
@@ -21348,16 +21155,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21351: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21158: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21354: \$? = $ac_status" >&5
+  echo "$as_me:21161: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21357: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21360: \$? = $ac_status" >&5
+  echo "$as_me:21167: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -21367,11 +21174,11 @@ ac_R_space=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	if test $ac_R_space = yes; then
-	  echo "$as_me:21370: result: yes" >&5
+	  echo "$as_me:21177: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:21374: result: neither works" >&5
+	  echo "$as_me:21181: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -21391,7 +21198,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >conftest.$ac_ext <<_ACEOF
-#line 21394 "configure"
+#line 21201 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21410,22 +21217,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21413: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21220: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21416: \$? = $ac_status" >&5
+  echo "$as_me:21223: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21419: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21226: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21422: \$? = $ac_status" >&5
+  echo "$as_me:21229: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:21428: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:21235: checking for dnet_ntoa in -ldnet" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21433,7 +21240,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21436 "configure"
+#line 21243 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21452,16 +21259,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21455: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21262: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21458: \$? = $ac_status" >&5
+  echo "$as_me:21265: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21464: \$? = $ac_status" >&5
+  echo "$as_me:21271: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -21472,14 +21279,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21475: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:21282: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo "$as_me:21482: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:21289: checking for dnet_ntoa in -ldnet_stub" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21487,7 +21294,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21490 "configure"
+#line 21297 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21506,16 +21313,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21509: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21316: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21512: \$? = $ac_status" >&5
+  echo "$as_me:21319: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21515: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21322: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21518: \$? = $ac_status" >&5
+  echo "$as_me:21325: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -21526,7 +21333,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21529: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:21336: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
@@ -21545,13 +21352,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:21548: checking for gethostbyname" >&5
+    echo "$as_me:21355: checking for gethostbyname" >&5
 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21554 "configure"
+#line 21361 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -21582,16 +21389,16 @@ f = gethostbyname;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21585: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21392: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21588: \$? = $ac_status" >&5
+  echo "$as_me:21395: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21591: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21398: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21594: \$? = $ac_status" >&5
+  echo "$as_me:21401: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -21601,11 +21408,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21604: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:21411: result: $ac_cv_func_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then
-      echo "$as_me:21608: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:21415: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21613,7 +21420,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21616 "configure"
+#line 21423 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21632,16 +21439,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21635: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21442: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21638: \$? = $ac_status" >&5
+  echo "$as_me:21445: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21641: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21448: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21644: \$? = $ac_status" >&5
+  echo "$as_me:21451: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -21652,14 +21459,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21655: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:21462: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-        echo "$as_me:21662: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:21469: checking for gethostbyname in -lbsd" >&5
 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21667,7 +21474,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21670 "configure"
+#line 21477 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21686,16 +21493,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21689: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21496: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21692: \$? = $ac_status" >&5
+  echo "$as_me:21499: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21695: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21502: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21698: \$? = $ac_status" >&5
+  echo "$as_me:21505: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -21706,7 +21513,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21709: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:21516: result: $ac_cv_lib_bsd_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
 if test $ac_cv_lib_bsd_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
@@ -21722,13 +21529,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:21725: checking for connect" >&5
+    echo "$as_me:21532: checking for connect" >&5
 echo $ECHO_N "checking for connect... $ECHO_C" >&6
 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21731 "configure"
+#line 21538 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -21759,16 +21566,16 @@ f = connect;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21762: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21569: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21765: \$? = $ac_status" >&5
+  echo "$as_me:21572: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21771: \$? = $ac_status" >&5
+  echo "$as_me:21578: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -21778,11 +21585,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21781: result: $ac_cv_func_connect" >&5
+echo "$as_me:21588: result: $ac_cv_func_connect" >&5
 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then
-      echo "$as_me:21785: checking for connect in -lsocket" >&5
+      echo "$as_me:21592: checking for connect in -lsocket" >&5
 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21790,7 +21597,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21793 "configure"
+#line 21600 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21809,16 +21616,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21812: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21619: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21815: \$? = $ac_status" >&5
+  echo "$as_me:21622: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21821: \$? = $ac_status" >&5
+  echo "$as_me:21628: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -21829,7 +21636,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21832: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:21639: result: $ac_cv_lib_socket_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 if test $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
@@ -21838,13 +21645,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:21841: checking for remove" >&5
+    echo "$as_me:21648: checking for remove" >&5
 echo $ECHO_N "checking for remove... $ECHO_C" >&6
 if test "${ac_cv_func_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21847 "configure"
+#line 21654 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -21875,16 +21682,16 @@ f = remove;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21878: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21685: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21881: \$? = $ac_status" >&5
+  echo "$as_me:21688: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21691: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21887: \$? = $ac_status" >&5
+  echo "$as_me:21694: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -21894,11 +21701,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21897: result: $ac_cv_func_remove" >&5
+echo "$as_me:21704: result: $ac_cv_func_remove" >&5
 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then
-      echo "$as_me:21901: checking for remove in -lposix" >&5
+      echo "$as_me:21708: checking for remove in -lposix" >&5
 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
 if test "${ac_cv_lib_posix_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21906,7 +21713,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21909 "configure"
+#line 21716 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21925,16 +21732,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21928: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21735: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21931: \$? = $ac_status" >&5
+  echo "$as_me:21738: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21741: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21937: \$? = $ac_status" >&5
+  echo "$as_me:21744: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -21945,7 +21752,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21948: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:21755: result: $ac_cv_lib_posix_remove" >&5
 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
 if test $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
@@ -21954,13 +21761,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:21957: checking for shmat" >&5
+    echo "$as_me:21764: checking for shmat" >&5
 echo $ECHO_N "checking for shmat... $ECHO_C" >&6
 if test "${ac_cv_func_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21963 "configure"
+#line 21770 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -21991,16 +21798,16 @@ f = shmat;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21994: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21801: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21997: \$? = $ac_status" >&5
+  echo "$as_me:21804: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21807: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22003: \$? = $ac_status" >&5
+  echo "$as_me:21810: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -22010,11 +21817,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22013: result: $ac_cv_func_shmat" >&5
+echo "$as_me:21820: result: $ac_cv_func_shmat" >&5
 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then
-      echo "$as_me:22017: checking for shmat in -lipc" >&5
+      echo "$as_me:21824: checking for shmat in -lipc" >&5
 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22022,7 +21829,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22025 "configure"
+#line 21832 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22041,16 +21848,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22044: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21851: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22047: \$? = $ac_status" >&5
+  echo "$as_me:21854: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22053: \$? = $ac_status" >&5
+  echo "$as_me:21860: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -22061,7 +21868,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22064: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:21871: result: $ac_cv_lib_ipc_shmat" >&5
 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
 if test $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
@@ -22079,7 +21886,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:22082: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:21889: checking for IceConnectionNumber in -lICE" >&5
 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22087,7 +21894,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22090 "configure"
+#line 21897 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22106,16 +21913,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22109: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21916: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22112: \$? = $ac_status" >&5
+  echo "$as_me:21919: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22118: \$? = $ac_status" >&5
+  echo "$as_me:21925: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -22126,7 +21933,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22129: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:21936: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
@@ -22136,7 +21943,11 @@ fi
 
 fi
 
-	LDFLAGS="$LDFLAGS $X_LIBS"
+# SYSTEM_NAME=`echo "$cf_cv_system_name"|tr ' ' -`
+
+cf_have_X_LIBS=no
+
+LDFLAGS="$X_LIBS $LDFLAGS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
@@ -22177,7 +21988,7 @@ fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 22180 "configure"
+#line 21991 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22189,16 +22000,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22192: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22003: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22195: \$? = $ac_status" >&5
+  echo "$as_me:22006: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22198: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22009: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22201: \$? = $ac_status" >&5
+  echo "$as_me:22012: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22215,7 +22026,69 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-	echo "$as_me:22218: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:22029: checking for XOpenDisplay" >&5
+echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
+if test "${ac_cv_func_XOpenDisplay+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 22035 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char XOpenDisplay (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char XOpenDisplay ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_XOpenDisplay) || defined (__stub___XOpenDisplay)
+choke me
+#else
+f = XOpenDisplay;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:22066: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:22069: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:22072: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:22075: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_XOpenDisplay=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_XOpenDisplay=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:22085: result: $ac_cv_func_XOpenDisplay" >&5
+echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
+if test $ac_cv_func_XOpenDisplay = yes; then
+  :
+else
+
+echo "$as_me:22091: checking for XOpenDisplay in -lX11" >&5
 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22223,7 +22096,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22226 "configure"
+#line 22099 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22242,16 +22115,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22245: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22118: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22248: \$? = $ac_status" >&5
+  echo "$as_me:22121: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22254: \$? = $ac_status" >&5
+  echo "$as_me:22127: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -22262,23 +22135,25 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22265: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:22138: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   LIBS="-lX11 $LIBS"
 fi
 
-	echo "$as_me:22271: checking for XtAppInitialize in -lXt" >&5
-echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
-if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
+fi
+
+echo "$as_me:22146: checking for XtAppInitialize" >&5
+echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
+if test "${ac_cv_func_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 22279 "configure"
+  cat >conftest.$ac_ext <<_ACEOF
+#line 22152 "configure"
 #include "confdefs.h"
-
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char XtAppInitialize (); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -22286,130 +22161,112 @@ extern "C"
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
 char XtAppInitialize ();
+char (*f) ();
+
 int
 main ()
 {
-XtAppInitialize ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_XtAppInitialize) || defined (__stub___XtAppInitialize)
+choke me
+#else
+f = XtAppInitialize;
+#endif
+
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22298: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22183: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22301: \$? = $ac_status" >&5
+  echo "$as_me:22186: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22189: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22307: \$? = $ac_status" >&5
+  echo "$as_me:22192: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_Xt_XtAppInitialize=yes
+  ac_cv_func_XtAppInitialize=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-ac_cv_lib_Xt_XtAppInitialize=no
+ac_cv_func_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:22318: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
-echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
-if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
-  cat >>confdefs.h <<\EOF
-#define HAVE_LIBXT 1
-EOF
-
-		 cf_have_X_LIBS=Xt
-		 LIBS="-lXt $X_PRE_LIBS $LIBS"
 fi
-
+echo "$as_me:22202: result: $ac_cv_func_XtAppInitialize" >&5
+echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
+if test $ac_cv_func_XtAppInitialize = yes; then
+  :
 else
-	LDFLAGS="$LDFLAGS $X_LIBS"
-
-test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
-
-cf_check_cflags="$CFLAGS"
-cf_check_cppflags="$CPPFLAGS"
-
-cf_new_cflags=
-cf_new_cppflags=
-for cf_add_cflags in $X_CFLAGS
-do
-	case $cf_add_cflags in #(vi
-	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
-		case "$CPPFLAGS" in
-		*$cf_add_cflags) #(vi
-			;;
-		*) #(vi
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
-			;;
-		esac
-		;;
-	*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
-		;;
-	esac
-done
-
-if test -n "$cf_new_cflags" ; then
-	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
-fi
-
-if test -n "$cf_new_cppflags" ; then
-	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
-
-	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
-fi
-
-if test "$cf_check_cflags" != "$CFLAGS" ; then
+echo "$as_me:22208: checking for XtAppInitialize in -lXt" >&5
+echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
+if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22371 "configure"
+#line 22216 "configure"
 #include "confdefs.h"
-#include <stdio.h>
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char XtAppInitialize ();
 int
 main ()
 {
-printf("Hello world");
+XtAppInitialize ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22383: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22235: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22386: \$? = $ac_status" >&5
+  echo "$as_me:22238: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22389: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22392: \$? = $ac_status" >&5
+  echo "$as_me:22244: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  :
+  ac_cv_lib_Xt_XtAppInitialize=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
-
-	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
-		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
-
-	 fi
-	 CFLAGS="$cf_check_flags"
+ac_cv_lib_Xt_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:22255: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
+if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
+  cat >>confdefs.h <<\EOF
+#define HAVE_LIBXT 1
+EOF
+
+	 cf_have_X_LIBS=Xt
+	 LIBS="-lXt $X_PRE_LIBS $LIBS"
 fi
 
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:22412: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:22269: WARNING: Unable to successfully link X Toolkit library (-lXt) with
 test program.  You will have to check and add the proper libraries by hand
 to makefile." >&5
 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
@@ -22437,7 +22294,7 @@ if test "${with_XawPlus+set}" = set; then
   cf_x_athena=XawPlus
 fi;
 
-echo "$as_me:22440: checking for XextCreateExtension in -lXext" >&5
+echo "$as_me:22297: checking for XextCreateExtension in -lXext" >&5
 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22445,7 +22302,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22448 "configure"
+#line 22305 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22464,16 +22321,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22467: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22324: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22470: \$? = $ac_status" >&5
+  echo "$as_me:22327: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22473: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22476: \$? = $ac_status" >&5
+  echo "$as_me:22333: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -22484,7 +22341,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22487: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:22344: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
   LIBS="-lXext $LIBS"
@@ -22506,14 +22363,14 @@ do
 		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
 		if test $cf_path != default ; then
 			CPPFLAGS="-I$cf_path/include $cf_save"
-			echo "$as_me:22509: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:22366: checking for $cf_test in $cf_path" >&5
 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
 		else
-			echo "$as_me:22512: checking for $cf_test" >&5
+			echo "$as_me:22369: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 22516 "configure"
+#line 22373 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -22527,16 +22384,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22530: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22387: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22533: \$? = $ac_status" >&5
+  echo "$as_me:22390: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22393: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22539: \$? = $ac_status" >&5
+  echo "$as_me:22396: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -22545,7 +22402,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:22548: result: $cf_result" >&5
+		echo "$as_me:22405: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_include=$cf_path
@@ -22557,7 +22414,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_include" ; then
-	{ echo "$as_me:22560: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:22417: WARNING: Unable to successfully find Athena header files with test program" >&5
 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
 elif test "$cf_x_athena_include" != default ; then
 	CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include"
@@ -22582,17 +22439,17 @@ do
 			cf_test=XawSimpleMenuAddGlobalActions
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
-				echo "$as_me:22585: checking for $cf_lib in $cf_path" >&5
+				echo "$as_me:22442: checking for $cf_lib in $cf_path" >&5
 echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6
 			else
 				LIBS="$cf_lib $LIBS"
-				echo "$as_me:22589: checking for $cf_test in $cf_lib" >&5
+				echo "$as_me:22446: checking for $cf_test in $cf_lib" >&5
 echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6
 			fi
 			cf_SAVE="$LIBS"
 			LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 22595 "configure"
+#line 22452 "configure"
 #include "confdefs.h"
 
 int
@@ -22604,16 +22461,16 @@ $cf_test()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22607: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22464: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22610: \$? = $ac_status" >&5
+  echo "$as_me:22467: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22613: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22470: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22616: \$? = $ac_status" >&5
+  echo "$as_me:22473: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -22622,7 +22479,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:22625: result: $cf_result" >&5
+			echo "$as_me:22482: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_lib"
@@ -22636,7 +22493,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:22639: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:22496: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22688,7 +22545,7 @@ fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 22691 "configure"
+#line 22548 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22700,16 +22557,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22560: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22706: \$? = $ac_status" >&5
+  echo "$as_me:22563: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22712: \$? = $ac_status" >&5
+  echo "$as_me:22569: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22726,7 +22583,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:22729: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:22586: checking for XOpenDisplay in -lX11" >&5
 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22734,7 +22591,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22737 "configure"
+#line 22594 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22753,16 +22610,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22756: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22613: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22759: \$? = $ac_status" >&5
+  echo "$as_me:22616: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22762: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22619: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22765: \$? = $ac_status" >&5
+  echo "$as_me:22622: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -22773,13 +22630,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22776: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:22633: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   LIBS="-lX11 $LIBS"
 fi
 
-echo "$as_me:22782: checking for XCurses library" >&5
+echo "$as_me:22639: checking for XCurses library" >&5
 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
 if test "${cf_cv_lib_XCurses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22787,7 +22644,7 @@ else
 
 LIBS="-lXCurses $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22790 "configure"
+#line 22647 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -22802,16 +22659,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22805: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22662: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22808: \$? = $ac_status" >&5
+  echo "$as_me:22665: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22668: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22814: \$? = $ac_status" >&5
+  echo "$as_me:22671: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -22822,7 +22679,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:22825: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:22682: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 if test $cf_cv_lib_XCurses = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -22838,14 +22695,14 @@ EOF
 EOF
 
 else
-	{ { echo "$as_me:22841: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:22698: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 else
 
-echo "$as_me:22848: checking if we can include termio.h with curses" >&5
+echo "$as_me:22705: checking if we can include termio.h with curses" >&5
 echo $ECHO_N "checking if we can include termio.h with curses... $ECHO_C" >&6
 if test "${cf_cv_termio_and_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22855,7 +22712,7 @@ else
     CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H -I. -I${srcdir-.} -I${srcdir-.}/src -I${srcdir-.}/WWW/Library/Implementation"
     touch lynx_cfg.h
     cat >conftest.$ac_ext <<_ACEOF
-#line 22858 "configure"
+#line 22715 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -22869,16 +22726,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22872: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22729: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22875: \$? = $ac_status" >&5
+  echo "$as_me:22732: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22735: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22881: \$? = $ac_status" >&5
+  echo "$as_me:22738: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -22891,7 +22748,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:22894: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:22751: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test $cf_cv_termio_and_curses = yes && cat >>confdefs.h <<\EOF
@@ -22906,23 +22763,23 @@ if test $cf_cv_screen != slang ; then
 for ac_header in $cf_cv_screen/term.h term.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22909: checking for $ac_header" >&5
+echo "$as_me:22766: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22915 "configure"
+#line 22772 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22919: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:22776: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22925: \$? = $ac_status" >&5
+  echo "$as_me:22782: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22941,7 +22798,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:22944: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:22801: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -22951,7 +22808,7 @@ EOF
 fi
 done
 
-echo "$as_me:22954: checking if curses supports alternate-character set" >&5
+echo "$as_me:22811: checking if curses supports alternate-character set" >&5
 echo $ECHO_N "checking if curses supports alternate-character set... $ECHO_C" >&6
 if test "${cf_cv_alt_char_set+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22960,7 +22817,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22963 "configure"
+#line 22820 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -22974,16 +22831,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22977: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22834: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22980: \$? = $ac_status" >&5
+  echo "$as_me:22837: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22986: \$? = $ac_status" >&5
+  echo "$as_me:22843: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -22997,20 +22854,20 @@ done
 
 fi
 
-echo "$as_me:23000: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:22857: result: $cf_cv_alt_char_set" >&5
 echo "${ECHO_T}$cf_cv_alt_char_set" >&6
 test $cf_cv_alt_char_set != no && cat >>confdefs.h <<EOF
 #define ALT_CHAR_SET $cf_cv_alt_char_set
 EOF
 
-echo "$as_me:23006: checking if curses supports fancy attributes" >&5
+echo "$as_me:22863: checking if curses supports fancy attributes" >&5
 echo $ECHO_N "checking if curses supports fancy attributes... $ECHO_C" >&6
 if test "${cf_cv_fancy_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23013 "configure"
+#line 22870 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -23028,16 +22885,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23031: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22888: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23034: \$? = $ac_status" >&5
+  echo "$as_me:22891: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23037: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22894: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23040: \$? = $ac_status" >&5
+  echo "$as_me:22897: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -23049,21 +22906,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:23052: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:22909: result: $cf_cv_fancy_curses" >&5
 echo "${ECHO_T}$cf_cv_fancy_curses" >&6
 test $cf_cv_fancy_curses = yes && cat >>confdefs.h <<\EOF
 #define FANCY_CURSES 1
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:23059: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:22916: checking for obsolete/broken version of ncurses" >&5
 echo $ECHO_N "checking for obsolete/broken version of ncurses... $ECHO_C" >&6
 if test "${cf_cv_ncurses_broken+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 23066 "configure"
+#line 22923 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -23082,16 +22939,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23085: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22942: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23088: \$? = $ac_status" >&5
+  echo "$as_me:22945: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22948: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23094: \$? = $ac_status" >&5
+  echo "$as_me:22951: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -23103,10 +22960,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:23106: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:22963: result: $cf_cv_ncurses_broken" >&5
 echo "${ECHO_T}$cf_cv_ncurses_broken" >&6
 if test "$cf_cv_ncurses_broken" = yes ; then
-	{ echo "$as_me:23109: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:22966: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
 echo "$as_me: WARNING: hmm... you should get an up-to-date version of ncurses" >&2;}
 	cat >>confdefs.h <<\EOF
 #define NCURSES_BROKEN 1
@@ -23115,14 +22972,14 @@ EOF
 fi
 fi
 
-echo "$as_me:23118: checking if curses supports color attributes" >&5
+echo "$as_me:22975: checking if curses supports color attributes" >&5
 echo $ECHO_N "checking if curses supports color attributes... $ECHO_C" >&6
 if test "${cf_cv_color_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23125 "configure"
+#line 22982 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -23142,16 +22999,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23145: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23002: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23148: \$? = $ac_status" >&5
+  echo "$as_me:23005: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23154: \$? = $ac_status" >&5
+  echo "$as_me:23011: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -23163,7 +23020,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:23166: result: $cf_cv_color_curses" >&5
+echo "$as_me:23023: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test $cf_cv_color_curses = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -23183,23 +23040,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23186: checking for $ac_header" >&5
+echo "$as_me:23043: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23192 "configure"
+#line 23049 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23196: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:23053: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23202: \$? = $ac_status" >&5
+  echo "$as_me:23059: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23218,7 +23075,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:23221: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:23078: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -23233,23 +23090,23 @@ if test "$ISC" = yes ; then
 for ac_header in sys/termio.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:23236: checking for $ac_header" >&5
+echo "$as_me:23093: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23242 "configure"
+#line 23099 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23246: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:23103: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23252: \$? = $ac_status" >&5
+  echo "$as_me:23109: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23268,7 +23125,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:23271: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:23128: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -23286,10 +23143,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:23289: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:23146: checking whether termios.h needs _POSIX_SOURCE" >&5
 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23292 "configure"
+#line 23149 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -23301,16 +23158,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23304: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23161: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23307: \$? = $ac_status" >&5
+  echo "$as_me:23164: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23167: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23313: \$? = $ac_status" >&5
+  echo "$as_me:23170: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -23318,7 +23175,7 @@ else
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 23321 "configure"
+#line 23178 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -23332,16 +23189,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23335: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23192: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23338: \$? = $ac_status" >&5
+  echo "$as_me:23195: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23341: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23344: \$? = $ac_status" >&5
+  echo "$as_me:23201: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -23356,12 +23213,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:23359: result: $termios_bad" >&5
+	echo "$as_me:23216: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:23364: checking declaration of size-change" >&5
+echo "$as_me:23221: checking declaration of size-change" >&5
 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
 if test "${cf_cv_sizechange+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23376,7 +23233,7 @@ do
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat >conftest.$ac_ext <<_ACEOF
-#line 23379 "configure"
+#line 23236 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -23420,16 +23277,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23423: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23280: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23426: \$? = $ac_status" >&5
+  echo "$as_me:23283: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23286: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23432: \$? = $ac_status" >&5
+  echo "$as_me:23289: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -23448,7 +23305,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:23451: result: $cf_cv_sizechange" >&5
+echo "$as_me:23308: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 	cat >>confdefs.h <<\EOF
@@ -23465,14 +23322,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:23468: checking if ttytype is declared in curses library" >&5
+echo "$as_me:23325: checking if ttytype is declared in curses library" >&5
 echo $ECHO_N "checking if ttytype is declared in curses library... $ECHO_C" >&6
 if test "${cf_cv_have_ttytype+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23475 "configure"
+#line 23332 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -23484,16 +23341,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23487: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23344: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23490: \$? = $ac_status" >&5
+  echo "$as_me:23347: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23493: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23350: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23496: \$? = $ac_status" >&5
+  echo "$as_me:23353: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -23505,20 +23362,20 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:23508: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:23365: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test $cf_cv_have_ttytype = yes && cat >>confdefs.h <<\EOF
 #define HAVE_TTYTYPE 1
 EOF
 
-echo "$as_me:23514: checking if curses supports wide characters" >&5
+echo "$as_me:23371: checking if curses supports wide characters" >&5
 echo $ECHO_N "checking if curses supports wide characters... $ECHO_C" >&6
 if test "${cf_cv_widec_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 23521 "configure"
+#line 23378 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -23537,16 +23394,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23540: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23397: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23543: \$? = $ac_status" >&5
+  echo "$as_me:23400: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23546: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23403: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23549: \$? = $ac_status" >&5
+  echo "$as_me:23406: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -23557,7 +23414,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:23560: result: $cf_cv_widec_curses" >&5
+echo "$as_me:23417: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -23566,14 +23423,14 @@ if test "$cf_cv_widec_curses" = yes ; then
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:23569: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:23426: checking if we must include wchar.h to declare mbstate_t" >&5
 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
 if test "${cf_cv_widec_mbstate+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23576 "configure"
+#line 23433 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -23587,23 +23444,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23590: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23447: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23593: \$? = $ac_status" >&5
+  echo "$as_me:23450: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23596: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23599: \$? = $ac_status" >&5
+  echo "$as_me:23456: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 23606 "configure"
+#line 23463 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -23618,16 +23475,16 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23621: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23478: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23624: \$? = $ac_status" >&5
+  echo "$as_me:23481: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23484: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23630: \$? = $ac_status" >&5
+  echo "$as_me:23487: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -23639,7 +23496,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:23642: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:23499: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -23658,14 +23515,14 @@ fi
 
 fi
 
-echo "$as_me:23661: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:23518: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
 if test "${cf_cv_need_xopen_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 23668 "configure"
+#line 23525 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -23682,23 +23539,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23685: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23542: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23688: \$? = $ac_status" >&5
+  echo "$as_me:23545: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23694: \$? = $ac_status" >&5
+  echo "$as_me:23551: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 23701 "configure"
+#line 23558 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -23716,16 +23573,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23719: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23576: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23722: \$? = $ac_status" >&5
+  echo "$as_me:23579: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23728: \$? = $ac_status" >&5
+  echo "$as_me:23585: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
@@ -23737,11 +23594,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23740: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:23597: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 
-echo "$as_me:23744: checking for term.h" >&5
+echo "$as_me:23601: checking for term.h" >&5
 echo $ECHO_N "checking for term.h... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23754,7 +23611,7 @@ for cf_header in \
 	term.h
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23757 "configure"
+#line 23614 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -23768,16 +23625,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23771: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23628: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23774: \$? = $ac_status" >&5
+  echo "$as_me:23631: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23634: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23780: \$? = $ac_status" >&5
+  echo "$as_me:23637: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -23790,7 +23647,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:23793: result: $cf_cv_term_header" >&5
+echo "$as_me:23650: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
@@ -23840,10 +23697,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:23843: checking for ${cf_func}" >&5
+	echo "$as_me:23700: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "(line 23846) testing ${cf_func} ..." 1>&5
+echo "(line 23703) testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23852,7 +23709,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 23855 "configure"
+#line 23712 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -23886,16 +23743,16 @@ exit(foo == 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23889: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23746: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23892: \$? = $ac_status" >&5
+  echo "$as_me:23749: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23752: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23898: \$? = $ac_status" >&5
+  echo "$as_me:23755: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -23911,7 +23768,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:23914: result: $cf_result" >&5
+	echo "$as_me:23771: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -23925,12 +23782,12 @@ fi
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:23928: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:23785: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 	if test $cf_cv_screen = slang ; then
-		{ { echo "$as_me:23933: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:23790: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -23938,7 +23795,7 @@ fi
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:23941: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:23798: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 		cat >>confdefs.h <<\EOF
@@ -24043,7 +23900,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:24046: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:23903: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -24219,7 +24076,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:24222: error: ambiguous option: $1
+    { { echo "$as_me:24079: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -24238,7 +24095,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:24241: error: unrecognized option: $1
+  -*) { { echo "$as_me:24098: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -24291,7 +24148,7 @@ do
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "$CONFIG_H" ) CONFIG_HEADERS="$CONFIG_HEADERS $CONFIG_H:config.hin" ;;
-  *) { { echo "$as_me:24294: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:24151: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -24596,7 +24453,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:24599: creating $ac_file" >&5
+    { echo "$as_me:24456: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -24614,7 +24471,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24617: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24474: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -24627,7 +24484,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:24630: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24487: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24693,7 +24550,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:24696: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:24553: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -24704,7 +24561,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24707: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24564: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -24717,7 +24574,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:24720: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24577: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24835,7 +24692,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:24838: $ac_file is unchanged" >&5
+      { echo "$as_me:24695: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/configure.in b/configure.in
index 3d13673a..27832be0 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
 dnl
 dnl ask PRCS to plug-in the project-version for the configure-script.
 dnl $Format: "AC_REVISION($ProjectVersion$)"$
-AC_REVISION(2.8.6dev.1)
+AC_REVISION(2.8.6dev.2)
 
 # Save the original $CFLAGS so we can distinguish whether the user set those
 # in the environment, or whether autoconf added -O and -g options:
@@ -33,7 +33,7 @@ CF_CHECK_CACHE
 PACKAGE=lynx
 dnl ask PRCS to plug-in the project-version for the packages.
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.6dev.1
+VERSION=2.8.6dev.2
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 AC_SUBST(DESTDIR)
@@ -63,15 +63,16 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_CHECK_PROGS(LINT, lint alint lclint tdlint, [])
+
+AC_AIX
+AC_ISC_POSIX
+
 CF_BUILD_CC([#],[])
 
 AC_CHECK_TOOL(RANLIB, ranlib, ':')
 AC_CHECK_TOOL(AR, ar, ar)
 CF_SUBST(archiver options,AR_OPTS,rv)
 
-AC_AIX
-AC_ISC_POSIX
-
 dnl --------------------------------------------------------------------------
 dnl Debug/development/test
 dnl --------------------------------------------------------------------------
diff --git a/lynx.cfg b/lynx.cfg
index 4213f1c0..a7df509c 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -3,10 +3,10 @@
 #                                     or Lynx_Dir:lynx.cfg (VMS)
 #
 # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
-#PRCS LYNX_VERSION "2.8.6dev.1"
+#PRCS LYNX_VERSION "2.8.6dev.2"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Tue, 20 Apr 2004 03:36:55 -0700"
+#PRCS LYNX_DATE "Tue, 27 Apr 2004 13:06:18 -0700"
 #
 # Definition pairs are of the form  VARIABLE:DEFINITION
 # NO spaces are allowed between the pair items.
diff --git a/src/AttrList.h b/src/AttrList.h
index 1fac1e8e..3fc13cab 100644
--- a/src/AttrList.h
+++ b/src/AttrList.h
@@ -38,7 +38,7 @@ typedef struct {
 #define HText_characterStyle _internal_HTC
 
 #if defined(USE_COLOR_STYLE)
-extern void _internal_HTC PARAMS((HText * text, int style, int dir));
+extern void _internal_HTC (HText * text, int style, int dir);
 #define TEMPSTRINGSIZE 256
 extern char class_string[TEMPSTRINGSIZE];
 
diff --git a/src/DefaultStyle.c b/src/DefaultStyle.c
index 8a0745d9..2fe5f6cb 100644
--- a/src/DefaultStyle.c
+++ b/src/DefaultStyle.c
@@ -11,7 +11,7 @@
 
 /*	Tab arrays:
 */
-PRIVATE CONST HTTabStop tabs_8[] = {
+static const HTTabStop tabs_8[] = {
 	{ 0, 8 }, {0, 16}, {0, 24}, {0, 32}, {0, 40},
 	{ 0, 48 }, {0, 56}, {0, 64}, {0, 72}, {0, 80},
 	{ 0, 88 }, {0, 96}, {0, 104}, {0, 112}, {0, 120},
@@ -27,324 +27,324 @@ PRIVATE CONST HTTabStop tabs_8[] = {
 **	word wrap, free format, space: before, after, flags.
 */
 
-PRIVATE HTStyle HTStyleNormal = {
+static HTStyle HTStyleNormal = {
 	0,  "Normal", ST_Normal, "P",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	3, 3, 6, HT_LEFT,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
-PRIVATE HTStyle HTStyleDivCenter = {
+static HTStyle HTStyleDivCenter = {
 	&HTStyleNormal,  "DivCenter", ST_DivCenter, "DCENTER",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	3, 3, 6, HT_CENTER,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
-PRIVATE HTStyle HTStyleDivLeft = {
+static HTStyle HTStyleDivLeft = {
 	&HTStyleDivCenter,  "DivLeft", ST_DivLeft, "DLEFT",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	3, 3, 6, HT_LEFT,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
-PRIVATE HTStyle HTStyleDivRight = {
+static HTStyle HTStyleDivRight = {
 	&HTStyleDivLeft,  "DivRight", ST_DivRight, "DRIGHT",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	3, 3, 6, HT_RIGHT,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
-PRIVATE HTStyle HTStyleBanner = {
+static HTStyle HTStyleBanner = {
 	&HTStyleDivRight,  "Banner", ST_Banner, "BANNER",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	3, 3, 6, HT_LEFT,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
-PRIVATE HTStyle HTStyleBlockquote = {
+static HTStyle HTStyleBlockquote = {
 	&HTStyleBanner,  "Blockquote", ST_Blockquote, "BLOCKQUOTE",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	5, 5, 7, HT_LEFT,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
-PRIVATE HTStyle HTStyleBq = { /* HTML 3.0 BLOCKQUOTE - FM */
+static HTStyle HTStyleBq = { /* HTML 3.0 BLOCKQUOTE - FM */
 	&HTStyleBlockquote,  "Bq", ST_Bq, "BQ",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	5, 5, 7, HT_LEFT,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
-PRIVATE HTStyle HTStyleFootnote = { /* HTML 3.0 FN - FM */
+static HTStyle HTStyleFootnote = { /* HTML 3.0 FN - FM */
 	&HTStyleBq,  "Footnote", ST_Footnote, "FN",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	5, 5, 7, HT_LEFT,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
-PRIVATE HTStyle HTStyleList = {
+static HTStyle HTStyleList = {
 	&HTStyleFootnote,  "List", ST_List, "UL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	3, 7, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0 };
 
-PRIVATE HTStyle HTStyleList1 = {
+static HTStyle HTStyleList1 = {
 	&HTStyleList,  "List1", ST_List1, "UL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	8, 12, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0 };
 
-PRIVATE HTStyle HTStyleList2 = {
+static HTStyle HTStyleList2 = {
 	&HTStyleList1,  "List2", ST_List2, "UL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	13, 17, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0 };
 
-PRIVATE HTStyle HTStyleList3 = {
+static HTStyle HTStyleList3 = {
 	&HTStyleList2,  "List3", ST_List3, "UL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	18, 22, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0 };
 
-PRIVATE HTStyle HTStyleList4 = {
+static HTStyle HTStyleList4 = {
 	&HTStyleList3,  "List4", ST_List4, "UL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	23, 27, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0 };
 
-PRIVATE HTStyle HTStyleList5 = {
+static HTStyle HTStyleList5 = {
 	&HTStyleList4,  "List5", ST_List5, "UL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	28, 32, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0 };
 
-PRIVATE HTStyle HTStyleList6 = {
+static HTStyle HTStyleList6 = {
 	&HTStyleList5,  "List6", ST_List6, "UL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	33, 37, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0 };
 
-PRIVATE HTStyle HTStyleMenu = {
+static HTStyle HTStyleMenu = {
 	&HTStyleList6,  "Menu", ST_Menu, "MENU",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	3, 7, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
-PRIVATE HTStyle HTStyleMenu1 = {
+static HTStyle HTStyleMenu1 = {
 	&HTStyleMenu,  "Menu1", ST_Menu1, "MENU",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	8, 12, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
-PRIVATE HTStyle HTStyleMenu2= {
+static HTStyle HTStyleMenu2= {
 	&HTStyleMenu1,  "Menu2", ST_Menu2, "MENU",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	13, 17, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
-PRIVATE HTStyle HTStyleMenu3= {
+static HTStyle HTStyleMenu3= {
 	&HTStyleMenu2,  "Menu3", ST_Menu3, "MENU",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	18, 22, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
-PRIVATE HTStyle HTStyleMenu4= {
+static HTStyle HTStyleMenu4= {
 	&HTStyleMenu3,  "Menu4", ST_Menu4, "MENU",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	23, 27, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
-PRIVATE HTStyle HTStyleMenu5= {
+static HTStyle HTStyleMenu5= {
 	&HTStyleMenu4,  "Menu5", ST_Menu5, "MENU",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	28, 33, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
-PRIVATE HTStyle HTStyleMenu6= {
+static HTStyle HTStyleMenu6= {
 	&HTStyleMenu5,  "Menu6", ST_Menu6, "MENU",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	33, 38, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
-PRIVATE HTStyle HTStyleGlossary = {
+static HTStyle HTStyleGlossary = {
 	&HTStyleMenu6,  "Glossary", ST_Glossary, "DL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	3, 10, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 1,			0
 };
 
-PRIVATE HTStyle HTStyleGlossary1 = {
+static HTStyle HTStyleGlossary1 = {
 	&HTStyleGlossary,  "Glossary1", ST_Glossary1, "DL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	8, 16, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 1,			0
 };
 
-PRIVATE HTStyle HTStyleGlossary2 = {
+static HTStyle HTStyleGlossary2 = {
 	&HTStyleGlossary1,  "Glossary2", ST_Glossary2, "DL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	14, 22, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 1,			0
 };
 
-PRIVATE HTStyle HTStyleGlossary3 = {
+static HTStyle HTStyleGlossary3 = {
 	&HTStyleGlossary2,  "Glossary3", ST_Glossary3, "DL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	20, 28, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 1,			0
 };
 
-PRIVATE HTStyle HTStyleGlossary4 = {
+static HTStyle HTStyleGlossary4 = {
 	&HTStyleGlossary3,  "Glossary4", ST_Glossary4, "DL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	26, 34, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 1,			0
 };
 
-PRIVATE HTStyle HTStyleGlossary5 = {
+static HTStyle HTStyleGlossary5 = {
 	&HTStyleGlossary4,  "Glossary5", ST_Glossary5, "DL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	32, 40, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 1,			0
 };
 
-PRIVATE HTStyle HTStyleGlossary6 = {
+static HTStyle HTStyleGlossary6 = {
 	&HTStyleGlossary5,  "Glossary6", ST_Glossary6, "DL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	38, 46, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 1,			0
 };
 
-PRIVATE HTStyle HTStyleGlossaryCompact = {
+static HTStyle HTStyleGlossaryCompact = {
 	&HTStyleGlossary6,  "GlossaryCompact", ST_GlossaryCompact, "DLC",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	3, 10, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
-PRIVATE HTStyle HTStyleGlossaryCompact1 = {
+static HTStyle HTStyleGlossaryCompact1 = {
 	&HTStyleGlossaryCompact,  "GlossaryCompact1", ST_GlossaryCompact1, "DLC",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	8, 15, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
-PRIVATE HTStyle HTStyleGlossaryCompact2 = {
+static HTStyle HTStyleGlossaryCompact2 = {
 	&HTStyleGlossaryCompact1,  "GlossaryCompact2", ST_GlossaryCompact2, "DLC",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	13, 20, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
-PRIVATE HTStyle HTStyleGlossaryCompact3 = {
+static HTStyle HTStyleGlossaryCompact3 = {
 	&HTStyleGlossaryCompact2,  "GlossaryCompact3", ST_GlossaryCompact3, "DLC",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	18, 25, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
-PRIVATE HTStyle HTStyleGlossaryCompact4 = {
+static HTStyle HTStyleGlossaryCompact4 = {
 	&HTStyleGlossaryCompact3,  "GlossaryCompact4", ST_GlossaryCompact4, "DLC",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	23, 30, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
-PRIVATE HTStyle HTStyleGlossaryCompact5 = {
+static HTStyle HTStyleGlossaryCompact5 = {
 	&HTStyleGlossaryCompact4,  "GlossaryCompact5", ST_GlossaryCompact5, "DLC",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	28, 35, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
-PRIVATE HTStyle HTStyleGlossaryCompact6 = {
+static HTStyle HTStyleGlossaryCompact6 = {
 	&HTStyleGlossaryCompact5,  "GlossaryCompact6", ST_GlossaryCompact6, "DLC",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	33, 40, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
-PRIVATE HTStyle HTStyleExample = {
+static HTStyle HTStyleExample = {
 	&HTStyleGlossaryCompact6,  "Example", ST_Example, "XMP",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	0, 0, 0, HT_LEFT,		1, 0,	tabs_8,
 	NO, NO, 0, 0,			0
 };
 
-PRIVATE HTStyle HTStylePreformatted = {
+static HTStyle HTStylePreformatted = {
 	&HTStyleExample,	"Preformatted", ST_Preformatted, "PRE",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	0, 0, 0, HT_LEFT,		1, 0,	tabs_8,
 	NO, NO, 0, 0,			0
 };
 
-PRIVATE HTStyle HTStyleListing = {
+static HTStyle HTStyleListing = {
 	&HTStylePreformatted,  "Listing", ST_Listing, "LISTING",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	0, 0, 0, HT_LEFT,		1, 0,	tabs_8,
 	NO, NO, 0, 0,			0 };
 
-PRIVATE HTStyle HTStyleAddress = {
+static HTStyle HTStyleAddress = {
 	&HTStyleListing,  "Address", ST_Address, "ADDRESS",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	4, 4, 7, HT_LEFT,		1, 0,	tabs_8,
 	YES, YES, 2, 0,			0 };
 
-PRIVATE HTStyle HTStyleNote = { /* HTML 3.0 NOTE - FM */
+static HTStyle HTStyleNote = { /* HTML 3.0 NOTE - FM */
 	&HTStyleAddress,  "Note", ST_Note, "NOTE",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	5, 5, 7, HT_LEFT,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
-PRIVATE HTStyle HTStyleHeading1 = {
+static HTStyle HTStyleHeading1 = {
 	&HTStyleNote,  "Heading1", ST_Heading1, "H1",
 	HT_FONT+HT_BOLD, 1, HT_BLACK,	0, 0,
 	0, 0, 0, HT_CENTER,		1, 0,	0,
 	YES, YES, 1, 1,			0 };
 
-PRIVATE HTStyle HTStyleHeading2 = {
+static HTStyle HTStyleHeading2 = {
 	&HTStyleHeading1,  "Heading2", ST_Heading2, "H2",
 	HT_FONT+HT_BOLD, 1, HT_BLACK,	0, 0,
 	0, 0, 0, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 1,			0 };
 
-PRIVATE HTStyle HTStyleHeading3 = {
+static HTStyle HTStyleHeading3 = {
 	&HTStyleHeading2,  "Heading3", ST_Heading3, "H3",
 	HT_FONT+HT_BOLD, 1, HT_BLACK,	0, 0,
 	2, 2, 0, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 0,			0 };
 
-PRIVATE HTStyle HTStyleHeading4 = {
+static HTStyle HTStyleHeading4 = {
 	&HTStyleHeading3,  "Heading4", ST_Heading4, "H4",
 	HT_FONT+HT_BOLD, 1, HT_BLACK,	0, 0,
 	4, 4, 0, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 0,			0 };
 
-PRIVATE HTStyle HTStyleHeading5 = {
+static HTStyle HTStyleHeading5 = {
 	&HTStyleHeading4,  "Heading5", ST_Heading5, "H5",
 	HT_FONT+HT_BOLD, 1, HT_BLACK,	0, 0,
 	6, 6, 0, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 0,			0 };
 
-PRIVATE HTStyle HTStyleHeading6 = {
+static HTStyle HTStyleHeading6 = {
 	&HTStyleHeading5,  "Heading6", ST_Heading6, "H6",
 	HT_FONT+HT_BOLD, 1, HT_BLACK,	0, 0,
 	8, 8, 0, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 0,			0 };
 
-PRIVATE HTStyle HTStyleHeadingCenter = {
+static HTStyle HTStyleHeadingCenter = {
 	&HTStyleHeading6,  "HeadingCenter", ST_HeadingCenter, "HCENTER",
 	HT_FONT+HT_BOLD, 1, HT_BLACK,	0, 0,
 	0, 0, 3, HT_CENTER,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
-PRIVATE HTStyle HTStyleHeadingLeft = {
+static HTStyle HTStyleHeadingLeft = {
 	&HTStyleHeadingCenter,  "HeadingLeft", ST_HeadingLeft, "HLEFT",
 	HT_FONT+HT_BOLD, 1, HT_BLACK,	0, 0,
 	0, 0, 3, HT_LEFT,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
-PRIVATE HTStyle HTStyleHeadingRight = {
+static HTStyle HTStyleHeadingRight = {
 	&HTStyleHeadingLeft,  "HeadingRight", ST_HeadingRight, "HRIGHT",
 	HT_FONT+HT_BOLD, 1, HT_BLACK,	0, 0,
 	0, 0, 3, HT_RIGHT,		1, 0,	tabs_8,
@@ -352,15 +352,15 @@ PRIVATE HTStyle HTStyleHeadingRight = {
 
 /* Style sheet points to the last in the list:
 */
-PRIVATE HTStyleSheet sheet = { "default.style",
+static HTStyleSheet sheet = { "default.style",
 				&HTStyleHeadingRight }; /* sheet */
 
-PRIVATE HTStyle * st_array[ST_HeadingRight + 1] = { NULL };
+static HTStyle * st_array[ST_HeadingRight + 1] = { NULL };
 
-PRIVATE HTStyleSheet *result = NULL;
+static HTStyleSheet *result = NULL;
 
 #ifdef LY_FIND_LEAKS
-PRIVATE void FreeDefaultStyle NOARGS
+static void FreeDefaultStyle (void)
 {
     HTStyle * style;
     while((style=result->styles)!=0) {
@@ -371,7 +371,7 @@ PRIVATE void FreeDefaultStyle NOARGS
 }
 #endif /* LY_FIND_LEAKS */
 
-PUBLIC HTStyleSheet * DefaultStyle ARGS1 (HTStyle ***, result_array)
+HTStyleSheet * DefaultStyle (HTStyle *** result_array)
 {
     HTStyle *p, *q;
 
diff --git a/src/GridText.c b/src/GridText.c
index ae2026b1..17085aef 100644
--- a/src/GridText.c
+++ b/src/GridText.c
@@ -67,13 +67,13 @@ unsigned int cached_styles[CACHEH][CACHEW];
 #define FirstHTLine(text) ((text)->last_line->next)
 #define LastHTLine(text)  ((text)->last_line)
 
-PRIVATE void HText_trimHightext PARAMS((
+static void HText_trimHightext (
 	HText *		text,
 	BOOLEAN		final,
-	int		stop_before));
+	int		stop_before);
 
 #ifdef USE_COLOR_STYLE
-PRIVATE void LynxResetScreenCache NOARGS
+static void LynxResetScreenCache (void)
 {
     int i, j;
 
@@ -85,7 +85,7 @@ PRIVATE void LynxResetScreenCache NOARGS
 #endif /* USE_COLOR_STYLE */
 
 struct _HTStream {			/* only know it as object */
-    CONST HTStreamClass *       isa;
+    const HTStreamClass *       isa;
     /* ... */
 };
 
@@ -103,7 +103,7 @@ struct _HTStream {			/* only know it as object */
 #define UTF_XLEN(c) UTF8_XNEGLEN(((char)~(c)))
 
 #ifdef KANJI_CODE_OVERRIDE
-PUBLIC HTkcode last_kcode = NOKANJI;	/* 1997/11/14 (Fri) 09:09:26 */
+HTkcode last_kcode = NOKANJI;	/* 1997/11/14 (Fri) 09:09:26 */
 #endif
 #ifdef CJK_EX
 #define CHAR_WIDTH 6
@@ -113,38 +113,38 @@ PUBLIC HTkcode last_kcode = NOKANJI;	/* 1997/11/14 (Fri) 09:09:26 */
 
 /*	Exports
 */
-PUBLIC HText * HTMainText = NULL;		/* Equivalent of main window */
-PUBLIC HTParentAnchor * HTMainAnchor = NULL;	/* Anchor for HTMainText */
+HText * HTMainText = NULL;		/* Equivalent of main window */
+HTParentAnchor * HTMainAnchor = NULL;	/* Anchor for HTMainText */
 
-PUBLIC char * HTAppName = LYNX_NAME;		/* Application name */
-PUBLIC char * HTAppVersion = LYNX_VERSION;	/* Application version */
+char * HTAppName = LYNX_NAME;		/* Application name */
+char * HTAppVersion = LYNX_VERSION;	/* Application version */
 
-PUBLIC int HTFormNumber = 0;
-PUBLIC int HTFormFields = 0;
-PUBLIC char * HTCurSelectGroup = NULL;		/* Form select group name */
-PRIVATE int HTCurSelectGroupCharset = -1;	/* ... and name's charset */
-PUBLIC int HTCurSelectGroupType = F_RADIO_TYPE;	/* Group type */
-PUBLIC char * HTCurSelectGroupSize = NULL;	/* Length of select */
-PRIVATE char * HTCurSelectedOptionValue = NULL;	/* Select choice */
+int HTFormNumber = 0;
+int HTFormFields = 0;
+char * HTCurSelectGroup = NULL;		/* Form select group name */
+static int HTCurSelectGroupCharset = -1;	/* ... and name's charset */
+int HTCurSelectGroupType = F_RADIO_TYPE;	/* Group type */
+char * HTCurSelectGroupSize = NULL;	/* Length of select */
+static char * HTCurSelectedOptionValue = NULL;	/* Select choice */
 
-PUBLIC char * checked_box = "[X]";
-PUBLIC char * unchecked_box = "[ ]";
-PUBLIC char * checked_radio = "(*)";
-PUBLIC char * unchecked_radio = "( )";
+char * checked_box = "[X]";
+char * unchecked_box = "[ ]";
+char * checked_radio = "(*)";
+char * unchecked_radio = "( )";
 
-PRIVATE BOOLEAN underline_on = OFF;
-PRIVATE BOOLEAN bold_on      = OFF;
+static BOOLEAN underline_on = OFF;
+static BOOLEAN bold_on      = OFF;
 
 #ifdef USE_SOURCE_CACHE
-PUBLIC int LYCacheSource = SOURCE_CACHE_NONE;
-PUBLIC int LYCacheSourceForAborted = SOURCE_CACHE_FOR_ABORTED_DROP;
+int LYCacheSource = SOURCE_CACHE_NONE;
+int LYCacheSourceForAborted = SOURCE_CACHE_FOR_ABORTED_DROP;
 #endif
 
 #ifdef USE_SCROLLBAR
-PUBLIC BOOLEAN LYShowScrollbar = FALSE;
-PUBLIC BOOLEAN LYsb_arrow = TRUE;
-PUBLIC int LYsb_begin = -1;
-PUBLIC int LYsb_end = -1;
+BOOLEAN LYShowScrollbar = FALSE;
+BOOLEAN LYsb_arrow = TRUE;
+int LYsb_begin = -1;
+int LYsb_end = -1;
 #endif
 
 #ifndef VMS			/* VMS has a better way - right? - kw */
@@ -152,7 +152,7 @@ PUBLIC int LYsb_end = -1;
 #endif
 
 #ifdef CHECK_FREE_MEM
-PRIVATE void * LY_check_calloc PARAMS((size_t nmemb, size_t size));
+static void * LY_check_calloc (size_t nmemb, size_t size);
 #define LY_CALLOC LY_check_calloc
 #else
   /* using the regular calloc */
@@ -246,9 +246,9 @@ There are 3 functions - POOL_NEW, POOL_FREE, and ALLOC_IN_POOL.
  *   Returns a pointer to the "allocated" memory or NULL if fails.
  *   Updates 'poolptr' if necessary.
  */
-PRIVATE pool_data* ALLOC_IN_POOL ARGS2(
-	HTPool**,	ppoolptr,
-	unsigned,	request)
+static pool_data* ALLOC_IN_POOL (
+	HTPool**	ppoolptr,
+	unsigned	request)
 {
     HTPool* pool = *ppoolptr;
     pool_data* ptr;
@@ -287,7 +287,7 @@ PRIVATE pool_data* ALLOC_IN_POOL ARGS2(
 /*
  *   Returns a pointer to initialized pool of type 'HTPool', or NULL if fails.
  */
-PRIVATE HTPool* POOL_NEW NOARGS
+static HTPool* POOL_NEW (void)
 {
     HTPool* poolptr = (HTPool*)LY_CALLOC(1, sizeof(HTPool));
     if (poolptr) {
@@ -300,8 +300,8 @@ PRIVATE HTPool* POOL_NEW NOARGS
 /*
  *   Frees a pool of type 'HTPool' pointed by poolptr.
  */
-PRIVATE void POOL_FREE ARGS1(
-	HTPool*,	poolptr)
+static void POOL_FREE (
+	HTPool*	poolptr)
 {
     HTPool* cur = poolptr;
     HTPool* prev;
@@ -473,29 +473,29 @@ struct _HText {
 };
 
 /* exported */
-PUBLIC void* HText_pool_calloc ARGS2(
-	HText *,	text,
-	unsigned,	size)
+void* HText_pool_calloc (
+	HText *	text,
+	unsigned	size)
 {
     return (void*) ALLOC_IN_POOL(&text->pool, size);
 }
 
-PRIVATE void HText_AddHiddenLink PARAMS((HText *text, TextAnchor *textanchor));
+static void HText_AddHiddenLink (HText *text, TextAnchor *textanchor);
 
 #ifdef EXP_JUSTIFY_ELTS
-PUBLIC BOOL can_justify_here;
-PUBLIC BOOL can_justify_here_saved;
+BOOL can_justify_here;
+BOOL can_justify_here_saved;
 
-PUBLIC BOOL can_justify_this_line;/* =FALSE if line contains form objects */
-PUBLIC int wait_for_this_stacked_elt;/* -1 if can justify contents of the
+BOOL can_justify_this_line;/* =FALSE if line contains form objects */
+int wait_for_this_stacked_elt;/* -1 if can justify contents of the
     element on the op of stack. If positive - specifies minimal stack depth
     plus 1 at which we can justify element (can be MAX_LINE+2 if
     ok_justify ==FALSE or in psrcview. */
-PUBLIC BOOL form_in_htext;/*to indicate that we are in form (since HTML_FORM is
+BOOL form_in_htext;/*to indicate that we are in form (since HTML_FORM is
   not stacked in the HTML.c */
-PUBLIC BOOL in_DT = FALSE;
+BOOL in_DT = FALSE;
 #ifdef DEBUG_JUSTIFY
-PUBLIC BOOL can_justify_stack_depth;/* can be 0 or 1 if all code is correct*/
+BOOL can_justify_stack_depth;/* can be 0 or 1 if all code is correct*/
 #endif
 
 
@@ -513,7 +513,7 @@ static BOOL this_line_was_split;
 static TextAnchor* last_anchor_of_previous_line;
 static BOOL have_raw_nbsps = FALSE;
 
-PUBLIC void ht_justify_cleanup NOARGS
+void ht_justify_cleanup (void)
 {
     wait_for_this_stacked_elt = !ok_justify
 #  ifdef USE_PRETTYSRC
@@ -530,7 +530,7 @@ PUBLIC void ht_justify_cleanup NOARGS
     have_raw_nbsps = FALSE;
 }
 
-PUBLIC void mark_justify_start_position ARGS1(void*,text)
+void mark_justify_start_position (void* text)
 {
     if (text && ((HText*)text)->last_line)
 	justify_start_position = ((HText*)text )->last_line->size;
@@ -558,11 +558,11 @@ PUBLIC void mark_justify_start_position ARGS1(void*,text)
  *	05-29-94 Lynx 2-3-1 Garrett Arch Blythe
  *	Changed to arrays.
  */
-PRIVATE char underscore_string[MAX_LINE + 1];
-PUBLIC char star_string[MAX_LINE + 1];
+static char underscore_string[MAX_LINE + 1];
+char star_string[MAX_LINE + 1];
 
-PRIVATE int ctrl_chars_on_this_line = 0; /* num of ctrl chars in current line */
-PRIVATE int utfxtra_on_this_line = 0; /* num of UTF-8 extra bytes in line,
+static int ctrl_chars_on_this_line = 0; /* num of ctrl chars in current line */
+static int utfxtra_on_this_line = 0; /* num of UTF-8 extra bytes in line,
 				       they *also* count as ctrl chars. */
 #ifdef WIDEC_CURSES
 #define UTFXTRA_ON_THIS_LINE 0
@@ -570,7 +570,7 @@ PRIVATE int utfxtra_on_this_line = 0; /* num of UTF-8 extra bytes in line,
 #define UTFXTRA_ON_THIS_LINE utfxtra_on_this_line
 #endif
 
-PRIVATE HTStyle default_style =
+static HTStyle default_style =
 	{ 0,  "(Unstyled)", 0, "",
 	(HTFont)0, 1, HT_BLACK,		0, 0,
 	0, 0, 0, HT_LEFT,		1, 0,	0,
@@ -578,21 +578,21 @@ PRIVATE HTStyle default_style =
 
 
 
-PRIVATE HTList * loaded_texts = NULL;	 /* A list of all those in memory */
-PUBLIC  HTList * search_queries = NULL;  /* isindex and whereis queries   */
+static HTList * loaded_texts = NULL;	 /* A list of all those in memory */
+HTList * search_queries = NULL;  /* isindex and whereis queries   */
 #ifdef LY_FIND_LEAKS
-PRIVATE void free_all_texts NOARGS;
+static void free_all_texts (void);
 #endif
 
-PRIVATE BOOL HText_TrueEmptyLine PARAMS((
+static BOOL HText_TrueEmptyLine (
 	HTLine *	line,
 	HText *		text,
-	BOOL		IgnoreSpaces));
+	BOOL		IgnoreSpaces);
 
-PRIVATE int HText_TrueLineSize PARAMS((
+static int HText_TrueLineSize (
 	HTLine *	line,
 	HText *		text,
-	BOOL		IgnoreSpaces));
+	BOOL		IgnoreSpaces);
 
 #ifdef CHECK_FREE_MEM
 
@@ -604,7 +604,7 @@ PRIVATE int HText_TrueLineSize PARAMS((
  *		   3: normal text output will be suppressed (but not anchors,
  *		      form fields etc.)
  */
-PRIVATE void HText_halt NOARGS
+static void HText_halt (void)
 {
     if (HTFormNumber > 0)
 	HText_DisableCurrentForm();
@@ -628,9 +628,9 @@ PRIVATE void HText_halt NOARGS
  *  which might make the situation worse depending how allocation works.
  *  There should be a better way... - kw
  */
-PRIVATE BOOL mem_is_avail ARGS2(
-    size_t,	factor,
-    size_t,	bytes)
+static BOOL mem_is_avail (
+    size_t	factor,
+    size_t	bytes)
 {
     void *p;
     if (bytes < MIN_NEEDED_MEM && factor > 0)
@@ -651,9 +651,9 @@ PRIVATE BOOL mem_is_avail ARGS2(
  *  (with some security margins) and tries various recovery actions
  *  if deemed necessary. - kw
  */
-PRIVATE void * LY_check_calloc ARGS2(
-    size_t,	nmemb,
-    size_t,	size)
+static void * LY_check_calloc (
+    size_t	nmemb,
+    size_t	size)
 {
     int i, n;
     if (mem_is_avail(4, nmemb * size)) {
@@ -701,8 +701,8 @@ PRIVATE void * LY_check_calloc ARGS2(
  * Clear highlight information for a given anchor
  * (text was allocated in the pool).
  */
-PRIVATE void LYClearHiText ARGS1(
-	TextAnchor *,	a)
+static void LYClearHiText (
+	TextAnchor *	a)
 {
     FREE(a->lites.hl_info);
 
@@ -714,10 +714,10 @@ PRIVATE void LYClearHiText ARGS1(
 /*
  * Set the initial highlight information for a given anchor.
  */
-PRIVATE void LYSetHiText ARGS3(
-	TextAnchor *,	a,
-	char *,		text,
-	int,		len)
+static void LYSetHiText (
+	TextAnchor *	a,
+	char *		text,
+	int		len)
 {
     if (text != NULL) {
 	POOLallocstring(a->lites.hl_base.hl_text, len + 1);
@@ -731,10 +731,10 @@ PRIVATE void LYSetHiText ARGS3(
 /*
  * Add highlight information for the next line of a anchor.
  */
-PRIVATE void LYAddHiText ARGS3(
-	TextAnchor *,	a,
-	char *,		text,
-	int,		x)
+static void LYAddHiText (
+	TextAnchor *	a,
+	char *		text,
+	int		x)
 {
     HiliteInfo *have = a->lites.hl_info;
     unsigned need = (a->lites.hl_len - 1);
@@ -757,9 +757,9 @@ PRIVATE void LYAddHiText ARGS3(
  * needed to avoid having the color-style paint the leading blanks.
  */
 #ifdef USE_COLOR_STYLE
-PRIVATE int LYAdjHiTextPos ARGS2(
-	TextAnchor *,	a,
-	int,		count)
+static int LYAdjHiTextPos (
+	TextAnchor *	a,
+	int		count)
 {
     char *result;
 
@@ -779,9 +779,9 @@ PRIVATE int LYAdjHiTextPos ARGS2(
 /*
  * Get the highlight text, counting from zero.
  */
-PRIVATE char *LYGetHiTextStr ARGS2(
-	TextAnchor *,	a,
-	int,		count)
+static char *LYGetHiTextStr (
+	TextAnchor *	a,
+	int		count)
 {
     char *result;
 
@@ -798,9 +798,9 @@ PRIVATE char *LYGetHiTextStr ARGS2(
 /*
  * Get the X-ordinate at which to draw the corresponding highlight-text
  */
-PRIVATE int LYGetHiTextPos ARGS2(
-	TextAnchor *,	a,
-	int,		count)
+static int LYGetHiTextPos (
+	TextAnchor *	a,
+	int		count)
 {
     int result;
 
@@ -817,9 +817,9 @@ PRIVATE int LYGetHiTextPos ARGS2(
 /*
  * Copy highlighting information from anchor 'b' to 'a'.
  */
-PRIVATE void LYCopyHiText ARGS2(
-	TextAnchor *,	a,
-	TextAnchor *,	b)
+static void LYCopyHiText (
+	TextAnchor *	a,
+	TextAnchor *	b)
 {
     int count;
     char *s;
@@ -836,8 +836,8 @@ PRIVATE void LYCopyHiText ARGS2(
     }
 }
 
-PRIVATE void HText_getChartransInfo ARGS1(
-	HText *,	me)
+static void HText_getChartransInfo (
+	HText *	me)
 {
     me->UCLYhndl = HTAnchor_getUCLYhndl(me->node_anchor, UCT_STAGE_HTEXT);
     if (me->UCLYhndl < 0) {
@@ -850,8 +850,8 @@ PRIVATE void HText_getChartransInfo ARGS1(
     me->UCI = HTAnchor_getUCInfoStage(me->node_anchor, UCT_STAGE_HTEXT);
 }
 
-PRIVATE void PerFormInfo_free ARGS1(
-    PerFormInfo *,	form)
+static void PerFormInfo_free (
+    PerFormInfo *	form)
 {
     if (form) {
 	FREE(form->accept_cs);
@@ -860,8 +860,8 @@ PRIVATE void PerFormInfo_free ARGS1(
     }
 }
 
-PRIVATE void free_form_fields ARGS1(
-	FormInfo *,	input_field)
+static void free_form_fields (
+	FormInfo *	input_field)
 {
     /*
      *  Free form fields.
@@ -908,8 +908,8 @@ PRIVATE void free_form_fields ARGS1(
     FREE(input_field->accept_cs);
 }
 
-PRIVATE void FormList_delete ARGS1(
-    HTList *,		forms)
+static void FormList_delete (
+    HTList *		forms)
 {
     HTList *cur = forms;
     PerFormInfo *form;
@@ -921,8 +921,8 @@ PRIVATE void FormList_delete ARGS1(
 /*			Creation Method
 **			---------------
 */
-PUBLIC HText *	HText_new ARGS1(
-	HTParentAnchor *,	anchor)
+HText *	HText_new (
+	HTParentAnchor *	anchor)
 {
 #if defined(VMS) && defined(VAXC) && !defined(__DECC)
 #include <lib$routines.h>
@@ -1153,9 +1153,9 @@ PUBLIC HText *	HText_new ARGS1(
 **
 **      Stream is assumed open and left open.
 */
-PUBLIC HText *  HText_new2 ARGS2(
-	HTParentAnchor *,	anchor,
-	HTStream *,		stream)
+HText *  HText_new2 (
+	HTParentAnchor *	anchor,
+	HTStream *		stream)
 
 {
     HText * this = HText_new(anchor);
@@ -1170,8 +1170,8 @@ PUBLIC HText *  HText_new2 ARGS2(
 /*	Free Entire Text
 **	----------------
 */
-PUBLIC void HText_free ARGS1(
-	HText *,	self)
+void HText_free (
+	HText *	self)
 {
     if (!self)
 	return;
@@ -1273,11 +1273,11 @@ PUBLIC void HText_free ARGS1(
 /*	Output a line
 **	-------------
 */
-PRIVATE int display_line ARGS4(
-	HTLine *,	line,
-	HText *,	text,
-	int,		scrline GCC_UNUSED,
-	CONST char*,	target GCC_UNUSED)
+static int display_line (
+	HTLine *	line,
+	HText *	text,
+	int		scrline GCC_UNUSED,
+	const char*	target GCC_UNUSED)
 {
     register int i, j;
     char buffer[7];
@@ -1292,7 +1292,7 @@ PRIVATE int display_line ARGS4(
     BOOL inbold=NO, inunderline=NO;
 #endif
 #if defined(SHOW_WHEREIS_TARGETS) && !defined(USE_COLOR_STYLE)
-    CONST char *cp_tgt;
+    const char *cp_tgt;
     int i_start_tgt=0, i_after_tgt;
     int HitOffset, LenNeeded;
     BOOL intarget=NO;
@@ -1588,8 +1588,8 @@ after_while:
 /*	Output the title line
 **	---------------------
 */
-PRIVATE void display_title ARGS1(
-	HText *,	text)
+static void display_title (
+	HText *	text)
 {
     char *title = NULL;
     char percent[20];
@@ -1686,7 +1686,7 @@ PRIVATE void display_title ARGS1(
 		}
 		tmp[j] = '\0';
 	    }
-	    StrAllocCopy(title, (CONST char *)tmp);
+	    StrAllocCopy(title, (const char *)tmp);
 	    FREE(tmp);
 	}
     }
@@ -1763,8 +1763,8 @@ PRIVATE void display_title ARGS1(
 **	---------------------
 */
 #ifdef USE_SCROLLBAR
-PRIVATE void display_scrollbar ARGS1(
-	HText *,	text)
+static void display_scrollbar (
+	HText *	text)
 {
     int i;
     int h = display_lines - 2 * (LYsb_arrow!=0); /* Height of the scrollbar */
@@ -1879,10 +1879,10 @@ PRIVATE void display_scrollbar ARGS1(
 /*	Output a page
 **	-------------
 */
-PRIVATE void display_page ARGS3(
-	HText *,	text,
-	int,		line_number,
-	char *,		target)
+static void display_page (
+	HText *	text,
+	int		line_number,
+	char *		target)
 {
     HTLine * line = NULL;
     int i;
@@ -2438,8 +2438,8 @@ PRIVATE void display_page ARGS3(
 **
 **	These are used by a parser to build the text in an object
 */
-PUBLIC void HText_beginAppend ARGS1(
-	HText *,	text)
+void HText_beginAppend (
+	HText *	text)
 {
     text->permissible_split = 0;
     text->in_line_1 = YES;
@@ -2494,11 +2494,11 @@ PUBLIC void HText_beginAppend ARGS1(
 #define CTRACE_SPLITLINE(p)	/*nothing*/
 #endif
 
-PRIVATE int set_style_by_embedded_chars ARGS4(
-	char *,		s,
-	char *,		e,
-	unsigned char,	start_c,
-	unsigned char,	end_c)
+static int set_style_by_embedded_chars (
+	char *		s,
+	char *		e,
+	unsigned char	start_c,
+	unsigned char	end_c)
 {
     int ret = NO;
 
@@ -2513,14 +2513,14 @@ PRIVATE int set_style_by_embedded_chars ARGS4(
     return ret;
 }
 
-PRIVATE void move_anchors_in_region ARGS7(
-    HTLine *,		line,
-    int,		line_number,
-    TextAnchor **,	prev_anchor,	/*updates++*/
-    int *,		prev_head_processed,
-    int,		sbyte,
-    int,		ebyte,
-    int,		shift)		/* Likewise */
+static void move_anchors_in_region (
+    HTLine *		line,
+    int		line_number,
+    TextAnchor **	prev_anchor,	/*updates++*/
+    int *		prev_head_processed,
+    int		sbyte,
+    int		ebyte,
+    int		shift)		/* Likewise */
 {
     /*
      * Update anchor positions for anchors that start on this line.  Note:  we
@@ -2588,14 +2588,14 @@ PRIVATE void move_anchors_in_region ARGS7(
  *  Returns NULL if no changes needed.  (Remove-spaces code may be buggy...)
  * - kw
  */
-PRIVATE HTLine * insert_blanks_in_line ARGS7(
-    HTLine *,		line,
-    int,		line_number,
-    HText *,		text,
-    TextAnchor **,	prev_anchor,	/*updates++*/
-    int,		ninserts,
-    int *,		oldpos,		/* Measured in cells */
-    int *,		newpos)		/* Likewise */
+static HTLine * insert_blanks_in_line (
+    HTLine *		line,
+    int		line_number,
+    HText *		text,
+    TextAnchor **	prev_anchor,	/*updates++*/
+    int		ninserts,
+    int *		oldpos,		/* Measured in cells */
+    int *		newpos)		/* Likewise */
 {
     int ioldc = 0;			/* count visible characters */
     int ip;				/* count insertion pairs */
@@ -2698,10 +2698,10 @@ PRIVATE HTLine * insert_blanks_in_line ARGS7(
 }
 
 #if defined(USE_COLOR_STYLE)
-PRIVATE HTStyleChange * skip_matched_and_correct_offsets ARGS3(
-	HTStyleChange *,	end,
-	HTStyleChange *,	start,
-	unsigned,		split_pos)
+static HTStyleChange * skip_matched_and_correct_offsets (
+	HTStyleChange *	end,
+	HTStyleChange *	start,
+	unsigned		split_pos)
 { /* Found an OFF change not part of an adjacent matched pair.
    * Walk backward looking for the corresponding ON change.
    * Move everything after split_pos to be at split_pos.
@@ -2728,9 +2728,9 @@ PRIVATE HTStyleChange * skip_matched_and_correct_offsets ARGS3(
 }
 #endif /* USE_COLOR_STYLE */
 
-PRIVATE void split_line ARGS2(
-	HText *,	text,
-	unsigned,	split)
+static void split_line (
+	HText *	text,
+	unsigned	split)
 {
     HTStyle * style = text->style;
     int spare;
@@ -3403,9 +3403,9 @@ PRIVATE void split_line ARGS2(
 /*	Allow vertical blank space
 **	--------------------------
 */
-PRIVATE void blank_lines ARGS2(
-	HText *,	text,
-	int,		newlines)
+static void blank_lines (
+	HText *	text,
+	int		newlines)
 {
     if (HText_LastLineEmpty(text, FALSE)) { /* No text on current line */
 	HTLine * line = text->last_line->prev;
@@ -3439,8 +3439,8 @@ PRIVATE void blank_lines ARGS2(
 **	------------------------------
 ** See also: setStyle.
 */
-PUBLIC void HText_appendParagraph ARGS1(
-	HText *,	text)
+void HText_appendParagraph (
+	HText *	text)
 {
     int after = text->style->spaceAfter;
     int before = text->style->spaceBefore;
@@ -3453,9 +3453,9 @@ PUBLIC void HText_appendParagraph ARGS1(
 **
 **	Does not filter unnecessary style changes.
 */
-PUBLIC void HText_setStyle ARGS2(
-	HText *,	text,
-	HTStyle *,	style)
+void HText_setStyle (
+	HText *	text,
+	HTStyle *	style)
 {
     int after, before;
 
@@ -3474,9 +3474,9 @@ PUBLIC void HText_setStyle ARGS2(
 /*	Append a character to the text object
 **	-------------------------------------
 */
-PUBLIC void HText_appendCharacter ARGS2(
-	HText *,	text,
-	int,		ch)
+void HText_appendCharacter (
+	HText *	text,
+	int		ch)
 {
     HTLine * line;
     HTStyle * style;
@@ -4075,7 +4075,7 @@ PUBLIC void HText_appendCharacter ARGS2(
      *  Tabs.
      */
     if (ch == '\t') {
-	CONST HTTabStop * Tab;
+	const HTTabStop * Tab;
 	int target, target_cu;	/* Where to tab to */
 	int here, here_cu;	/* in _cu we try to guess what curses thinks */
 
@@ -4429,7 +4429,7 @@ check_WrapSource:
 /*  Insert a style change into the current line
 **  -------------------------------------------
 */
-PUBLIC void _internal_HTC ARGS3(HText *,text, int,style, int,dir)
+void _internal_HTC (HText *text, int style, int dir)
 {
     HTLine* line;
 
@@ -4471,9 +4471,9 @@ PUBLIC void _internal_HTC ARGS3(HText *,text, int,style, int,dir)
 /*	Set LastChar element in the text object.
 **	----------------------------------------
 */
-PUBLIC void HText_setLastChar ARGS2(
-	HText *,	text,
-	char,		ch)
+void HText_setLastChar (
+	HText *	text,
+	char		ch)
 {
     if (!text)
 	return;
@@ -4484,8 +4484,8 @@ PUBLIC void HText_setLastChar ARGS2(
 /*	Get LastChar element in the text object.
 **	----------------------------------------
 */
-PUBLIC char HText_getLastChar ARGS1(
-	HText *,	text)
+char HText_getLastChar (
+	HText *	text)
 {
     if (!text)
 	return('\0');
@@ -4496,9 +4496,9 @@ PUBLIC char HText_getLastChar ARGS1(
 /*	Set IgnoreExcess element in the text object.
 **	--------------------------------------------
 */
-PUBLIC void HText_setIgnoreExcess ARGS2(
-	HText *,	text,
-	BOOL,		ignore)
+void HText_setIgnoreExcess (
+	HText *	text,
+	BOOL		ignore)
 {
     if (!text)
 	return;
@@ -4518,9 +4518,9 @@ PUBLIC void HText_setIgnoreExcess ARGS2(
  *  display of the lines on screen will be updated after partial display
  *  upon return to mainloop. - kw
  */
-PRIVATE int HText_insertBlanksInStblLines ARGS2(
-    HText *,		me,
-    int,		ncols)
+static int HText_insertBlanksInStblLines (
+    HText *		me,
+    int		ncols)
 {
     HTLine *line;
     HTLine *mod_line, *first_line = NULL;
@@ -4757,8 +4757,8 @@ PRIVATE int HText_insertBlanksInStblLines ARGS2(
 
 /*	Cancel simple table handling
 */
-PUBLIC void HText_cancelStbl ARGS1(
-	HText *,	me)
+void HText_cancelStbl (
+	HText *	me)
 {
     if (!me || !me->stbl) {
 	CTRACE((tfp, "cancelStbl: ignored.\n"));
@@ -4781,9 +4781,9 @@ PUBLIC void HText_cancelStbl ARGS1(
 
 /*	Start simple table handling
 */
-PUBLIC void HText_startStblTABLE ARGS2(
-	HText *,	me,
-	short,		alignment)
+void HText_startStblTABLE (
+	HText *	me,
+	short		alignment)
 {
 #ifdef EXP_NESTED_TABLES
     STable_info *current = me->stbl;
@@ -4818,8 +4818,8 @@ PUBLIC void HText_startStblTABLE ARGS2(
 }
 
 #ifdef EXP_NESTED_TABLES
-PRIVATE void free_enclosed_stbl ARGS1(
-	HText *,	me)
+static void free_enclosed_stbl (
+	HText *	me)
 {
     if (me->enclosed_stbl != NULL) {
 	HTList *list = me->enclosed_stbl;
@@ -4839,8 +4839,8 @@ PRIVATE void free_enclosed_stbl ARGS1(
 /*	Finish simple table handling
  *	Return TRUE if the table is nested inside another table.
  */
-PUBLIC int HText_endStblTABLE ARGS1(
-	HText *,	me)
+int HText_endStblTABLE (
+	HText *	me)
 {
     int ncols, lines_changed = 0;
     STable_info *enclosing = NULL;
@@ -4897,9 +4897,9 @@ PUBLIC int HText_endStblTABLE ARGS1(
 
 /*	Start simple table row
 */
-PUBLIC void HText_startStblTR ARGS2(
-	HText *,	me,
-	short,		alignment)
+void HText_startStblTR (
+	HText *	me,
+	short		alignment)
 {
     if (!me || !me->stbl)
 	return;
@@ -4909,8 +4909,8 @@ PUBLIC void HText_startStblTR ARGS2(
 
 /*	Finish simple table row
 */
-PUBLIC void HText_endStblTR ARGS1(
-	HText *,	me)
+void HText_endStblTR (
+	HText *	me)
 {
     if (!me || !me->stbl)
 	return;
@@ -4919,12 +4919,12 @@ PUBLIC void HText_endStblTR ARGS1(
 
 /*	Start simple table cell
 */
-PUBLIC void HText_startStblTD ARGS5(
-	HText *,	me,
-	int,		colspan,
-	int,		rowspan,
-	short,		alignment,
-	BOOL,		isheader)
+void HText_startStblTD (
+	HText *	me,
+	int		colspan,
+	int		rowspan,
+	short		alignment,
+	BOOL		isheader)
 {
     if (!me || !me->stbl)
 	return;
@@ -4945,8 +4945,8 @@ PUBLIC void HText_startStblTD ARGS5(
 
 /*	Finish simple table cell
 */
-PUBLIC void HText_endStblTD ARGS1(
-	HText *,	me)
+void HText_endStblTD (
+	HText *	me)
 {
     if (!me || !me->stbl)
 	return;
@@ -4957,11 +4957,11 @@ PUBLIC void HText_endStblTD ARGS1(
 
 /*	Remember COL info / Start a COLGROUP and remember info
 */
-PUBLIC void HText_startStblCOL ARGS4(
-	HText *,	me,
-	int,		span,
-	short,		alignment,
-	BOOL,		isgroup)
+void HText_startStblCOL (
+	HText *	me,
+	int		span,
+	short		alignment,
+	BOOL		isgroup)
 {
     if (!me || !me->stbl)
 	return;
@@ -4977,8 +4977,8 @@ PUBLIC void HText_startStblCOL ARGS4(
 
 /*	Finish a COLGROUP
 */
-PUBLIC void HText_endStblCOLGROUP ARGS1(
-	HText *,	me)
+void HText_endStblCOLGROUP (
+	HText *	me)
 {
     if (!me || !me->stbl)
 	return;
@@ -4988,9 +4988,9 @@ PUBLIC void HText_endStblCOLGROUP ARGS1(
 
 /*	Start a THEAD / TFOOT / TBODY - remember its alignment info
 */
-PUBLIC void HText_startStblRowGroup ARGS2(
-	HText *,	me,
-	short,		alignment)
+void HText_startStblRowGroup (
+	HText *	me,
+	short		alignment)
 {
     if (!me || !me->stbl)
 	return;
@@ -5001,10 +5001,10 @@ PUBLIC void HText_startStblRowGroup ARGS2(
 /*		Anchor handling
 **		---------------
 */
-PRIVATE void add_link_number ARGS3(
-    HText *,		text,
-    TextAnchor *,	a,
-    BOOL,		save_position)
+static void add_link_number (
+    HText *		text,
+    TextAnchor *	a,
+    BOOL		save_position)
 {
     char marker[32];
 
@@ -5031,10 +5031,10 @@ PRIVATE void add_link_number ARGS3(
 
 /*	Start an anchor field
 */
-PUBLIC int HText_beginAnchor ARGS3(
-	HText *,		text,
-	BOOL,			underline,
-	HTChildAnchor *,	anc)
+int HText_beginAnchor (
+	HText *		text,
+	BOOL			underline,
+	HTChildAnchor *	anc)
 {
     TextAnchor * a;
 
@@ -5074,10 +5074,10 @@ PUBLIC int HText_beginAnchor ARGS3(
 }
 
 /* If !really, report whether the anchor is empty. */
-PRIVATE BOOL HText_endAnchor0 ARGS3(
-	HText *,	text,
-	int,		number,
-	int,		really)
+static BOOL HText_endAnchor0 (
+	HText *	text,
+	int		number,
+	int		really)
 {
     TextAnchor *a;
 
@@ -5545,9 +5545,9 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
     return FALSE;
 }
 
-PUBLIC void HText_endAnchor ARGS2(
-	HText *,	text,
-	int,		number)
+void HText_endAnchor (
+	HText *	text,
+	int		number)
 {
     HText_endAnchor0(text, number, 1);
 }
@@ -5558,19 +5558,19 @@ PUBLIC void HText_endAnchor ARGS2(
     links - like ones produced by <a href=".">foo</a>, no inputs, etc. - VH
 */
 #ifdef MARK_HIDDEN_LINKS
-PUBLIC BOOL HText_isAnchorBlank ARGS2(
-	HText *,	text,
-	int,		number)
+BOOL HText_isAnchorBlank (
+	HText *	text,
+	int		number)
 {
     return HText_endAnchor0(text, number, 0);
 }
 #endif /* MARK_HIDDEN_LINKS */
 
-PUBLIC void HText_appendText ARGS2(
-	HText *,	text,
-	CONST char *,	str)
+void HText_appendText (
+	HText *	text,
+	const char *	str)
 {
-    CONST char *p;
+    const char *p;
 
     if (str == NULL)
 	return;
@@ -5584,8 +5584,8 @@ PUBLIC void HText_appendText ARGS2(
 }
 
 
-PRIVATE int remove_special_attr_chars ARGS1(
-	char *,		buf)
+static int remove_special_attr_chars (
+	char *		buf)
 {
     register char *cp;
     register int soft_newline_count = 0;
@@ -5610,8 +5610,8 @@ PRIVATE int remove_special_attr_chars ARGS1(
 **  and brings the anchors in line with the text by adding the text
 **  offset to each of the anchors.
 */
-PUBLIC void HText_endAppend ARGS1(
-	HText *,	text)
+void HText_endAppend (
+	HText *	text)
 {
     HTLine *line_ptr;
 
@@ -5701,10 +5701,10 @@ PUBLIC void HText_endAppend ARGS1(
 **  This needs to be done so that display_page finds the anchors in the
 **  form it expects when it sets the links[] elements.
 */
-PRIVATE void HText_trimHightext ARGS3(
-	HText *,	text,
-	BOOLEAN,	final,
-	int,		stop_before)
+static void HText_trimHightext (
+	HText *	text,
+	BOOLEAN	final,
+	int		stop_before)
 {
     int cur_line, cur_shift;
     TextAnchor *anchor_ptr;
@@ -5950,8 +5950,8 @@ re_parse:
 
 /*	Return the anchor associated with this node
 */
-PUBLIC HTParentAnchor * HText_nodeAnchor ARGS1(
-	HText *,	text)
+HTParentAnchor * HText_nodeAnchor (
+	HText *	text)
 {
     return text->node_anchor;
 }
@@ -5964,9 +5964,9 @@ PUBLIC HTParentAnchor * HText_nodeAnchor ARGS1(
  *  HText_childNextNumber() returns the anchor with index [number],
  *  using a pointer from the previous number (=optimization) or NULL.
  */
-PUBLIC HTChildAnchor * HText_childNextNumber ARGS2(
-	int,		number,
-	void**,		prev)
+HTChildAnchor * HText_childNextNumber (
+	int		number,
+	void**		prev)
 {
     /* Sorry, TextAnchor is not declared outside this file, use a cast. */
     TextAnchor * a = *prev;
@@ -5993,9 +5993,9 @@ PUBLIC HTChildAnchor * HText_childNextNumber ARGS2(
  *  with index N.  The index corresponds to the [number] we print
  *  for the field. -FM & LE
  */
-PUBLIC void HText_FormDescNumber ARGS2(
-	int,		number,
-	char **,	desc)
+void HText_FormDescNumber (
+	int		number,
+	char **	desc)
 {
     TextAnchor * a;
 
@@ -6072,10 +6072,10 @@ PUBLIC void HText_FormDescNumber ARGS2(
  * rel is 0 or '+' or '-'
  * cur is the current link
  */
-PUBLIC int HTGetRelLinkNum ARGS3(
-	int,	num,
-	int,	rel,
-	int,	cur)
+int HTGetRelLinkNum (
+	int	num,
+	int	rel,
+	int	cur)
 {
     TextAnchor *a, *l = 0;
     int scrtop = HText_getTopOfScreen(); /*XXX +1? */
@@ -6145,13 +6145,13 @@ PUBLIC int HTGetRelLinkNum ARGS3(
  *  If want_go is 0 and the number doesn't represent an input field, info
  *  on the link indicated by number is deposited in *hightext and *lname.
  */
-PUBLIC int HTGetLinkInfo ARGS6(
-	int,		number,
-	int,		want_go,
-	int *,		go_line,
-	int *,		linknum,
-	char **,	hightext,
-	char **,	lname)
+int HTGetLinkInfo (
+	int		number,
+	int		want_go,
+	int *		go_line,
+	int *		linknum,
+	char **	hightext,
+	char **	lname)
 {
     TextAnchor *a;
     HTAnchor *link_dest;
@@ -6301,12 +6301,12 @@ PUBLIC int HTGetLinkInfo ARGS6(
     return(NO);
 }
 
-PRIVATE BOOLEAN same_anchor_or_field ARGS5(
-    int,		numberA,
-    FormInfo *,		formA,
-    int,		numberB,
-    FormInfo *,		formB,
-    BOOLEAN,		ta_same)
+static BOOLEAN same_anchor_or_field (
+    int		numberA,
+    FormInfo *		formA,
+    int		numberB,
+    FormInfo *		formB,
+    BOOLEAN		ta_same)
 {
     if (numberA > 0 || numberB > 0) {
 	if (numberA == numberB)
@@ -6355,9 +6355,9 @@ PRIVATE BOOLEAN same_anchor_or_field ARGS5(
  *  (direction < 0) or after (direction > 0) the current one?
  *  On entry, curlink must be the index in links[] of a textarea field. - kw
  */
-PUBLIC BOOL HText_TAHasMoreLines ARGS2(
-	int,		curlink,
-	int,		direction)
+BOOL HText_TAHasMoreLines (
+	int		curlink,
+	int		direction)
 {
     TextAnchor *a;
     TextAnchor *prev_a = NULL;
@@ -6412,12 +6412,12 @@ PUBLIC BOOL HText_TAHasMoreLines ARGS2(
  *  to use after the line in *go_line has been made the new top screen
  *  line. - kw
  */
-PUBLIC int HTGetLinkOrFieldStart ARGS5(
-	int,		curlink,
-	int *,		go_line,
-	int *,		linknum,
-	int,		direction,
-	BOOLEAN,	ta_skip)
+int HTGetLinkOrFieldStart (
+	int		curlink,
+	int *		go_line,
+	int *		linknum,
+	int		direction,
+	BOOLEAN	ta_skip)
 {
     TextAnchor *a;
     int anchors_this_line = 0;
@@ -6603,14 +6603,14 @@ PUBLIC int HTGetLinkOrFieldStart ARGS5(
  *  or utf8 characters) are loaded into *offset and *tLen, and
  *  TRUE is returned. -FM
  */
-PUBLIC BOOL HText_getFirstTargetInLine ARGS7(
-	HText *,	text,
-	int,		line_num,
-	BOOL,		utf_flag,
-	int *,		offset,
-	int *,		tLen,
-	char **,	data,
-	CONST char *,	target)
+BOOL HText_getFirstTargetInLine (
+	HText *	text,
+	int		line_num,
+	BOOL		utf_flag,
+	int *		offset,
+	int *		tLen,
+	char **	data,
+	const char *	target)
 {
     HTLine *line;
     char *LineData;
@@ -6678,7 +6678,7 @@ PUBLIC BOOL HText_getFirstTargetInLine ARGS7(
  *  HText_getNumOfLines returns the number of lines in the
  *  current document.
  */
-PUBLIC int HText_getNumOfLines NOARGS
+int HText_getNumOfLines (void)
 {
     return(HTMainText ? HTMainText->Lines : 0);
 }
@@ -6687,14 +6687,14 @@ PUBLIC int HText_getNumOfLines NOARGS
  *  HText_getTitle returns the title of the
  *  current document.
  */
-PUBLIC CONST char * HText_getTitle NOARGS
+const char * HText_getTitle (void)
 {
     return(HTMainText ?
 	  HTAnchor_title(HTMainText->node_anchor) : 0);
 }
 
 #ifdef USE_COLOR_STYLE
-PUBLIC CONST char *HText_getStyle NOARGS
+const char *HText_getStyle (void)
 {
    return(HTMainText ?
 	  HTAnchor_style(HTMainText->node_anchor) : 0);
@@ -6706,7 +6706,7 @@ PUBLIC CONST char *HText_getStyle NOARGS
  *  document (normally derived from a Content-Disposition header with
  *  attachment; filename=name.suffix). -FM
  */
-PUBLIC CONST char * HText_getSugFname NOARGS
+const char * HText_getSugFname (void)
 {
     return(HTMainText ?
 	  HTAnchor_SugFname(HTMainText->node_anchor) : 0);
@@ -6724,16 +6724,16 @@ PUBLIC CONST char * HText_getSugFname NOARGS
  *  info enough to remove a compression suffix if the anchor object
  *  does not indicate compression. - kw
  */
-PUBLIC void HTCheckFnameForCompression ARGS3(
-	char **,		fname,
-	HTParentAnchor *,	anchor,
-	BOOL,			strip_ok)
+void HTCheckFnameForCompression (
+	char **		fname,
+	HTParentAnchor *	anchor,
+	BOOL			strip_ok)
 {
     char *fn = *fname;
     char *dot = NULL, *cp = NULL;
     char *suffix;
-    CONST char *ct = NULL;
-    CONST char *ce = NULL;
+    const char *ct = NULL;
+    const char *ce = NULL;
     CompressFileType method = cftNone;
     CompressFileType second;
 
@@ -6884,7 +6884,7 @@ PUBLIC void HTCheckFnameForCompression ARGS3(
  *  HText_getLastModified returns the Last-Modified header
  *  if available, for the current document. -FM
  */
-PUBLIC CONST char * HText_getLastModified NOARGS
+const char * HText_getLastModified (void)
 {
     return(HTMainText ?
 	  HTAnchor_last_modified(HTMainText->node_anchor) : 0);
@@ -6894,7 +6894,7 @@ PUBLIC CONST char * HText_getLastModified NOARGS
  *  HText_getDate returns the Date header
  *  if available, for the current document. -FM
  */
-PUBLIC CONST char * HText_getDate NOARGS
+const char * HText_getDate (void)
 {
     return(HTMainText ?
 	  HTAnchor_date(HTMainText->node_anchor) : 0);
@@ -6904,7 +6904,7 @@ PUBLIC CONST char * HText_getDate NOARGS
  *  HText_getServer returns the Server header
  *  if available, for the current document. -FM
  */
-PUBLIC CONST char * HText_getServer NOARGS
+const char * HText_getServer (void)
 {
     return(HTMainText ?
 	  HTAnchor_server(HTMainText->node_anchor) : 0);
@@ -6915,9 +6915,9 @@ PUBLIC CONST char * HText_getServer NOARGS
  *  starting from the line 'line_num'-1.
  *  This is the primary call for lynx.
  */
-PUBLIC void HText_pageDisplay ARGS2(
-	int,		line_num,
-	char *,		target)
+void HText_pageDisplay (
+	int		line_num,
+	char *		target)
 {
 #ifdef DISP_PARTIAL
     if (debug_display_partial || (LYTraceLogFP != NULL)) {
@@ -6961,7 +6961,7 @@ PUBLIC void HText_pageDisplay ARGS2(
  *  Return YES if we have a whereis search target on the displayed
  *  page. - kw
  */
-PUBLIC BOOL HText_pageHasPrevTarget NOARGS
+BOOL HText_pageHasPrevTarget (void)
 {
     if (!HTMainText)
 	return NO;
@@ -6973,10 +6973,10 @@ PUBLIC BOOL HText_pageHasPrevTarget NOARGS
  *  HText_LinksInLines returns the number of links in the
  *  'Lines' number of lines beginning with 'line_num'-1. -FM
  */
-PUBLIC int HText_LinksInLines ARGS3(
-	HText *,	text,
-	int,		line_num,
-	int,		Lines)
+int HText_LinksInLines (
+	HText *	text,
+	int		line_num,
+	int		Lines)
 {
     int total = 0;
     int start = (line_num - 1);
@@ -7000,32 +7000,32 @@ PUBLIC int HText_LinksInLines ARGS3(
     return total;
 }
 
-PUBLIC void HText_setStale ARGS1(
-	HText *,	text)
+void HText_setStale (
+	HText *	text)
 {
     text->stale = YES;
 }
 
-PUBLIC void HText_refresh ARGS1(
-	HText *,	text)
+void HText_refresh (
+	HText *	text)
 {
     if (text->stale)
 	display_page(text, text->top_of_screen, "");
 }
 
-PUBLIC int HText_sourceAnchors ARGS1(
-	HText *,	text)
+int HText_sourceAnchors (
+	HText *	text)
 {
     return (text ? text->last_anchor_number : -1);
 }
 
-PUBLIC BOOL HText_canScrollUp ARGS1(
-	HText *,	text)
+BOOL HText_canScrollUp (
+	HText *	text)
 {
     return (BOOL) (text->top_of_screen != 0);
 }
 
-PUBLIC BOOL HText_canScrollDown NOARGS
+BOOL HText_canScrollDown (void)
 {
     HText * text = HTMainText;
 
@@ -7035,26 +7035,26 @@ PUBLIC BOOL HText_canScrollDown NOARGS
 
 /*		Scroll actions
 */
-PUBLIC void HText_scrollTop ARGS1(
-	HText *,	text)
+void HText_scrollTop (
+	HText *	text)
 {
     display_page(text, 0, "");
 }
 
-PUBLIC void HText_scrollDown ARGS1(
-	HText *,	text)
+void HText_scrollDown (
+	HText *	text)
 {
     display_page(text, text->top_of_screen + display_lines, "");
 }
 
-PUBLIC void HText_scrollUp ARGS1(
-	HText *,	text)
+void HText_scrollUp (
+	HText *	text)
 {
     display_page(text, text->top_of_screen - display_lines, "");
 }
 
-PUBLIC void HText_scrollBottom ARGS1(
-	HText *,	text)
+void HText_scrollBottom (
+	HText *	text)
 {
     display_page(text, text->Lines - display_lines, "");
 }
@@ -7066,8 +7066,8 @@ PUBLIC void HText_scrollBottom ARGS1(
 
 /* Bring to front and highlight it
 */
-PUBLIC BOOL HText_select ARGS1(
-	HText *,	text)
+BOOL HText_select (
+	HText *	text)
 {
     if (text != HTMainText) {
 	/*
@@ -7124,8 +7124,8 @@ PUBLIC BOOL HText_select ARGS1(
  *  and isHEAD elements are identical to those of a loaded
  *  (memory cached) text. -FM
  */
-PUBLIC BOOL HText_POSTReplyLoaded ARGS1(
-	DocInfo *,	doc)
+BOOL HText_POSTReplyLoaded (
+	DocInfo *	doc)
 {
     HText *text = NULL;
     HTList *cur = loaded_texts;
@@ -7165,8 +7165,8 @@ PUBLIC BOOL HText_POSTReplyLoaded ARGS1(
     return(FALSE);
 }
 
-PUBLIC BOOL HTFindPoundSelector ARGS1(
-	CONST char *,		selector)
+BOOL HTFindPoundSelector (
+	const char *		selector)
 {
     TextAnchor * a;
 
@@ -7191,9 +7191,9 @@ PUBLIC BOOL HTFindPoundSelector ARGS1(
 
 }
 
-PUBLIC BOOL HText_selectAnchor ARGS2(
-	HText *,		text,
-	HTChildAnchor *,	anchor)
+BOOL HText_selectAnchor (
+	HText *		text,
+	HTChildAnchor *	anchor)
 {
     TextAnchor * a;
 
@@ -7245,9 +7245,9 @@ PUBLIC BOOL HText_selectAnchor ARGS2(
 */
 /*	Apply this style to the selection
 */
-PUBLIC void HText_applyStyle ARGS2(
-	HText *,	me GCC_UNUSED,
-	HTStyle *,	style GCC_UNUSED)
+void HText_applyStyle (
+	HText *	me GCC_UNUSED,
+	HTStyle *	style GCC_UNUSED)
 {
 
 }
@@ -7255,9 +7255,9 @@ PUBLIC void HText_applyStyle ARGS2(
 
 /*	Update all text with changed style.
 */
-PUBLIC void HText_updateStyle ARGS2(
-	HText *,	me GCC_UNUSED,
-	HTStyle *,	style GCC_UNUSED)
+void HText_updateStyle (
+	HText *	me GCC_UNUSED,
+	HTStyle *	style GCC_UNUSED)
 {
 
 }
@@ -7265,9 +7265,9 @@ PUBLIC void HText_updateStyle ARGS2(
 
 /*	Return style of  selection
 */
-PUBLIC HTStyle * HText_selectionStyle ARGS2(
-	HText *,		me GCC_UNUSED,
-	HTStyleSheet *,		sheet GCC_UNUSED)
+HTStyle * HText_selectionStyle (
+	HText *		me GCC_UNUSED,
+	HTStyleSheet *		sheet GCC_UNUSED)
 {
     return 0;
 }
@@ -7275,10 +7275,10 @@ PUBLIC HTStyle * HText_selectionStyle ARGS2(
 
 /*	Paste in styled text
 */
-PUBLIC void HText_replaceSel ARGS3(
-	HText *,	me GCC_UNUSED,
-	CONST char *,	aString GCC_UNUSED,
-	HTStyle *,	aStyle GCC_UNUSED)
+void HText_replaceSel (
+	HText *	me GCC_UNUSED,
+	const char *	aString GCC_UNUSED,
+	HTStyle *	aStyle GCC_UNUSED)
 {
 }
 
@@ -7286,9 +7286,9 @@ PUBLIC void HText_replaceSel ARGS3(
 /*	Apply this style to the selection and all similarly formatted text
 **	(style recovery only)
 */
-PUBLIC void HTextApplyToSimilar ARGS2(
-	HText *,	me GCC_UNUSED,
-	HTStyle *,	style GCC_UNUSED)
+void HTextApplyToSimilar (
+	HText *	me GCC_UNUSED,
+	HTStyle *	style GCC_UNUSED)
 {
 
 }
@@ -7297,9 +7297,9 @@ PUBLIC void HTextApplyToSimilar ARGS2(
 /*	Select the first unstyled run.
 **	(style recovery only)
 */
-PUBLIC void HTextSelectUnstyled ARGS2(
-	HText *,		me GCC_UNUSED,
-	HTStyleSheet *,		sheet GCC_UNUSED)
+void HTextSelectUnstyled (
+	HText *		me GCC_UNUSED,
+	HTStyleSheet *		sheet GCC_UNUSED)
 {
 
 }
@@ -7307,34 +7307,34 @@ PUBLIC void HTextSelectUnstyled ARGS2(
 
 /*	Anchor handling:
 */
-PUBLIC void HText_unlinkSelection ARGS1(
-	HText *,	me GCC_UNUSED)
+void HText_unlinkSelection (
+	HText *	me GCC_UNUSED)
 {
 
 }
 
-PUBLIC HTAnchor * HText_referenceSelected ARGS1(
-	HText *,	me GCC_UNUSED)
+HTAnchor * HText_referenceSelected (
+	HText *	me GCC_UNUSED)
 {
      return 0;
 }
 
 
-PUBLIC int HText_getTopOfScreen NOARGS
+int HText_getTopOfScreen (void)
 {
     HText * text = HTMainText;
     return text != 0 ? text->top_of_screen : 0;
 }
 
-PUBLIC int HText_getLines ARGS1(
-	HText *,	text)
+int HText_getLines (
+	HText *	text)
 {
     return text->Lines;
 }
 
-PUBLIC HTAnchor * HText_linkSelTo ARGS2(
-	HText *,	me GCC_UNUSED,
-	HTAnchor *,	anchor GCC_UNUSED)
+HTAnchor * HText_linkSelTo (
+	HText *	me GCC_UNUSED,
+	HTAnchor *	anchor GCC_UNUSED)
 {
     return 0;
 }
@@ -7342,7 +7342,7 @@ PUBLIC HTAnchor * HText_linkSelTo ARGS2(
 /*
  *  Utility for freeing the list of previous isindex and whereis queries. -FM
  */
-PUBLIC void HTSearchQueries_free NOARGS
+void HTSearchQueries_free (void)
 {
     char *query;
     HTList *cur = search_queries;
@@ -7362,8 +7362,8 @@ PUBLIC void HTSearchQueries_free NOARGS
  *  Utility for listing isindex and whereis queries, making
  *  any repeated queries the most current in the list. -FM
  */
-PUBLIC void HTAddSearchQuery ARGS1(
-	char *,		query)
+void HTAddSearchQuery (
+	char *		query)
 {
     char *new_query = NULL;
     char *old;
@@ -7396,8 +7396,8 @@ PUBLIC void HTAddSearchQuery ARGS1(
     return;
 }
 
-PUBLIC int do_www_search ARGS1(
-	DocInfo *,	doc)
+int do_www_search (
+	DocInfo *	doc)
 {
     char searchstring[256], temp[256], *cp, *tmpaddress = NULL;
     int ch, recall;
@@ -7595,9 +7595,9 @@ get_query:
     return(NOT_FOUND);
 }
 
-PRIVATE void write_offset ARGS2(
-	FILE *,		fp,
-	HTLine *,	line)
+static void write_offset (
+	FILE *		fp,
+	HTLine *	line)
 {
     int i;
 
@@ -7608,8 +7608,8 @@ PRIVATE void write_offset ARGS2(
     }
 }
 
-PRIVATE void write_hyphen ARGS1(
-	FILE *,		fp)
+static void write_hyphen (
+	FILE *		fp)
 {
     if (dump_output_immediately &&
 	LYRawMode &&
@@ -7629,10 +7629,10 @@ PRIVATE void write_hyphen ARGS1(
  *  If is_reply is TRUE add ">" to the beginning of each
  *  line to specify the file is a reply to message.
  */
-PUBLIC void print_wwwfile_to_fd ARGS3(
-	FILE *,		fp,
-	BOOLEAN,	is_email,
-	BOOLEAN,	is_reply)
+void print_wwwfile_to_fd (
+	FILE *		fp,
+	BOOLEAN	is_email,
+	BOOLEAN	is_reply)
 {
     register int i;
     int first = TRUE;
@@ -7745,10 +7745,10 @@ PUBLIC void print_wwwfile_to_fd ARGS3(
  *  the file descriptor fp.
  *  First output line is "thelink", ie, the URL for this file.
  */
-PUBLIC void print_crawl_to_fd ARGS3(
-	FILE *,		fp,
-	char *,		thelink,
-	char *,		thetitle)
+void print_crawl_to_fd (
+	FILE *		fp,
+	char *		thelink,
+	char *		thetitle)
 {
     register int i;
     int first = TRUE;
@@ -7800,10 +7800,10 @@ PUBLIC void print_crawl_to_fd ARGS3(
 #endif /* VMS */
 }
 
-PRIVATE void adjust_search_result ARGS3(
-    DocInfo *,	doc,
-    int,	tentative_result,
-    int,	start_line)
+static void adjust_search_result (
+    DocInfo *	doc,
+    int	tentative_result,
+    int	start_line)
 {
     if (tentative_result > 0) {
 	int anch_line = -1;
@@ -7871,9 +7871,9 @@ PRIVATE void adjust_search_result ARGS3(
     }
 }
 
-PRIVATE BOOL anchor_has_target ARGS2(
-	TextAnchor *,	a,
-	char *,		target)
+static BOOL anchor_has_target (
+	TextAnchor *	a,
+	char *		target)
 {
     OptionType * option;
     char *stars = NULL, *cp;
@@ -7962,8 +7962,8 @@ PRIVATE BOOL anchor_has_target ARGS2(
     return FALSE;
 }
 
-PRIVATE TextAnchor *line_num_to_anchor ARGS1(
-    int,	line_num)
+static TextAnchor *line_num_to_anchor (
+    int	line_num)
 {
     TextAnchor *a;
 
@@ -7978,9 +7978,9 @@ PRIVATE TextAnchor *line_num_to_anchor ARGS1(
     return a;
 }
 
-PRIVATE int line_num_in_text ARGS2(
-    HText *,		text,
-    HTLine *,		line)
+static int line_num_in_text (
+    HText *		text,
+    HTLine *		line)
 {
     int result = 1;
     HTLine *temp = FirstHTLine(text);
@@ -7995,8 +7995,8 @@ PRIVATE int line_num_in_text ARGS2(
 /* Computes the 'prev' pointers on demand, and returns the one for the given
  * anchor.
  */
-PRIVATE TextAnchor *get_prev_anchor ARGS1(
-    TextAnchor *,	a)
+static TextAnchor *get_prev_anchor (
+    TextAnchor *	a)
 {
     TextAnchor *p, *q;
 
@@ -8011,12 +8011,12 @@ PRIVATE TextAnchor *get_prev_anchor ARGS1(
     return a->prev;
 }
 
-PRIVATE int www_search_forward ARGS5(
-	int,		start_line,
-	DocInfo *,	doc,
-	char *,		target,
-	HTLine *,	line,
-	int,		count)
+static int www_search_forward (
+	int		start_line,
+	DocInfo *	doc,
+	char *		target,
+	HTLine *	line,
+	int		count)
 {
     int wrapped = 0;
     TextAnchor *a = line_num_to_anchor(count - 1);
@@ -8054,12 +8054,12 @@ PRIVATE int www_search_forward ARGS5(
     return 0;
 }
 
-PRIVATE int www_search_backward ARGS5(
-	int,		start_line,
-	DocInfo *,	doc,
-	char *,		target,
-	HTLine *,	line,
-	int,		count)
+static int www_search_backward (
+	int		start_line,
+	DocInfo *	doc,
+	char *		target,
+	HTLine *	line,
+	int		count)
 {
     int wrapped = 0;
     TextAnchor *a = line_num_to_anchor(count - 1);
@@ -8097,11 +8097,11 @@ PRIVATE int www_search_backward ARGS5(
     return 0;
 }
 
-PUBLIC void www_user_search ARGS4(
-	int,		start_line,
-	DocInfo *,	doc,
-	char *,		target,
-	int,		direction)
+void www_user_search (
+	int		start_line,
+	DocInfo *	doc,
+	char *		target,
+	int		direction)
 {
     HTLine * line;
     int count;
@@ -8133,9 +8133,9 @@ PUBLIC void www_user_search ARGS4(
 	www_search_backward(start_line, doc, target, line, count);
 }
 
-PUBLIC void user_message ARGS2(
-	CONST char *,	message,
-	CONST char *,	argument)
+void user_message (
+	const char *	message,
+	const char *	argument)
 {
     char *temp = NULL;
 
@@ -8156,7 +8156,7 @@ PUBLIC void user_message ARGS2(
  *  HText_getOwner returns the owner of the
  *  current document.
  */
-PUBLIC CONST char * HText_getOwner NOARGS
+const char * HText_getOwner (void)
 {
     return(HTMainText ?
 	   HTAnchor_owner(HTMainText->node_anchor) : 0);
@@ -8166,8 +8166,8 @@ PUBLIC CONST char * HText_getOwner NOARGS
  *  HText_setMainTextOwner sets the owner for the
  *  current document.
  */
-PUBLIC void HText_setMainTextOwner ARGS1(
-	CONST char *,	owner)
+void HText_setMainTextOwner (
+	const char *	owner)
 {
     if (!HTMainText)
 	return;
@@ -8180,7 +8180,7 @@ PUBLIC void HText_setMainTextOwner ARGS1(
  *  current document, used as the subject for mailto comments
  *  to the owner.
  */
-PUBLIC CONST char * HText_getRevTitle NOARGS
+const char * HText_getRevTitle (void)
 {
     return(HTMainText ?
 	   HTAnchor_RevTitle(HTMainText->node_anchor) : 0);
@@ -8190,7 +8190,7 @@ PUBLIC CONST char * HText_getRevTitle NOARGS
  *  HText_getContentBase returns the Content-Base header
  *  of the current document.
  */
-PUBLIC CONST char * HText_getContentBase NOARGS
+const char * HText_getContentBase (void)
 {
     return(HTMainText ?
 	   HTAnchor_content_base(HTMainText->node_anchor) : 0);
@@ -8200,7 +8200,7 @@ PUBLIC CONST char * HText_getContentBase NOARGS
  *  HText_getContentLocation returns the Content-Location header
  *  of the current document.
  */
-PUBLIC CONST char * HText_getContentLocation NOARGS
+const char * HText_getContentLocation (void)
 {
     return(HTMainText ?
 	   HTAnchor_content_location(HTMainText->node_anchor) : 0);
@@ -8210,13 +8210,13 @@ PUBLIC CONST char * HText_getContentLocation NOARGS
  *  HText_getMessageID returns the Message-ID of the
  *  current document.
  */
-PUBLIC CONST char * HText_getMessageID NOARGS
+const char * HText_getMessageID (void)
 {
     return(HTMainText ?
 	   HTAnchor_messageID(HTMainText->node_anchor) : NULL);
 }
 
-PUBLIC void HTuncache_current_document NOARGS
+void HTuncache_current_document (void)
 {
     /*
      *  Should remove current document from memory.
@@ -8247,9 +8247,9 @@ PUBLIC void HTuncache_current_document NOARGS
 
 #ifdef USE_SOURCE_CACHE
 
-PRIVATE HTProtocol scm = { "source-cache-mem", 0, 0 }; /* dummy - kw */
+static HTProtocol scm = { "source-cache-mem", 0, 0 }; /* dummy - kw */
 
-PUBLIC BOOLEAN HTreparse_document NOARGS
+BOOLEAN HTreparse_document (void)
 {
     BOOLEAN ok = FALSE;
 
@@ -8375,7 +8375,7 @@ PUBLIC BOOLEAN HTreparse_document NOARGS
     return ok;
 }
 
-PUBLIC BOOLEAN HTcan_reparse_document NOARGS
+BOOLEAN HTcan_reparse_document (void)
 {
     if (!HTMainAnchor || LYCacheSource == SOURCE_CACHE_NONE ||
 	(LYCacheSource == SOURCE_CACHE_FILE &&
@@ -8396,17 +8396,17 @@ PUBLIC BOOLEAN HTcan_reparse_document NOARGS
     return FALSE;  /* if came to here */
 }
 
-PRIVATE void trace_setting_change ARGS3(
-	CONST char *,	name,
-	int,		prev_setting,
-	int,		new_setting)
+static void trace_setting_change (
+	const char *	name,
+	int		prev_setting,
+	int		new_setting)
 {
     if (prev_setting != new_setting)
 	CTRACE((tfp, "HTdocument_settings_changed: %s setting has changed (was %d, now %d)\n",
 	       name, prev_setting, new_setting));
 }
 
-PUBLIC BOOLEAN HTdocument_settings_changed NOARGS
+BOOLEAN HTdocument_settings_changed (void)
 {
     /*
      * Annoying Hack(TM):  If we don't have a source cache, we can't
@@ -8463,12 +8463,12 @@ PUBLIC BOOLEAN HTdocument_settings_changed NOARGS
 }
 #endif
 
-PUBLIC int HTisDocumentSource NOARGS
+int HTisDocumentSource (void)
 {
     return (HTMainText != 0) ? HTMainText->source : FALSE;
 }
 
-PUBLIC char * HTLoadedDocumentURL NOARGS
+char * HTLoadedDocumentURL (void)
 {
     if (!HTMainText)
 	return ("");
@@ -8479,7 +8479,7 @@ PUBLIC char * HTLoadedDocumentURL NOARGS
 	return ("");
 }
 
-PUBLIC bstring * HTLoadedDocumentPost_data NOARGS
+bstring * HTLoadedDocumentPost_data (void)
 {
     if (HTMainText
      && HTMainText->node_anchor
@@ -8489,7 +8489,7 @@ PUBLIC bstring * HTLoadedDocumentPost_data NOARGS
 	return (0);
 }
 
-PUBLIC char * HTLoadedDocumentTitle NOARGS
+char * HTLoadedDocumentTitle (void)
 {
     if (!HTMainText)
 	return ("");
@@ -8500,7 +8500,7 @@ PUBLIC char * HTLoadedDocumentTitle NOARGS
 	return ("");
 }
 
-PUBLIC BOOLEAN HTLoadedDocumentIsHEAD NOARGS
+BOOLEAN HTLoadedDocumentIsHEAD (void)
 {
     if (!HTMainText)
 	return (FALSE);
@@ -8511,7 +8511,7 @@ PUBLIC BOOLEAN HTLoadedDocumentIsHEAD NOARGS
 	return (FALSE);
 }
 
-PUBLIC BOOLEAN HTLoadedDocumentIsSafe NOARGS
+BOOLEAN HTLoadedDocumentIsSafe (void)
 {
     if (!HTMainText)
 	return (FALSE);
@@ -8522,7 +8522,7 @@ PUBLIC BOOLEAN HTLoadedDocumentIsSafe NOARGS
 	return (FALSE);
 }
 
-PUBLIC char * HTLoadedDocumentCharset NOARGS
+char * HTLoadedDocumentCharset (void)
 {
     if (!HTMainText)
 	return (NULL);
@@ -8533,7 +8533,7 @@ PUBLIC char * HTLoadedDocumentCharset NOARGS
 	return (NULL);
 }
 
-PUBLIC BOOL HTLoadedDocumentEightbit NOARGS
+BOOL HTLoadedDocumentEightbit (void)
 {
     if (!HTMainText)
 	return (NO);
@@ -8541,8 +8541,8 @@ PUBLIC BOOL HTLoadedDocumentEightbit NOARGS
 	return (HTMainText->have_8bit_chars);
 }
 
-PUBLIC void HText_setNodeAnchorBookmark ARGS1(
-	CONST char *,	bookmark)
+void HText_setNodeAnchorBookmark (
+	const char *	bookmark)
 {
     if (!HTMainText)
 	return;
@@ -8551,7 +8551,7 @@ PUBLIC void HText_setNodeAnchorBookmark ARGS1(
 	HTAnchor_setBookmark(HTMainText->node_anchor, bookmark);
 }
 
-PUBLIC char * HTLoadedDocumentBookmark NOARGS
+char * HTLoadedDocumentBookmark (void)
 {
     if (!HTMainText)
 	return (NULL);
@@ -8562,35 +8562,35 @@ PUBLIC char * HTLoadedDocumentBookmark NOARGS
 	return (NULL);
 }
 
-PUBLIC int HText_LastLineSize ARGS2(
-	HText *,	text,
-	BOOL,		IgnoreSpaces)
+int HText_LastLineSize (
+	HText *	text,
+	BOOL		IgnoreSpaces)
 {
     if (!text || !text->last_line || !text->last_line->size)
 	return 0;
     return HText_TrueLineSize(text->last_line, text, IgnoreSpaces);
 }
 
-PUBLIC BOOL HText_LastLineEmpty ARGS2(
-	HText *,	text,
-	BOOL,		IgnoreSpaces)
+BOOL HText_LastLineEmpty (
+	HText *	text,
+	BOOL		IgnoreSpaces)
 {
     if (!text || !text->last_line || !text->last_line->size)
 	return TRUE;
     return HText_TrueEmptyLine(text->last_line, text, IgnoreSpaces);
 }
 
-PUBLIC int HText_LastLineOffset ARGS1(
-	HText *,	text)
+int HText_LastLineOffset (
+	HText *	text)
 {
     if (!text || !text->last_line)
 	return 0;
     return  text->last_line->offset;
 }
 
-PUBLIC int HText_PreviousLineSize ARGS2(
-	HText *,	text,
-	BOOL,		IgnoreSpaces)
+int HText_PreviousLineSize (
+	HText *	text,
+	BOOL		IgnoreSpaces)
 {
     HTLine * line;
 
@@ -8601,9 +8601,9 @@ PUBLIC int HText_PreviousLineSize ARGS2(
     return HText_TrueLineSize(line, text, IgnoreSpaces);
 }
 
-PUBLIC BOOL HText_PreviousLineEmpty ARGS2(
-	HText *,	text,
-	BOOL,		IgnoreSpaces)
+BOOL HText_PreviousLineEmpty (
+	HText *	text,
+	BOOL		IgnoreSpaces)
 {
     HTLine * line;
 
@@ -8617,10 +8617,10 @@ PUBLIC BOOL HText_PreviousLineEmpty ARGS2(
 /*
  * Compute the "true" line size.
  */
-PRIVATE int HText_TrueLineSize ARGS3(
-	HTLine *,	line,
-	HText *,	text,
-	BOOL,		IgnoreSpaces)
+static int HText_TrueLineSize (
+	HTLine *	line,
+	HText *	text,
+	BOOL		IgnoreSpaces)
 {
     size_t i;
     int true_size = 0;
@@ -8654,10 +8654,10 @@ PRIVATE int HText_TrueLineSize ARGS3(
  * HText_TrueLineSize(), and most lines are not empty.  So it is faster to
  * do this check than to check if the line size happens to be zero.
  */
-PRIVATE BOOL HText_TrueEmptyLine ARGS3(
-	HTLine *,	line,
-	HText *,	text,
-	BOOL,		IgnoreSpaces)
+static BOOL HText_TrueEmptyLine (
+	HTLine *	line,
+	HText *	text,
+	BOOL		IgnoreSpaces)
 {
     size_t i;
 
@@ -8685,8 +8685,8 @@ PRIVATE BOOL HText_TrueEmptyLine ARGS3(
     return TRUE;
 }
 
-PUBLIC void HText_NegateLineOne ARGS1(
-	HText *,	text)
+void HText_NegateLineOne (
+	HText *	text)
 {
     if (text) {
 	text->in_line_1 = NO;
@@ -8694,8 +8694,8 @@ PUBLIC void HText_NegateLineOne ARGS1(
     return;
 }
 
-PUBLIC BOOL HText_inLineOne ARGS1(
-	HText *,	text)
+BOOL HText_inLineOne (
+	HText *	text)
 {
     if (text) {
 	return text->in_line_1;
@@ -8713,8 +8713,8 @@ PUBLIC BOOL HText_inLineOne ARGS1(
  *  reiterated by split_line() in the retained blank
  *  line. -FM
  */
-PUBLIC void HText_RemovePreviousLine ARGS1(
-	HText *,	text)
+void HText_RemovePreviousLine (
+	HText *	text)
 {
     HTLine *line, *previous;
 
@@ -8736,8 +8736,8 @@ PUBLIC void HText_RemovePreviousLine ARGS1(
  *	  HT_RIGHT until subsequent characters are received
  *	  and split_line() is called. -FM
  */
-PUBLIC int HText_getCurrentColumn ARGS1(
-	HText *,	text)
+int HText_getCurrentColumn (
+	HText *	text)
 {
     int column = 0;
     BOOL IgnoreSpaces = FALSE;
@@ -8751,8 +8751,8 @@ PUBLIC int HText_getCurrentColumn ARGS1(
     return column;
 }
 
-PUBLIC int HText_getMaximumColumn ARGS1(
-	HText *,	text)
+int HText_getMaximumColumn (
+	HText *	text)
 {
     int column = (DISPLAY_COLS-2);
     if (text) {
@@ -8767,9 +8767,9 @@ PUBLIC int HText_getMaximumColumn ARGS1(
  *	  presently is correct only if the alignment is
  *	  HT_LEFT. -FM
  */
-PUBLIC void HText_setTabID ARGS2(
-	HText *,	text,
-	CONST char *,	name)
+void HText_setTabID (
+	HText *	text,
+	const char *	name)
 {
     HTTabID * Tab = NULL;
     HTList * cur = text->tabs;
@@ -8800,9 +8800,9 @@ PUBLIC void HText_setTabID ARGS2(
     return;
 }
 
-PUBLIC int HText_getTabIDColumn ARGS2(
-	HText *,	text,
-	CONST char *,	name)
+int HText_getTabIDColumn (
+	HText *	text,
+	const char *	name)
 {
     int column = 0;
     HTTabID * Tab;
@@ -8830,9 +8830,9 @@ PUBLIC int HText_getTabIDColumn ARGS2(
  *  retrieved via HText_HiddenLinkAt(), below, based on
  *  count. -FM
  */
-PRIVATE void HText_AddHiddenLink ARGS2(
-	HText *,	text,
-	TextAnchor *,	textanchor)
+static void HText_AddHiddenLink (
+	HText *	text,
+	TextAnchor *	textanchor)
 {
     HTAnchor *dest;
 
@@ -8866,8 +8866,8 @@ PRIVATE void HText_AddHiddenLink ARGS2(
  *  This function returns the number of addresses
  *  that are loaded in text->hidden_links. -FM
  */
-PUBLIC int HText_HiddenLinkCount ARGS1(
-	HText *,	text)
+int HText_HiddenLinkCount (
+	HText *	text)
 {
     int count = 0;
 
@@ -8882,9 +8882,9 @@ PUBLIC int HText_HiddenLinkCount ARGS1(
  *  a hidden link, at the position (zero-based) in the
  *  text->hidden_links list of the number argument. -FM
  */
-PUBLIC char * HText_HiddenLinkAt ARGS2(
-	HText *,	text,
-	int,		number)
+char * HText_HiddenLinkAt (
+	HText *	text,
+	int		number)
 {
     char *href = NULL;
 
@@ -8900,20 +8900,20 @@ PUBLIC char * HText_HiddenLinkAt ARGS2(
  *    These routines are used to build forms consisting
  *    of input fields
  */
-PRIVATE int HTFormMethod;
-PRIVATE char * HTFormAction = NULL;
-PRIVATE char * HTFormEnctype = NULL;
-PRIVATE char * HTFormTitle = NULL;
-PRIVATE char * HTFormAcceptCharset = NULL;
-PRIVATE BOOLEAN HTFormDisabled = FALSE;
-PRIVATE PerFormInfo * HTCurrentForm;
-
-PUBLIC void HText_beginForm ARGS5(
-	char *,		action,
-	char *,		method,
-	char *,		enctype,
-	char *,		title,
-	CONST char *,	accept_cs)
+static int HTFormMethod;
+static char * HTFormAction = NULL;
+static char * HTFormEnctype = NULL;
+static char * HTFormTitle = NULL;
+static char * HTFormAcceptCharset = NULL;
+static BOOLEAN HTFormDisabled = FALSE;
+static PerFormInfo * HTCurrentForm;
+
+void HText_beginForm (
+	char *		action,
+	char *		method,
+	char *		enctype,
+	char *		title,
+	const char *	accept_cs)
 {
     PerFormInfo * newform;
     HTFormMethod = URL_GET_METHOD;
@@ -8997,8 +8997,8 @@ PUBLIC void HText_beginForm ARGS5(
 		NonNull(HTFormAcceptCharset)));
 }
 
-PUBLIC void HText_endForm ARGS1(
-	HText *,	text)
+void HText_endForm (
+	HText *	text)
 {
     if (HTFormFields == 1 && text && text->first_anchor) {
 	/*
@@ -9063,11 +9063,11 @@ PUBLIC void HText_endForm ARGS1(
     HTFormDisabled = FALSE;
 }
 
-PUBLIC void HText_beginSelect ARGS4(
-	char *,		name,
-	int,		name_cs,
-	BOOLEAN,	multiple,
-	char *,		size)
+void HText_beginSelect (
+	char *		name,
+	int		name_cs,
+	BOOLEAN	multiple,
+	char *		size)
 {
     /*
      *  Save the group name.
@@ -9108,8 +9108,8 @@ PUBLIC void HText_beginSelect ARGS4(
 **  value currently is being accumulated for a select
 **  block. - LE && FM
 */
-PUBLIC int HText_getOptionNum ARGS1(
-	HText *,	text)
+int HText_getOptionNum (
+	HText *	text)
 {
     TextAnchor *a;
     OptionType *op;
@@ -9136,8 +9136,8 @@ PUBLIC int HText_getOptionNum ARGS1(
 **  pointer to the actual value, following that prefix.
 **  Otherwise, it returns the original pointer.
 */
-PRIVATE char * HText_skipOptionNumPrefix ARGS1(
-	char *,		opname)
+static char * HText_skipOptionNumPrefix (
+	char *		opname)
 {
     /*
      *  Check if we are in the correct keypad mode.
@@ -9186,14 +9186,14 @@ PRIVATE char * HText_skipOptionNumPrefix ARGS1(
 **  tag so we have to do it now.  Assume that the last anchor
 **  was the previous options tag.
 */
-PUBLIC char * HText_setLastOptionValue ARGS7(
-	HText *,	text,
-	char *,		value,
-	char*,		submit_value,
-	int,		order,
-	BOOLEAN,	checked,
-	int,		val_cs,
-	int,		submit_val_cs)
+char * HText_setLastOptionValue (
+	HText *	text,
+	char *		value,
+	char*		submit_value,
+	int		order,
+	BOOLEAN	checked,
+	int		val_cs,
+	int		submit_val_cs)
 {
     char *cp, *cp1;
     char *ret_Value = NULL;
@@ -9351,7 +9351,7 @@ PUBLIC char * HText_setLastOptionValue ARGS7(
 			}
 		    }
 		}
-		StrAllocCopy(new_ptr->name, (CONST char *)tmp);
+		StrAllocCopy(new_ptr->name, (const char *)tmp);
 		FREE(tmp);
 	    }
 	} else {
@@ -9454,14 +9454,14 @@ PUBLIC char * HText_setLastOptionValue ARGS7(
  *  Returns the number of characters to leave
  *  blank so that the input field can fit.
  */
-PUBLIC int HText_beginInput ARGS3(
-	HText *,		text,
-	BOOL,			underline,
-	InputFieldData *,	I)
+int HText_beginInput (
+	HText *		text,
+	BOOL			underline,
+	InputFieldData *	I)
 {
     TextAnchor * a;
     FormInfo * f;
-    CONST char *cp_option = NULL;
+    const char *cp_option = NULL;
     char *IValue = NULL;
     unsigned char *tmp = NULL;
     int i, j;
@@ -9561,7 +9561,7 @@ PUBLIC int HText_beginInput ARGS3(
 		    }
 		}
 	    }
-	    StrAllocCopy(IValue, (CONST char *)tmp);
+	    StrAllocCopy(IValue, (const char *)tmp);
 	    FREE(tmp);
 	}
     }
@@ -9941,8 +9941,8 @@ PUBLIC int HText_beginInput ARGS3(
  * be too long for the line - we'll lose the marker in that case rather than
  * truncate the field.
  */
-PUBLIC void HText_endInput ARGS1(
-	HText *,		text)
+void HText_endInput (
+	HText *		text)
 {
     if (fields_are_numbered()
      && !number_fields_on_left
@@ -9967,9 +9967,9 @@ PUBLIC void HText_endInput ARGS1(
  *  Obsolete, it was planned to use here a quality parametr UCTQ_t,
  *  which is boolean now.
  */
-PRIVATE double get_trans_q ARGS2(
-    int,		cs_from,
-    char *,		givenmime)
+static double get_trans_q (
+    int		cs_from,
+    char *		givenmime)
 {
     double df = 1.0;
     BOOL tq;
@@ -10018,10 +10018,10 @@ PRIVATE double get_trans_q ARGS2(
  *  charset corresponding to the return value if return value >= 0.
  *  - kw
  */
-PRIVATE int find_best_target_cs ARGS3(
-    char **,		best_csname,
-    int,		cs_from,
-    CONST char *,	acceptstring)
+static int find_best_target_cs (
+    char **		best_csname,
+    int		cs_from,
+    const char *	acceptstring)
 {
     char *paccept = NULL;
     double bestq = -1.0;
@@ -10056,9 +10056,9 @@ PRIVATE int find_best_target_cs ARGS3(
 }
 
 #ifdef USE_FILE_UPLOAD
-PRIVATE void load_a_file ARGS2(
-    char *,	val_used,
-    bstring **,	result)
+static void load_a_file (
+    char *	val_used,
+    bstring **	result)
 {
     FILE *fd;
     size_t bytes;
@@ -10078,10 +10078,10 @@ PRIVATE void load_a_file ARGS2(
     }
 }
 
-PRIVATE CONST char *guess_content_type ARGS1(CONST char *, filename)
+static const char *guess_content_type (const char * filename)
 {
     HTAtom *encoding;
-    CONST char *desc;
+    const char *desc;
     HTFormat format = HTFileFormat (filename, &encoding, &desc);
     return (format != 0 && non_empty(format->name))
 	    ? format->name
@@ -10090,9 +10090,9 @@ PRIVATE CONST char *guess_content_type ARGS1(CONST char *, filename)
 #endif /* USE_FILE_UPLOAD */
 
 
-PRIVATE void cannot_transcode ARGS2(
-    BOOL *,		had_warning,
-    CONST char *,	target_csname)
+static void cannot_transcode (
+    BOOL *		had_warning,
+    const char *	target_csname)
 {
     if (*had_warning == NO) {
 	*had_warning = YES;
@@ -10105,8 +10105,8 @@ PRIVATE void cannot_transcode ARGS2(
 #define SPECIAL_8BIT 1
 #define SPECIAL_FORM 2
 
-PRIVATE unsigned check_form_specialchars ARGS1(
-    char *,	value)
+static unsigned check_form_specialchars (
+    char *	value)
 {
     unsigned result = 0;
     char *p;
@@ -10129,9 +10129,9 @@ PRIVATE unsigned check_form_specialchars ARGS1(
  * Scan the given data, adding characters to the MIME-boundary to keep it from
  * matching any part of the data.
  */
-PRIVATE void UpdateBoundary ARGS2(
-	char **,	Boundary,
-	bstring *,	data)
+static void UpdateBoundary (
+	char **	Boundary,
+	bstring *	data)
 {
     int j;
     int have = strlen(*Boundary);
@@ -10155,13 +10155,13 @@ PRIVATE void UpdateBoundary ARGS2(
 /*
  * Convert a string to base64
  */
-PRIVATE char * convert_to_base64 ARGS2(
-	char *,		src,
-	int,		len)
+static char * convert_to_base64 (
+	char *		src,
+	int		len)
 {
 #define B64_LINE       76
 
-    static CONST char basis_64[] =
+    static const char basis_64[] =
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
     char *dest;
@@ -10241,10 +10241,10 @@ typedef struct {
     QuoteData quote;	/* how to quote/translate the data */
 } PostData;
 
-PRIVATE char *escape_or_quote_name ARGS3(
-	char *,		name,
-	QuoteData,	quoting,
-	char *,		MultipartContentType)
+static char *escape_or_quote_name (
+	char *		name,
+	QuoteData	quoting,
+	char *		MultipartContentType)
 {
     char *escaped1 = NULL;
 
@@ -10269,9 +10269,9 @@ PRIVATE char *escape_or_quote_name ARGS3(
     return escaped1;
 }
 
-PRIVATE char *escape_or_quote_value ARGS2(
-	char *,		value,
-	QuoteData,	quoting)
+static char *escape_or_quote_value (
+	char *		value,
+	QuoteData	quoting)
 {
     char *escaped2 = NULL;
 
@@ -10296,9 +10296,9 @@ PRIVATE char *escape_or_quote_value ARGS2(
  * a multipart content type.  We should, if we're sending mail and the data
  * contains long lines or nonprinting characters.
  */
-PRIVATE int check_if_base64_needed ARGS2(
-	int,		submit_method,
-	bstring *,	data)
+static int check_if_base64_needed (
+	int		submit_method,
+	bstring *	data)
 {
     int width = 0;
     BOOL printable = TRUE;
@@ -10337,11 +10337,11 @@ PRIVATE int check_if_base64_needed ARGS2(
  *  Returns 1 if *doc set appropriately for next request,
  *	    0 otherwise. - kw
  */
-PUBLIC int HText_SubmitForm ARGS4(
-	FormInfo *,	submit_item,
-	DocInfo *,	doc,
-	char *,		link_name,
-	char *,		link_value)
+int HText_SubmitForm (
+	FormInfo *	submit_item,
+	DocInfo *	doc,
+	char *		link_name,
+	char *		link_value)
 {
     BOOL had_chartrans_warning = NO;
     BOOL have_accept_cs = NO;
@@ -10349,8 +10349,8 @@ PUBLIC int HText_SubmitForm ARGS4(
     BOOLEAN PlainText = FALSE;
     BOOLEAN SemiColon = FALSE;
     BOOL skip_field = FALSE;
-    CONST char *out_csname;
-    CONST char *target_csname = NULL;
+    const char *out_csname;
+    const char *target_csname = NULL;
     PerFormInfo *thisform;
     PostData *my_data = NULL;
     TextAnchor *anchor_ptr;
@@ -11166,7 +11166,7 @@ PUBLIC int HText_SubmitForm ARGS4(
 		if (PlainText) {
 		    StrAllocCopy(escaped1, my_data[anchor_count].name);
 		} else if (Boundary) {
-		    CONST char *t = guess_content_type(val_used);
+		    const char *t = guess_content_type(val_used);
 
 		    StrAllocCopy(escaped1, "Content-Disposition: form-data");
 		    HTSprintf(&escaped1, "; name=\"%s\"", my_data[anchor_count].name);
@@ -11264,7 +11264,7 @@ PUBLIC int HText_SubmitForm ARGS4(
     return (result);
 }
 
-PUBLIC void HText_DisableCurrentForm NOARGS
+void HText_DisableCurrentForm (void)
 {
     TextAnchor * anchor_ptr;
 
@@ -11288,8 +11288,8 @@ PUBLIC void HText_DisableCurrentForm NOARGS
     return;
 }
 
-PUBLIC void HText_ResetForm ARGS1(
-	FormInfo *,	form)
+void HText_ResetForm (
+	FormInfo *	form)
 {
     TextAnchor * anchor_ptr;
 
@@ -11338,8 +11338,8 @@ PUBLIC void HText_ResetForm ARGS1(
  * whether any forms content was changed by user so any information will be
  * lost.
  */
-PUBLIC BOOLEAN HText_HaveUserChangedForms ARGS1(
-	HText *,	text)
+BOOLEAN HText_HaveUserChangedForms (
+	HText *	text)
 {
     TextAnchor * anchor_ptr;
 
@@ -11383,8 +11383,8 @@ PUBLIC BOOLEAN HText_HaveUserChangedForms ARGS1(
     return FALSE;
 }
 
-PUBLIC void HText_activateRadioButton ARGS1(
-	FormInfo *,	form)
+void HText_activateRadioButton (
+	FormInfo *	form)
 {
     TextAnchor * anchor_ptr;
     int form_number = form->number;
@@ -11426,7 +11426,7 @@ PUBLIC void HText_activateRadioButton ARGS1(
  *	Revision History:
  *		05-27-94	created Lynx 2-3-1 Garrett Arch Blythe
  */
-PRIVATE void free_all_texts NOARGS
+static void free_all_texts (void)
 {
     HText *cur = NULL;
 
@@ -11472,8 +11472,8 @@ PRIVATE void free_all_texts NOARGS
 **  of N internal links.  Since the parent link has already been taken,
 **  it won't go again, hence the (incorrect) links won't cause problems.
 */
-PUBLIC char * stub_HTAnchor_address ARGS1(
-	HTAnchor *,	me)
+char * stub_HTAnchor_address (
+	HTAnchor *	me)
 {
     char *addr = NULL;
     if (me)
@@ -11481,36 +11481,36 @@ PUBLIC char * stub_HTAnchor_address ARGS1(
     return addr;
 }
 
-PUBLIC void HText_setToolbar ARGS1(
-	HText *,	text)
+void HText_setToolbar (
+	HText *	text)
 {
     if (text)
 	text->toolbar = TRUE;
     return;
 }
 
-PUBLIC BOOL HText_hasToolbar ARGS1(
-	HText *,	text)
+BOOL HText_hasToolbar (
+	HText *	text)
 {
     return (BOOL) ((text && text->toolbar) ? TRUE : FALSE);
 }
 
-PUBLIC void HText_setNoCache ARGS1(
-	HText *,	text)
+void HText_setNoCache (
+	HText *	text)
 {
     if (text)
 	text->no_cache = TRUE;
     return;
 }
 
-PUBLIC BOOL HText_hasNoCacheSet ARGS1(
-	HText *,	text)
+BOOL HText_hasNoCacheSet (
+	HText *	text)
 {
     return (BOOL) ((text && text->no_cache) ? TRUE : FALSE);
 }
 
-PUBLIC BOOL HText_hasUTF8OutputSet ARGS1(
-	HText *,	text)
+BOOL HText_hasUTF8OutputSet (
+	HText *	text)
 {
     return (BOOL) ((text && text->T.output_utf8) ? TRUE : FALSE);
 }
@@ -11525,10 +11525,10 @@ PUBLIC BOOL HText_hasUTF8OutputSet ARGS1(
 **  long.  It's potentially more important not to set HTCJK to
 **  NOCJK unless we are sure. - kw
 */
-PUBLIC void HText_setKcode ARGS3(
-	HText *,	text,
-	CONST char *,	charset,
-	LYUCcharset *,	p_in)
+void HText_setKcode (
+	HText *	text,
+	const char *	charset,
+	LYUCcharset *	p_in)
 {
     BOOL explicit;
 
@@ -11613,8 +11613,8 @@ PUBLIC void HText_setKcode ARGS3(
 /*
 **  Set a permissible split at the current end of the last line. -FM
 */
-PUBLIC void HText_setBreakPoint ARGS1(
-	HText *,	text)
+void HText_setBreakPoint (
+	HText *	text)
 {
     if (!text)
 	return;
@@ -11640,9 +11640,9 @@ PUBLIC void HText_setBreakPoint ARGS1(
 **  based on any caching directives or analyses which
 **  claimed or suggested this. -FM
 */
-PUBLIC BOOL HText_AreDifferent ARGS2(
-	HTParentAnchor *,	anchor,
-	CONST char *,		full_address)
+BOOL HText_AreDifferent (
+	HTParentAnchor *	anchor,
+	const char *		full_address)
 {
     HTParentAnchor *MTanc;
     char *MTaddress;
@@ -11746,9 +11746,9 @@ PUBLIC BOOL HText_AreDifferent ARGS2(
  *
  *  --KED  02/24/99
  */
-PRIVATE void cleanup_line_for_textarea ARGS2(
-	     char *,  line,
-	     int,     len)
+static void cleanup_line_for_textarea (
+	     char *  line,
+	     int     len)
 {
     char  tbuf[MAX_LINE];
 
@@ -11858,13 +11858,13 @@ PRIVATE void cleanup_line_for_textarea ARGS2(
  *
  *  --KED  02/03/99
  */
-PRIVATE int increment_tagged_htline ARGS6(
-	HTLine *,	ht,
-	TextAnchor *,   a,
-	int *,		lx_val,
-	int *,		old_val,
-	int,		incr,
-	int,		mode)
+static int increment_tagged_htline (
+	HTLine *	ht,
+	TextAnchor *   a,
+	int *		lx_val,
+	int *		old_val,
+	int		incr,
+	int		mode)
 {
     char    buf[MAX_LINE];
     char  lxbuf[MAX_LINE * 2];
@@ -12117,9 +12117,9 @@ PRIVATE int increment_tagged_htline ARGS6(
  *
  *  --KED  02/13/99
  */
-PRIVATE void insert_new_textarea_anchor ARGS2(
-	TextAnchor **,   curr_anchor,
-	HTLine **,       exit_htline)
+static void insert_new_textarea_anchor (
+	TextAnchor **   curr_anchor,
+	HTLine **       exit_htline)
 {
     TextAnchor *anchor = *curr_anchor;
     HTLine     *htline;
@@ -12247,11 +12247,11 @@ PRIVATE void insert_new_textarea_anchor ARGS2(
  *
  *  --KED  02/13/99
  */
-PRIVATE void update_subsequent_anchors ARGS4(
-	int,		 newlines,
-	TextAnchor *,	 start_anchor,
-	HTLine *,	 start_htline,
-	int,		 start_tag)
+static void update_subsequent_anchors (
+	int		 newlines,
+	TextAnchor *	 start_anchor,
+	HTLine *	 start_htline,
+	int		 start_tag)
 {
     TextAnchor *anchor;
     HTLine     *htline = start_htline;
@@ -12394,8 +12394,8 @@ hang_detected:  /* ugliness has happened; inform user and do the best we can */
  *
  *  --KED  02/01/99
  */
-PUBLIC int HText_ExtEditForm ARGS1(
-	   LinkInfo *,	form_link)
+int HText_ExtEditForm (
+	   LinkInfo *	form_link)
 {
     struct stat stat_info;
     size_t	size;
@@ -12732,9 +12732,9 @@ PUBLIC int HText_ExtEditForm ARGS1(
  *
  *  --KED  02/14/99
  */
-PUBLIC void HText_ExpandTextarea ARGS2(
-	    LinkInfo *,	form_link,
-	    int,	newlines)
+void HText_ExpandTextarea (
+	    LinkInfo *	form_link,
+	    int	newlines)
 {
     TextAnchor *anchor_ptr;
     TextAnchor *end_anchor    = NULL;
@@ -12832,8 +12832,8 @@ PUBLIC void HText_ExpandTextarea ARGS2(
  *
  *  --KED  02/21/99
  */
-PUBLIC int HText_InsertFile ARGS1(
-	   LinkInfo *,	form_link)
+int HText_InsertFile (
+	   LinkInfo *	form_link)
 {
     struct stat stat_info;
     size_t	size;
@@ -13157,11 +13157,11 @@ PUBLIC int HText_InsertFile ARGS1(
  * (since no support for lss is availble for Slang) -HV.
  */
 #ifdef USE_COLOR_STYLE
-PRIVATE void redraw_part_of_line ARGS4(
-	HTLine *,	line,
-	char*,		str,
-	int,		len,
-	HText *,	text)
+static void redraw_part_of_line (
+	HTLine *	line,
+	char*		str,
+	int		len,
+	HText *	text)
 {
     register int i;
     char buffer[7];
@@ -13337,24 +13337,24 @@ PRIVATE void redraw_part_of_line ARGS4(
  *  cases.  If possible.  The complex WHEREIS target logic in highlight()
  *  could then be completely removed. - kw
  */
-PRIVATE void move_to_glyph ARGS10(
-	int,		YP,
-	int,		XP,
-	int,		XP_draw_min,
-	char *,		data,
-	int,		datasize,
-	unsigned,	offset,
-	CONST char *,	target,
-	char *,		hightext,
-	int,		flags,
-	BOOL,		utf_flag)
+static void move_to_glyph (
+	int		YP,
+	int		XP,
+	int		XP_draw_min,
+	char *		data,
+	int		datasize,
+	unsigned	offset,
+	const char *	target,
+	char *		hightext,
+	int		flags,
+	BOOL		utf_flag)
 {
     register int i;
     char buffer[7];
-    CONST char *end_of_data;
+    const char *end_of_data;
     size_t utf_extra = 0;
 #if defined(SHOW_WHEREIS_TARGETS)
-    CONST char *cp_tgt;
+    const char *cp_tgt;
     int i_start_tgt=0, i_after_tgt;
     int HitOffset, LenNeeded;
 #endif /* SHOW_WHEREIS_TARGETS */
@@ -13800,13 +13800,13 @@ PRIVATE void move_to_glyph ARGS10(
  *  link as stored in a links[] element, and the anchor text will be
  *  drawn too, with appropriate attributes. - kw
  */
-PUBLIC void LYMoveToLink ARGS6(
-	int,		cur,
-	CONST char *,	target,
-	char *,		hightext,
-	int,		flag,
-	BOOL,		inU,
-	BOOL,		utf_flag)
+void LYMoveToLink (
+	int		cur,
+	const char *	target,
+	char *		hightext,
+	int		flag,
+	BOOL		inU,
+	BOOL		utf_flag)
 {
 #define pvtTITLE_HEIGHT 1
     HTLine* todr;
@@ -13859,8 +13859,8 @@ PUBLIC void LYMoveToLink ARGS6(
  * This is used only if compiled with lss support.  It's called to draw regular
  * link (1st two lines of link) when it's being unhighlighted in LYhighlight().
  */
-PUBLIC void redraw_lines_of_link ARGS1(
-	int,		cur GCC_UNUSED)
+void redraw_lines_of_link (
+	int		cur GCC_UNUSED)
 {
 #ifdef USE_COLOR_STYLE
 #define pvtTITLE_HEIGHT 1
@@ -13895,40 +13895,40 @@ PUBLIC void redraw_lines_of_link ARGS1(
 }
 
 #ifdef USE_PRETTYSRC
-PUBLIC void HTMark_asSource NOARGS
+void HTMark_asSource (void)
 {
     if (HTMainText)
 	HTMainText->source = TRUE;
 }
 #endif
 
-PUBLIC HTkcode HText_getKcode ARGS1(
-	HText *,	text)
+HTkcode HText_getKcode (
+	HText *	text)
 {
     return text->kcode;
 }
 
-PUBLIC void HText_updateKcode ARGS2(
-	HText *,	text,
-	HTkcode,	kcode)
+void HText_updateKcode (
+	HText *	text,
+	HTkcode	kcode)
 {
     text->kcode = kcode;
 }
 
-PUBLIC HTkcode HText_getSpecifiedKcode ARGS1(
-	HText *,	text)
+HTkcode HText_getSpecifiedKcode (
+	HText *	text)
 {
     return text->specified_kcode;
 }
 
-PUBLIC void HText_updateSpecifiedKcode ARGS2(
-	HText *,	text,
-	HTkcode,	kcode)
+void HText_updateSpecifiedKcode (
+	HText *	text,
+	HTkcode	kcode)
 {
     text->specified_kcode = kcode;
 }
 
-PUBLIC int HTMainText_Get_UCLYhndl NOARGS
+int HTMainText_Get_UCLYhndl (void)
 {
     return (HTMainText ?
 	    HTAnchor_getUCLYhndl(HTMainText->node_anchor, UCT_STAGE_MIME)
diff --git a/src/GridText.h b/src/GridText.h
index 0f5d2d9f..f42d2502 100644
--- a/src/GridText.h
+++ b/src/GridText.h
@@ -63,230 +63,230 @@ extern char * HTCurSelectGroupSize;
 extern int HTVirtualMemorySize;
 #endif /* VMS && VAXC && !__DECC */
 
-extern HTChildAnchor * HText_childNextNumber PARAMS((int n, void** prev));
-extern void HText_FormDescNumber PARAMS((int n, char **desc));
+extern HTChildAnchor * HText_childNextNumber (int n, void** prev);
+extern void HText_FormDescNumber (int n, char **desc);
 
 /*	Is there any file left?
 */
-extern BOOL HText_canScrollUp PARAMS((HText * text));
-extern BOOL HText_canScrollDown NOPARAMS;
+extern BOOL HText_canScrollUp (HText * text);
+extern BOOL HText_canScrollDown (void);
 
 /*	Move display within window
 */
-extern void HText_scrollUp PARAMS((HText * text));	/* One page */
-extern void HText_scrollDown PARAMS((HText * text));	/* One page */
-extern void HText_scrollTop PARAMS((HText * text));
-extern void HText_scrollBottom PARAMS((HText * text));
-extern void HText_pageDisplay PARAMS((int line_num, char *target));
-extern BOOL HText_pageHasPrevTarget NOPARAMS;
-
-extern int HText_LinksInLines PARAMS((HText *text, int line_num, int Lines));
-
-extern void HText_setLastChar PARAMS((HText *text, char ch));
-extern char HText_getLastChar PARAMS((HText *text));
-extern void HText_setIgnoreExcess PARAMS((HText *text, BOOL ignore));
-
-extern int HText_sourceAnchors PARAMS((HText * text));
-extern void HText_setStale PARAMS((HText * text));
-extern void HText_refresh PARAMS((HText * text));
-extern CONST char * HText_getTitle NOPARAMS;
-extern CONST char * HText_getSugFname NOPARAMS;
-extern void HTCheckFnameForCompression PARAMS((
+extern void HText_scrollUp (HText * text);	/* One page */
+extern void HText_scrollDown (HText * text);	/* One page */
+extern void HText_scrollTop (HText * text);
+extern void HText_scrollBottom (HText * text);
+extern void HText_pageDisplay (int line_num, char *target);
+extern BOOL HText_pageHasPrevTarget (void);
+
+extern int HText_LinksInLines (HText *text, int line_num, int Lines);
+
+extern void HText_setLastChar (HText *text, char ch);
+extern char HText_getLastChar (HText *text);
+extern void HText_setIgnoreExcess (HText *text, BOOL ignore);
+
+extern int HText_sourceAnchors (HText * text);
+extern void HText_setStale (HText * text);
+extern void HText_refresh (HText * text);
+extern const char * HText_getTitle (void);
+extern const char * HText_getSugFname (void);
+extern void HTCheckFnameForCompression (
 	char **			fname,
 	HTParentAnchor *	anchor,
-	BOOLEAN			strip_ok));
-extern CONST char * HText_getLastModified NOPARAMS;
-extern CONST char * HText_getDate NOPARAMS;
-extern CONST char * HText_getServer NOPARAMS;
-extern CONST char * HText_getOwner NOPARAMS;
-extern CONST char * HText_getContentBase NOPARAMS;
-extern CONST char * HText_getContentLocation NOPARAMS;
-extern CONST char * HText_getMessageID NOPARAMS;
-extern CONST char * HText_getRevTitle NOPARAMS;
+	BOOLEAN			strip_ok);
+extern const char * HText_getLastModified (void);
+extern const char * HText_getDate (void);
+extern const char * HText_getServer (void);
+extern const char * HText_getOwner (void);
+extern const char * HText_getContentBase (void);
+extern const char * HText_getContentLocation (void);
+extern const char * HText_getMessageID (void);
+extern const char * HText_getRevTitle (void);
 #ifdef USE_COLOR_STYLE
-extern CONST char * HText_getStyle NOPARAMS;
+extern const char * HText_getStyle (void);
 #endif
-extern void HText_setMainTextOwner PARAMS((CONST char * owner));
-extern void print_wwwfile_to_fd PARAMS((FILE * fp, BOOLEAN is_email, BOOLEAN is_reply));
-extern BOOL HText_select PARAMS((HText *text));
-extern BOOL HText_POSTReplyLoaded PARAMS((DocInfo *doc));
-extern BOOL HTFindPoundSelector PARAMS((CONST char *selector));
-extern int HTGetRelLinkNum PARAMS((int num, int rel, int cur));
-extern int HTGetLinkInfo PARAMS((
+extern void HText_setMainTextOwner (const char * owner);
+extern void print_wwwfile_to_fd (FILE * fp, BOOLEAN is_email, BOOLEAN is_reply);
+extern BOOL HText_select (HText *text);
+extern BOOL HText_POSTReplyLoaded (DocInfo *doc);
+extern BOOL HTFindPoundSelector (const char *selector);
+extern int HTGetRelLinkNum (int num, int rel, int cur);
+extern int HTGetLinkInfo (
 	int		number,
 	int		want_go,
 	int *		go_line,
 	int *		linknum,
 	char **		hightext,
-	char **		lname));
-extern BOOL HText_TAHasMoreLines PARAMS((
+	char **		lname);
+extern BOOL HText_TAHasMoreLines (
 	int		curlink,
-	int		direction));
-extern int HTGetLinkOrFieldStart PARAMS((
+	int		direction);
+extern int HTGetLinkOrFieldStart (
 	int		curlink,
 	int *		go_line,
 	int *		linknum,
 	int		direction,
-	BOOLEAN		ta_skip));
-extern BOOL HText_getFirstTargetInLine PARAMS((
+	BOOLEAN		ta_skip);
+extern BOOL HText_getFirstTargetInLine (
 	HText *		text,
 	int		line_num,
 	BOOL		utf_flag,
 	int *		offset,
 	int *		tLen,
 	char **		data,
-	CONST char *	target));
-extern int HTisDocumentSource NOPARAMS;
-extern void HTuncache_current_document NOPARAMS;
+	const char *	target);
+extern int HTisDocumentSource (void);
+extern void HTuncache_current_document (void);
 
 #ifdef USE_SOURCE_CACHE
-extern BOOLEAN HTreparse_document NOPARAMS;
-extern BOOLEAN HTcan_reparse_document NOPARAMS;
-extern BOOLEAN HTdocument_settings_changed NOPARAMS;
+extern BOOLEAN HTreparse_document (void);
+extern BOOLEAN HTcan_reparse_document (void);
+extern BOOLEAN HTdocument_settings_changed (void);
 #endif
 
-extern BOOL HTLoadedDocumentEightbit NOPARAMS;
-extern BOOL HText_LastLineEmpty PARAMS((HText *me, BOOL IgnoreSpaces));
-extern BOOL HText_PreviousLineEmpty PARAMS((HText *me, BOOL IgnoreSpaces));
-extern BOOL HText_inLineOne PARAMS((HText *text));
-extern BOOLEAN HTLoadedDocumentIsHEAD NOPARAMS;
-extern BOOLEAN HTLoadedDocumentIsSafe NOPARAMS;
-extern bstring * HTLoadedDocumentPost_data NOPARAMS;
-extern char * HTLoadedDocumentBookmark NOPARAMS;
-extern char * HTLoadedDocumentCharset NOPARAMS;
-extern char * HTLoadedDocumentTitle NOPARAMS;
-extern char * HTLoadedDocumentURL NOPARAMS;
-extern char * HText_HiddenLinkAt PARAMS((HText *text, int number));
-extern int HText_HiddenLinkCount PARAMS((HText *text));
-extern int HText_LastLineOffset PARAMS((HText *me));
-extern int HText_LastLineSize PARAMS((HText *me, BOOL IgnoreSpaces));
-extern int HText_PreviousLineSize PARAMS((HText *me, BOOL IgnoreSpaces));
-extern int HText_getCurrentColumn PARAMS((HText *text));
-extern int HText_getLines PARAMS((HText * text));
-extern int HText_getMaximumColumn PARAMS((HText *text));
-extern int HText_getNumOfLines NOPARAMS;
-extern int HText_getTabIDColumn PARAMS((HText *text, CONST char *name));
-extern int HText_getTopOfScreen NOPARAMS;
-extern int do_www_search PARAMS((DocInfo *doc));
-extern void HText_NegateLineOne PARAMS((HText *text));
-extern void HText_RemovePreviousLine PARAMS((HText *text));
-extern void HText_setNodeAnchorBookmark PARAMS((CONST char *bookmark));
-extern void HText_setTabID PARAMS((HText *text, CONST char *name));
-extern void* HText_pool_calloc PARAMS((HText * text, unsigned size));
+extern BOOL HTLoadedDocumentEightbit (void);
+extern BOOL HText_LastLineEmpty (HText *me, BOOL IgnoreSpaces);
+extern BOOL HText_PreviousLineEmpty (HText *me, BOOL IgnoreSpaces);
+extern BOOL HText_inLineOne (HText *text);
+extern BOOLEAN HTLoadedDocumentIsHEAD (void);
+extern BOOLEAN HTLoadedDocumentIsSafe (void);
+extern bstring * HTLoadedDocumentPost_data (void);
+extern char * HTLoadedDocumentBookmark (void);
+extern char * HTLoadedDocumentCharset (void);
+extern char * HTLoadedDocumentTitle (void);
+extern char * HTLoadedDocumentURL (void);
+extern char * HText_HiddenLinkAt (HText *text, int number);
+extern int HText_HiddenLinkCount (HText *text);
+extern int HText_LastLineOffset (HText *me);
+extern int HText_LastLineSize (HText *me, BOOL IgnoreSpaces);
+extern int HText_PreviousLineSize (HText *me, BOOL IgnoreSpaces);
+extern int HText_getCurrentColumn (HText *text);
+extern int HText_getLines (HText * text);
+extern int HText_getMaximumColumn (HText *text);
+extern int HText_getNumOfLines (void);
+extern int HText_getTabIDColumn (HText *text, const char *name);
+extern int HText_getTopOfScreen (void);
+extern int do_www_search (DocInfo *doc);
+extern void HText_NegateLineOne (HText *text);
+extern void HText_RemovePreviousLine (HText *text);
+extern void HText_setNodeAnchorBookmark (const char *bookmark);
+extern void HText_setTabID (HText *text, const char *name);
+extern void* HText_pool_calloc (HText * text, unsigned size);
 
 /* "simple table" stuff */
-extern int HText_endStblTABLE PARAMS((HText *));
-extern int HText_trimCellLines PARAMS((HText * text));
-extern void HText_cancelStbl PARAMS((HText *));
-extern void HText_endStblCOLGROUP PARAMS((HText *));
-extern void HText_endStblTD PARAMS((HText *));
-extern void HText_endStblTR PARAMS((HText *));
-extern void HText_startStblCOL PARAMS((HText *, int, short, BOOL));
-extern void HText_startStblRowGroup PARAMS((HText *, short));
-extern void HText_startStblTABLE PARAMS((HText *, short));
-extern void HText_startStblTD PARAMS((HText *, int, int, short, BOOL));
-extern void HText_startStblTR PARAMS((HText *, short));
+extern int HText_endStblTABLE (HText *);
+extern int HText_trimCellLines (HText * text);
+extern void HText_cancelStbl (HText *);
+extern void HText_endStblCOLGROUP (HText *);
+extern void HText_endStblTD (HText *);
+extern void HText_endStblTR (HText *);
+extern void HText_startStblCOL (HText *, int, short, BOOL);
+extern void HText_startStblRowGroup (HText *, short);
+extern void HText_startStblTABLE (HText *, short);
+extern void HText_startStblTD (HText *, int, int, short, BOOL);
+extern void HText_startStblTR (HText *, short);
 
 /* forms stuff */
-extern void HText_beginForm PARAMS((
+extern void HText_beginForm (
 	char *		action,
 	char *		method,
 	char *		enctype,
 	char *		title,
-	CONST char *	accept_cs));
-extern void HText_endForm PARAMS((HText *text));
-extern void HText_beginSelect PARAMS((char *name,
+	const char *	accept_cs);
+extern void HText_endForm (HText *text);
+extern void HText_beginSelect (char *name,
 				      int name_cs,
 				      BOOLEAN multiple,
-				      char *len));
-extern int HText_getOptionNum PARAMS((HText *text));
-extern char * HText_setLastOptionValue PARAMS((
+				      char *len);
+extern int HText_getOptionNum (HText *text);
+extern char * HText_setLastOptionValue (
 	HText *		text,
 	char *		value,
 	char *		submit_value,
 	int		order,
 	BOOLEAN		checked,
 	int		val_cs,
-	int		submit_val_cs));
-extern int HText_beginInput PARAMS((
+	int		submit_val_cs);
+extern int HText_beginInput (
 	HText *		text,
 	BOOL		underline,
-	InputFieldData *I));
-extern void HText_endInput PARAMS((
-	HText *		text));
-extern int HText_SubmitForm PARAMS((
+	InputFieldData *I);
+extern void HText_endInput (
+	HText *		text);
+extern int HText_SubmitForm (
 	FormInfo *	submit_item,
 	DocInfo *	doc,
 	char *		link_name,
-	char *		link_value));
-extern void HText_DisableCurrentForm NOPARAMS;
-extern void HText_ResetForm PARAMS((FormInfo *form));
-extern void HText_activateRadioButton PARAMS((FormInfo *form));
-extern BOOLEAN HText_HaveUserChangedForms PARAMS((HText *text));
+	char *		link_value);
+extern void HText_DisableCurrentForm (void);
+extern void HText_ResetForm (FormInfo *form);
+extern void HText_activateRadioButton (FormInfo *form);
+extern BOOLEAN HText_HaveUserChangedForms (HText *text);
 
 extern HTList * search_queries; /* Previous isindex and whereis queries */
-extern void HTSearchQueries_free NOPARAMS;
-extern void HTAddSearchQuery PARAMS((char *query));
+extern void HTSearchQueries_free (void);
+extern void HTAddSearchQuery (char *query);
 
-extern void user_message PARAMS((
-	CONST char *	message,
-	CONST char *	argument));
+extern void user_message (
+	const char *	message,
+	const char *	argument);
 
 #define _user_message(msg, arg)	mustshow = TRUE, user_message(msg, arg)
 
-extern void www_user_search PARAMS((
+extern void www_user_search (
 	int		start_line,
 	DocInfo *	doc,
 	char *		target,
-	int		direction));
+	int		direction);
 
-extern void print_crawl_to_fd PARAMS((
+extern void print_crawl_to_fd (
 	FILE *		fp,
 	char *		thelink,
-	char *		thetitle));
-extern char * stub_HTAnchor_address PARAMS((HTAnchor *me));
+	char *		thetitle);
+extern char * stub_HTAnchor_address (HTAnchor *me);
 
-extern void HText_setToolbar PARAMS((HText *text));
-extern BOOL HText_hasToolbar PARAMS((HText *text));
+extern void HText_setToolbar (HText *text);
+extern BOOL HText_hasToolbar (HText *text);
 
-extern void HText_setNoCache PARAMS((HText *text));
-extern BOOL HText_hasNoCacheSet PARAMS((HText *text));
+extern void HText_setNoCache (HText *text);
+extern BOOL HText_hasNoCacheSet (HText *text);
 
-extern BOOL HText_hasUTF8OutputSet PARAMS((HText *text));
-extern void HText_setKcode PARAMS((
+extern BOOL HText_hasUTF8OutputSet (HText *text);
+extern void HText_setKcode (
 	HText *		text,
-	CONST char *	charset,
-	LYUCcharset *	p_in));
+	const char *	charset,
+	LYUCcharset *	p_in);
 
-extern void HText_setBreakPoint PARAMS((HText *text));
+extern void HText_setBreakPoint (HText *text);
 
-extern BOOL HText_AreDifferent PARAMS((
+extern BOOL HText_AreDifferent (
 	HTParentAnchor *	anchor,
-	CONST char *		full_address));
+	const char *		full_address);
 
-extern int HText_ExtEditForm PARAMS((
-	LinkInfo *	form_link));
-extern void HText_ExpandTextarea PARAMS((
+extern int HText_ExtEditForm (
+	LinkInfo *	form_link);
+extern void HText_ExpandTextarea (
 	LinkInfo *	form_link,
-	int             newlines));
-extern int HText_InsertFile PARAMS((
-	LinkInfo *	form_link));
+	int             newlines);
+extern int HText_InsertFile (
+	LinkInfo *	form_link);
 
-extern void redraw_lines_of_link PARAMS((int cur));
-extern void LYMoveToLink PARAMS((
+extern void redraw_lines_of_link (int cur);
+extern void LYMoveToLink (
 	int		cur,
-	CONST char *	target,
+	const char *	target,
 	char *		hightext,
 	int		flag,
 	BOOL		inU,
-	BOOL		utf_flag));
+	BOOL		utf_flag);
 
 
 #ifdef USE_PRETTYSRC
-extern void HTMark_asSource NOPARAMS;
+extern void HTMark_asSource (void);
 #endif
 
-extern int HTMainText_Get_UCLYhndl NOPARAMS;
+extern int HTMainText_Get_UCLYhndl (void);
 
 #include <HTCJK.h>
 
@@ -294,9 +294,9 @@ extern int HTMainText_Get_UCLYhndl NOPARAMS;
 extern HTkcode last_kcode;
 #endif
 
-extern HTkcode HText_getKcode PARAMS((HText * text));
-extern void HText_updateKcode PARAMS((HText * text, HTkcode kcode));
-extern HTkcode HText_getSpecifiedKcode PARAMS((HText * text));
-extern void HText_updateSpecifiedKcode PARAMS((HText * text, HTkcode kcode));
+extern HTkcode HText_getKcode (HText * text);
+extern void HText_updateKcode (HText * text, HTkcode kcode);
+extern HTkcode HText_getSpecifiedKcode (HText * text);
+extern void HText_updateSpecifiedKcode (HText * text, HTkcode kcode);
 
 #endif /* LYGRIDTEXT_H */
diff --git a/src/HTAlert.c b/src/HTAlert.c
index 1f4c98e8..e0735937 100644
--- a/src/HTAlert.c
+++ b/src/HTAlert.c
@@ -43,8 +43,8 @@
 /*	Issue a message about a problem.		HTAlert()
 **	--------------------------------
 */
-PUBLIC void HTAlert ARGS1(
-	CONST char *,	Msg)
+void HTAlert (
+	const char *	Msg)
 {
     CTRACE((tfp, "\nAlert!: %s\n\n", Msg));
     CTRACE_FLUSH(tfp);
@@ -54,9 +54,9 @@ PUBLIC void HTAlert ARGS1(
     LYSleepAlert();
 }
 
-PUBLIC void HTAlwaysAlert ARGS2(
-	CONST char *,	extra_prefix,
-	CONST char *,	Msg)
+void HTAlwaysAlert (
+	const char *	extra_prefix,
+	const char *	Msg)
 {
     if (!dump_output_immediately && LYCursesON) {
 	HTAlert(Msg);
@@ -83,8 +83,8 @@ PUBLIC void HTAlwaysAlert ARGS2(
 /*	Issue an informational message.			HTInfoMsg()
 **	--------------------------------
 */
-PUBLIC void HTInfoMsg ARGS1(
-	CONST char *,	Msg)
+void HTInfoMsg (
+	const char *	Msg)
 {
     _statusline(Msg);
     if (Msg && *Msg) {
@@ -97,8 +97,8 @@ PUBLIC void HTInfoMsg ARGS1(
 /*	Issue an important message.			HTUserMsg()
 **	--------------------------------
 */
-PUBLIC void HTUserMsg ARGS1(
-	CONST char *,	Msg)
+void HTUserMsg (
+	const char *	Msg)
 {
     _statusline(Msg);
     if (Msg && *Msg) {
@@ -114,9 +114,9 @@ PUBLIC void HTUserMsg ARGS1(
     }
 }
 
-PUBLIC void HTUserMsg2 ARGS2(
-	CONST char *,	Msg2,
-	CONST char *,	Arg)
+void HTUserMsg2 (
+	const char *	Msg2,
+	const char *	Arg)
 {
     _user_message(Msg2, Arg);
     if (Msg2 && *Msg2) {
@@ -131,8 +131,8 @@ PUBLIC void HTUserMsg2 ARGS2(
 /*	Issue a progress message.			HTProgress()
 **	-------------------------
 */
-PUBLIC void HTProgress ARGS1(
-	CONST char *,	Msg)
+void HTProgress (
+	const char *	Msg)
 {
     statusline(Msg);
     LYstore_message(Msg);
@@ -140,11 +140,11 @@ PUBLIC void HTProgress ARGS1(
     LYSleepDebug();
 }
 
-PUBLIC CONST char *HTProgressUnits ARGS1(
-	int,		rate)
+const char *HTProgressUnits (
+	int		rate)
 {
-    static CONST char *bunits = 0;
-    static CONST char *kbunits = 0;
+    static const char *bunits = 0;
+    static const char *kbunits = 0;
 
     if (!bunits) {
 	bunits = gettext("bytes");
@@ -157,13 +157,13 @@ PUBLIC CONST char *HTProgressUnits ARGS1(
 	    ) ? kbunits : bunits;
 }
 
-PRIVATE CONST char *sprint_bytes ARGS3(
-	char *,		s,
-	long,		n,
-	CONST char *, 	was_units)
+static const char *sprint_bytes (
+	char *		s,
+	long		n,
+	const char * 	was_units)
 {
     static long kb_units = 1024;
-    CONST char *u = HTProgressUnits(LYTransferRate);
+    const char *u = HTProgressUnits(LYTransferRate);
 
     if (LYTransferRate == rateKB || LYTransferRate == rateEtaKB_maybe) {
 	if (n >= 10 * kb_units) {
@@ -185,9 +185,9 @@ PRIVATE CONST char *sprint_bytes ARGS3(
 
 #ifdef USE_READPROGRESS
 #define TIME_HMS_LENGTH (16)
-PRIVATE char *sprint_tbuf ARGS2(
-	char *,	       s,
-	long,	       t)
+static char *sprint_tbuf (
+	char *	       s,
+	long	       t)
 {
     if (t > 3600)
 	sprintf (s, "%ldh%ldm%lds", t / 3600, (t / 60) % 60, t % 60);
@@ -202,16 +202,16 @@ PRIVATE char *sprint_tbuf ARGS2(
 /*	Issue a read-progress message.			HTReadProgress()
 **	------------------------------
 */
-PUBLIC void HTReadProgress ARGS2(
-	long,		bytes,
-	long,		total)
+void HTReadProgress (
+	long		bytes,
+	long		total)
 {
     static long bytes_last, total_last;
     static long transfer_rate = 0;
     static char *line = NULL;
     char bytesp[80], totalp[80], transferp[80];
     int renew = 0;
-    CONST char *was_units;
+    const char *was_units;
 
 #ifdef HAVE_GETTIMEOFDAY
     struct timeval tv;
@@ -321,9 +321,9 @@ PUBLIC void HTReadProgress ARGS2(
 #endif
 }
 
-PRIVATE BOOL conf_cancelled = NO; /* used by HTConfirm only - kw */
+static BOOL conf_cancelled = NO; /* used by HTConfirm only - kw */
 
-PUBLIC BOOL HTLastConfirmCancelled NOARGS
+BOOL HTLastConfirmCancelled (void)
 {
     if (conf_cancelled) {
 	conf_cancelled = NO;	/* reset */
@@ -337,10 +337,10 @@ PUBLIC BOOL HTLastConfirmCancelled NOARGS
  * Prompt for yes/no response, but let a configuration variable override
  * the prompt entirely.
  */
-PUBLIC int HTForcedPrompt ARGS3(
-	int,		option,
-	CONST char *,	msg,
-	int,		dft)
+int HTForcedPrompt (
+	int		option,
+	const char *	msg,
+	int		dft)
 {
     int result = FALSE;
     char *show = NULL;
@@ -370,7 +370,7 @@ PUBLIC int HTForcedPrompt ARGS3(
 /*	Seek confirmation with default answer.		HTConfirmDefault()
 **	--------------------------------------
 */
-PUBLIC int HTConfirmDefault ARGS2(CONST char *, Msg, int, Dft)
+int HTConfirmDefault (const char * Msg, int Dft)
 {
 /* Meta-note: don't move the following note from its place right
    in front of the first gettext().  As it is now, it should
@@ -471,7 +471,7 @@ PUBLIC int HTConfirmDefault ARGS2(CONST char *, Msg, int, Dft)
 /*	Seek confirmation.				HTConfirm()
 **	------------------
 */
-PUBLIC BOOL HTConfirm ARGS1(CONST char *, Msg)
+BOOL HTConfirm (const char * Msg)
 {
     return (BOOL) HTConfirmDefault(Msg, DFT_CONFIRM);
 }
@@ -487,14 +487,14 @@ PUBLIC BOOL HTConfirm ARGS1(CONST char *, Msg)
  *  - kw
  */
 
-PUBLIC BOOL confirm_post_resub ARGS4(
-    CONST char*,	address,
-    CONST char*,	title,
-    int,		if_imgmap,
-    int,		if_file)
+BOOL confirm_post_resub (
+    const char*	address,
+    const char*	title,
+    int		if_imgmap,
+    int		if_file)
 {
     size_t len1;
-    CONST char *msg = CONFIRM_POST_RESUBMISSION_TO;
+    const char *msg = CONFIRM_POST_RESUBMISSION_TO;
     char buf[240];
     char *temp = NULL;
     BOOL res;
@@ -561,9 +561,9 @@ PUBLIC BOOL confirm_post_resub ARGS4(
 /*	Prompt for answer and get text back.		HTPrompt()
 **	------------------------------------
 */
-PUBLIC char * HTPrompt ARGS2(
-	CONST char *,	Msg,
-	CONST char *,	deflt)
+char * HTPrompt (
+	const char *	Msg,
+	const char *	deflt)
 {
     char * rep = NULL;
     char Tmp[200];
@@ -587,8 +587,8 @@ PUBLIC char * HTPrompt ARGS2(
 **	Prompt for password without echoing the reply.	HTPromptPassword()
 **	----------------------------------------------
 */
-PUBLIC char * HTPromptPassword ARGS1(
-	CONST char *,	Msg)
+char * HTPromptPassword (
+	const char *	Msg)
 {
     char *result = NULL;
     char pw[120];
@@ -629,11 +629,11 @@ PUBLIC char * HTPromptPassword ARGS1(
 **	are NOT freed.
 **
 */
-PUBLIC void HTPromptUsernameAndPassword ARGS4(
-	CONST char *,	Msg,
-	char **,	username,
-	char **,	password,
-	BOOL,		IsProxy)
+void HTPromptUsernameAndPassword (
+	const char *	Msg,
+	char **	username,
+	char **	password,
+	BOOL		IsProxy)
 {
     if ((IsProxy == FALSE &&
 	 authentication_info[0] && authentication_info[1]) ||
@@ -771,11 +771,11 @@ PUBLIC void HTPromptUsernameAndPassword ARGS4(
 **	Returns FALSE on cancel,
 **		TRUE if the cookie should be set.
 */
-PUBLIC BOOL HTConfirmCookie ARGS4(
-	domain_entry *, de,
-	CONST char *,	server,
-	CONST char *,	name,
-	CONST char *,	value)
+BOOL HTConfirmCookie (
+	domain_entry * de,
+	const char *	server,
+	const char *	name,
+	const char *	value)
 {
     int ch;
     char *prompt = ADVANCED_COOKIE_CONFIRMATION;
@@ -941,9 +941,9 @@ PUBLIC BOOL HTConfirmCookie ARGS4(
 **	  1 for redirect of POST with content,
 **	303 for redirect as GET without content
 */
-PUBLIC int HTConfirmPostRedirect ARGS2(
-	CONST char *,	Redirecting_url,
-	int,		server_status)
+int HTConfirmPostRedirect (
+	const char *	Redirecting_url,
+	int		server_status)
 {
     int result = -1;
     char *show_POST_url = NULL;
@@ -1081,32 +1081,32 @@ PUBLIC int HTConfirmPostRedirect ARGS2(
 /*
  * Sleep for the given message class's time.
  */
-PUBLIC void LYSleepAlert NOARGS
+void LYSleepAlert (void)
 {
     if (okToSleep())
 	LYSleep(AlertSecs);
 }
 
-PUBLIC void LYSleepDebug NOARGS
+void LYSleepDebug (void)
 {
     if (okToSleep())
 	LYSleep(DebugSecs);
 }
 
-PUBLIC void LYSleepInfo NOARGS
+void LYSleepInfo (void)
 {
     if (okToSleep())
 	LYSleep(InfoSecs);
 }
 
-PUBLIC void LYSleepMsg NOARGS
+void LYSleepMsg (void)
 {
     if (okToSleep())
 	LYSleep(MessageSecs);
 }
 
 #ifdef EXP_CMD_LOGGING
-PUBLIC void LYSleepReplay NOARGS
+void LYSleepReplay (void)
 {
     if (okToSleep())
 	LYSleep(ReplaySecs);
@@ -1119,7 +1119,7 @@ PUBLIC void LYSleepReplay NOARGS
 #ifdef LYStrerror
     /* defined as macro in .h file. */
 #else
-PUBLIC char *LYStrerror ARGS1(int, code)
+char *LYStrerror (int code)
 {
     static char temp[80];
     sprintf(temp, "System errno is %d.\r\n", code);
diff --git a/src/HTAlert.h b/src/HTAlert.h
index 49456c42..9a854fcb 100644
--- a/src/HTAlert.h
+++ b/src/HTAlert.h
@@ -20,7 +20,7 @@
 **      On exit,
 **              Return value is malloc'd string which must be freed.
 */
-extern char * HTPrompt PARAMS((CONST char * Msg, CONST char * deflt));
+extern char * HTPrompt (const char * Msg, const char * deflt);
 
 
 /*      Display a message, don't wait for input
@@ -28,11 +28,11 @@ extern char * HTPrompt PARAMS((CONST char * Msg, CONST char * deflt));
 **      On entry,
 **              The input is a list of parameters for printf.
 */
-extern void HTAlert PARAMS((CONST char * Msg));
-extern void HTAlwaysAlert PARAMS((CONST char * extra_prefix, CONST char * Msg));
-extern void HTInfoMsg PARAMS((CONST char * Msg));
-extern void HTUserMsg PARAMS((CONST char * Msg));
-extern void HTUserMsg2 PARAMS((CONST char * Msg, CONST char * Arg));
+extern void HTAlert (const char * Msg);
+extern void HTAlwaysAlert (const char * extra_prefix, const char * Msg);
+extern void HTInfoMsg (const char * Msg);
+extern void HTUserMsg (const char * Msg);
+extern void HTUserMsg2 (const char * Msg, const char * Arg);
 
 
 /*      Display a progress message for information (and diagnostics) only
@@ -40,21 +40,21 @@ extern void HTUserMsg2 PARAMS((CONST char * Msg, CONST char * Arg));
 **      On entry,
 **              The input is a list of parameters for printf.
 */
-extern CONST char *HTProgressUnits PARAMS((int kilobytes));
-extern void HTProgress PARAMS((CONST char * Msg));
-extern void HTReadProgress PARAMS((long bytes, long total));
+extern const char *HTProgressUnits (int kilobytes);
+extern void HTProgress (const char * Msg);
+extern void HTReadProgress (long bytes, long total);
 #define _HTProgress(msg)	mustshow = TRUE, HTProgress(msg)
 
 /*
  *  Indicates whether last HTConfirm was cancelled (^G or ^C) and
  *  resets flag. (so only call once!) - kw
  */
-extern BOOL HTLastConfirmCancelled NOPARAMS;
+extern BOOL HTLastConfirmCancelled (void);
 
 /*
 **	Supports logic for forced yes/no prompt results.
 */
-extern int HTForcedPrompt PARAMS((int Opt, CONST char * Msg, int Dft));
+extern int HTForcedPrompt (int Opt, const char * Msg, int Dft);
 
 /*      Display a message, then wait for 'yes' or 'no', allowing default
 **	response if a return or left-arrow is used.
@@ -66,7 +66,7 @@ extern int HTForcedPrompt PARAMS((int Opt, CONST char * Msg, int Dft));
 **              If the user enters 'YES', returns TRUE, returns FALSE
 **              otherwise.
 */
-extern int HTConfirmDefault PARAMS ((CONST char * Msg, int Dft));
+extern int HTConfirmDefault (const char * Msg, int Dft);
 
 
 /*      Display a message, then wait for 'yes' or 'no'.
@@ -78,17 +78,17 @@ extern int HTConfirmDefault PARAMS ((CONST char * Msg, int Dft));
 **              If the user enters 'YES', returns TRUE, returns FALSE
 **              otherwise.
 */
-extern BOOL HTConfirm PARAMS ((CONST char * Msg));
+extern BOOL HTConfirm (const char * Msg);
 
-extern BOOL confirm_post_resub PARAMS((
-    CONST char*		address,
-    CONST char*		title,
+extern BOOL confirm_post_resub (
+    const char*		address,
+    const char*		title,
     int			if_imgmap,
-    int			if_file));
+    int			if_file);
 
 /*      Prompt for password without echoing the reply
 */
-extern char * HTPromptPassword PARAMS((CONST char * Msg));
+extern char * HTPromptPassword (const char * Msg);
 
 /*      Prompt both username and password       HTPromptUsernameAndPassword()
 **      ---------------------------------
@@ -111,11 +111,11 @@ extern char * HTPromptPassword PARAMS((CONST char * Msg));
 **      are NOT freed.
 **
 */
-extern void HTPromptUsernameAndPassword PARAMS((
-	CONST char *	Msg,
+extern void HTPromptUsernameAndPassword (
+	const char *	Msg,
 	char **		username,
 	char **		password,
-	BOOL		IsProxy));
+	BOOL		IsProxy);
 
 
 /*	Confirm a cookie operation.			HTConfirmCookie()
@@ -132,11 +132,11 @@ extern void HTPromptUsernameAndPassword PARAMS((
 **	Returns FALSE on cancel,
 **		TRUE if the cookie should be set.
 */
-extern BOOL HTConfirmCookie PARAMS((
+extern BOOL HTConfirmCookie (
 	domain_entry *	dp,
-	CONST char *	server,
-	CONST char *	name,
-	CONST char *	value));
+	const char *	server,
+	const char *	name,
+	const char *	value);
 
 
 /*      Confirm redirection of POST.		HTConfirmPostRedirect()
@@ -150,22 +150,22 @@ extern BOOL HTConfirmCookie PARAMS((
 **	  1 for redirect of POST with content,
 **	303 for redirect as GET without content
 */
-extern int HTConfirmPostRedirect PARAMS((
-	CONST char *	Redirecting_url,
-	int		server_status));
+extern int HTConfirmPostRedirect (
+	const char *	Redirecting_url,
+	int		server_status);
 
 
-extern void LYSleepAlert NOPARAMS;
-extern void LYSleepDebug NOPARAMS;
-extern void LYSleepInfo NOPARAMS;
-extern void LYSleepMsg NOPARAMS;
-extern void LYSleepReplay NOPARAMS;
+extern void LYSleepAlert (void);
+extern void LYSleepDebug (void);
+extern void LYSleepInfo (void);
+extern void LYSleepMsg (void);
+extern void LYSleepReplay (void);
 
 #ifdef HAVE_STRERROR
 #define LYStrerror strerror
 #else
-extern char *LYStrerror PARAMS((
-	int		code));
+extern char *LYStrerror (
+	int		code);
 #endif /* HAVE_STRERROR */
 
 #endif /* HTALERT_H */
diff --git a/src/HTFWriter.c b/src/HTFWriter.c
index 100fb1e6..a7ac8f04 100644
--- a/src/HTFWriter.c
+++ b/src/HTFWriter.c
@@ -41,31 +41,31 @@ extern int exec_command(char * cmd, int wait_flag); /* xsystem.c */
 #include <LYCookie.h>
 #endif
 
-PUBLIC char * WWW_Download_File=NULL; /* contains the name of the temp file
+char * WWW_Download_File=NULL; /* contains the name of the temp file
 				      ** which is being downloaded into
 				      */
-PUBLIC BOOLEAN LYCancelDownload=FALSE;   /* exported to HTFormat.c in libWWW */
+BOOLEAN LYCancelDownload=FALSE;   /* exported to HTFormat.c in libWWW */
 
 #ifdef VMS
-PRIVATE char * FIXED_RECORD_COMMAND = NULL;
+static char * FIXED_RECORD_COMMAND = NULL;
 #ifdef USE_COMMAND_FILE		     /* Keep this as an option. - FM	*/
 #define FIXED_RECORD_COMMAND_MASK "@Lynx_Dir:FIXED512 %s"
 #else
 #define FIXED_RECORD_COMMAND_MASK "%s"
-PUBLIC unsigned long LYVMS_FixedLengthRecords PARAMS((char *filename));
+unsigned long LYVMS_FixedLengthRecords (char *filename);
 #endif /* USE_COMMAND_FILE */
 #endif /* VMS */
 
-PUBLIC HTStream* HTSaveToFile PARAMS((
+HTStream* HTSaveToFile (
 	HTPresentation *       pres,
 	HTParentAnchor *       anchor,
-	HTStream *	       sink));
+	HTStream *	       sink);
 
 /*	Stream Object
 **	-------------
 */
 struct _HTStream {
-	CONST HTStreamClass *	isa;
+	const HTStreamClass *	isa;
 
 	FILE *			fp;		/* The file we've opened */
 	char *			end_command;	/* What to do on _free.  */
@@ -91,7 +91,7 @@ struct _HTStream {
 /*	Character handling
 **	------------------
 */
-PRIVATE void HTFWriter_put_character ARGS2(HTStream *, me, char, c)
+static void HTFWriter_put_character (HTStream * me, char c)
 {
     if (me->fp) {
 	putc(c, me->fp);
@@ -103,7 +103,7 @@ PRIVATE void HTFWriter_put_character ARGS2(HTStream *, me, char, c)
 **
 **	Strings must be smaller than this buffer size.
 */
-PRIVATE void HTFWriter_put_string ARGS2(HTStream *, me, CONST char*, s)
+static void HTFWriter_put_string (HTStream * me, const char* s)
 {
     if (me->fp) {
 	fputs(s, me->fp);
@@ -113,7 +113,7 @@ PRIVATE void HTFWriter_put_string ARGS2(HTStream *, me, CONST char*, s)
 /*	Buffer write.  Buffers can (and should!) be big.
 **	------------
 */
-PRIVATE void HTFWriter_write ARGS3(HTStream *, me, CONST char*, s, int, l)
+static void HTFWriter_write (HTStream * me, const char* s, int l)
 {
     if (me->fp) {
 	fwrite(s, 1, l, me->fp);
@@ -130,7 +130,7 @@ PRIVATE void HTFWriter_write ARGS3(HTStream *, me, CONST char*, s, int, l)
 **	object is not,
 **	as it takes on an existence of its own unless explicitly freed.
 */
-PRIVATE void HTFWriter_free ARGS1(HTStream *, me)
+static void HTFWriter_free (HTStream * me)
 {
     int len;
     char *path = NULL;
@@ -455,9 +455,9 @@ PRIVATE void HTFWriter_free ARGS1(HTStream *, me)
 /*	Abort writing
 **	-------------
 */
-PRIVATE void HTFWriter_abort ARGS2(
-	HTStream *,	me,
-	HTError,	e GCC_UNUSED)
+static void HTFWriter_abort (
+	HTStream *	me,
+	HTError	e GCC_UNUSED)
 {
     CTRACE((tfp,"HTFWriter_abort called\n"));
     LYCloseTempFP(me->fp);
@@ -491,7 +491,7 @@ PRIVATE void HTFWriter_abort ARGS2(
 /*	Structured Object Class
 **	-----------------------
 */
-PRIVATE CONST HTStreamClass HTFWriter = /* As opposed to print etc */
+static const HTStreamClass HTFWriter = /* As opposed to print etc */
 {
 	"FileWriter",
 	HTFWriter_free,
@@ -503,7 +503,7 @@ PRIVATE CONST HTStreamClass HTFWriter = /* As opposed to print etc */
 /*	Subclass-specific Methods
 **	-------------------------
 */
-PUBLIC HTStream* HTFWriter_new ARGS1(FILE *, fp)
+HTStream* HTFWriter_new (FILE * fp)
 {
     HTStream* me;
 
@@ -524,9 +524,9 @@ PUBLIC HTStream* HTFWriter_new ARGS1(FILE *, fp)
     return me;
 }
 
-PRIVATE void chrcat ARGS2(
-	char *,		result,
-	int,		ch)
+static void chrcat (
+	char *		result,
+	int		ch)
 {
     result += strlen(result);
     *result++ = (char)ch;
@@ -538,10 +538,10 @@ PRIVATE void chrcat ARGS2(
 **
 **	See mailcap spec for description of template.
 */
-PRIVATE char *mailcap_substitute ARGS3(
-	HTParentAnchor *,	anchor,
-	HTPresentation *,	pres,
-	char *,			fnam)
+static char *mailcap_substitute (
+	HTParentAnchor *	anchor,
+	HTPresentation *	pres,
+	char *			fnam)
 {
     int pass;
     int skip;
@@ -621,13 +621,13 @@ PRIVATE char *mailcap_substitute ARGS3(
 **	in case the application is fussy, or so that a generic opener can
 **	be used.
 */
-PUBLIC HTStream* HTSaveAndExecute ARGS3(
-	HTPresentation *,	pres,
-	HTParentAnchor *,	anchor,
-	HTStream *,		sink)
+HTStream* HTSaveAndExecute (
+	HTPresentation *	pres,
+	HTParentAnchor *	anchor,
+	HTStream *		sink)
 {
     char fnam[LY_MAXPATH];
-    CONST char *suffix;
+    const char *suffix;
     HTStream* me;
 
     if (traversal) {
@@ -788,14 +788,14 @@ PUBLIC HTStream* HTSaveAndExecute ARGS3(
 **	file, and writes to it.  In HTSaveToFile_Free
 **	the user will see a list of choices for download
 */
-PUBLIC HTStream* HTSaveToFile ARGS3(
-	HTPresentation *,	pres,
-	HTParentAnchor *,	anchor,
-	HTStream *,		sink)
+HTStream* HTSaveToFile (
+	HTPresentation *	pres,
+	HTParentAnchor *	anchor,
+	HTStream *		sink)
 {
     HTStream * ret_obj;
     char fnam[LY_MAXPATH];
-    CONST char * suffix;
+    const char * suffix;
     char *cp;
     int c = 0;
     BOOL IsBinary = TRUE;
@@ -1021,10 +1021,10 @@ Prepend_BASE:
 /*	Set up stream for uncompressing - FM
 **	-------------------------------
 */
-PUBLIC HTStream* HTCompressed ARGS3(
-	HTPresentation *,	pres,
-	HTParentAnchor *,	anchor,
-	HTStream *,		sink)
+HTStream* HTCompressed (
+	HTPresentation *	pres,
+	HTParentAnchor *	anchor,
+	HTStream *		sink)
 {
     HTStream* me;
     HTFormat format;
@@ -1034,11 +1034,11 @@ PUBLIC HTStream* HTCompressed ARGS3(
     BOOL can_present = FALSE;
     char fnam[LY_MAXPATH];
     char temp[LY_MAXPATH];	/* actually stores just a suffix */
-    CONST char *program;
-    CONST char *suffix;
+    const char *program;
+    const char *suffix;
     char *uncompress_mask = NULL;
     char *compress_suffix = "";
-    CONST char *middle;
+    const char *middle;
 
     /*
      *	Deal with any inappropriate invocations of this function,
@@ -1268,10 +1268,10 @@ PUBLIC HTStream* HTCompressed ARGS3(
 **	---------------------
 **
 */
-PUBLIC HTStream* HTDumpToStdout ARGS3(
-	HTPresentation *,	pres GCC_UNUSED,
-	HTParentAnchor *,	anchor,
-	HTStream *,		sink GCC_UNUSED)
+HTStream* HTDumpToStdout (
+	HTPresentation *	pres GCC_UNUSED,
+	HTParentAnchor *	anchor,
+	HTStream *		sink GCC_UNUSED)
 {
     HTStream * ret_obj;
     ret_obj = typecalloc(HTStream);
@@ -1326,7 +1326,7 @@ extern unsigned long	sys$open(),  sys$qiow(),  sys$dassgn();
  *  Force a file to be marked as having fixed-length, 512 byte records
  *  without implied carriage control, and with best_try_contiguous set.
  */
-PUBLIC unsigned long LYVMS_FixedLengthRecords ARGS1(char *, filename)
+unsigned long LYVMS_FixedLengthRecords (char * filename)
 {
     struct FAB	    fab;		/* RMS file access block */
     struct fibdef   fib;		/* XQP file information block */
diff --git a/src/HTForms.h b/src/HTForms.h
index cf31e49e..c4bc84c5 100644
--- a/src/HTForms.h
+++ b/src/HTForms.h
@@ -9,45 +9,45 @@
 
 /* change_form_link calls change_form_link_ex with all its args and FALSE as
   last arg */
-extern int change_form_link PARAMS((int cur,
+extern int change_form_link (int cur,
 				    DocInfo *newdoc,
 				    BOOLEAN *refresh_screen,
 				    BOOLEAN use_last_tfpos,
-				    BOOLEAN immediate_submit));
+				    BOOLEAN immediate_submit);
 
-extern int change_form_link_ex PARAMS((int cur,
+extern int change_form_link_ex (int cur,
 				    DocInfo *newdoc,
 				    BOOLEAN *refresh_screen,
 				    BOOLEAN use_last_tfpos,
 				    BOOLEAN immediate_submit,
-				    BOOLEAN draw_only));
+				    BOOLEAN draw_only);
 
 /* InputFieldData is used to pass the info between
  * HTML.c and Gridtext.c in HText_beginInput()
  */
 typedef struct _InputFieldData {
-	CONST char *accept;
-	CONST char *align;
+	const char *accept;
+	const char *align;
 	int   checked;
-	CONST char *class;
+	const char *class;
 	int   disabled;
-	CONST char *error;
-	CONST char *height;
-	CONST char *id;
-	CONST char *lang;
-	CONST char *max;
-	CONST char *maxlength;
-	CONST char *md;
-	CONST char *min;
-	CONST char *name;
-	CONST char *size;
-	CONST char *src;
-	CONST char *type;
+	const char *error;
+	const char *height;
+	const char *id;
+	const char *lang;
+	const char *max;
+	const char *maxlength;
+	const char *md;
+	const char *min;
+	const char *name;
+	const char *size;
+	const char *src;
+	const char *type;
 	char *value;
-	CONST char *width;
+	const char *width;
 	int name_cs;		/* charset handle for name */
 	int value_cs;		/* charset handle for value */
-	CONST char *accept_cs;
+	const char *accept_cs;
 } InputFieldData;
 
 /* The OptionType structure is for a linked list of option entries
@@ -153,7 +153,7 @@ typedef struct _PerFormInfo
 #define LAST_ORDER   3
 
 /* in LYForms.c */
-extern void show_formlink_statusline PARAMS((CONST FormInfo *	form,
-					     int		for_what));
+extern void show_formlink_statusline (const FormInfo *	form,
+					     int		for_what);
 
 #endif /* HTFORMS_H */
diff --git a/src/HTInit.c b/src/HTInit.c
index 8415876c..ef37c5b2 100644
--- a/src/HTInit.c
+++ b/src/HTInit.c
@@ -28,10 +28,10 @@
 #include <LYexit.h>
 #include <LYLeaks.h>
 
-PRIVATE int HTLoadTypesConfigFile PARAMS((char *fn));
-PRIVATE int HTLoadExtensionsConfigFile PARAMS((char *fn));
+static int HTLoadTypesConfigFile (char *fn);
+static int HTLoadExtensionsConfigFile (char *fn);
 
-PUBLIC void HTFormatInit NOARGS
+void HTFormatInit (void)
 {
 #ifdef NeXT
   HTSetPresentation("application/postscript",   "open %s", 1.0, 2.0, 0.0, 0);
@@ -179,7 +179,7 @@ PUBLIC void HTFormatInit NOARGS
  HTFilterPresentations();
 }
 
-PUBLIC void HTPreparsedFormatInit NOARGS
+void HTPreparsedFormatInit (void)
 {
  if (LYPreparsedSource) {
      HTSetConversion("text/html", "www/source", HTMLParsedPresent, 1.0, 0.0, 0.0, 0);
@@ -225,14 +225,14 @@ struct MailcapEntry {
 };
 
 
-PRIVATE int ExitWithError PARAMS((char *txt));
-PRIVATE int PassesTest PARAMS((struct MailcapEntry *mc));
+static int ExitWithError (char *txt);
+static int PassesTest (struct MailcapEntry *mc);
 
 #define LINE_BUF_SIZE		2048
 
-PRIVATE char *GetCommand ARGS2(
-	char *,		s,
-	char **,	t)
+static char *GetCommand (
+	char *		s,
+	char **	t)
 {
     char *s2;
     int quoted = 0;
@@ -268,8 +268,8 @@ PRIVATE char *GetCommand ARGS2(
 }
 
 /* no leading or trailing space, all lower case */
-PRIVATE char *Cleanse ARGS1(
-	char *,		s)
+static char *Cleanse (
+	char *		s)
 {
     LYTrimLeading(s);
     LYTrimTrailing(s);
@@ -277,9 +277,9 @@ PRIVATE char *Cleanse ARGS1(
     return(s);
 }
 
-PRIVATE int ProcessMailcapEntry ARGS2(
-	FILE *,			fp,
-	struct MailcapEntry *,	mc)
+static int ProcessMailcapEntry (
+	FILE *			fp,
+	struct MailcapEntry *	mc)
 {
     size_t rawentryalloc = 2000, len, need;
     char *rawentry, *s, *t;
@@ -416,12 +416,12 @@ assign_presentation:
     return(1);
 }
 
-PRIVATE void BuildCommand ARGS5(
-	char **,	pBuf,
-	size_t,		Bufsize,
-	char *,		controlstring,
-	char *,		TmpFileName,
-	size_t,		TmpFileLen)
+static void BuildCommand (
+	char **	pBuf,
+	size_t		Bufsize,
+	char *		controlstring,
+	char *		TmpFileName,
+	size_t		TmpFileLen)
 {
     char *from, *to;
     int prefixed = 0;
@@ -480,10 +480,10 @@ PRIVATE void BuildCommand ARGS5(
 #define RTR_lookup      1
 #define RTR_add         2
 
-PRIVATE int RememberTestResult ARGS3(
-	int,		mode,
-	char *,		cmd,
-	int,		result)
+static int RememberTestResult (
+	int		mode,
+	char *		cmd,
+	int		result)
 {
     struct cmdlist_s {
 	char *cmd;
@@ -520,8 +520,8 @@ PRIVATE int RememberTestResult ARGS3(
     return 0;
 }
 
-PRIVATE int PassesTest ARGS1(
-	struct MailcapEntry *,	mc)
+static int PassesTest (
+	struct MailcapEntry *	mc)
 {
     int result;
     char *cmd, TmpFileName[LY_MAXPATH];
@@ -621,8 +621,8 @@ PRIVATE int PassesTest ARGS1(
     return(result == 0);
 }
 
-PRIVATE int ProcessMailcapFile ARGS1(
-	char *,		file)
+static int ProcessMailcapFile (
+	char *		file)
 {
     struct MailcapEntry mc;
     FILE *fp;
@@ -643,8 +643,8 @@ PRIVATE int ProcessMailcapFile ARGS1(
     return(0 == 0);
 }
 
-PRIVATE int ExitWithError ARGS1(
-	char *,		txt)
+static int ExitWithError (
+	char *		txt)
 {
     if (txt)
 	fprintf(tfp, "Lynx: %s\n", txt);
@@ -657,8 +657,8 @@ PRIVATE int ExitWithError ARGS1(
  * behavior, which means that the last match wins. - kw */
 static int reverse_mailcap = 1;
 
-PRIVATE int HTLoadTypesConfigFile ARGS1(
-	char *,		fn)
+static int HTLoadTypesConfigFile (
+	char *		fn)
 {
     int result = 0;
     HTList * saved = HTPresentations;
@@ -724,7 +724,7 @@ PRIVATE int HTLoadTypesConfigFile ARGS1(
  *  become consistently case-sensitive, as in newer W3C libwww).
  *  - kw 1999-10-12
  */
-PUBLIC void HTFileInit NOARGS
+void HTFileInit (void)
 {
 #ifdef BUILTIN_SUFFIX_MAPS
     if (LYUseBuiltinSuffixes)
@@ -1073,10 +1073,10 @@ PUBLIC void HTFileInit NOARGS
 
 #define MAX_STRING_LEN 256
 
-PRIVATE int HTGetLine ARGS3(
-	char *,		s,
-	int,		n,
-	FILE *,		f)
+static int HTGetLine (
+	char *		s,
+	int		n,
+	FILE *		f)
 {
     register int i = 0, r;
 
@@ -1103,11 +1103,11 @@ PRIVATE int HTGetLine ARGS3(
     }
 }
 
-PRIVATE void HTGetWord ARGS4(
-	char *,		word,
-	char *,		line,
-	char ,		stop,
-	char ,		stop2)
+static void HTGetWord (
+	char *		word,
+	char *		line,
+	char 		stop,
+	char 		stop2)
 {
     int x = 0, y;
 
@@ -1126,8 +1126,8 @@ PRIVATE void HTGetWord ARGS4(
     return;
 }
 
-PRIVATE int HTLoadExtensionsConfigFile ARGS1(
-	char *,		fn)
+static int HTLoadExtensionsConfigFile (
+	char *		fn)
 {
     char line[MAX_STRING_LEN];
     char word[MAX_STRING_LEN];
diff --git a/src/HTML.c b/src/HTML.c
index 1f09b877..473ffb7c 100644
--- a/src/HTML.c
+++ b/src/HTML.c
@@ -81,13 +81,13 @@
 #define STACKLEVEL(me) ((me->stack + MAX_NESTING - 1) - me->sp)
 
 struct _HTStream {
-    CONST HTStreamClass *	isa;
+    const HTStreamClass *	isa;
 #ifdef USE_SOURCE_CACHE
     HTParentAnchor *		anchor;
     FILE *			fp;
     char *			filename;
     HTChunk *			chunk;
-    CONST HTStreamClass *	actions;
+    const HTStreamClass *	actions;
     HTStream *			target;
     int				status;
 #else
@@ -95,36 +95,36 @@ struct _HTStream {
 #endif
 };
 
-PRIVATE HTStyleSheet * styleSheet = NULL;	/* Application-wide */
+static HTStyleSheet * styleSheet = NULL;	/* Application-wide */
 
 /*	Module-wide style cache
 */
-PRIVATE HTStyle *styles[HTML_ELEMENTS+LYNX_HTML_EXTRA_ELEMENTS];
+static HTStyle *styles[HTML_ELEMENTS+LYNX_HTML_EXTRA_ELEMENTS];
 					   /* adding 24 nested list styles  */
 					   /* and 3 header alignment styles */
 					   /* and 3 div alignment styles    */
-PRIVATE HTStyle *default_style = NULL;
+static HTStyle *default_style = NULL;
 
-PUBLIC char *LYToolbarName = "LynxPseudoToolbar";
+char *LYToolbarName = "LynxPseudoToolbar";
 
 /* used to turn off a style if the HTML author forgot to
-PRIVATE int i_prior_style = -1;
+static int i_prior_style = -1;
  */
 
 /*
  *	Private function....
  */
-PRIVATE int HTML_end_element PARAMS((HTStructured *me,
+static int HTML_end_element (HTStructured *me,
 				      int element_number,
-				      char **include));
+				      char **include);
 
-PRIVATE int HTML_start_element PARAMS((
+static int HTML_start_element (
 	HTStructured *		me,
 	int			element_number,
-	CONST BOOL*		present,
-	CONST char **		value,
+	const BOOL*		present,
+	const char **		value,
 	int			tag_charset,
-	char **			include));
+	char **			include);
 
 /*
  * If we have verbose_img set, display labels for images.
@@ -132,9 +132,9 @@ PRIVATE int HTML_start_element PARAMS((
 #define VERBOSE_IMG(value,src_type,string) \
       ((verbose_img) ? (newtitle = MakeNewTitle(value,src_type)): string)
 
-PRIVATE char* MakeNewTitle PARAMS((CONST char ** value, int src_type));
-PRIVATE char* MakeNewImageValue PARAMS((CONST char ** value));
-PRIVATE char* MakeNewMapValue PARAMS((CONST char ** value, CONST char* mapstr));
+static char* MakeNewTitle (const char ** value, int src_type);
+static char* MakeNewImageValue (const char ** value);
+static char* MakeNewMapValue (const char ** value, const char* mapstr);
 
 /*	Set an internal flag that the next call to a stack-affecting method
 **	is only internal and the stack manipulation should be skipped. - kw
@@ -142,7 +142,7 @@ PRIVATE char* MakeNewMapValue PARAMS((CONST char ** value, CONST char* mapstr));
 #define SET_SKIP_STACK(el_num) if (HTML_dtd.tags[el_num].contents != SGML_EMPTY) \
 						{ me->skip_stack++; }
 
-PUBLIC void strtolower ARGS1(char*, i)
+void strtolower (char* i)
 {
     if (!i) return;
     while (*i) { *i = (char)TOLOWER(*i); i++; }
@@ -160,7 +160,7 @@ a sequence of styles.
 /*
 **  If style really needs to be set, call this.
 */
-PUBLIC void actually_set_style ARGS1(HTStructured *, me)
+void actually_set_style (HTStructured * me)
 {
     if (!me->text) {			/* First time through */
 	LYGetChartransInfo(me);
@@ -186,7 +186,7 @@ PUBLIC void actually_set_style ARGS1(HTStructured *, me)
 /*
 **  If you THINK you need to change style, call this.
 */
-PRIVATE void change_paragraph_style ARGS2(HTStructured *, me, HTStyle *,style)
+static void change_paragraph_style (HTStructured * me, HTStyle * style)
 {
     if (me->new_style != style) {
 	me->style_change = YES;
@@ -195,8 +195,8 @@ PRIVATE void change_paragraph_style ARGS2(HTStructured *, me, HTStyle *,style)
     me->in_word = NO;
 }
 
-PUBLIC BOOL LYBadHTML ARGS1(
-    HTStructured *,	me)
+BOOL LYBadHTML (
+    HTStructured *	me)
 {
     if (!TRACE && !me->inBadHTML) {
 	HTUserMsg(BAD_HTML_USE_TRACE);
@@ -226,7 +226,7 @@ PUBLIC BOOL LYBadHTML ARGS1(
 /*	Character handling
 **	------------------
 */
-PUBLIC void HTML_put_character ARGS2(HTStructured *, me, char, c)
+void HTML_put_character (HTStructured * me, char c)
 {
     /*
      *	Ignore all non-MAP content when just
@@ -435,7 +435,7 @@ PUBLIC void HTML_put_character ARGS2(HTStructured *, me, char, c)
 **	This is written separately from put_character because the loop can
 **	in some cases be promoted to a higher function call level for speed.
 */
-PUBLIC void HTML_put_string ARGS2(HTStructured *, me, CONST char *, s)
+void HTML_put_string (HTStructured * me, const char * s)
 {
 #ifdef USE_PRETTYSRC
     char* translated_string = NULL;
@@ -447,7 +447,7 @@ PUBLIC void HTML_put_string ARGS2(HTStructured *, me, CONST char *, s)
     if (psrc_convert_string) {
 	StrAllocCopy(translated_string,s);
 	TRANSLATE_AND_UNESCAPE_ENTITIES(&translated_string, TRUE, FALSE);
-	s = (CONST char *) translated_string;
+	s = (const char *) translated_string;
     }
 #endif
 
@@ -517,7 +517,7 @@ PUBLIC void HTML_put_string ARGS2(HTStructured *, me, CONST char *, s)
 	    HText_appendText(me->text, s);
 	    break;
 	} else {
-	    CONST char *p = s;
+	    const char *p = s;
 	    char c;
 	    if (me->style_change) {
 		for (; *p && ((*p == '\n') || (*p == '\r') ||
@@ -594,10 +594,10 @@ PUBLIC void HTML_put_string ARGS2(HTStructured *, me, CONST char *, s)
 /*	Buffer write
 **	------------
 */
-PUBLIC void HTML_write ARGS3(HTStructured *, me, CONST char*, s, int, l)
+void HTML_write (HTStructured * me, const char* s, int l)
 {
-    CONST char* p;
-    CONST char* e = s+l;
+    const char* p;
+    const char* e = s+l;
 
     if (LYMapsOnly && me->sp[0].tag_number != HTML_OBJECT)
 	return;
@@ -664,22 +664,22 @@ PUBLIC void HTML_write ARGS3(HTStructured *, me, CONST char*, s, int, l)
 
 
 #ifdef USE_COLOR_STYLE
-PRIVATE char* Style_className = 0;
-PRIVATE char* Style_className_end = 0;
-PRIVATE unsigned Style_className_len = 0;
-PRIVATE int hcode;
+static char* Style_className = 0;
+static char* Style_className_end = 0;
+static unsigned Style_className_len = 0;
+static int hcode;
 
 #ifdef LY_FIND_LEAKS
-PRIVATE void free_Style_className NOARGS
+static void free_Style_className (void)
 {
     FREE(Style_className);
 }
 #endif
 
-PRIVATE void addClassName ARGS3(
-	CONST char *,	prefix,
-	CONST char *,	actual,
-	int,		length)
+static void addClassName (
+	const char *	prefix,
+	const char *	actual,
+	int		length)
 {
     int offset = strlen(prefix);
     unsigned have = (Style_className_end - Style_className);
@@ -712,11 +712,11 @@ PRIVATE void addClassName ARGS3(
 
 #ifdef USE_PRETTYSRC
 
-PRIVATE void HTMLSRC_apply_markup ARGS4(
-	    HTStructured *,   context,
-	    HTlexeme,	      lexeme,
-	    BOOL,	      start,
-	    int,	      tag_charset)
+static void HTMLSRC_apply_markup (
+	    HTStructured *   context,
+	    HTlexeme	      lexeme,
+	    BOOL	      start,
+	    int	      tag_charset)
 {
     HT_tagspec* ts = *( ( start ? lexeme_start : lexeme_end ) + lexeme);
 
@@ -735,7 +735,7 @@ PRIVATE void HTMLSRC_apply_markup ARGS4(
 		context,
 		ts->element,
 		ts->present,
-		(CONST char **)ts->value,
+		(const char **)ts->value,
 		tag_charset,
 		NULL);
 	else
@@ -749,28 +749,23 @@ PRIVATE void HTMLSRC_apply_markup ARGS4(
 #  define START TRUE
 #  define STOP FALSE
 
-#if defined(__STDC__) || defined(_WIN_CC)
 #  define PSRCSTART(x)	HTMLSRC_apply_markup(me,HTL_##x,START,tag_charset)
 #  define PSRCSTOP(x)  HTMLSRC_apply_markup(me,HTL_##x,STOP,tag_charset)
-#else
-#  define PSRCSTART(x)	HTMLSRC_apply_markup(me,HTL_/**/x,START,tag_charset)
-#  define PSRCSTOP(x)  HTMLSRC_apply_markup(me,HTL_/**/x,STOP,tag_charset)
-#endif
 
 #  define PUTC(x) HTML_put_character(me,x)
 #  define PUTS(x) HTML_put_string(me,x)
 
 #endif /* USE_PRETTYSRC*/
 
-PRIVATE void LYStartArea ARGS5(
-	HTStructured *,		obj,
-	CONST char *,		href,
-	CONST char *,		alt,
-	CONST char *,		title,
-	int,			tag_charset)
+static void LYStartArea (
+	HTStructured *		obj,
+	const char *		href,
+	const char *		alt,
+	const char *		title,
+	int			tag_charset)
 {
     BOOL		new_present[HTML_AREA_ATTRIBUTES];
-    CONST char *	new_value[HTML_AREA_ATTRIBUTES];
+    const char *	new_value[HTML_AREA_ATTRIBUTES];
     int i;
 
     for (i = 0; i < HTML_AREA_ATTRIBUTES; i++)
@@ -778,32 +773,32 @@ PRIVATE void LYStartArea ARGS5(
 
     if (alt) {
 	new_present[HTML_AREA_ALT] = YES;
-	new_value[HTML_AREA_ALT] = (CONST char *)alt;
+	new_value[HTML_AREA_ALT] = (const char *)alt;
     }
     if (title && *title) {
 	new_present[HTML_AREA_TITLE] = YES;
-	new_value[HTML_AREA_TITLE] = (CONST char *)title;
+	new_value[HTML_AREA_TITLE] = (const char *)title;
     }
     if (href) {
 	new_present[HTML_AREA_HREF] = YES;
-	new_value[HTML_AREA_HREF] = (CONST char *)href;
+	new_value[HTML_AREA_HREF] = (const char *)href;
     }
 
     (*obj->isa->start_element)(obj, HTML_AREA, new_present, new_value,
 			       tag_charset, 0);
 }
 
-PRIVATE void LYHandleFIG ARGS10(
-	HTStructured *,		me,
-	CONST BOOL*,		present,
-	CONST char **,		value,
-	BOOL,			isobject,
-	BOOL,			imagemap,
-	CONST char *,		id,
-	CONST char *,		src,
-	BOOL,			convert,
-	BOOL,			start,
-	BOOL *,			intern_flag GCC_UNUSED)
+static void LYHandleFIG (
+	HTStructured *		me,
+	const BOOL*		present,
+	const char **		value,
+	BOOL			isobject,
+	BOOL			imagemap,
+	const char *		id,
+	const char *		src,
+	BOOL			convert,
+	BOOL			start,
+	BOOL *			intern_flag GCC_UNUSED)
 {
     if (start == TRUE) {
 	me->inFIG = TRUE;
@@ -870,8 +865,8 @@ PRIVATE void LYHandleFIG ARGS10(
     }
 }
 
-PRIVATE void clear_objectdata ARGS1(
-	HTStructured *,		me)
+static void clear_objectdata (
+	HTStructured *		me)
 {
     if (me) {
 	HTChunkClear(&me->object);
@@ -900,13 +895,13 @@ PRIVATE void clear_objectdata ARGS1(
 /*	Start Element
 **	-------------
 */
-PRIVATE int HTML_start_element ARGS6(
-	HTStructured *,		me,
-	int,			element_number,
-	CONST BOOL*,		present,
-	CONST char **,		value,
-	int,			tag_charset,
-	char **,		include)
+static int HTML_start_element (
+	HTStructured *		me,
+	int			element_number,
+	const BOOL*		present,
+	const char **		value,
+	int			tag_charset,
+	char **		include)
 {
     char *alt_string = NULL;
     char *id_string = NULL;
@@ -918,7 +913,7 @@ PRIVATE int HTML_start_element ARGS6(
     char *I_value = NULL;
     char *I_name = NULL;
     char *temp = NULL;
-    CONST char *Base = NULL;
+    const char *Base = NULL;
     int dest_char_set = -1;
     HTParentAnchor *dest = NULL;	     /* An anchor's destination */
     BOOL dest_ismap = FALSE;		     /* Is dest an image map script? */
@@ -939,7 +934,7 @@ PRIVATE int HTML_start_element ARGS6(
 	if (!psrc_nested_call) {
 	    HTTag * tag = &HTML_dtd.tags[element_number];
 	    char buf[200];
-	    CONST char* p;
+	    const char* p;
 	    if (psrc_first_tag) {
 		psrc_first_tag = FALSE;
 		/* perform the special actions on the begining of the document.
@@ -1104,7 +1099,7 @@ PRIVATE int HTML_start_element ARGS6(
 
 #if !OMIT_SCN_KEEPING		/* Can be done in other cases too... */
     if (!class_used && ElementNumber == HTML_INPUT) { /* For some other too? */
-	CONST char *type = "";
+	const char *type = "";
 	int ohcode = hcode;
 
 	if (present && present[HTML_INPUT_TYPE] && value[HTML_INPUT_TYPE])
@@ -1145,7 +1140,7 @@ PRIVATE int HTML_start_element ARGS6(
 	if (present && present[HTML_BASE_HREF] && !local_host_only &&
 	    value[HTML_BASE_HREF] && *value[HTML_BASE_HREF]) {
 	    char *base = NULL;
-	    CONST char *related = NULL;
+	    const char *related = NULL;
 
 	    StrAllocCopy(base, value[HTML_BASE_HREF]);
 	    CTRACE((tfp, "*HTML_BASE: initial href=`%s'\n", NonNull(base)));
@@ -4174,7 +4169,7 @@ PRIVATE int HTML_start_element ARGS6(
 	    char * action = NULL;
 	    char * method = NULL;
 	    char * enctype = NULL;
-	    CONST char * accept_cs = NULL;
+	    const char * accept_cs = NULL;
 
 	    HTChildAnchor * source;
 	    HTAnchor *link_dest;
@@ -5098,7 +5093,7 @@ PRIVATE int HTML_start_element ARGS6(
 	 * Start a new SELECT block. - FM
 	 */
 	LYHandleSELECT(me,
-		       present, (CONST char **)value,
+		       present, (const char **)value,
 		       include,
 		       TRUE);
 	break;
@@ -5649,10 +5644,10 @@ PRIVATE int HTML_start_element ARGS6(
 **	(internal code errors apart) good nesting.  The parser checks
 **	incoming code errors, not this module.
 */
-PRIVATE int HTML_end_element ARGS3(
-	HTStructured *,		me,
-	int,			element_number,
-	char **,		include)
+static int HTML_end_element (
+	HTStructured *		me,
+	int			element_number,
+	char **		include)
 {
     int i = 0;
     int status = HT_OK;
@@ -6074,7 +6069,7 @@ PRIVATE int HTML_end_element ARGS3(
 
     case HTML_P:
 	LYHandlePlike(me,
-		 (CONST BOOL*)0, (CONST char **)0,
+		 (const BOOL*)0, (const char **)0,
 		 include, 0,
 		 FALSE);
 	break;
@@ -7257,7 +7252,7 @@ End_Object:
 */
 /*	(In fact, they all shrink!)
 */
-PUBLIC int HTML_put_entity ARGS2(HTStructured *, me, int, entity_number)
+int HTML_put_entity (HTStructured * me, int entity_number)
 {
     int nent = HTML_dtd.number_of_entities;
 
@@ -7279,7 +7274,7 @@ PUBLIC int HTML_put_entity ARGS2(HTStructured *, me, int, entity_number)
 **	If non-interactive, everything is freed off.   No: crashes -listrefs
 **	Otherwise, the interactive object is left.
 */
-PRIVATE void HTML_free ARGS1(HTStructured *, me)
+static void HTML_free (HTStructured * me)
 {
     char *include = NULL;
 
@@ -7459,7 +7454,7 @@ PRIVATE void HTML_free ARGS1(HTStructured *, me)
     FREE(me);
 }
 
-PRIVATE void HTML_abort ARGS2(HTStructured *, me, HTError, e)
+static void HTML_abort (HTStructured * me, HTError e)
 {
     char *include = NULL;
 
@@ -7552,7 +7547,7 @@ PRIVATE void HTML_abort ARGS2(HTStructured *, me, HTError, e)
 /*	Get Styles from style sheet
 **	---------------------------
 */
-PRIVATE void get_styles NOARGS
+static void get_styles (void)
 {
     HTStyle** st = NULL;
     styleSheet = DefaultStyle(&st);  /* sets st[] array */
@@ -7627,7 +7622,7 @@ PRIVATE void get_styles NOARGS
  * If we're called from another module, make sure we've initialized styles
  * array first.
  */
-PUBLIC  HTStyle *LYstyles ARGS1(int, style_number)
+HTStyle *LYstyles (int style_number)
 {
     if (styles[style_number] == 0)
 	get_styles();
@@ -7640,7 +7635,7 @@ PUBLIC  HTStyle *LYstyles ARGS1(int, style_number)
 /*	Structured Object Class
 **	-----------------------
 */
-PUBLIC CONST HTStructuredClass HTMLPresentation = /* As opposed to print etc */
+const HTStructuredClass HTMLPresentation = /* As opposed to print etc */
 {
 	"Lynx_HTML_Handler",
 	HTML_free,
@@ -7656,10 +7651,10 @@ PUBLIC CONST HTStructuredClass HTMLPresentation = /* As opposed to print etc */
 **	The structured stream can generate either presentation,
 **	or plain text, or HTML.
 */
-PUBLIC HTStructured* HTML_new ARGS3(
-	HTParentAnchor *,	anchor,
-	HTFormat,		format_out,
-	HTStream*,		stream)
+HTStructured* HTML_new (
+	HTParentAnchor *	anchor,
+	HTFormat		format_out,
+	HTStream*		stream)
 {
 
     HTStructured * me;
@@ -7851,14 +7846,14 @@ PUBLIC HTStructured* HTML_new ARGS3(
  *  cannot be written would be annoying.  Reset when  lynx.cfg is being
  *  reloaded (user may change SOURCE_CACHE setting). - kw
  */
-PUBLIC BOOLEAN source_cache_file_error = FALSE;
+BOOLEAN source_cache_file_error = FALSE;
 
 /*
  * Pass-thru cache HTStream
  */
 
-PRIVATE void CacheThru_do_free ARGS1(
-	HTStream *,	me)
+static void CacheThru_do_free (
+	HTStream *me)
 {
     if (me->anchor->source_cache_file) {
 	CTRACE((tfp, "SourceCacheWriter: Removing previous file %s\n",
@@ -7907,17 +7902,17 @@ PRIVATE void CacheThru_do_free ARGS1(
     }
 }
 
-PRIVATE void CacheThru_free ARGS1(
-	HTStream *,	me)
+static void CacheThru_free (
+	HTStream *	me)
 {
     CacheThru_do_free(me);
     (*me->actions->_free)(me->target);
     FREE(me);
 }
 
-PRIVATE void CacheThru_abort ARGS2(
-	HTStream *,	me,
-	HTError,	e)
+static void CacheThru_abort (
+	HTStream *	me,
+	HTError	e)
 {
     if (me->fp)
 	LYCloseTempFP(me->fp);
@@ -7941,9 +7936,9 @@ PRIVATE void CacheThru_abort ARGS2(
     FREE(me);
 }
 
-PRIVATE void CacheThru_put_character ARGS2(
-	HTStream *,	me,
-	char,		c_in)
+static void CacheThru_put_character (
+	HTStream *	me,
+	char		c_in)
 {
     if (me->status == HT_OK) {
 	if (me->fp) {
@@ -7957,9 +7952,9 @@ PRIVATE void CacheThru_put_character ARGS2(
     (*me->actions->put_character)(me->target, c_in);
 }
 
-PRIVATE void CacheThru_put_string ARGS2(
-	HTStream *,	me,
-	CONST char *,	str)
+static void CacheThru_put_string (
+	HTStream *	me,
+	const char *	str)
 {
     if (me->status == HT_OK) {
 	if (me->fp) {
@@ -7973,10 +7968,10 @@ PRIVATE void CacheThru_put_string ARGS2(
     (*me->actions->put_string)(me->target, str);
 }
 
-PRIVATE void CacheThru_write ARGS3(
-	HTStream *,	me,
-	CONST char *,	str,
-	int,		l)
+static void CacheThru_write (
+	HTStream *	me,
+	const char *	str,
+	int		l)
 {
     if (me->status == HT_OK) {
 	if (me->fp) {
@@ -7992,7 +7987,7 @@ PRIVATE void CacheThru_write ARGS3(
     (*me->actions->put_block)(me->target, str, l);
 }
 
-PRIVATE CONST HTStreamClass PassThruCache =
+static const HTStreamClass PassThruCache =
 {
     "PassThruCache",
     CacheThru_free,
@@ -8002,9 +7997,9 @@ PRIVATE CONST HTStreamClass PassThruCache =
     CacheThru_write
 };
 
-PRIVATE HTStream* CacheThru_new ARGS2(
-	HTParentAnchor *,	anchor,
-	HTStream *,		target)
+static HTStream* CacheThru_new (
+	HTParentAnchor *	anchor,
+	HTStream *		target)
 {
     char filename[LY_MAXPATH];
     HTStream *stream = NULL;
@@ -8100,10 +8095,10 @@ PRIVATE HTStream* CacheThru_new ARGS2(
 **	It is registered in HTInit.c, but never actually used by lynx.
 **	- kw 1999-03-15
 */
-PUBLIC HTStream* HTMLToPlain ARGS3(
-	HTPresentation *,	pres,
-	HTParentAnchor *,	anchor,
-	HTStream *,		sink)
+HTStream* HTMLToPlain (
+	HTPresentation *	pres,
+	HTParentAnchor *	anchor,
+	HTStream *		sink)
 {
     return CacheThru_new(anchor,
 			 SGML_new(&HTML_dtd, anchor,
@@ -8121,10 +8116,10 @@ PUBLIC HTStream* HTMLToPlain ARGS3(
 **	structured stream for regenerating flat text; the latter should
 **	end up being handled as text/plain. - kw
 */
-PUBLIC HTStream* HTMLParsedPresent ARGS3(
-	HTPresentation *,	pres,
-	HTParentAnchor *,	anchor,
-	HTStream *,		sink)
+HTStream* HTMLParsedPresent (
+	HTPresentation *	pres,
+	HTParentAnchor *	anchor,
+	HTStream *		sink)
 {
     HTStream * intermediate = sink;
     if (!intermediate) {
@@ -8181,10 +8176,10 @@ PUBLIC HTStream* HTMLParsedPresent ARGS3(
 **	It is registered in HTInit.c, but normally not used by lynx.
 **	- kw 1999-03-15
 */
-PUBLIC HTStream* HTMLToC ARGS3(
-	HTPresentation *,	pres GCC_UNUSED,
-	HTParentAnchor *,	anchor,
-	HTStream *,		sink)
+HTStream* HTMLToC (
+	HTPresentation *	pres GCC_UNUSED,
+	HTParentAnchor *	anchor,
+	HTStream *		sink)
 {
     HTStructured * html;
     if (sink)
@@ -8207,10 +8202,10 @@ PUBLIC HTStream* HTMLToC ARGS3(
 **	Override this if you have a windows version
 */
 #ifndef GUI
-PUBLIC HTStream* HTMLPresent ARGS3(
-	HTPresentation *,	pres GCC_UNUSED,
-	HTParentAnchor *,	anchor,
-	HTStream *,		sink GCC_UNUSED)
+HTStream* HTMLPresent (
+	HTPresentation *	pres GCC_UNUSED,
+	HTParentAnchor *	anchor,
+	HTStream *		sink GCC_UNUSED)
 {
     return CacheThru_new(anchor,
 			 SGML_new(&HTML_dtd, anchor,
@@ -8241,16 +8236,16 @@ PUBLIC HTStream* HTMLPresent ARGS3(
    the trivial implementation for lynx just generates a message
    and returns. - kw 1999-03-15)
 */
-PUBLIC int HTLoadError ARGS3(
-	HTStream *,	sink GCC_UNUSED,
-	int,		number,
-	CONST char *,	message)
+int HTLoadError (
+	HTStream *	sink GCC_UNUSED,
+	int		number,
+	const char *	message)
 {
     HTAlert(message);		/* @@@@@@@@@@@@@@@@@@@ */
     return -number;
 }
 
-PRIVATE char * MakeNewTitle ARGS2(CONST char **, value, int, src_type)
+static char * MakeNewTitle (const char ** value, int src_type)
 {
     char *ptr;
     char *newtitle = NULL;
@@ -8291,7 +8286,7 @@ PRIVATE char * MakeNewTitle ARGS2(CONST char **, value, int, src_type)
     return newtitle;
 }
 
-PRIVATE char * MakeNewImageValue ARGS1(CONST char **, value)
+static char * MakeNewImageValue (const char ** value)
 {
     char *ptr;
     char *newtitle = NULL;
@@ -8307,7 +8302,7 @@ PRIVATE char * MakeNewImageValue ARGS1(CONST char **, value)
     return newtitle;
 }
 
-PRIVATE char * MakeNewMapValue ARGS2(CONST char **, value, CONST char*, mapstr)
+static char * MakeNewMapValue (const char ** value, const char* mapstr)
 {
     char *ptr;
     char *newtitle = NULL;
diff --git a/src/HTML.h b/src/HTML.h
index a324ae10..527d3439 100644
--- a/src/HTML.h
+++ b/src/HTML.h
@@ -47,7 +47,7 @@
 #define UNESCAPE_FIELDNAME_TO_STD(s) \
 	LYUCTranslateHTMLString(s, ATTR_CS_IN, ATTR_CS_IN, NO, NO, YES, st_HTML)
 
-extern CONST HTStructuredClass HTMLPresentation;
+extern const HTStructuredClass HTMLPresentation;
 
 #ifdef Lynx_HTML_Handler
 /*
@@ -66,7 +66,7 @@ typedef struct _stack_element {
 #define MAX_NESTING 800		/* Should be checked by parser */
 
 struct _HTStructured {
-    CONST HTStructuredClass *	isa;
+    const HTStructuredClass *	isa;
     HTParentAnchor *		node_anchor;
     HText *			text;
 
@@ -215,24 +215,24 @@ struct _HTStructured {
     int			tag_charset; /* charset for attribute values etc. */
 };
 
-extern  HTStyle *LYstyles PARAMS((int style_number));
-extern	BOOL LYBadHTML PARAMS((HTStructured *me)); 
+extern  HTStyle *LYstyles (int style_number);
+extern	BOOL LYBadHTML (HTStructured *me); 
 
 /*
  *	Semi-Private functions. - FM
  */
-extern void HTML_put_character PARAMS((HTStructured *me, char c));
-extern void HTML_put_string PARAMS((HTStructured *me, CONST char *s));
-extern void HTML_write PARAMS((HTStructured *me, CONST char *s, int l));
-extern int HTML_put_entity PARAMS((HTStructured *me, int entity_number));
-extern void actually_set_style PARAMS((HTStructured * me));
+extern void HTML_put_character (HTStructured *me, char c);
+extern void HTML_put_string (HTStructured *me, const char *s);
+extern void HTML_write (HTStructured *me, const char *s, int l);
+extern int HTML_put_entity (HTStructured *me, int entity_number);
+extern void actually_set_style (HTStructured * me);
 
 /*	Style buffering avoids dummy paragraph begin/ends.
 */
 #define UPDATE_STYLE if (me->style_change) { actually_set_style(me); }
 #endif /* Lynx_HTML_Handler */
 
-extern void strtolower PARAMS((char* i));
+extern void strtolower (char* i);
 
 /*				P U B L I C
 */
@@ -240,30 +240,30 @@ extern void strtolower PARAMS((char* i));
 /*
 **  HTConverter to present HTML
 */
-extern HTStream* HTMLToPlain PARAMS((
+extern HTStream* HTMLToPlain (
 	HTPresentation *	pres,
 	HTParentAnchor *	anchor,
-	HTStream *		sink));
+	HTStream *		sink);
 
-extern HTStream* HTMLParsedPresent PARAMS((
+extern HTStream* HTMLParsedPresent (
 	HTPresentation *	pres,
 	HTParentAnchor *	anchor,
-	HTStream *		sink));
+	HTStream *		sink);
 
-extern HTStream* HTMLToC PARAMS((
+extern HTStream* HTMLToC (
 	HTPresentation *	pres,
 	HTParentAnchor *	anchor,
-	HTStream *		sink));
+	HTStream *		sink);
 
-extern HTStream* HTMLPresent PARAMS((
+extern HTStream* HTMLPresent (
 	HTPresentation *	pres,
 	HTParentAnchor *	anchor,
-	HTStream *		sink));
+	HTStream *		sink);
 
-extern HTStructured* HTML_new PARAMS((
+extern HTStructured* HTML_new (
 	HTParentAnchor * anchor,
 	HTFormat	format_out,
-	HTStream *	target));
+	HTStream *	target);
 
 /*
 **  Record error message as a hypertext object.
@@ -277,11 +277,11 @@ extern HTStructured* HTML_new PARAMS((
 **      number  is the HTTP error number
 **      message is the human readable message.
 **  On exit,
-**      a retrun code like HT_LOADED if object exists else 60; 0
+**      a return code like HT_LOADED if object exists else 60; 0
 */
-extern int HTLoadError PARAMS((
+extern int HTLoadError (
 	HTStream *	sink,
 	int		number,
-	CONST char *	message));
+	const char *	message);
 
 #endif /* HTML_H */
diff --git a/src/HTSaveToFile.h b/src/HTSaveToFile.h
index 995a01f3..b16b4763 100644
--- a/src/HTSaveToFile.h
+++ b/src/HTSaveToFile.h
@@ -8,19 +8,19 @@
 #include <HTStream.h>
 #include <HTFormat.h>
 
-extern HTStream * HTSaveToFile PARAMS((
+extern HTStream * HTSaveToFile (
         HTPresentation *        pres,
         HTParentAnchor *        anchor,
-        HTStream *              sink));
+        HTStream *              sink);
 
-extern HTStream * HTDumpToStdout PARAMS((
+extern HTStream * HTDumpToStdout (
         HTPresentation *        pres,
         HTParentAnchor *        anchor,
-        HTStream *              sink));
+        HTStream *              sink);
 
-extern HTStream * HTCompressed PARAMS((
+extern HTStream * HTCompressed (
         HTPresentation *        pres,
         HTParentAnchor *        anchor,
-        HTStream *              sink));
+        HTStream *              sink);
 
 #endif /* HTSAVETOFILE_H */
diff --git a/src/LYBookmark.c b/src/LYBookmark.c
index 6f333c76..81c60b36 100644
--- a/src/LYBookmark.c
+++ b/src/LYBookmark.c
@@ -20,19 +20,19 @@
 
 #include <LYLeaks.h>
 
-PUBLIC char *MBM_A_subbookmark[MBM_V_MAXFILES+1];
-PUBLIC char *MBM_A_subdescript[MBM_V_MAXFILES+1];
+char *MBM_A_subbookmark[MBM_V_MAXFILES+1];
+char *MBM_A_subdescript[MBM_V_MAXFILES+1];
 
-PRIVATE BOOLEAN is_mosaic_hotlist = FALSE;
-PRIVATE char * convert_mosaic_bookmark_file PARAMS((char *filename_buffer));
+static BOOLEAN is_mosaic_hotlist = FALSE;
+static char * convert_mosaic_bookmark_file (char *filename_buffer);
 
-PUBLIC int LYindex2MBM ARGS1(int, n)
+int LYindex2MBM (int n)
 {
     static char MBMcodes[MBM_V_MAXFILES+2] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
     return n >= 0 && n <= MBM_V_MAXFILES ? MBMcodes[n] : '?';
 }
 
-PUBLIC int LYMBM2index ARGS1(int, ch)
+int LYMBM2index (int ch)
 {
     if ((ch = TOUPPER(ch)) > 0) {
 	char *letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
@@ -44,8 +44,8 @@ PUBLIC int LYMBM2index ARGS1(int, ch)
     return -1;
 }
 
-PRIVATE void
-show_bookmark_not_defined NOARGS
+static void
+show_bookmark_not_defined (void)
 {
     char *string_buffer = 0;
 
@@ -69,8 +69,8 @@ show_bookmark_not_defined NOARGS
  *  but not *URL is the selection is valid but the file doesn't
  *  yet exist. - FM
  */
-PUBLIC char * get_bookmark_filename ARGS1(
-	char **,	URL)
+char * get_bookmark_filename (
+	char **	URL)
 {
     static char filename_buffer[LY_MAXPATH];
     char *string_buffer = 0;
@@ -145,8 +145,8 @@ PUBLIC char * get_bookmark_filename ARGS1(
  *  Converts a Mosaic hotlist file into an HTML
  *  file for handling as a Lynx bookmark file. - FM
  */
-PRIVATE char * convert_mosaic_bookmark_file ARGS1(
-	char *,		filename_buffer)
+static char * convert_mosaic_bookmark_file (
+	char *		filename_buffer)
 {
     static char newfile[LY_MAXPATH];
     FILE *fp, *nfp;
@@ -190,9 +190,9 @@ PRIVATE char * convert_mosaic_bookmark_file ARGS1(
     return(newfile);
 }
 
-PRIVATE  BOOLEAN havevisible PARAMS((CONST char *Title));
-PRIVATE  BOOLEAN have8bit PARAMS((CONST char *Title));
-PRIVATE  char* title_convert8bit PARAMS((CONST char *Title));
+static  BOOLEAN havevisible (const char *Title);
+static  BOOLEAN have8bit (const char *Title);
+static  char* title_convert8bit (const char *Title);
 
 /*
  *  Adds a link to a bookmark file, creating the file
@@ -201,9 +201,9 @@ PRIVATE  char* title_convert8bit PARAMS((CONST char *Title));
  *  so that the change will be evident on return to
  *  to that file. - FM
  */
-PUBLIC void save_bookmark_link ARGS2(
-	char *,		address,
-	char *,		title)
+void save_bookmark_link (
+	char *		address,
+	char *		title)
 {
     FILE *fp;
     BOOLEAN first_time = FALSE;
@@ -266,8 +266,8 @@ PUBLIC void save_bookmark_link ARGS2(
      *	bookmark file, get confirmation. - FM
      */
     if (LYMultiBookmarks != MBM_OFF) {
-	CONST char *url = HTLoadedDocumentURL();
-	CONST char *page = (*BookmarkPage == '.')
+	const char *url = HTLoadedDocumentURL();
+	const char *page = (*BookmarkPage == '.')
 			    ? (BookmarkPage + 1)
 			    : BookmarkPage;
 	if (strstr(url, page) != NULL) {
@@ -287,10 +287,10 @@ PUBLIC void save_bookmark_link ARGS2(
 	if (HTCJK == JAPANESE) {
 	    switch(kanji_code) {
 	    case EUC:
-		TO_EUC((CONST unsigned char *) title, (unsigned char *) tmp_buffer);
+		TO_EUC((const unsigned char *) title, (unsigned char *) tmp_buffer);
 		break;
 	    case SJIS:
-		TO_SJIS((CONST unsigned char *) title, (unsigned char *) tmp_buffer);
+		TO_SJIS((const unsigned char *) title, (unsigned char *) tmp_buffer);
 		break;
 	    default:
 		break;
@@ -451,9 +451,9 @@ Note: if you edit this file manually\n\
  *  string as cur_bookmark_page, and to have set up no_cache
  *  itself. - FM
  */
-PUBLIC void remove_bookmark_link ARGS2(
-	int,		cur,
-	char *,		cur_bookmark_page)
+void remove_bookmark_link (
+	int		cur,
+	char *		cur_bookmark_page)
 {
     FILE *fp, *nfp;
     char *buf = NULL;
@@ -634,9 +634,9 @@ PUBLIC void remove_bookmark_link ARGS2(
 	}
 #else
 	if (errno == EXDEV) {
-	    static CONST char MV_FMT[] = "%s %s %s";
+	    static const char MV_FMT[] = "%s %s %s";
 	    char *buffer = 0;
-	    CONST char *program;
+	    const char *program;
 
 	    if ((program = HTGetProgramPath(ppMV)) != NULL) {
 		HTAddParam(&buffer, MV_FMT, 1, program);
@@ -688,7 +688,7 @@ failure:
 /*
  *  Allows user to select sub-bookmarks files. - FMG & FM
  */
-PUBLIC int select_multi_bookmarks NOARGS
+int select_multi_bookmarks (void)
 {
     int c;
 
@@ -768,7 +768,7 @@ get_advanced_choice:
 /*
  *  Allows user to select sub-bookmarks files. - FMG & FM
  */
-PUBLIC int select_menu_multi_bookmarks NOARGS
+int select_menu_multi_bookmarks (void)
 {
     int c, d, MBM_tmp_count, MBM_allow;
     int MBM_screens, MBM_from, MBM_to, MBM_current;
@@ -947,7 +947,7 @@ PUBLIC int select_menu_multi_bookmarks NOARGS
  *  Otherwise (i.e., only the default bookmark file is defined),
  *  it returns FALSE. - FM
  */
-PUBLIC BOOLEAN LYHaveSubBookmarks NOARGS
+BOOLEAN LYHaveSubBookmarks (void)
 {
     int i;
 
@@ -967,8 +967,8 @@ PUBLIC BOOLEAN LYHaveSubBookmarks NOARGS
  *  _statusline() so that any multibyte/CJK characters in the
  *  string will be handled properly. - FM
  */
-PUBLIC void LYMBM_statusline  ARGS1(
-	char *,		text)
+void LYMBM_statusline  (
+	char *		text)
 {
     if (LYMultiBookmarks != MBM_OFF && user_mode == NOVICE_MODE) {
 	LYStatusLine = (LYlines - 1);
@@ -982,9 +982,9 @@ PUBLIC void LYMBM_statusline  ARGS1(
 /*
  * Check whether we have any visible (non-blank) chars.
  */
-PRIVATE  BOOLEAN havevisible ARGS1(CONST char *, Title)
+static  BOOLEAN havevisible (const char * Title)
 {
-    CONST char *p = Title;
+    const char *p = Title;
     unsigned char c;
     long unicode;
 
@@ -1011,9 +1011,9 @@ PRIVATE  BOOLEAN havevisible ARGS1(CONST char *, Title)
 /*
  * Check whether string have 8 bit chars.
  */
-PRIVATE  BOOLEAN have8bit ARGS1(CONST char *, Title)
+static  BOOLEAN have8bit (const char * Title)
 {
-    CONST char *p = Title;
+    const char *p = Title;
 
     for ( ; *p; p++) {
 	if (UCH(*p) > 127)
@@ -1041,9 +1041,9 @@ PRIVATE  BOOLEAN have8bit ARGS1(CONST char *, Title)
  *  Older versions fail.
  *
  */
-PRIVATE  char* title_convert8bit ARGS1(CONST char *, Title)
+static  char* title_convert8bit (const char * Title)
 {
-    CONST char *p = Title;
+    const char *p = Title;
     char *p0;
     char *q;
     char *comment = NULL;
@@ -1105,8 +1105,8 @@ PRIVATE  char* title_convert8bit ARGS1(CONST char *, Title)
  * Since this is the "Default Bookmark File", we save it as a global, and as
  * the first MBM_A_subbookmark entry.
  */
-PUBLIC void set_default_bookmark_page ARGS1(
-	char *,		value)
+void set_default_bookmark_page (
+	char *		value)
 {
     if (value != 0) {
 	if (bookmark_page == 0
diff --git a/src/LYBookmark.h b/src/LYBookmark.h
index e90a2e45..fc0401bd 100644
--- a/src/LYBookmark.h
+++ b/src/LYBookmark.h
@@ -6,15 +6,15 @@
 #include <LYStructs.h>
 #endif /* LYSTRUCTS_H */
 
-extern BOOLEAN LYHaveSubBookmarks NOPARAMS;
-extern char * get_bookmark_filename PARAMS((char **name));
-extern int LYMBM2index PARAMS((int ch));
-extern int LYindex2MBM PARAMS((int n));
-extern int select_menu_multi_bookmarks NOPARAMS;
-extern int select_multi_bookmarks NOPARAMS;
-extern void LYMBM_statusline PARAMS((char *text));
-extern void remove_bookmark_link PARAMS((int cur, char *cur_bookmark_page));
-extern void save_bookmark_link PARAMS((char *address, char *title));
-extern void set_default_bookmark_page PARAMS((char * value));
+extern BOOLEAN LYHaveSubBookmarks (void);
+extern char * get_bookmark_filename (char **name);
+extern int LYMBM2index (int ch);
+extern int LYindex2MBM (int n);
+extern int select_menu_multi_bookmarks (void);
+extern int select_multi_bookmarks (void);
+extern void LYMBM_statusline (char *text);
+extern void remove_bookmark_link (int cur, char *cur_bookmark_page);
+extern void save_bookmark_link (char *address, char *title);
+extern void set_default_bookmark_page (char * value);
 
 #endif /* LYBOOKMARK_H */
diff --git a/src/LYCgi.c b/src/LYCgi.c
index 4c819ffe..e3ac50ce 100644
--- a/src/LYCgi.c
+++ b/src/LYCgi.c
@@ -52,23 +52,23 @@ struct _HTStream
   HTStreamClass * isa;
 };
 
-PRIVATE char **env = NULL;  /* Environment variables */
-PRIVATE int envc_size = 0;  /* Slots in environment array */
-PRIVATE int envc = 0;	    /* Slots used so far */
-PRIVATE HTList *alloced = NULL;
+static char **env = NULL;  /* Environment variables */
+static int envc_size = 0;  /* Slots in environment array */
+static int envc = 0;	    /* Slots used so far */
+static HTList *alloced = NULL;
 #ifdef LYNXCGI_LINKS
-PRIVATE char *user_agent = NULL;
-PRIVATE char *server_software = NULL;
-PRIVATE char *accept_language = NULL;
-PRIVATE char *post_len = NULL;
+static char *user_agent = NULL;
+static char *server_software = NULL;
+static char *accept_language = NULL;
+static char *post_len = NULL;
 #endif /* LYNXCGI_LINKS */
 
-PRIVATE void add_environment_value PARAMS((char *env_value));
+static void add_environment_value (char *env_value);
 
 #define PERROR(msg) CTRACE((tfp, "LYNXCGI: %s: %s\n", msg, LYStrerror(errno)))
 
 #ifdef LY_FIND_LEAKS
-PRIVATE void free_alloced_lynxcgi NOARGS
+static void free_alloced_lynxcgi (void)
 {
     void *ptr;
     while ((ptr = HTList_removeLastObject(alloced)) != NULL) {
@@ -82,8 +82,8 @@ PRIVATE void free_alloced_lynxcgi NOARGS
 }
 #endif /* LY_FIND_LEAKS */
 
-PRIVATE void remember_alloced ARGS1(
-    void *,		ptr)
+static void remember_alloced (
+    void *		ptr)
 {
     if (!alloced) {
 	alloced = HTList_new();
@@ -98,8 +98,8 @@ PRIVATE void remember_alloced ARGS1(
  * Simple routine for expanding the environment array and adding a value to
  * it
  */
-PRIVATE void add_environment_value ARGS1(
-	char *,	env_value)
+static void add_environment_value (
+	char *	env_value)
 {
     if (envc == envc_size) {   /* Need some more slots */
 	envc_size += 10;
@@ -125,8 +125,8 @@ PRIVATE void add_environment_value ARGS1(
  * Add the value of an existing environment variable to those passed on to the
  * lynxcgi script.
  */
-PUBLIC void add_lynxcgi_environment ARGS1(
-	CONST char *,	variable_name)
+void add_lynxcgi_environment (
+	const char *	variable_name)
 {
     char *env_value;
 
@@ -141,20 +141,20 @@ PUBLIC void add_lynxcgi_environment ARGS1(
 }
 
 #ifdef __MINGW32__
-PRIVATE int LYLoadCGI ARGS4(
-	CONST char *, 		arg,
-	HTParentAnchor *,	anAnchor,
-	HTFormat,		format_out,
-	HTStream*,		sink)
+static int LYLoadCGI (
+	const char * 		arg,
+	HTParentAnchor *	anAnchor,
+	HTFormat		format_out,
+	HTStream*		sink)
 {
 	return -1;
 }
 #else
-PRIVATE int LYLoadCGI ARGS4(
-	CONST char *, 		arg,
-	HTParentAnchor *,	anAnchor,
-	HTFormat,		format_out,
-	HTStream*,		sink)
+static int LYLoadCGI (
+	const char * 		arg,
+	HTParentAnchor *	anAnchor,
+	HTFormat		format_out,
+	HTStream*		sink)
 {
     int status = 0;
 #ifdef LYNXCGI_LINKS
@@ -700,5 +700,5 @@ PRIVATE int LYLoadCGI ARGS4(
 #define _LYCGI_C_GLOBALDEF_1_INIT { "lynxcgi", LYLoadCGI, 0 }
 GLOBALDEF (HTProtocol,LYLynxCGI,_LYCGI_C_GLOBALDEF_1_INIT);
 #else
-GLOBALDEF PUBLIC HTProtocol LYLynxCGI = { "lynxcgi", LYLoadCGI, 0 };
+GLOBALDEF HTProtocol LYLynxCGI = { "lynxcgi", LYLoadCGI, 0 };
 #endif /* GLOBALDEF_IS_MACRO */
diff --git a/src/LYCgi.h b/src/LYCgi.h
index c800c4db..2ffe1109 100644
--- a/src/LYCgi.h
+++ b/src/LYCgi.h
@@ -5,6 +5,6 @@
 #include <HTUtils.h>
 #endif
 
-extern void add_lynxcgi_environment PARAMS((CONST char *variable_name));
+extern void add_lynxcgi_environment (const char *variable_name);
 
 #endif /* LYGETFILE_H */
diff --git a/src/LYCharSets.c b/src/LYCharSets.c
index 410d7131..fb839168 100644
--- a/src/LYCharSets.c
+++ b/src/LYCharSets.c
@@ -13,27 +13,27 @@
 
 #include <LYLeaks.h>
 
-PUBLIC HTkcode kanji_code = NOKANJI;
-PUBLIC BOOLEAN LYHaveCJKCharacterSet = FALSE;
-PUBLIC BOOLEAN DisplayCharsetMatchLocale = TRUE;
-PUBLIC BOOL force_old_UCLYhndl_on_reload = FALSE;
-PUBLIC int forced_UCLYhdnl;
-PUBLIC int LYNumCharsets = 0;  /* Will be initialized later by UC_Register. */
-PUBLIC int current_char_set = -1; /* will be intitialized later in LYMain.c */
-PUBLIC CONST char** p_entity_values = NULL; /* Pointer, for HTML_put_entity()*/
+HTkcode kanji_code = NOKANJI;
+BOOLEAN LYHaveCJKCharacterSet = FALSE;
+BOOLEAN DisplayCharsetMatchLocale = TRUE;
+BOOL force_old_UCLYhndl_on_reload = FALSE;
+int forced_UCLYhdnl;
+int LYNumCharsets = 0;  /* Will be initialized later by UC_Register. */
+int current_char_set = -1; /* will be intitialized later in LYMain.c */
+const char** p_entity_values = NULL; /* Pointer, for HTML_put_entity()*/
 			      /* obsolete and probably not used(???)        */
 			      /* will be initialized in HTMLUseCharacterSet */
 #ifdef EXP_CHARSET_CHOICE
-PUBLIC charset_subset_t charset_subsets[MAXCHARSETS];
-PUBLIC BOOL custom_display_charset = FALSE;
-PUBLIC BOOL custom_assumed_doc_charset = FALSE;
+charset_subset_t charset_subsets[MAXCHARSETS];
+BOOL custom_display_charset = FALSE;
+BOOL custom_assumed_doc_charset = FALSE;
 #ifndef ALL_CHARSETS_IN_O_MENU_SCREEN
-PUBLIC int display_charset_map[MAXCHARSETS];
-PUBLIC int assumed_doc_charset_map[MAXCHARSETS];
+int display_charset_map[MAXCHARSETS];
+int assumed_doc_charset_map[MAXCHARSETS];
 
-PUBLIC CONST char* display_charset_choices[MAXCHARSETS+1];
-PUBLIC CONST char* assumed_charset_choices[MAXCHARSETS+1];
-PUBLIC int displayed_display_charset_idx;
+const char* display_charset_choices[MAXCHARSETS+1];
+const char* assumed_charset_choices[MAXCHARSETS+1];
+int displayed_display_charset_idx;
 #endif
 #endif /* EXP_CHARSET_CHOICE */
 
@@ -69,7 +69,7 @@ PUBLIC int displayed_display_charset_idx;
 **
 **	This MUST match exactly the table referred to in the DTD!
 */
-PRIVATE CONST char * ISO_Latin1[] = {
+static const char * ISO_Latin1[] = {
 	"\306", /* capital AE diphthong (ligature) (&#198;) - AElig */
 	"\301", /* capital A, acute accent (&#193;) - Aacute */
 	"\302", /* capital A, circumflex accent (&#194;) - Acirc */
@@ -188,7 +188,7 @@ PRIVATE CONST char * ISO_Latin1[] = {
 **
 **	This MUST match exactly the table referred to in the DTD!
 */
-PUBLIC CONST char * SevenBitApproximations[] = {
+const char * SevenBitApproximations[] = {
 	"AE",	/* capital AE diphthong (ligature) (&#198;) - AElig */
 	"A",	/* capital A, acute accent (&#193;) - Aacute */
 	"A",	/* capital A, circumflex accent (&#194;) - Acirc */
@@ -335,7 +335,7 @@ PUBLIC CONST char * SevenBitApproximations[] = {
 /*
  *  Add the array name to LYCharSets
  */
-PUBLIC CONST char ** LYCharSets[MAXCHARSETS]={
+const char ** LYCharSets[MAXCHARSETS]={
 	ISO_Latin1,		/* ISO Latin 1		*/
 	SevenBitApproximations, /* 7 Bit Approximations */
 };
@@ -344,7 +344,7 @@ PUBLIC CONST char ** LYCharSets[MAXCHARSETS]={
  *  Add the name that the user will see below.
  *  The order of LYCharSets and LYchar_set_names MUST be the same
  */
-PUBLIC CONST char * LYchar_set_names[MAXCHARSETS + 1]={
+const char * LYchar_set_names[MAXCHARSETS + 1]={
 	"Western (ISO-8859-1)",
 	"7 bit approximations (US-ASCII)",
 	(char *) 0
@@ -362,7 +362,7 @@ PUBLIC CONST char * LYchar_set_names[MAXCHARSETS + 1]={
  *  Note that most of the charsets added by the new mechanism in src/chrtrans
  *  don't show up here at all.  They don't have to.
  */
-PUBLIC LYUCcharset LYCharSet_UC[MAXCHARSETS]=
+LYUCcharset LYCharSet_UC[MAXCHARSETS]=
 {
   /*
    *  Zero position placeholder and HTMLGetEntityUCValue() reference. - FM
@@ -388,7 +388,7 @@ PUBLIC LYUCcharset LYCharSet_UC[MAXCHARSETS]=
  *  (If charset have chartrans unicode table,
  *  LYlowest_eightbit will be verified/modified anyway.)
  */
-PUBLIC int LYlowest_eightbit[MAXCHARSETS]={
+int LYlowest_eightbit[MAXCHARSETS]={
 	160,	/* ISO Latin 1		*/
 	999,	/* 7 bit approximations */
 };
@@ -398,7 +398,7 @@ PUBLIC int LYlowest_eightbit[MAXCHARSETS]={
  *  Function to set the handling of selected character sets
  *  based on the current LYUseDefaultRawMode value. - FM
  */
-PUBLIC void HTMLSetCharacterHandling ARGS1(int,i)
+void HTMLSetCharacterHandling (int i)
 {
     int chndl = safeUCGetLYhndl_byMIME(UCAssume_MIMEcharset);
     BOOLEAN LYRawMode_flag = LYRawMode;
@@ -430,7 +430,7 @@ PUBLIC void HTMLSetCharacterHandling ARGS1(int,i)
 	HTPassHighCtrlNum = FALSE;
 
     } else { /* CJK encoding: */
-	CONST char *mime = LYCharSet_UC[i].MIMEname;
+	const char *mime = LYCharSet_UC[i].MIMEname;
 
 	if (!strcmp(mime, "euc-cn")) {
 	    HTCJK = CHINESE;
@@ -508,9 +508,9 @@ PUBLIC void HTMLSetCharacterHandling ARGS1(int,i)
 /*
  * Function to set HTCJK based on "in" and "out" charsets.
  */
-PUBLIC void Set_HTCJK ARGS2(
-	CONST char *,	inMIMEname,
-	CONST char *,	outMIMEname)
+void Set_HTCJK (
+	const char *	inMIMEname,
+	const char *	outMIMEname)
 {
     /* need not check for synonyms: MIMEname's got from LYCharSet_UC */
 
@@ -544,7 +544,7 @@ PUBLIC void Set_HTCJK ARGS2(
  *  Currently unused: the default value so obvious
  *  that LYUseDefaultRawMode utilized directly by someone's mistake. - LP
  */
-PRIVATE void HTMLSetRawModeDefault ARGS1(int,i)
+static void HTMLSetRawModeDefault (int i)
 {
     LYDefaultRawMode = (BOOL) (LYCharSet_UC[i].enc == UCT_ENC_CJK);
     return;
@@ -555,9 +555,9 @@ PRIVATE void HTMLSetRawModeDefault ARGS1(int,i)
  *  based on the selected character set and the
  *  current LYRawMode value. - FM
  */
-PUBLIC void HTMLSetUseDefaultRawMode ARGS2(
-	int,		i,
-	BOOLEAN,	modeflag)
+void HTMLSetUseDefaultRawMode (
+	int		i,
+	BOOLEAN		modeflag)
 {
     if (LYCharSet_UC[i].enc != UCT_ENC_CJK) {
 
@@ -576,7 +576,7 @@ PUBLIC void HTMLSetUseDefaultRawMode ARGS2(
  *  Function to set the LYHaveCJKCharacterSet value
  *  based on the selected character set. - FM
  */
-PRIVATE void HTMLSetHaveCJKCharacterSet ARGS1(int,i)
+static void HTMLSetHaveCJKCharacterSet (int i)
 {
     LYHaveCJKCharacterSet = (BOOL) (LYCharSet_UC[i].enc == UCT_ENC_CJK);
     return;
@@ -588,7 +588,7 @@ PRIVATE void HTMLSetHaveCJKCharacterSet ARGS1(int,i)
  *  It is used in UPPER8 for 8bit case-insensitive search
  *  by matching def7_uni.tbl images. - LP
  */
-PRIVATE void HTMLSetDisplayCharsetMatchLocale ARGS1(int,i)
+static void HTMLSetDisplayCharsetMatchLocale (int i)
 {
     BOOLEAN match;
 
@@ -641,11 +641,11 @@ PRIVATE void HTMLSetDisplayCharsetMatchLocale ARGS1(int,i)
  *  Please update this table when you change "fullname" of any present charset.
  */
 typedef struct _names_pairs {
-    CONST char * fullname;
-    CONST char * MIMEname;
+    const char * fullname;
+    const char * MIMEname;
 } names_pairs;
 
-PRIVATE CONST names_pairs OLD_charset_names[] = {
+static const names_pairs OLD_charset_names[] = {
     {"ISO Latin 1",         "iso-8859-1"},
     {"ISO Latin 2",         "iso-8859-2"},
     {"WinLatin1 (cp1252)",  "windows-1252"},
@@ -701,7 +701,7 @@ PRIVATE CONST names_pairs OLD_charset_names[] = {
  *  in both MIME name and "human-readable" name (old and new style).
  *  Returns -1 if not recognized.
  */
-PUBLIC int UCGetLYhndl_byAnyName ARGS1 (char *, value)
+int UCGetLYhndl_byAnyName (char * value)
 {
     int i;
 
@@ -734,7 +734,7 @@ PUBLIC int UCGetLYhndl_byAnyName ARGS1 (char *, value)
  *   For conversions of DECIMAL escaped entities.
  *   Must be in order of ascending value.
  */
-PRIVATE CONST char * LYEntityNames[] = {
+static const char * LYEntityNames[] = {
 /*	 NAME		   DECIMAL VALUE */
 	"nbsp",		/* 160, non breaking space */
 	"iexcl",	/* 161, inverted exclamation mark */
@@ -838,8 +838,8 @@ PRIVATE CONST char * LYEntityNames[] = {
  *  Function to return the entity names of
  *  ISO-8859-1 8-bit characters. - FM
  */
-PUBLIC CONST char * HTMLGetEntityName ARGS1(
-	UCode_t,	code)
+const char * HTMLGetEntityName (
+	UCode_t	code)
 {
 #define IntValue code
     int MaxValue = (TABLESIZE(LYEntityNames) - 1);
@@ -864,8 +864,8 @@ PUBLIC CONST char * HTMLGetEntityName ARGS1(
  *  In the future we will try to isolate all calls to entities[]
  *  in favor of new unicode-based chartrans scheme. - LP
  */
-PUBLIC UCode_t HTMLGetEntityUCValue ARGS1(
-	CONST char *,	name)
+UCode_t HTMLGetEntityUCValue (
+	const char *	name)
 {
 #include <entities.h>
 
@@ -903,7 +903,7 @@ PUBLIC UCode_t HTMLGetEntityUCValue ARGS1(
  *  Function to select a character set and then set the
  *  character handling and LYHaveCJKCharacterSet flag. - FM
  */
-PUBLIC void HTMLUseCharacterSet ARGS1(int, i)
+void HTMLUseCharacterSet (int i)
 {
     HTMLSetRawModeDefault(i);
     p_entity_values = LYCharSets[i];
@@ -917,7 +917,7 @@ PUBLIC void HTMLUseCharacterSet ARGS1(int, i)
  *  Initializer, calls initialization function for the
  *  CHARTRANS handling. - KW
  */
-PUBLIC int LYCharSetsDeclared NOARGS
+int LYCharSetsDeclared (void)
 {
     UCInit();
 
@@ -925,7 +925,7 @@ PUBLIC int LYCharSetsDeclared NOARGS
 }
 
 #ifdef EXP_CHARSET_CHOICE
-PUBLIC void init_charset_subsets NOARGS
+void init_charset_subsets (void)
 {
     int i,n;
     int cur_display = 0;
diff --git a/src/LYCharSets.h b/src/LYCharSets.h
index 051e9c90..3e8f8d6c 100644
--- a/src/LYCharSets.h
+++ b/src/LYCharSets.h
@@ -30,24 +30,24 @@ extern int current_char_set;
  *  Initializer, calls initialization function for the
  *  CHARTRANS handling. - KW
  */
-extern int LYCharSetsDeclared NOPARAMS;
+extern int LYCharSetsDeclared (void);
 
 
-extern CONST char ** LYCharSets[];
-extern CONST char * SevenBitApproximations[];
-extern CONST char ** p_entity_values;
-extern CONST char * LYchar_set_names[];  /* Full name, not MIME */
+extern const char ** LYCharSets[];
+extern const char * SevenBitApproximations[];
+extern const char ** p_entity_values;
+extern const char * LYchar_set_names[];  /* Full name, not MIME */
 extern int LYlowest_eightbit[];
 extern int LYNumCharsets;
 extern LYUCcharset LYCharSet_UC[];
-extern int UCGetLYhndl_byAnyName PARAMS((char *value));
-extern void HTMLSetCharacterHandling PARAMS((int i));
-extern void HTMLSetUseDefaultRawMode PARAMS((int i, BOOLEAN modeflag));
-extern void HTMLUseCharacterSet PARAMS((int i));
-extern UCode_t HTMLGetEntityUCValue PARAMS((CONST char *name));
-extern void Set_HTCJK PARAMS((CONST char *inMIMEname, CONST char *outMIMEname));
-
-extern CONST char * HTMLGetEntityName PARAMS((UCode_t code));
+extern int UCGetLYhndl_byAnyName (char *value);
+extern void HTMLSetCharacterHandling (int i);
+extern void HTMLSetUseDefaultRawMode (int i, BOOLEAN modeflag);
+extern void HTMLUseCharacterSet (int i);
+extern UCode_t HTMLGetEntityUCValue (const char *name);
+extern void Set_HTCJK (const char *inMIMEname, const char *outMIMEname);
+
+extern const char * HTMLGetEntityName (UCode_t code);
 		/*
 		** HTMLGetEntityName calls LYEntityNames for iso-8859-1 entity
 		** names only.	This is an obsolete technique but widely used in
@@ -87,14 +87,14 @@ extern int display_charset_map[];
 extern int assumed_doc_charset_map[];
 
 /* these arrays are NULL terminated */
-extern CONST char* display_charset_choices[];
-extern CONST char* assumed_charset_choices[];
+extern const char* display_charset_choices[];
+extern const char* assumed_charset_choices[];
 
 extern int displayed_display_charset_idx;
 
 #endif
 /* this will be called after lynx.cfg and .lynxrc are read */
-extern void init_charset_subsets NOPARAMS;
+extern void init_charset_subsets (void);
 #endif /* EXP_CHARSET_CHOICE */
 
 #if !defined(NO_AUTODETECT_DISPLAY_CHARSET)
@@ -116,8 +116,8 @@ enum switch_display_charset_t {
     SWITCH_DISPLAY_CHARSET_REALLY,
     SWITCH_DISPLAY_CHARSET_RESIZE
 };
-extern int Switch_Display_Charset PARAMS((int ord, enum switch_display_charset_t really));
-extern int Find_Best_Display_Charset PARAMS((int ord));
+extern int Switch_Display_Charset (int ord, enum switch_display_charset_t really);
+extern int Find_Best_Display_Charset (int ord);
 extern char *charsets_directory;
 extern char *charset_switch_rules;
 extern int switch_display_charsets;
diff --git a/src/LYCharUtils.c b/src/LYCharUtils.c
index 85a65383..f643742b 100644
--- a/src/LYCharUtils.c
+++ b/src/LYCharUtils.c
@@ -41,8 +41,8 @@
 /*
  *  Used for nested lists. - FM
  */
-PUBLIC int OL_CONTINUE = -29999;     /* flag for whether CONTINUE is set */
-PUBLIC int OL_VOID = -29998;	     /* flag for whether a count is set */
+int OL_CONTINUE = -29999;     /* flag for whether CONTINUE is set */
+int OL_VOID = -29998;	     /* flag for whether a count is set */
 
 
 /*
@@ -50,9 +50,9 @@ PUBLIC int OL_VOID = -29998;	     /* flag for whether a count is set */
 **  strings to "&amp;".  If isTITLE is TRUE, it also
 **  converts any angle-brackets to "&lt;" or "&gt;". - FM
 */
-PUBLIC void LYEntify ARGS2(
-	char **,	str,
-	BOOLEAN,	isTITLE)
+void LYEntify (
+	char **	str,
+	BOOLEAN	isTITLE)
 {
     char *p = *str;
     char *q = NULL, *cp = NULL;
@@ -224,10 +224,10 @@ PUBLIC void LYEntify ARGS2(
 **  including HT_NON_BREAK_SPACE (1) and HT_EN_SPACE (2),
 **  but not ESC, from the heads of strings. - FM
 */
-PUBLIC void LYTrimHead ARGS1(
-	char *, str)
+void LYTrimHead (
+	char * str)
 {
-    CONST char *s = str;
+    const char *s = str;
 
     if (isEmpty(s))
 	return;
@@ -248,8 +248,8 @@ PUBLIC void LYTrimHead ARGS1(
 **  including HT_NON_BREAK_SPACE (1), HT_EN_SPACE (2), and
 **  ESC from the tails of strings. - FM
 */
-PUBLIC void LYTrimTail ARGS1(
-	char *, str)
+void LYTrimTail (
+	char * str)
 {
     int i;
 
@@ -272,8 +272,8 @@ PUBLIC void LYTrimTail ARGS1(
 ** character of comment, or it's best guess if the comment
 ** is invalid. - FM
 */
-PUBLIC char *LYFindEndOfComment ARGS1(
-	char *, str)
+char *LYFindEndOfComment (
+	char * str)
 {
     char *cp, *cp1;
     enum comment_state { start1, start2, end1, end2 } state;
@@ -385,9 +385,9 @@ PUBLIC char *LYFindEndOfComment ARGS1(
 **  to assume "//localhost" when a host field is not
 **  present in file URLs - FM
 */
-PUBLIC void LYFillLocalFileURL ARGS2(
-	char **,	href,
-	CONST char *,	base)
+void LYFillLocalFileURL (
+	char **	href,
+	const char *	base)
 {
     char * temp = NULL;
 
@@ -442,7 +442,7 @@ PUBLIC void LYFillLocalFileURL ARGS2(
      * directory listing for the current default. - FM
      */
     if (!strcmp(*href, "file://localhost")) {
-	CONST char *temp2;
+	const char *temp2;
 #ifdef VMS
 	temp2 = HTVMS_wwwName(LYGetEnv("PATH"));
 #else
@@ -503,9 +503,9 @@ PUBLIC void LYFillLocalFileURL ARGS2(
 **  the display charset later: new bookmark entries may be mistranslated).
 **								 - LP
 */
-PUBLIC void LYAddMETAcharsetToFD ARGS2(
-	FILE *,		fd,
-	int,		disp_chndl)
+void LYAddMETAcharsetToFD (
+	FILE *		fd,
+	int		disp_chndl)
 {
     if (disp_chndl == -1)
 	/*
@@ -545,8 +545,8 @@ PUBLIC void LYAddMETAcharsetToFD ARGS2(
 ** This function returns OL TYPE="A" strings in
 ** the range of " A." (1) to "ZZZ." (18278). - FM
 */
-PUBLIC char *LYUppercaseA_OL_String ARGS1(
-	int, seqnum)
+char *LYUppercaseA_OL_String (
+	int seqnum)
 {
     static char OLstring[8];
 
@@ -577,8 +577,8 @@ PUBLIC char *LYUppercaseA_OL_String ARGS1(
 ** This function returns OL TYPE="a" strings in
 ** the range of " a." (1) to "zzz." (18278). - FM
 */
-PUBLIC char *LYLowercaseA_OL_String ARGS1(
-	int, seqnum)
+char *LYLowercaseA_OL_String (
+	int seqnum)
 {
     static char OLstring[8];
 
@@ -610,8 +610,8 @@ PUBLIC char *LYLowercaseA_OL_String ARGS1(
 ** range of " I." (1) to "MMM." (3000).- FM
 ** Maximum length: 16 -TD
 */
-PUBLIC char *LYUppercaseI_OL_String ARGS1(
-	int, seqnum)
+char *LYUppercaseI_OL_String (
+	int seqnum)
 {
     static char OLstring[20];
     int Arabic = seqnum;
@@ -745,8 +745,8 @@ PUBLIC char *LYUppercaseI_OL_String ARGS1(
 ** range of " i." (1) to "mmm." (3000).- FM
 ** Maximum length: 16 -TD
 */
-PUBLIC char *LYLowercaseI_OL_String ARGS1(
-	int, seqnum)
+char *LYLowercaseI_OL_String (
+	int seqnum)
 {
     static char OLstring[20];
     int Arabic = seqnum;
@@ -878,8 +878,8 @@ PUBLIC char *LYLowercaseI_OL_String ARGS1(
 /*
 **  This function initializes the Ordered List counter. - FM
 */
-PUBLIC void LYZero_OL_Counter ARGS1(
-	HTStructured *,		me)
+void LYZero_OL_Counter (
+	HTStructured *		me)
 {
     int i;
 
@@ -900,8 +900,8 @@ PUBLIC void LYZero_OL_Counter ARGS1(
 /*
 **  This function is used by the HTML Structured object. - KW
 */
-PUBLIC void LYGetChartransInfo ARGS1(
-	HTStructured *,		me)
+void LYGetChartransInfo (
+	HTStructured *		me)
 {
     me->UCLYhndl = HTAnchor_getUCLYhndl(me->node_anchor,
 					UCT_STAGE_STRUCTURED);
@@ -933,7 +933,7 @@ PUBLIC void LYGetChartransInfo ARGS1(
  *			next char after the UTF-8 put into buffer.
  *  On failure, including invalid code or 7-bit code, returns NULL.
  */
-PRIVATE char * UCPutUtf8ToBuffer ARGS3(char *, q, UCode_t, code, BOOL, terminate)
+static char * UCPutUtf8ToBuffer (char * q, UCode_t code, BOOL terminate)
 {
     char *q_in = q;
     if (!q)
@@ -977,7 +977,7 @@ PRIVATE char * UCPutUtf8ToBuffer ARGS3(char *, q, UCode_t, code, BOOL, terminate
 }
 
 	/* as in HTParse.c, saves some calls - kw */
-PRIVATE CONST char *hex = "0123456789ABCDEF";
+static const char *hex = "0123456789ABCDEF";
 
 /*
  *	  Any raw 8-bit or multibyte characters already have been
@@ -1048,28 +1048,28 @@ PRIVATE CONST char *hex = "0123456789ABCDEF";
 **
 **  In general, this somehow ugly function (KW)
 **  cover three functions from v.2.7.2 (FM):
-**		    extern void LYExpandString PARAMS((
+**		    extern void LYExpandString (
 **		       HTStructured *	       me,
-**		       char **		       str));
-**		    extern void LYUnEscapeEntities PARAMS((
+**		       char **		       str);
+**		    extern void LYUnEscapeEntities (
 **		       HTStructured *	       me,
-**		       char **		       str));
-**		    extern void LYUnEscapeToLatinOne PARAMS((
+**		       char **		       str);
+**		    extern void LYUnEscapeToLatinOne (
 **		       HTStructured *	       me,
 **		       char **		       str,
-**		       BOOLEAN		       isURL));
+**		       BOOLEAN		       isURL);
 */
 
-PUBLIC char ** LYUCFullyTranslateString ARGS9(
-	char **,	str,
-	int,		cs_from,
-	int,		cs_to,
-	BOOLEAN,	do_ent,
-	BOOL,		use_lynx_specials,
-	BOOLEAN,	plain_space,
-	BOOLEAN,	hidden,
-	BOOL,		Back,
-	CharUtil_st,	stype)
+char ** LYUCFullyTranslateString (
+	char **	str,
+	int		cs_from,
+	int		cs_to,
+	BOOLEAN	do_ent,
+	BOOL		use_lynx_specials,
+	BOOLEAN	plain_space,
+	BOOLEAN	hidden,
+	BOOL		Back,
+	CharUtil_st	stype)
 {
     char * p;
     char *q, *qs;
@@ -1084,7 +1084,7 @@ PUBLIC char ** LYUCFullyTranslateString ARGS9(
     long int lcode;
     BOOL output_utf8 = 0, repl_translated_C0 = 0;
     size_t len;
-    CONST char * name = NULL;
+    const char * name = NULL;
     BOOLEAN no_bytetrans;
     UCTransParams T;
     BOOL from_is_utf8 = FALSE;
@@ -1999,14 +1999,14 @@ PUBLIC char ** LYUCFullyTranslateString ARGS9(
 #undef REPLACE_CHAR
 #undef REPLACE_STRING
 
-PUBLIC BOOL LYUCTranslateHTMLString ARGS7(
-	char **, str,
-	int,	cs_from,
-	int,	cs_to,
-	BOOL,	use_lynx_specials,
-	BOOLEAN,	plain_space,
-	BOOLEAN,	hidden,
-	CharUtil_st,	stype)
+BOOL LYUCTranslateHTMLString (
+	char ** str,
+	int	cs_from,
+	int	cs_to,
+	BOOL	use_lynx_specials,
+	BOOLEAN	plain_space,
+	BOOLEAN	hidden,
+	CharUtil_st	stype)
 {
     BOOL ret = YES;
     /* May reallocate *str even if cs_to == 0 */
@@ -2018,11 +2018,11 @@ PUBLIC BOOL LYUCTranslateHTMLString ARGS7(
     return ret;
 }
 
-PUBLIC BOOL LYUCTranslateBackFormData ARGS4(
-	char **, str,
-	int,	cs_from,
-	int,	cs_to,
-	BOOLEAN,	plain_space)
+BOOL LYUCTranslateBackFormData (
+	char ** str,
+	int	cs_from,
+	int	cs_to,
+	BOOLEAN	plain_space)
 {
     char ** ret;
     /* May reallocate *str */
@@ -2035,9 +2035,9 @@ PUBLIC BOOL LYUCTranslateBackFormData ARGS4(
 /*
  * Parse a parameter from an HTML META tag, i.e., the CONTENT.
  */
-PUBLIC char *LYParseTagParam ARGS2(
-	char *,		from,
-	char *,		name)
+char *LYParseTagParam (
+	char *		from,
+	char *		name)
 {
     size_t len = strlen(name);
     char *result = NULL;
@@ -2078,10 +2078,10 @@ PUBLIC char *LYParseTagParam ARGS2(
  * Given a refresh-URL content string, parses the delay time and the URL
  * string.  Ignore the remainder of the content.
  */
-PUBLIC void LYParseRefreshURL ARGS3(
-	char *,		content,
-	char **,	p_seconds,
-	char **,	p_address)
+void LYParseRefreshURL (
+	char *		content,
+	char **	p_seconds,
+	char **	p_address)
 {
     char *cp;
     char *cp1 = NULL;
@@ -2107,11 +2107,11 @@ PUBLIC void LYParseRefreshURL ARGS3(
 /*
 **  This function processes META tags in HTML streams. - FM
 */
-PUBLIC void LYHandleMETA ARGS4(
-	HTStructured *,		me,
-	CONST BOOL*,		present,
-	CONST char **,		value,
-	char **,		include GCC_UNUSED)
+void LYHandleMETA (
+	HTStructured *		me,
+	const BOOL*		present,
+	const char **		value,
+	char **		include GCC_UNUSED)
 {
     char *http_equiv = NULL, *name = NULL, *content = NULL;
     char *href = NULL, *id_string = NULL, *temp = NULL;
@@ -2665,13 +2665,13 @@ free_META_copies:
 **  current paragraph and subsequent text when a P
 **  end tag is present or not in the markup. - FM
 */
-PUBLIC void LYHandlePlike ARGS6(
-	HTStructured *,		me,
-	CONST BOOL*,		present,
-	CONST char **,		value,
-	char **,		include GCC_UNUSED,
-	int,			align_idx,
-	BOOL,			start)
+void LYHandlePlike (
+	HTStructured *		me,
+	const BOOL*		present,
+	const char **		value,
+	char **		include GCC_UNUSED,
+	int			align_idx,
+	BOOL			start)
 {
     if (TRUE) {
 	/*
@@ -2776,12 +2776,12 @@ PUBLIC void LYHandlePlike ARGS6(
 **  If start is TRUE it handles a start tag, and if FALSE,
 **  an end tag. - FM
 */
-PUBLIC void LYHandleSELECT ARGS5(
-	HTStructured *,		me,
-	CONST BOOL*,		present,
-	CONST char **,		value,
-	char **,		include GCC_UNUSED,
-	BOOL,			start)
+void LYHandleSELECT (
+	HTStructured *		me,
+	const BOOL*		present,
+	const char **		value,
+	char **		include GCC_UNUSED,
+	BOOL			start)
 {
     int i;
 
@@ -2991,16 +2991,16 @@ PUBLIC void LYHandleSELECT ARGS5(
 **  are to be treated as partial or absolute
 **  URLs. - FM
 */
-PUBLIC int LYLegitimizeHREF ARGS4(
-	HTStructured *,		me,
-	char **,		href,
-	BOOL,			force_slash,
-	BOOL,			strip_dots)
+int LYLegitimizeHREF (
+	HTStructured *		me,
+	char **		href,
+	BOOL			force_slash,
+	BOOL			strip_dots)
 {
     int url_type = 0;
     char *p = NULL;
     char *pound = NULL;
-    CONST char *Base = NULL;
+    const char *Base = NULL;
 
     if (!me || !href || isEmpty(*href))
 	return(url_type);
@@ -3089,7 +3089,7 @@ PUBLIC int LYLegitimizeHREF ARGS4(
 	 *  by the document provider. - FM
 	 */
 	char *temp = NULL, *path = NULL, *cp;
-	CONST char *str = "";
+	const char *str = "";
 
 	temp = HTParse(*href, Base, PARSE_ALL);
 	path = HTParse(temp, "", PARSE_PATH+PARSE_PUNCTUATION);
@@ -3136,12 +3136,12 @@ PUBLIC int LYLegitimizeHREF ARGS4(
 **  accordingly.  If set, it will be replaced by
 **  any BASE tag in the HTML stream, itself. - FM
 */
-PUBLIC void LYCheckForContentBase ARGS1(
-	HTStructured *,		me)
+void LYCheckForContentBase (
+	HTStructured *		me)
 {
     char *cp = NULL;
     BOOL present[HTML_BASE_ATTRIBUTES];
-    CONST char *value[HTML_BASE_ATTRIBUTES];
+    const char *value[HTML_BASE_ATTRIBUTES];
     int i;
 
     if (!(me && me->node_anchor))
@@ -3194,7 +3194,7 @@ PUBLIC void LYCheckForContentBase ARGS1(
     for (i = 0; i < HTML_BASE_ATTRIBUTES; i++)
 	 present[i] = NO;
     present[HTML_BASE_HREF] = YES;
-    value[HTML_BASE_HREF] = (CONST char *)cp;
+    value[HTML_BASE_HREF] = (const char *)cp;
     (*me->isa->start_element)(me, HTML_BASE, present, value,
 			      0, 0);
     FREE(cp);
@@ -3204,11 +3204,11 @@ PUBLIC void LYCheckForContentBase ARGS1(
 **  This function creates NAMEd Anchors if a non-zero-length NAME
 **  or ID attribute was present in the tag. - FM
 */
-PUBLIC void LYCheckForID ARGS4(
-	HTStructured *,		me,
-	CONST BOOL *,		present,
-	CONST char **,		value,
-	int,			attribute)
+void LYCheckForID (
+	HTStructured *		me,
+	const BOOL *		present,
+	const char **		value,
+	int			attribute)
 {
     HTChildAnchor *ID_A = NULL;
     char *temp = NULL;
@@ -3246,9 +3246,9 @@ PUBLIC void LYCheckForID ARGS4(
 **  passed to it directly as an argument.  It assumes the
 **  does not need checking for character references. - FM
 */
-PUBLIC void LYHandleID ARGS2(
-	HTStructured *,		me,
-	CONST char *,		id)
+void LYHandleID (
+	HTStructured *		me,
+	const char *		id)
 {
     HTChildAnchor *ID_A = NULL;
 
@@ -3275,8 +3275,8 @@ PUBLIC void LYHandleID ARGS2(
 **  instead use that specified in the element's style
 **  sheet. - FM
 */
-PUBLIC BOOLEAN LYoverride_default_alignment ARGS1(
-	HTStructured *, me)
+BOOLEAN LYoverride_default_alignment (
+	HTStructured * me)
 {
     if (!me)
 	return NO;
@@ -3301,8 +3301,8 @@ PUBLIC BOOLEAN LYoverride_default_alignment ARGS1(
 **  and sets the left margin for subsequent text to the second line
 **  indentation of the current style. - FM
 */
-PUBLIC void LYEnsureDoubleSpace ARGS1(
-	HTStructured *, me)
+void LYEnsureDoubleSpace (
+	HTStructured * me)
 {
     if (!me || !me->text)
 	return;
@@ -3326,8 +3326,8 @@ PUBLIC void LYEnsureDoubleSpace ARGS1(
 **  and sets the left margin for subsequent text to the second line
 **  indentation of the current style. - FM
 */
-PUBLIC void LYEnsureSingleSpace ARGS1(
-	HTStructured *, me)
+void LYEnsureSingleSpace (
+	HTStructured * me)
 {
     if (!me || !me->text)
 	return;
@@ -3346,8 +3346,8 @@ PUBLIC void LYEnsureSingleSpace ARGS1(
 **  This function resets paragraph alignments for block
 **  elements which do not have a defined style sheet. - FM
 */
-PUBLIC void LYResetParagraphAlignment ARGS1(
-	HTStructured *, me)
+void LYResetParagraphAlignment (
+	HTStructured * me)
 {
     if (!me)
 	return;
@@ -3380,9 +3380,9 @@ PUBLIC void LYResetParagraphAlignment ARGS1(
 **  some other HTStructured object like in HTMLGen.c), or the new
 **  functions could be added to the SGML.h interface.
 */
-PUBLIC BOOLEAN LYCheckForCSI ARGS2(
-	HTParentAnchor *,	anchor,
-	char **,		url)
+BOOLEAN LYCheckForCSI (
+	HTParentAnchor *	anchor,
+	char **		url)
 {
     if (!(anchor && anchor->address))
 	return FALSE;
@@ -3418,11 +3418,11 @@ PUBLIC BOOLEAN LYCheckForCSI ARGS2(
 **  would have to agree on some better mechanism to make this kind of info
 **  from original mail headers available, for example using LINK.  - kw
 */
-PUBLIC BOOLEAN LYCommentHacks ARGS2(
-	HTParentAnchor *,	anchor,
-	CONST char *,		comment)
+BOOLEAN LYCommentHacks (
+	HTParentAnchor *	anchor,
+	const char *		comment)
 {
-    CONST char *cp = comment;
+    const char *cp = comment;
     size_t len;
 
     if (comment == NULL)
@@ -3533,9 +3533,9 @@ PUBLIC BOOLEAN LYCommentHacks ARGS2(
      *  from display character set which may need changing.
      *  Do NOT convert any 8-bit chars if we have CJK display. - LP
      */
-void LYformTitle ARGS2(
-	char **,	dst,
-	CONST char *,	src)
+void LYformTitle (
+	char **	dst,
+	const char *	src)
 {
     if (HTCJK == JAPANESE) {
 	char *tmp_buffer = NULL;
@@ -3543,10 +3543,10 @@ void LYformTitle ARGS2(
 	    outofmem(__FILE__, "LYformTitle");
 	switch(kanji_code) {	/* 1997/11/22 (Sat) 09:28:00 */
 	case EUC:
-	    TO_EUC((CONST unsigned char *) src, (unsigned char *) tmp_buffer);
+	    TO_EUC((const unsigned char *) src, (unsigned char *) tmp_buffer);
 	    break;
 	case SJIS:
-	    TO_SJIS((CONST unsigned char *) src, (unsigned char *) tmp_buffer);
+	    TO_SJIS((const unsigned char *) src, (unsigned char *) tmp_buffer);
 	    break;
 	default:
 	    CTRACE((tfp, "\nLYformTitle: kanji_code is an unexpected value."));
diff --git a/src/LYCharUtils.h b/src/LYCharUtils.h
index 8fad7644..9f65a805 100644
--- a/src/LYCharUtils.h
+++ b/src/LYCharUtils.h
@@ -14,7 +14,7 @@ typedef enum {
     st_other
 } CharUtil_st;
 
-extern char** LYUCFullyTranslateString PARAMS((
+extern char** LYUCFullyTranslateString (
 	char **		str,
 	int		cs_from,
 	int		cs_to,
@@ -23,105 +23,105 @@ extern char** LYUCFullyTranslateString PARAMS((
 	BOOLEAN		plain_space,
 	BOOLEAN		hidden,
 	BOOL		Back,
-	CharUtil_st	stype));
-extern BOOL LYUCTranslateHTMLString PARAMS((
+	CharUtil_st	stype);
+extern BOOL LYUCTranslateHTMLString (
 	char **		str,
 	int		cs_from,
 	int		cs_to,
 	BOOL		use_lynx_specials,
 	BOOLEAN		plain_space,
 	BOOLEAN		hidden,
-	CharUtil_st	stype));
-extern BOOL LYUCTranslateBackFormData PARAMS((
+	CharUtil_st	stype);
+extern BOOL LYUCTranslateBackFormData (
 	char **		str,
 	int		cs_from,
 	int		cs_to,
-	BOOLEAN		plain_space));
-extern void LYEntify PARAMS((
+	BOOLEAN		plain_space);
+extern void LYEntify (
 	char **		str,
-	BOOLEAN		isTITLE));
-extern void LYTrimHead PARAMS((
-	char *		str));
-extern void LYTrimTail PARAMS((
-	char *		str));
-extern char *LYFindEndOfComment PARAMS((
-	char *		str));
-extern void LYFillLocalFileURL PARAMS((
+	BOOLEAN		isTITLE);
+extern void LYTrimHead (
+	char *		str);
+extern void LYTrimTail (
+	char *		str);
+extern char *LYFindEndOfComment (
+	char *		str);
+extern void LYFillLocalFileURL (
 	char **		href,
-	CONST char *	base));
-extern void LYAddMETAcharsetToFD PARAMS((
+	const char *	base);
+extern void LYAddMETAcharsetToFD (
 	FILE *		fd,
-	int		disp_chndl));
-extern void LYformTitle PARAMS((
+	int		disp_chndl);
+extern void LYformTitle (
 	char **		dst,
-	CONST char *	src));
-extern char *LYParseTagParam PARAMS((
+	const char *	src);
+extern char *LYParseTagParam (
 	char *		from,
-	char *		name));
-extern void LYParseRefreshURL PARAMS((
+	char *		name);
+extern void LYParseRefreshURL (
 	char *		content,
 	char **		p_seconds,
-	char **		p_address));
+	char **		p_address);
 
 #ifdef Lynx_HTML_Handler
 extern int OL_CONTINUE;		/* flag for whether CONTINUE is set */
 extern int OL_VOID;		/* flag for whether a count is set */
-extern void LYZero_OL_Counter PARAMS((
-	HTStructured *		me));
-extern char *LYUppercaseA_OL_String PARAMS((
-	int			seqnum));
-extern char *LYLowercaseA_OL_String PARAMS((
-	int			seqnum));
-extern char *LYUppercaseI_OL_String PARAMS((
-	int			seqnum));
-extern char *LYLowercaseI_OL_String PARAMS((
-	int			seqnum));
-extern void LYGetChartransInfo PARAMS((
-	HTStructured *		me));
-extern void LYHandleMETA PARAMS((
+extern void LYZero_OL_Counter (
+	HTStructured *		me);
+extern char *LYUppercaseA_OL_String (
+	int			seqnum);
+extern char *LYLowercaseA_OL_String (
+	int			seqnum);
+extern char *LYUppercaseI_OL_String (
+	int			seqnum);
+extern char *LYLowercaseI_OL_String (
+	int			seqnum);
+extern void LYGetChartransInfo (
+	HTStructured *		me);
+extern void LYHandleMETA (
 	HTStructured *		me,
-	CONST BOOL*		present,
-	CONST char **		value,
-	char **			include));
-extern void LYHandlePlike PARAMS((
+	const BOOL*		present,
+	const char **		value,
+	char **			include);
+extern void LYHandlePlike (
 	HTStructured *		me,
-	CONST BOOL*		present,
-	CONST char **		value,
+	const BOOL*		present,
+	const char **		value,
 	char **			include,
 	int			align_idx,
-	BOOL			start));
-extern void LYHandleSELECT PARAMS((
+	BOOL			start);
+extern void LYHandleSELECT (
 	HTStructured *		me,
-	CONST BOOL*		present,
-	CONST char **		value,
+	const BOOL*		present,
+	const char **		value,
 	char **			include,
-	BOOL			start));
-extern int LYLegitimizeHREF PARAMS((
+	BOOL			start);
+extern int LYLegitimizeHREF (
 	HTStructured *		me,
 	char **			href,
 	BOOL			force_slash,
-	BOOL			strip_dots));
-extern void LYCheckForContentBase PARAMS((
-	HTStructured *		me));
-extern void LYCheckForID PARAMS((
+	BOOL			strip_dots);
+extern void LYCheckForContentBase (
+	HTStructured *		me);
+extern void LYCheckForID (
 	HTStructured *		me,
-	CONST BOOL *		present,
-	CONST char **		value,
-	int			attribute));
-extern void LYHandleID PARAMS((
+	const BOOL *		present,
+	const char **		value,
+	int			attribute);
+extern void LYHandleID (
 	HTStructured *		me,
-	CONST char *		id));
-extern BOOLEAN LYoverride_default_alignment PARAMS((
-	HTStructured *		me));
-extern void LYEnsureDoubleSpace PARAMS((
-	HTStructured *		me));
-extern void LYEnsureSingleSpace PARAMS((
-	HTStructured *		me));
-extern void LYResetParagraphAlignment PARAMS((
-	HTStructured *		me));
-extern BOOLEAN LYCheckForCSI PARAMS((
+	const char *		id);
+extern BOOLEAN LYoverride_default_alignment (
+	HTStructured *		me);
+extern void LYEnsureDoubleSpace (
+	HTStructured *		me);
+extern void LYEnsureSingleSpace (
+	HTStructured *		me);
+extern void LYResetParagraphAlignment (
+	HTStructured *		me);
+extern BOOLEAN LYCheckForCSI (
 	HTParentAnchor *	anchor,
-	char **			url));
+	char **			url);
 
 #endif /* Lynx_HTML_Handler */
 
diff --git a/src/LYClean.c b/src/LYClean.c
index 8bb59b3d..9518b8fd 100644
--- a/src/LYClean.c
+++ b/src/LYClean.c
@@ -25,8 +25,8 @@ BOOLEAN HadVMSInterrupt = FALSE;
 /*
  *  Interrupt handler.	Stop curses and exit gracefully.
  */
-PUBLIC void cleanup_sig ARGS1(
-	int,		sig)
+void cleanup_sig (
+	int		sig)
 {
 
 #ifdef IGNORE_CTRL_C
@@ -149,13 +149,13 @@ PUBLIC void cleanup_sig ARGS1(
  *  Called by Interrupt handler or at quit time.
  *  Erases the temporary files that lynx created.
  */
-PUBLIC void cleanup_files NOARGS
+void cleanup_files (void)
 {
     LYCleanupTemp();
     FREE(lynx_temp_space);
 }
 
-PUBLIC void cleanup NOARGS
+void cleanup (void)
 {
 #ifdef VMS
     extern BOOLEAN DidCleanup;
diff --git a/src/LYClean.h b/src/LYClean.h
index 08460408..69dc4131 100644
--- a/src/LYClean.h
+++ b/src/LYClean.h
@@ -9,10 +9,10 @@
 extern BOOLEAN HadVMSInterrupt;
 #endif
 
-extern void cleanup_sig PARAMS((int sig));
-extern void cleanup NOPARAMS;
-extern void cleanup_files NOPARAMS;
-extern void set_alarm PARAMS((int sig));
-extern void reset_alarm NOPARAMS;
+extern void cleanup_sig (int sig);
+extern void cleanup (void);
+extern void cleanup_files (void);
+extern void set_alarm (int sig);
+extern void reset_alarm (void);
 
 #endif /* LYCLEAN_H */
diff --git a/src/LYCookie.c b/src/LYCookie.c
index 5dce429f..39358c78 100644
--- a/src/LYCookie.c
+++ b/src/LYCookie.c
@@ -86,9 +86,9 @@
 **  list.  We keep a running total of cookies as we add or delete
 **  them
 */
-PRIVATE HTList *domain_list = NULL;
-PRIVATE HTList *cookie_list = NULL;
-PRIVATE int total_cookies = 0;
+static HTList *domain_list = NULL;
+static HTList *cookie_list = NULL;
+static int total_cookies = 0;
 
 struct _cookie {
     char *lynxID;  /* Lynx cookie identifier */
@@ -120,10 +120,10 @@ struct _HTStream
   HTStreamClass * isa;
 };
 
-PRIVATE void MemAllocCopy ARGS3(
-	char **,	dest,
-	CONST char *,	start,
-	CONST char *,	end)
+static void MemAllocCopy (
+	char **	dest,
+	const char *	start,
+	const char *	end)
 {
     char *temp;
 
@@ -140,7 +140,7 @@ PRIVATE void MemAllocCopy ARGS3(
     FREE(temp);
 }
 
-PRIVATE cookie * newCookie NOARGS
+static cookie * newCookie (void)
 {
     cookie *p = typecalloc(cookie);
 
@@ -151,8 +151,8 @@ PRIVATE cookie * newCookie NOARGS
     return p;
 }
 
-PRIVATE void freeCookie ARGS1(
-	cookie *,	co)
+static void freeCookie (
+	cookie *	co)
 {
     if (co) {
 	FREE(co->lynxID);
@@ -168,7 +168,7 @@ PRIVATE void freeCookie ARGS1(
 }
 
 #ifdef LY_FIND_LEAKS
-PRIVATE void LYCookieJar_free NOARGS
+static void LYCookieJar_free (void)
 {
     HTList *dl = domain_list;
     domain_entry *de = NULL;
@@ -207,9 +207,9 @@ PRIVATE void LYCookieJar_free NOARGS
 **   http://www.ics.uci.edu/pub/ietf/http/draft-ietf-http-state-man-mec-02.txt
 **	- AK & FM
 */
-PRIVATE BOOLEAN host_matches ARGS2(
-	CONST char *,	A,
-	CONST char *,	B)
+static BOOLEAN host_matches (
+	const char *	A,
+	const char *	B)
 {
     /*
      *	The following line will handle both numeric IP addresses and
@@ -237,11 +237,11 @@ PRIVATE BOOLEAN host_matches ARGS2(
 **   http://www.ics.uci.edu/pub/ietf/http/draft-ietf-http-state-man-mec-02.txt
 **	- FM
 */
-PRIVATE BOOLEAN port_matches ARGS2(
-	int,		port,
-	CONST char *,	list)
+static BOOLEAN port_matches (
+	int		port,
+	const char *	list)
 {
-    CONST char *number = list;
+    const char *number = list;
 
     if (!(number && isdigit(UCH(*number))))
 	return(FALSE);
@@ -264,7 +264,7 @@ PRIVATE BOOLEAN port_matches ARGS2(
 /*
  * Returns the length of the given path ignoring trailing slashes.
  */
-PRIVATE int ignore_trailing_slash ARGS1(CONST char *, a)
+static int ignore_trailing_slash (const char * a)
 {
     int len = strlen(a);
     while (len > 1 && a[len-1] == '/')
@@ -276,7 +276,7 @@ PRIVATE int ignore_trailing_slash ARGS1(CONST char *, a)
  * Check if the path 'a' is a prefix of path 'b', ignoring trailing slashes
  * in either, since they denote an empty component.
  */
-PRIVATE BOOL is_prefix ARGS2(CONST char *, a, CONST char *, b)
+static BOOL is_prefix (const char * a, const char * b)
 {
     int len_a = ignore_trailing_slash(a);
     int len_b = ignore_trailing_slash(b);
@@ -300,8 +300,8 @@ PRIVATE BOOL is_prefix ARGS2(CONST char *, a, CONST char *, b)
 /*
  * Find the domain-entry for the given name.
  */
-PRIVATE domain_entry * find_domain_entry ARGS1(
-    CONST char *,	name)
+static domain_entry * find_domain_entry (
+    const char *	name)
 {
     HTList *hl;
     domain_entry *de = NULL;
@@ -333,16 +333,16 @@ PRIVATE domain_entry * find_domain_entry ARGS1(
 /*
 **  Store a cookie somewhere in the domain list. - AK & FM
 */
-PRIVATE void store_cookie ARGS3(
-	cookie *,	co,
-	CONST char *,	hostname,
-	CONST char *,	path)
+static void store_cookie (
+	cookie *	co,
+	const char *	hostname,
+	const char *	path)
 {
     HTList *hl, *next;
     cookie *c2;
     time_t now = time(NULL);
     int pos;
-    CONST char *ptr;
+    const char *ptr;
     domain_entry *de = NULL;
     BOOL Replacement = FALSE;
     int invprompt_reasons = 0;	/* what is wrong with this cookie - kw */
@@ -655,13 +655,13 @@ PRIVATE void store_cookie ARGS3(
 **  Scan a domain's cookie_list for any cookies we should
 **  include in a Cookie: request header. - AK & FM
 */
-PRIVATE char * scan_cookie_sublist ARGS6(
-	char *,		hostname,
-	char *,		path,
-	int,		port,
-	HTList *,	sublist,
-	char *,		header,
-	BOOL,		secure)
+static char * scan_cookie_sublist (
+	char *		hostname,
+	char *		path,
+	int		port,
+	HTList *	sublist,
+	char *		header,
+	BOOL		secure)
 {
     HTList *hl = sublist, *next = NULL;
     cookie *co;
@@ -835,9 +835,9 @@ PRIVATE char * scan_cookie_sublist ARGS6(
  * Presence of value is needed (indicated normally by '=') to start a cookie,
  * but it can be an empty string.  - kw 1999-06-24
  */
-PRIVATE char *alloc_attr_value ARGS2(
-	CONST char *,	value_start,
-	CONST char *,	value_end)
+static char *alloc_attr_value (
+	const char *	value_start,
+	const char *	value_end)
 {
     char *value = NULL;
 
@@ -861,16 +861,16 @@ PRIVATE char *alloc_attr_value ARGS2(
 
 #define is_attr(s, len) attr_len == len && !strncasecomp(attr_start, s, len)
 
-PRIVATE unsigned parse_attribute ARGS9(
-	unsigned,	flags,
-	cookie *,	cur_cookie,
-	int *,		cookie_len,
-	CONST char *,	attr_start,
-	int,		attr_len,
-	char *,		value,
-	CONST char *,	address,
-	char *,		hostname,
-	int,		port)
+static unsigned parse_attribute (
+	unsigned	flags,
+	cookie *	cur_cookie,
+	int *		cookie_len,
+	const char *	attr_start,
+	int		attr_len,
+	char *		value,
+	const char *	address,
+	char *		hostname,
+	int		port)
 {
     BOOLEAN known_attr = NO;
     int url_type;
@@ -1090,15 +1090,15 @@ PRIVATE unsigned parse_attribute ARGS9(
 **  Process potentially concatenated Set-Cookie2 and/or Set-Cookie
 **  headers. - FM
 */
-PRIVATE void LYProcessSetCookies ARGS6(
-	CONST char *,	SetCookie,
-	CONST char *,	SetCookie2,
-	CONST char *,	address,
-	char *,		hostname,
-	char *,		path,
-	int,		port)
+static void LYProcessSetCookies (
+	const char *	SetCookie,
+	const char *	SetCookie2,
+	const char *	address,
+	char *		hostname,
+	char *		path,
+	int		port)
 {
-    CONST char *p, *attr_start, *attr_end, *value_start, *value_end;
+    const char *p, *attr_start, *attr_end, *value_start, *value_end;
     HTList *CombinedCookies = NULL, *cl = NULL;
     cookie *cur_cookie = NULL, *co = NULL;
     int cookie_len = 0;
@@ -1221,7 +1221,7 @@ PRIVATE void LYProcessSetCookies ARGS6(
 		/*
 		 *  The value starts as an unquoted number.
 		 */
-		CONST char *cp, *cp1;
+		const char *cp, *cp1;
 		value_start = p;
 		while (1) {
 		    while (isdigit(UCH(*p)))
@@ -1515,7 +1515,7 @@ PRIVATE void LYProcessSetCookies ARGS6(
 		/*
 		 *  The value starts as an unquoted number.
 		 */
-		CONST char *cp, *cp1;
+		const char *cp, *cp1;
 		value_start = p;
 		while (1) {
 		    while (isdigit(UCH(*p)))
@@ -1735,10 +1735,10 @@ PRIVATE void LYProcessSetCookies ARGS6(
 **  reply headers.   They may have been concatenated as comma
 **  separated lists in HTTP.c or HTMIME.c. - FM
 */
-PUBLIC void LYSetCookie ARGS3(
-	CONST char *,	SetCookie,
-	CONST char *,	SetCookie2,
-	CONST char *,	address)
+void LYSetCookie (
+	const char *	SetCookie,
+	const char *	SetCookie2,
+	const char *	address)
 {
     BOOL BadHeaders = FALSE;
     char *hostname = NULL, *path = NULL, *ptr;
@@ -1813,11 +1813,11 @@ PUBLIC void LYSetCookie ARGS3(
 **  Entry function from creating a Cookie: request header
 **  if needed. - AK & FM
 */
-PUBLIC char * LYAddCookieHeader ARGS4(
-	char *,		hostname,
-	char *,		path,
-	int,		port,
-	BOOL,		secure)
+char * LYAddCookieHeader (
+	char *		hostname,
+	char *		path,
+	int		port,
+	BOOL		secure)
 {
     char *header = NULL;
     HTList *hl = domain_list, *next = NULL;
@@ -1865,11 +1865,11 @@ PUBLIC char * LYAddCookieHeader ARGS4(
 }
 
 #ifdef USE_PERSISTENT_COOKIES
-PRIVATE int number_of_file_cookies = 0;
+static int number_of_file_cookies = 0;
 
 /* rjp - experiment cookie loading */
-PUBLIC void LYLoadCookies ARGS1 (
-	char *,		cookie_file)
+void LYLoadCookies (
+	char *		cookie_file)
 {
     FILE *cookie_handle;
     char *buf = NULL;
@@ -2019,8 +2019,8 @@ PUBLIC void LYLoadCookies ARGS1 (
 }
 
 /* rjp - experimental persistent cookie support */
-PUBLIC void LYStoreCookies ARGS1 (
-	char *,		cookie_file)
+void LYStoreCookies (
+	char *		cookie_file)
 {
     HTList *dl, *cl;
     domain_entry *de;
@@ -2117,11 +2117,11 @@ PUBLIC void LYStoreCookies ARGS1 (
 **	New functions can be added as extensions to the path, and/or by
 **	assigning meanings to ;parameters, a ?searchpart, and/or #fragments.
 */
-PRIVATE int LYHandleCookies ARGS4 (
-	CONST char *,		arg,
-	HTParentAnchor *,	anAnchor,
-	HTFormat,		format_out,
-	HTStream*,		sink)
+static int LYHandleCookies (
+	const char *		arg,
+	HTParentAnchor *	anAnchor,
+	HTFormat		format_out,
+	HTStream*		sink)
 {
     HTFormat format_in = WWW_HTML;
     HTStream *target = NULL;
@@ -2551,9 +2551,9 @@ Delete_all_cookies_in_domain:
 **      invcheck behavior, as well as accept/reject behavior. - BJP
 */
 
-PRIVATE void cookie_domain_flag_set ARGS2(
-	char *,		domainstr,
-	int,		flag)
+static void cookie_domain_flag_set (
+	char *		domainstr,
+	int		flag)
 {
     domain_entry *de = NULL;
     char **str = typecalloc(char *);
@@ -2650,9 +2650,9 @@ PRIVATE void cookie_domain_flag_set ARGS2(
  *
  * And for query/strict/loose invalid cookie checking.  - BJP
  */
-PUBLIC void LYConfigCookies NOARGS
+void LYConfigCookies (void)
 {
-    static CONST struct {
+    static const struct {
 	char **domain;
 	int flag;
 	int once;
@@ -2688,5 +2688,5 @@ PUBLIC void LYConfigCookies NOARGS
 #define _LYCOOKIE_C_GLOBALDEF_1_INIT { "LYNXCOOKIE",LYHandleCookies,0}
 GLOBALDEF (HTProtocol,LYLynxCookies,_LYCOOKIE_C_GLOBALDEF_1_INIT);
 #else
-GLOBALDEF PUBLIC HTProtocol LYLynxCookies = {"LYNXCOOKIE",LYHandleCookies,0};
+GLOBALDEF HTProtocol LYLynxCookies = {"LYNXCOOKIE",LYHandleCookies,0};
 #endif /* GLOBALDEF_IS_MACRO */
diff --git a/src/LYCookie.h b/src/LYCookie.h
index 59e7ab79..0aef533c 100644
--- a/src/LYCookie.h
+++ b/src/LYCookie.h
@@ -37,19 +37,19 @@ struct _domain_entry {
 };
 typedef struct _domain_entry domain_entry;
 
-extern void LYSetCookie PARAMS((
-	CONST char *	SetCookie,
-	CONST char *	SetCookie2,
-	CONST char *	address));
-extern char *LYAddCookieHeader PARAMS((
+extern void LYSetCookie (
+	const char *	SetCookie,
+	const char *	SetCookie2,
+	const char *	address);
+extern char *LYAddCookieHeader (
 	char *		hostname,
 	char *		partialpath,
 	int		port,
-	BOOL		secure));
-extern void LYStoreCookies PARAMS((
-	char *		cookie_file));
-extern void LYLoadCookies PARAMS((
-	char * 		cookie_file));
-extern void LYConfigCookies NOPARAMS;
+	BOOL		secure);
+extern void LYStoreCookies (
+	char *		cookie_file);
+extern void LYLoadCookies (
+	char * 		cookie_file);
+extern void LYConfigCookies (void);
 
 #endif /* LYCOOKIES_H */
diff --git a/src/LYCurses.c b/src/LYCurses.c
index 94e2bcf0..8db75c64 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -71,31 +71,31 @@ BOOL LYuseCursesPads = TRUE;	/* use pads for left/right shifting */
  *  the screen at the end.
  */
 
-PRIVATE int dumbterm PARAMS((char *terminal));
+static int dumbterm (char *terminal);
 BOOLEAN LYCursesON = FALSE;
 
 #if defined(USE_BLINK) && defined(__EMX__)
-PRIVATE void make_blink_boldbg NOARGS;
+static void make_blink_boldbg (void);
 #endif
 
 #if defined(USE_COLOR_TABLE) || defined(USE_SLANG)
-PUBLIC int Current_Attr, Masked_Attr;
+int Current_Attr, Masked_Attr;
 #endif
 
 #ifdef USE_SLANG
-PUBLIC unsigned int Lynx_Color_Flags = 0;
-PUBLIC BOOLEAN FullRefresh = FALSE;
-PUBLIC int curscr = 0;
+unsigned int Lynx_Color_Flags = 0;
+BOOLEAN FullRefresh = FALSE;
+int curscr = 0;
 
 #ifdef SLANG_MBCS_HACK
 /*
  *  Will be set by size_change. - KW
  */
-PUBLIC int PHYSICAL_SLtt_Screen_Cols = 10;
+int PHYSICAL_SLtt_Screen_Cols = 10;
 #endif /* SLANG_MBCS_HACK */
 
 
-PUBLIC void LY_SLrefresh NOARGS
+void LY_SLrefresh (void)
 {
     if (FullRefresh) {
 	SLsmg_suspend_smg();
@@ -112,14 +112,14 @@ PUBLIC void LY_SLrefresh NOARGS
    described in curses man pages than like clear(); but for USE_SLANG
    clear() is still a macro calling this, and will do the same thing as
    erase(). - kw */
-PUBLIC void LY_SLerase NOARGS
+void LY_SLerase (void)
 {
     SLsmg_gotorc (0, 0);
     SLsmg_erase_eos ();
 }
 
 #ifdef VMS
-PUBLIC void VTHome NOARGS
+void VTHome (void)
 {
     printf("\033[;H");
 
@@ -127,21 +127,21 @@ PUBLIC void VTHome NOARGS
 }
 #endif /* VMS */
 
-PUBLIC void LYaddAttr ARGS1(
-	int,		a)
+void LYaddAttr (
+	int		a)
 {
     Current_Attr |= a;
     SLsmg_set_color(Current_Attr & ~Masked_Attr);
 }
 
-PUBLIC void LYsubAttr ARGS1(
-	int,		a)
+void LYsubAttr (
+	int		a)
 {
     Current_Attr &= ~a;
     SLsmg_set_color(Current_Attr & ~Masked_Attr);
 }
 
-PRIVATE void lynx_setup_attrs NOARGS
+static void lynx_setup_attrs (void)
 {
     static int monoattr[] = {
 	0,
@@ -159,7 +159,7 @@ PRIVATE void lynx_setup_attrs NOARGS
 	SLtt_set_mono(n, NULL, (monoattr[n] & ~Masked_Attr));
 }
 
-PUBLIC void lynx_setup_colors NOARGS
+void lynx_setup_colors (void)
 {
     CTRACE((tfp, "lynx_setup_colors\n"));
     SLtt_set_color(0, NULL, DEFAULT_FG, DEFAULT_BG);
@@ -179,8 +179,8 @@ PUBLIC void lynx_setup_colors NOARGS
     lynx_setup_attrs();
 }
 
-PRIVATE void sl_suspend ARGS1(
-	int,		sig)
+static void sl_suspend (
+	int		sig)
 {
 #ifdef SIGSTOP
 #ifndef VMS
@@ -236,8 +236,8 @@ static struct {
     { "dim",		A_DIM },
 };
 
-PUBLIC int string_to_attr ARGS1(
-    char *,	name)
+int string_to_attr (
+    char *	name)
 {
     unsigned i;
 
@@ -251,8 +251,8 @@ PUBLIC int string_to_attr ARGS1(
 #endif /* VMS */
 
 #ifdef USE_COLOR_STYLE
-PRIVATE char *attr_to_string ARGS1(
-    int,	code)
+static char *attr_to_string (
+    int	code)
 {
     static char result[sizeof(Mono_Attrs) + 80];
     unsigned i;
@@ -273,8 +273,8 @@ PRIVATE char *attr_to_string ARGS1(
     if (pair != 0) {
 	short f, b;
 	if (pair_content(pair, &f, &b) != ERR) {
-	    CONST char *fg = lookup_color(bold ? f+COLORS : f);
-	    CONST char *bg = lookup_color(b);
+	    const char *fg = lookup_color(bold ? f+COLORS : f);
+	    const char *bg = lookup_color(b);
 	    if (*result)
 		strcat(result, "+");
 	    sprintf(result + strlen(result), "%s/%s", fg, bg);
@@ -289,9 +289,9 @@ PRIVATE char *attr_to_string ARGS1(
 /*
 **  This function boxes windows for (n)curses.
 */
-PUBLIC void LYbox ARGS2(
-	WINDOW *,	win,
-	BOOLEAN,	formfield GCC_UNUSED)
+void LYbox (
+	WINDOW *	win,
+	BOOLEAN	formfield GCC_UNUSED)
 {
 #ifdef USE_SLANG
     SLsmg_draw_box(win->top_y, win->left_x, win->height, win->width + 4);
@@ -370,28 +370,28 @@ PUBLIC void LYbox ARGS2(
  * HTML) are set the same as the SLANG version for ease of programming.  The
  * other styles are simply the HTML enum from HTMLDTD.h + 16.
  */
-PUBLIC HTCharStyle displayStyles[DSTYLE_ELEMENTS];
+HTCharStyle displayStyles[DSTYLE_ELEMENTS];
 
 /*
  * set a style's attributes - RP
  */
-PUBLIC void setStyle ARGS4(
-    int,	style,
-    int,	color,
-    int,	cattr,
-    int,	mono)
+void setStyle (
+    int	style,
+    int	color,
+    int	cattr,
+    int	mono)
 {
     displayStyles[style].color = color;
     displayStyles[style].cattr = cattr;
     displayStyles[style].mono = mono;
 }
 
-PUBLIC void setHashStyle ARGS5(
-    int,	style,
-    int,	color,
-    int,	cattr,
-    int,	mono,
-    char *,	element)
+void setHashStyle (
+    int	style,
+    int	color,
+    int	cattr,
+    int	mono,
+    char *	element)
 {
     bucket* ds = &hashStyles[style];
 
@@ -408,10 +408,10 @@ PUBLIC void setHashStyle ARGS5(
 /*
  * set the curses attributes to be color or mono - RP
  */
-PRIVATE void LYAttrset ARGS3(
-    WINDOW *,	win,
-    int,	color,
-    int,	mono)
+static void LYAttrset (
+    WINDOW *	win,
+    int	color,
+    int	mono)
 {
     if (lynx_has_color
      && LYShowColor >= SHOW_COLOR_ON
@@ -427,10 +427,10 @@ PRIVATE void LYAttrset ARGS3(
     }
 }
 
-PUBLIC void curses_w_style ARGS3(
-	WINDOW*,	win,
-	int,		style,
-	int,		dir)
+void curses_w_style (
+	WINDOW*	win,
+	int		style,
+	int		dir)
 {
 #if OMIT_SCN_KEEPING
 # define SPECIAL_STYLE /*(CSHASHSIZE+1) */ 88888
@@ -514,10 +514,10 @@ PUBLIC void curses_w_style ARGS3(
 /*
  * wrapper function to set on-screen styles - RP
  */
-PUBLIC void wcurses_css ARGS3(
-    WINDOW *,	win,
-    char*,	name,
-    int,	dir)
+void wcurses_css (
+    WINDOW *	win,
+    char*	name,
+    int	dir)
 {
     int try_again = 1;
 
@@ -537,29 +537,29 @@ PUBLIC void wcurses_css ARGS3(
     }
 }
 
-PUBLIC void curses_css ARGS2(
-    char *,	name,
-    int,	dir)
+void curses_css (
+    char *	name,
+    int	dir)
 {
     wcurses_css(LYwin, name, dir);
 }
 
-PUBLIC void curses_style ARGS2(
-	int,	style,
-	int,	dir)
+void curses_style (
+	int	style,
+	int	dir)
 {
     curses_w_style(LYwin, style, dir);
 }
 #endif /* USE_COLOR_STYLE */
 
-PRIVATE BOOL lynx_called_initscr = FALSE;
+static BOOL lynx_called_initscr = FALSE;
 
 #if defined(HAVE_USE_DEFAULT_COLORS) && defined(USE_DEFAULT_COLORS)
 /*
  * If we find a "default" color while reading the config-file, set default
  * colors on the screen.
  */
-PUBLIC int lynx_default_colors NOARGS
+int lynx_default_colors (void)
 {
     int code = 0;
     if (lynx_called_initscr) {
@@ -584,7 +584,7 @@ PUBLIC int lynx_default_colors NOARGS
  * 1997/1/19 - T.E.Dickey <dickey@clark.net>
  */
 
-PRIVATE struct {
+static struct {
     int fg, bg;
 } lynx_color_cfg[] = {
     /*0*/ { DEFAULT_FG,    DEFAULT_BG},
@@ -600,7 +600,7 @@ PRIVATE struct {
 /*
  * Hold the codes for color-pairs here until 'initscr()' is called.
  */
-PRIVATE struct {
+static struct {
     int fg;
     int bg;
 } lynx_color_pairs[25];
@@ -611,7 +611,7 @@ PRIVATE struct {
  * curses assumes white-on-black, but we can override the assumption with this
  * function.
  */
-PRIVATE int get_color_pair ARGS1(int, n)
+static int get_color_pair (int n)
 {
 #ifdef USE_CURSES_PAIR_0
     if (lynx_color_pairs[n].fg == default_fg
@@ -635,7 +635,7 @@ PRIVATE int get_color_pair ARGS1(int, n)
  * Return the extra color as A_BOLD.
  * If there is no extra color, return A_NORMAL.
  */
-PRIVATE int lynx_color_cfg_attr ARGS1(int, code)
+static int lynx_color_cfg_attr (int code)
 {
     int result = A_NORMAL;
     if (code >= 0 && code < 8) {
@@ -650,7 +650,7 @@ PRIVATE int lynx_color_cfg_attr ARGS1(int, code)
  * Map the SGR attributes (0-7) into ANSI colors, modified with the actual BOLD
  * attribute we'll get 16 colors.
  */
-PRIVATE void LYsetWAttr ARGS1(WINDOW *, win)
+static void LYsetWAttr (WINDOW * win)
 {
     if (lynx_has_color && LYShowColor >= SHOW_COLOR_ON) {
 	int code = 0;
@@ -678,7 +678,7 @@ PRIVATE void LYsetWAttr ARGS1(WINDOW *, win)
 /*
  * Initialize a curses color-pair based on our configured color values.
  */
-PRIVATE void lynx_init_color_pair ARGS1(int, n)
+static void lynx_init_color_pair (int n)
 {
     int m;
 
@@ -695,7 +695,7 @@ PRIVATE void lynx_init_color_pair ARGS1(int, n)
     }
 }
 
-PRIVATE void lynx_map_color ARGS1(int, n)
+static void lynx_map_color (int n)
 {
     CTRACE((tfp, "lynx_map_color(%d)\n", n));
 
@@ -715,10 +715,10 @@ PRIVATE void lynx_map_color ARGS1(int, n)
  * Change a configured color value.  This may be called before initscr(), so
  * we may not be able to call init_pair() to finish the change.
  */
-PUBLIC int lynx_chg_color ARGS3(
-	int, color,
-	int, fg,
-	int, bg
+int lynx_chg_color (
+	int color,
+	int fg,
+	int bg
 	)
 {
     if (fg == ERR_COLOR || bg == ERR_COLOR) return -1;
@@ -732,7 +732,7 @@ PUBLIC int lynx_chg_color ARGS3(
     return 0;
 }
 
-PUBLIC void lynx_set_color ARGS1(int, a)
+void lynx_set_color (int a)
 {
     if (lynx_has_color && LYShowColor >= SHOW_COLOR_ON) {
 	wattrset(LYwin, lynx_color_cfg_attr(a)
@@ -742,7 +742,7 @@ PUBLIC void lynx_set_color ARGS1(int, a)
     }
 }
 
-PUBLIC void lynx_standout ARGS1(int, flag)
+void lynx_standout (int flag)
 {
     if (flag)
 	LYaddAttr(A_REVERSE);
@@ -750,7 +750,7 @@ PUBLIC void lynx_standout ARGS1(int, flag)
 	LYsubAttr(A_REVERSE);
 }
 
-PRIVATE void lynx_init_colors NOARGS
+static void lynx_init_colors (void)
 {
     if (lynx_has_color) {
 	size_t n;
@@ -769,7 +769,7 @@ PRIVATE void lynx_init_colors NOARGS
     }
 }
 
-PUBLIC void lynx_setup_colors NOARGS
+void lynx_setup_colors (void)
 {
     int n;
     CTRACE((tfp, "lynx_setup_colors\n"));
@@ -778,8 +778,8 @@ PUBLIC void lynx_setup_colors NOARGS
 }
 #endif /* USE_COLOR_TABLE */
 
-PUBLIC void LYnoVideo ARGS1(
-	int,		a)
+void LYnoVideo (
+	int		a)
 {
     CTRACE((tfp, "LYnoVideo(%d)\n", a));
 #ifdef USE_SLANG
@@ -831,11 +831,11 @@ static WINDOW *LYscreen = NULL;
 #endif /* !defined(VMS) && !defined(USE_SLANG) */
 
 #if defined(PDCURSES) && defined(PDC_BUILD) && PDC_BUILD >= 2401
-PUBLIC int saved_scrsize_x = 0;
-PUBLIC int saved_scrsize_y = 0;
+int saved_scrsize_x = 0;
+int saved_scrsize_y = 0;
 #endif
 
-PUBLIC void start_curses NOARGS
+void start_curses (void)
 {
 #ifdef USE_SLANG
     static int slinit;
@@ -1178,7 +1178,7 @@ PUBLIC void start_curses NOARGS
 }  /* end of start_curses() */
 
 
-PUBLIC void lynx_enable_mouse ARGS1(int,state)
+void lynx_enable_mouse (int state)
 {
 #ifdef USE_MOUSE
 /***********************************************************************/
@@ -1280,7 +1280,7 @@ PUBLIC void lynx_enable_mouse ARGS1(int,state)
  * other curses implementations, since the "cur_term->Nttyb" part is common to
  * SVr4 curses.
  */
-PUBLIC void lynx_nl2crlf ARGS1(int, normal GCC_UNUSED)
+void lynx_nl2crlf (int normal GCC_UNUSED)
 {
 #if defined(NCURSES_VERSION_PATCH) && defined(SET_TTY) && defined(TERMIOS) && defined(ONLCR)
     static TTY saved_tty;
@@ -1318,7 +1318,7 @@ PUBLIC void lynx_nl2crlf ARGS1(int, normal GCC_UNUSED)
 #endif
 }
 
-PUBLIC void stop_curses NOARGS
+void stop_curses (void)
 {
     if (LYCursesON)
 	echo();
@@ -1386,8 +1386,8 @@ PUBLIC void stop_curses NOARGS
 /*
  *  Check terminal type, start curses & setup terminal.
  */
-PUBLIC BOOLEAN setup ARGS1(
-	char *,		terminal)
+BOOLEAN setup (
+	char *		terminal)
 {
     int c;
     int status;
@@ -1459,8 +1459,8 @@ PUBLIC BOOLEAN setup ARGS1(
 /*
  *  Check terminal type, start curses & setup terminal.
  */
-PUBLIC BOOLEAN setup ARGS1(
-	char *,		terminal)
+BOOLEAN setup (
+	char *		terminal)
 {
     char *term_putenv = NULL;
     char *buffer = NULL;
@@ -1515,7 +1515,7 @@ PUBLIC BOOLEAN setup ARGS1(
      *  the current link is indistinguishable from all other links.
      *  The workaround here is to disable the 'rev' capability.
      */
-    if ((strncmp((CONST char *)ttytype, "sun", 3) == 0)) {
+    if ((strncmp((const char *)ttytype, "sun", 3) == 0)) {
 	LYnoVideo(2);
     }
 #endif /* HAVE_TTYTYPE */
@@ -1526,8 +1526,8 @@ PUBLIC BOOLEAN setup ARGS1(
     return(1);
 }
 
-PRIVATE int dumbterm ARGS1(
-	char *,		terminal)
+static int dumbterm (
+	char *		terminal)
 {
     int dumb = FALSE;
 
@@ -1549,30 +1549,30 @@ PRIVATE int dumbterm ARGS1(
 #ifdef FANCY_CURSES
 #ifndef USE_COLOR_STYLE
 #ifdef USE_COLOR_TABLE
-PUBLIC void LYaddWAttr ARGS2(
-	WINDOW *,	win,
-	int,		a)
+void LYaddWAttr (
+	WINDOW *	win,
+	int		a)
 {
     Current_Attr |= a;
     LYsetWAttr(win);
 }
 
-PUBLIC void LYaddAttr ARGS1(
-	int,		a)
+void LYaddAttr (
+	int		a)
 {
     LYaddWAttr(LYwin, a);
 }
 
-PUBLIC void LYsubWAttr ARGS2(
-	WINDOW *,	win,
-	int,		a)
+void LYsubWAttr (
+	WINDOW *	win,
+	int		a)
 {
     Current_Attr &= ~a;
     LYsetWAttr(win);
 }
 
-PUBLIC void LYsubAttr ARGS1(
-	int,		a)
+void LYsubAttr (
+	int		a)
 {
     LYsubWAttr(LYwin, a);
 }
@@ -1589,10 +1589,10 @@ PUBLIC void LYsubAttr ARGS1(
  * color to a uniform width in the popup-menu.
  */
 #ifndef USE_SLANG
-PUBLIC void LYpaddstr ARGS3(
-	WINDOW *,	the_window,
-	int,		width,
-	CONST char *,	the_string)
+void LYpaddstr (
+	WINDOW *	the_window,
+	int		width,
+	const char *	the_string)
 {
     int y, x;
     int actual = strlen(the_string);
@@ -1615,9 +1615,9 @@ PUBLIC void LYpaddstr ARGS3(
  * FIXME: the associated call on 'keypad()' is not needed for Unix, but
  * something in the OS/2 EMX port requires it.
  */
-PRIVATE WINDOW *my_subwindow;
+static WINDOW *my_subwindow;
 
-PUBLIC void LYsubwindow ARGS1(WINDOW *, param)
+void LYsubwindow (WINDOW * param)
 {
     if (param != 0) {
 	my_subwindow = param;
@@ -1636,17 +1636,17 @@ PUBLIC void LYsubwindow ARGS1(WINDOW *, param)
     }
 }
 
-PUBLIC WINDOW *LYtopwindow NOARGS
+WINDOW *LYtopwindow (void)
 {
     return (my_subwindow ? my_subwindow : LYwin);
 }
 #endif
 
-PUBLIC WINDOW *LYstartPopup ARGS4(
-    int,	top_y,
-    int,	left_x,
-    int,	height,
-    int,	width)
+WINDOW *LYstartPopup (
+    int	top_y,
+    int	left_x,
+    int	height,
+    int	width)
 {
     WINDOW *form_window = 0;
 #ifdef USE_SLANG
@@ -1684,7 +1684,7 @@ PUBLIC WINDOW *LYstartPopup ARGS4(
     return form_window;
 }
 
-PUBLIC void LYstartTargetEmphasis NOARGS
+void LYstartTargetEmphasis (void)
 {
 #ifdef USE_COLOR_STYLE
     if (s_whereis != NOSTYLE) {
@@ -1699,7 +1699,7 @@ PUBLIC void LYstartTargetEmphasis NOARGS
     lynx_start_underline();
 }
 
-PUBLIC void LYstopTargetEmphasis NOARGS
+void LYstopTargetEmphasis (void)
 {
 #ifdef USE_COLOR_STYLE
     if (s_whereis != NOSTYLE) {
@@ -1717,8 +1717,8 @@ PUBLIC void LYstopTargetEmphasis NOARGS
 /*
  * Accommodate the different flavors of touchline
  */
-PUBLIC void LYtouchline ARGS1(
-	int,		row)
+void LYtouchline (
+	int		row)
 {
 #if defined(HAVE_WREDRAWLN) && !defined(NCURSES_VERSION)
     wredrawln(LYwin, row, 1);
@@ -1746,10 +1746,10 @@ PUBLIC void LYtouchline ARGS1(
 /*
  * Wrapper for waddnstr().
  */
-PUBLIC void LYwaddnstr ARGS3(
-	WINDOW *,	w,
-	CONST char *,	src,
-	size_t,		len)
+void LYwaddnstr (
+	WINDOW *	w,
+	const char *	src,
+	size_t		len)
 {
     /*
      * We only want to trace this function for the color-style code.  It would
@@ -1962,9 +1962,9 @@ static	short	trap_flag = FALSE;	/* TRUE if AST is set		*/
 BOOLEAN DidCleanup = FALSE;		/* Exit handler flag		*/
 static char VersionVMS[20];		/* Version of VMS		*/
 
-PUBLIC int VMSVersion ARGS2(
-	char *,		VerString,
-	int,		VerLen)
+int VMSVersion (
+	char *		VerString,
+	int		VerLen)
 {
      unsigned long status, itm_cod = SYI$_VERSION;
      int i, verlen = 0;
@@ -1989,7 +1989,7 @@ PUBLIC int VMSVersion ARGS2(
      return strlen(VerString)+1;	/* Transmit ending 0 too */
 }
 
-PUBLIC void VMSexit NOARGS
+void VMSexit (void)
 {
     /*
      *	If we get here and DidCleanup is not set, it was via an
@@ -2031,7 +2031,7 @@ TRACEBACK if it can be captured, and any other relevant information.\n"));
  *		to EDIT, and sets up the Ctrl-C and Ctrl-Y interrupt
  *		handling.
  */
-PUBLIC int ttopen NOARGS
+int ttopen (void)
 {
 	int	iosb[2];
 	int	status;
@@ -2112,7 +2112,7 @@ PUBLIC int ttopen NOARGS
  *		to the command interpreter.  It puts the terminal back
  *		in a reasonable state.
  */
-PUBLIC int ttclose NOARGS
+int ttclose (void)
 {
 	int	status;
 	int	iosb[1];
@@ -2135,7 +2135,7 @@ PUBLIC int ttclose NOARGS
  *	TTGETC --
  *		Read a character from the terminal, with NOECHO and NOFILTR.
  */
-PUBLIC int ttgetc NOARGS
+int ttgetc (void)
 {
     int status;
     unsigned short iosb[4];
@@ -2167,7 +2167,7 @@ PUBLIC int ttgetc NOARGS
  *		Check whether a keystroke has been entered, and return
  *		 it, or -1 if none was entered.
  */
-PUBLIC int typeahead NOARGS
+int typeahead (void)
 {
     int status;
     unsigned short iosb[4];
@@ -2216,9 +2216,9 @@ again:
  *		 and VMSsignal() is just a "helper", also not a full emulation.
  */
 
-PUBLIC void VMSsignal (sig,func)
-int sig;
-void (*func)();
+void VMSsignal (
+int sig,
+void (*func)())
 {
 	int status;
 	short iosb[4];
@@ -2281,13 +2281,13 @@ void (*func)();
  *	or generates an ACCVIO during spawns.
  */
 #ifdef __DECC
-PRIVATE unsigned int DCLspawn_exception ARGS2(
-	void *,		sigarr,
-	void *,		mecharr)
+static unsigned int DCLspawn_exception (
+	void *		sigarr,
+	void *		mecharr)
 #else
-PRIVATE int DCLspawn_exception ARGS2(
-	void *,		sigarr,
-	void *,		mecharr)
+static int DCLspawn_exception (
+	void *		sigarr,
+	void *		mecharr)
 #endif /* __DECC */
 {
      int status;
@@ -2296,8 +2296,8 @@ PRIVATE int DCLspawn_exception ARGS2(
      return(SS$_UNWIND);
 }
 
-PRIVATE int spawn_DCLprocess ARGS1(
-	char *,		command)
+static int spawn_DCLprocess (
+	char *		command)
 {
      int status;
      unsigned long Status = 0;
@@ -2346,8 +2346,8 @@ PRIVATE int spawn_DCLprocess ARGS1(
      return(0);
 }
 
-PUBLIC int DCLsystem ARGS1(
-	char *,		command)
+int DCLsystem (
+	char *		command)
 {
      int status;
 
@@ -2364,7 +2364,7 @@ PUBLIC int DCLsystem ARGS1(
 /*
  * Return the physical screen dimensions that we're allowed to use.
  */
-PUBLIC int LYscreenHeight NOARGS
+int LYscreenHeight (void)
 {
     int result = LINES;
     if (result <= 0)
@@ -2372,7 +2372,7 @@ PUBLIC int LYscreenHeight NOARGS
     return result;
 }
 
-PUBLIC int LYscreenWidth NOARGS
+int LYscreenWidth (void)
 {
     int result = COLS;
 #if defined(PDCURSES_EXP) && defined(WIN_EX) && defined(CJK_EX) /* 1999/08/26 (Thu) 17:53:38 */
@@ -2392,7 +2392,7 @@ PUBLIC int LYscreenWidth NOARGS
  * The functions ifdef'd with USE_CURSES_PADS are implemented that way so we
  * don't break the slang configuration.
  */
-PUBLIC void LYclear NOARGS
+void LYclear (void)
 {
 #ifdef USE_CURSES_PADS
     wclear(LYwin);
@@ -2401,7 +2401,7 @@ PUBLIC void LYclear NOARGS
 #endif
 }
 
-PUBLIC void LYclrtoeol NOARGS
+void LYclrtoeol (void)
 {
 #ifdef USE_CURSES_PADS
     wclrtoeol(LYwin);
@@ -2410,7 +2410,7 @@ PUBLIC void LYclrtoeol NOARGS
 #endif
 }
 
-PUBLIC void LYerase NOARGS
+void LYerase (void)
 {
 #ifdef USE_CURSES_PADS
     werase(LYwin);
@@ -2419,7 +2419,7 @@ PUBLIC void LYerase NOARGS
 #endif
 }
 
-PUBLIC void LYmove ARGS2(int, y, int, x)
+void LYmove (int y, int x)
 {
 #ifdef USE_CURSES_PADS
     wmove(LYwin, y, x);
@@ -2428,7 +2428,7 @@ PUBLIC void LYmove ARGS2(int, y, int, x)
 #endif
 }
 
-PUBLIC void LYrefresh NOARGS
+void LYrefresh (void)
 {
 #ifdef USE_CURSES_PADS
     if (LYwin != stdscr) {
@@ -2465,28 +2465,28 @@ PUBLIC void LYrefresh NOARGS
 #endif
 }
 
-PUBLIC void lynx_force_repaint NOARGS
+void lynx_force_repaint (void)
 {
     clearok(curscr, TRUE);
 }
 
-PUBLIC void lynx_start_title_color NOARGS
+void lynx_start_title_color (void)
 {
 #ifdef SH_EX
     lynx_start_reverse();
 #endif
 }
 
-PUBLIC void lynx_stop_title_color NOARGS
+void lynx_stop_title_color (void)
 {
 #ifdef SH_EX
     lynx_stop_reverse();
 #endif
 }
 
-PUBLIC void lynx_start_link_color ARGS2(
-	int,	flag,
-	int,	pending)
+void lynx_start_link_color (
+	int	flag,
+	int	pending)
 {
     if (flag) {
 	/* makes some terminals work wrong because
@@ -2516,9 +2516,9 @@ PUBLIC void lynx_start_link_color ARGS2(
      }
 }
 
-PUBLIC void lynx_stop_link_color ARGS2(
-	int,	flag,
-	int,	pending GCC_UNUSED)
+void lynx_stop_link_color (
+	int	flag,
+	int	pending GCC_UNUSED)
 {
 #ifdef USE_COLOR_STYLE
     LynxChangeStyle(flag == ON ? s_alink : s_a, ABS_OFF);
@@ -2548,14 +2548,14 @@ PUBLIC void lynx_stop_link_color ARGS2(
 
 /* FIXME: consider inlining these */
 
-PUBLIC void lynx_stop_target_color NOARGS
+void lynx_stop_target_color (void)
 {
     lynx_stop_underline();
     lynx_stop_reverse();
     lynx_stop_bold();
 }
 
-PUBLIC void lynx_start_target_color NOARGS
+void lynx_start_target_color (void)
 {
     lynx_start_bold();
     lynx_start_reverse();
@@ -2563,7 +2563,7 @@ PUBLIC void lynx_start_target_color NOARGS
 }
 
 
-PUBLIC void lynx_start_status_color NOARGS
+void lynx_start_status_color (void)
 {
 #if defined(USE_COLOR_TABLE) && defined(COLOR_CURSES)
     if (lynx_has_color && LYShowColor >= SHOW_COLOR_ON)
@@ -2573,7 +2573,7 @@ PUBLIC void lynx_start_status_color NOARGS
 	lynx_start_reverse ();
 }
 
-PUBLIC void lynx_stop_status_color NOARGS
+void lynx_stop_status_color (void)
 {
 #if defined(USE_COLOR_TABLE) && defined(COLOR_CURSES)
     if (lynx_has_color && LYShowColor >= SHOW_COLOR_ON)
@@ -2583,39 +2583,39 @@ PUBLIC void lynx_stop_status_color NOARGS
 	lynx_stop_reverse ();
 }
 
-PUBLIC void lynx_start_h1_color NOARGS
+void lynx_start_h1_color (void)
 {
     if (bold_H1 || bold_headers)
 	lynx_start_bold();
 }
 
-PUBLIC void lynx_stop_h1_color NOARGS
+void lynx_stop_h1_color (void)
 {
     if (bold_H1 || bold_headers)
 	lynx_stop_bold();
 }
 
-PUBLIC void lynx_start_prompt_color NOARGS
+void lynx_start_prompt_color (void)
 {
     lynx_start_reverse ();
 }
 
-PUBLIC void lynx_stop_prompt_color NOARGS
+void lynx_stop_prompt_color (void)
 {
     lynx_stop_reverse ();
 }
 
-PUBLIC void lynx_start_radio_color NOARGS
+void lynx_start_radio_color (void)
 {
     lynx_start_bold ();
 }
 
-PUBLIC void lynx_stop_radio_color NOARGS
+void lynx_stop_radio_color (void)
 {
     lynx_stop_bold ();
 }
 
-PUBLIC void lynx_stop_all_colors NOARGS
+void lynx_stop_all_colors (void)
 {
     lynx_stop_underline ();
     lynx_stop_reverse ();
@@ -2625,32 +2625,32 @@ PUBLIC void lynx_stop_all_colors NOARGS
 /*
  * Wrappers for LYUnderlineLinks flag.
  */
-PUBLIC void lynx_start_bold NOARGS
+void lynx_start_bold (void)
 {
     start_bold();
 }
 
-PUBLIC void lynx_start_reverse NOARGS
+void lynx_start_reverse (void)
 {
     start_reverse();
 }
 
-PUBLIC void lynx_start_underline NOARGS
+void lynx_start_underline (void)
 {
     start_underline();
 }
 
-PUBLIC void lynx_stop_bold NOARGS
+void lynx_stop_bold (void)
 {
     stop_bold();
 }
 
-PUBLIC void lynx_stop_reverse NOARGS
+void lynx_stop_reverse (void)
 {
     stop_reverse();
 }
 
-PUBLIC void lynx_stop_underline NOARGS
+void lynx_stop_underline (void)
 {
     stop_underline();
 }
@@ -2664,10 +2664,10 @@ PUBLIC void lynx_stop_underline NOARGS
  * the current option's highlighting or color without the distraction of a
  * blinking cursor in the window.  - FM
  */
-PUBLIC void LYstowCursor ARGS3(
-    WINDOW *,	win,
-    int,	row,
-    int,	col)
+void LYstowCursor (
+    WINDOW *	win,
+    int	row,
+    int	col)
 {
     if (LYShowCursor)
 	wmove(win, row, col);
@@ -2684,7 +2684,7 @@ PUBLIC void LYstowCursor ARGS3(
 #  define BOOLEAN os2BOOLEAN
 #  define INCL_VIO
 #  include "os2.h"
-PRIVATE void make_blink_boldbg NOARGS
+static void make_blink_boldbg (void)
 {
     VIOINTENSITY buf;		/* VIO windows have it anyway, */
 				/* but FS session need a switch */
@@ -2699,7 +2699,7 @@ PRIVATE void make_blink_boldbg NOARGS
 /*
  * getattrs() is not in X/Open curses, but it is more convenient than this.
  */
-PUBLIC long LYgetattrs ARGS1(WINDOW *, win)
+long LYgetattrs (WINDOW * win)
 {
 #if ( defined(HAVE_GETATTRS) && ( !defined(NCURSES_MAJOR_VERSION) || NCURSES_VERSION_MAJOR < 5 ) )
     long result = 0;
diff --git a/src/LYCurses.h b/src/LYCurses.h
index 6168667d..aaec2500 100644
--- a/src/LYCurses.h
+++ b/src/LYCurses.h
@@ -288,13 +288,13 @@ typedef struct {
 #define LYstopPopup() /* nothing */
 #define LYtopwindow() LYwin
 #else
-extern void LYsubwindow PARAMS((WINDOW * param));
-extern WINDOW * LYtopwindow NOPARAMS;
+extern void LYsubwindow (WINDOW * param);
+extern WINDOW * LYtopwindow (void);
 #define LYstopPopup() LYsubwindow(0)
 #endif /* NCURSES */
 
-extern void LYbox PARAMS((WINDOW *win, BOOLEAN formfield));
-extern WINDOW *LYstartPopup PARAMS((int top_y, int left_x, int height, int width));
+extern void LYbox (WINDOW *win, BOOLEAN formfield);
+extern WINDOW *LYstartPopup (int top_y, int left_x, int height, int width);
 
 /*
  * Useful macros not in PDCurses or very old ncurses headers.
@@ -310,7 +310,7 @@ extern WINDOW *LYstartPopup PARAMS((int top_y, int left_x, int height, int width
 #endif
 
 #if defined(HAVE_WATTR_GET)
-extern long LYgetattrs PARAMS((WINDOW *win));
+extern long LYgetattrs (WINDOW *win);
 #else
 #if defined(HAVE_GETATTRS) || defined(getattrs)
 #define LYgetattrs(win) getattrs(win)
@@ -383,22 +383,22 @@ extern int Current_Attr;
 extern int Masked_Attr;
 #endif
 
-extern BOOLEAN setup PARAMS((char *terminal));
-extern int LYscreenHeight NOPARAMS;
-extern int LYscreenWidth NOPARAMS;
-extern void LYclear NOPARAMS;
-extern void LYclrtoeol NOPARAMS;
-extern void LYerase NOPARAMS;
-extern void LYmove PARAMS((int y, int x));
-extern void LYnoVideo PARAMS((int mask));
-extern void LYpaddstr PARAMS((WINDOW *w, int width, CONST char *s));
-extern void LYrefresh NOPARAMS;
-extern void LYstartTargetEmphasis NOPARAMS;
-extern void LYstopTargetEmphasis NOPARAMS;
-extern void LYtouchline PARAMS((int row));
-extern void LYwaddnstr PARAMS((WINDOW *w, CONST char *s, size_t len));
-extern void start_curses NOPARAMS;
-extern void stop_curses NOPARAMS;
+extern BOOLEAN setup (char *terminal);
+extern int LYscreenHeight (void);
+extern int LYscreenWidth (void);
+extern void LYclear (void);
+extern void LYclrtoeol (void);
+extern void LYerase (void);
+extern void LYmove (int y, int x);
+extern void LYnoVideo (int mask);
+extern void LYpaddstr (WINDOW *w, int width, const char *s);
+extern void LYrefresh (void);
+extern void LYstartTargetEmphasis (void);
+extern void LYstopTargetEmphasis (void);
+extern void LYtouchline (int row);
+extern void LYwaddnstr (WINDOW *w, const char *s, size_t len);
+extern void start_curses (void);
+extern void stop_curses (void);
 
 #define LYaddstr(s)      LYwaddnstr(LYwin, s, strlen(s))
 #define LYaddnstr(s,len) LYwaddnstr(LYwin, s, len)
@@ -410,16 +410,16 @@ extern void VMSexit();
 extern int ttopen();
 extern int ttclose();
 extern int ttgetc();
-extern void VMSsignal PARAMS((int sig, void (*func)()));
+extern void VMSsignal (int sig, void (*func)());
 #endif /* VMS */
 
 #if defined(USE_COLOR_STYLE)
-extern void curses_css PARAMS((char * name, int dir));
-extern void curses_style PARAMS((int style, int dir));
-extern void setHashStyle PARAMS((int style, int color, int cattr, int mono, char* element));
-extern void setStyle PARAMS((int style, int color, int cattr, int mono));
-extern void wcurses_css PARAMS((WINDOW * win, char* name, int dir));
-extern void curses_w_style PARAMS((WINDOW* win, int style, int	dir));
+extern void curses_css (char * name, int dir);
+extern void curses_style (int style, int dir);
+extern void setHashStyle (int style, int color, int cattr, int mono, char* element);
+extern void setStyle (int style, int color, int cattr, int mono);
+extern void wcurses_css (WINDOW * win, char* name, int dir);
+extern void curses_w_style (WINDOW* win, int style, int	dir);
 #  define LynxChangeStyle(style,dir) curses_style(style,dir)
 #  define LynxWChangeStyle(win,style,dir) curses_w_style(win,style,dir)
 #else
@@ -427,9 +427,9 @@ extern void curses_w_style PARAMS((WINDOW* win, int style, int	dir));
 #endif /* USE_COLOR_STYLE */
 
 #ifdef USE_COLOR_TABLE
-extern void LYaddAttr PARAMS((int a));
-extern void LYsubAttr PARAMS((int a));
-extern void lynx_setup_colors NOPARAMS;
+extern void LYaddAttr (int a);
+extern void LYsubAttr (int a);
+extern void lynx_setup_colors (void);
 extern unsigned int Lynx_Color_Flags;
 #endif
 
@@ -471,7 +471,7 @@ extern int PHYSICAL_SLtt_Screen_Cols;
 #define LINES SLtt_Screen_Rows
 #define move SLsmg_gotorc
 #define addstr SLsmg_write_string
-extern void LY_SLerase NOPARAMS;
+extern void LY_SLerase (void);
 #define erase LY_SLerase
 #define clear LY_SLerase
 #define standout SLsmg_reverse_video
@@ -500,14 +500,14 @@ extern BOOLEAN FullRefresh;
 #undef clearok
 #endif /* clearok */
 #define clearok(a,b) { FullRefresh = (BOOLEAN)b; }
-extern void LY_SLrefresh NOPARAMS;
+extern void LY_SLrefresh (void);
 #ifdef refresh
 #undef refresh
 #endif /* refresh */
 #define refresh LY_SLrefresh
 
 #ifdef VMS
-extern void VTHome NOPARAMS;
+extern void VTHome (void);
 #define endwin() LYclear(),refresh(),SLsmg_reset_smg(),VTHome()
 #else
 #define endwin SLsmg_reset_smg(),SLang_reset_tty
@@ -535,7 +535,7 @@ extern void VTHome NOPARAMS;
 
 #else /* Not VMS: */
 
-extern int string_to_attr PARAMS((char *name));
+extern int string_to_attr (char *name);
 
 /*
  *  For Unix FANCY_FANCY curses we interpose
@@ -543,13 +543,13 @@ extern int string_to_attr PARAMS((char *name));
  *  A_foo attributes. - FM
  */
 #ifdef USE_COLOR_TABLE
-extern void LYaddWAttr PARAMS((WINDOW *win, int a));
-extern void LYsubWAttr PARAMS((WINDOW *win, int a));
-extern void LYaddWAttr PARAMS((WINDOW *win, int a));
-extern void LYsubWAttr PARAMS((WINDOW *win, int a));
-extern void lynx_set_color PARAMS((int a));
-extern void lynx_standout  PARAMS((int a));
-extern int  lynx_chg_color PARAMS((int, int, int));
+extern void LYaddWAttr (WINDOW *win, int a);
+extern void LYsubWAttr (WINDOW *win, int a);
+extern void LYaddWAttr (WINDOW *win, int a);
+extern void LYsubWAttr (WINDOW *win, int a);
+extern void lynx_set_color (int a);
+extern void lynx_standout  (int a);
+extern int  lynx_chg_color (int, int, int);
 #undef  standout
 #define standout() 		lynx_standout(TRUE)
 #undef  standend
@@ -665,31 +665,31 @@ FANCY_CURSES.  Check your config.log to see why the FANCY_CURSES test failed.
 #endif
 #endif
 
-extern void lynx_enable_mouse PARAMS((int));
-extern void lynx_force_repaint NOPARAMS;
-extern void lynx_nl2crlf PARAMS((int normal));
-extern void lynx_start_title_color NOPARAMS;
-extern void lynx_stop_title_color NOPARAMS;
-extern void lynx_start_link_color PARAMS((int flag, int pending));
-extern void lynx_stop_link_color PARAMS((int flag, int pending));
-extern void lynx_stop_target_color NOPARAMS;
-extern void lynx_start_target_color NOPARAMS;
-extern void lynx_start_status_color NOPARAMS;
-extern void lynx_stop_status_color NOPARAMS;
-extern void lynx_start_h1_color NOPARAMS;
-extern void lynx_stop_h1_color NOPARAMS;
-extern void lynx_start_prompt_color NOPARAMS;
-extern void lynx_stop_prompt_color NOPARAMS;
-extern void lynx_start_radio_color NOPARAMS;
-extern void lynx_stop_radio_color NOPARAMS;
-extern void lynx_stop_all_colors NOPARAMS;
-
-extern void lynx_start_bold NOPARAMS;
-extern void lynx_start_reverse NOPARAMS;
-extern void lynx_start_underline NOPARAMS;
-extern void lynx_stop_bold NOPARAMS;
-extern void lynx_stop_reverse NOPARAMS;
-extern void lynx_stop_underline NOPARAMS;
+extern void lynx_enable_mouse (int);
+extern void lynx_force_repaint (void);
+extern void lynx_nl2crlf (int normal);
+extern void lynx_start_title_color (void);
+extern void lynx_stop_title_color (void);
+extern void lynx_start_link_color (int flag, int pending);
+extern void lynx_stop_link_color (int flag, int pending);
+extern void lynx_stop_target_color (void);
+extern void lynx_start_target_color (void);
+extern void lynx_start_status_color (void);
+extern void lynx_stop_status_color (void);
+extern void lynx_start_h1_color (void);
+extern void lynx_stop_h1_color (void);
+extern void lynx_start_prompt_color (void);
+extern void lynx_stop_prompt_color (void);
+extern void lynx_start_radio_color (void);
+extern void lynx_stop_radio_color (void);
+extern void lynx_stop_all_colors (void);
+
+extern void lynx_start_bold (void);
+extern void lynx_start_reverse (void);
+extern void lynx_start_underline (void);
+extern void lynx_stop_bold (void);
+extern void lynx_stop_reverse (void);
+extern void lynx_stop_underline (void);
 
 /*
  * To prevent corrupting binary data on DOS, MS-WINDOWS or OS/2 we open files
@@ -721,6 +721,6 @@ extern void lynx_stop_underline NOPARAMS;
 #define LYHideCursor() LYmove((LYlines - 1), (LYcols - 2))
 #endif
 
-extern void LYstowCursor PARAMS((WINDOW * win, int row, int col));
+extern void LYstowCursor (WINDOW * win, int row, int col);
 
 #endif /* LYCURSES_H */
diff --git a/src/LYDownload.c b/src/LYDownload.c
index 7f938374..b95602fb 100644
--- a/src/LYDownload.c
+++ b/src/LYDownload.c
@@ -19,13 +19,13 @@
  *  LYNXDOWNLOAD://Method=<#>/File=<STRING>/SugFile=<STRING>
  */
 #ifdef VMS
-PUBLIC BOOLEAN LYDidRename = FALSE;
+BOOLEAN LYDidRename = FALSE;
 #endif /* VMS */
 
-PRIVATE char LYValidDownloadFile[LY_MAXPATH] = "\0";
+static char LYValidDownloadFile[LY_MAXPATH] = "\0";
 
-PUBLIC void LYDownload ARGS1(
-	char *,		line)
+void LYDownload (
+	char *		line)
 {
     char *Line = NULL, *method, *file, *sug_file = NULL;
     int method_number;
@@ -466,9 +466,9 @@ cancelled:
  * Compare a filename with a given suffix, which we have set to give a rough
  * idea of its content.
  */
-PRIVATE int SuffixIs ARGS2(
-	char *,		filename,
-	char *,		suffix)
+static int SuffixIs (
+	char *		filename,
+	char *		suffix)
 {
     size_t have = strlen(filename);
     size_t need = strlen(suffix);
@@ -481,9 +481,9 @@ PRIVATE int SuffixIs ARGS2(
  *  they select all other links.  Download links look like:
  *  LYNXDOWNLOAD://Method=<#>/File=<STRING>/SugFile=<STRING>
  */
-PUBLIC int LYdownload_options ARGS2(
-	char **,	newfile,
-	char *,		data_file)
+int LYdownload_options (
+	char **	newfile,
+	char *		data_file)
 {
     static char tempfile[LY_MAXPATH] = "\0";
     char *downloaded_url = NULL;
diff --git a/src/LYDownload.h b/src/LYDownload.h
index b7d75ae7..9054016b 100644
--- a/src/LYDownload.h
+++ b/src/LYDownload.h
@@ -5,8 +5,8 @@
 #include <LYStructs.h>
 #endif /* LYSTRUCTS_H */
 
-extern void LYDownload PARAMS((char *line));
-extern int LYdownload_options PARAMS((char **newfile, char *data_file));
+extern void LYDownload (char *line);
+extern int LYdownload_options (char **newfile, char *data_file);
 
 #ifdef VMS
 extern BOOLEAN LYDidRename;
diff --git a/src/LYEdit.c b/src/LYEdit.c
index 3f06242d..a9362477 100644
--- a/src/LYEdit.c
+++ b/src/LYEdit.c
@@ -11,9 +11,9 @@
 
 #include <LYLeaks.h>
 
-PUBLIC BOOLEAN editor_can_position NOARGS
+BOOLEAN editor_can_position (void)
 {
-    static CONST char *table[] = {
+    static const char *table[] = {
 #ifdef VMS
 	"sedt",
 	"SEDT"
@@ -47,10 +47,10 @@ PUBLIC BOOLEAN editor_can_position NOARGS
  *
  *  Returns FALSE if file is uneditable.
  */
-PUBLIC int edit_current_file ARGS3(
-	char *,		newfile,
-	int,		cur,
-	int,		lineno)
+int edit_current_file (
+	char *		newfile,
+	int		cur,
+	int		lineno)
 {
     int result = FALSE;
     char *filename = NULL;
@@ -160,10 +160,10 @@ done:
     return (result);
 }
 
-PUBLIC void edit_temporary_file ARGS3(
-	char *,		filename,
-	char *,		position,
-	char *,		message)
+void edit_temporary_file (
+	char *		filename,
+	char *		position,
+	char *		message)
 {
 #ifdef UNIX
     struct stat stat_info;
diff --git a/src/LYEdit.h b/src/LYEdit.h
index 7aa95815..0c42670f 100644
--- a/src/LYEdit.h
+++ b/src/LYEdit.h
@@ -5,8 +5,8 @@
 #include <HTUtils.h>
 #endif
 
-extern BOOLEAN editor_can_position NOPARAMS;
-extern int edit_current_file PARAMS((char *newfile, int cur, int lineno));
-extern void edit_temporary_file PARAMS((char * filename, char * position, char * message));
+extern BOOLEAN editor_can_position (void);
+extern int edit_current_file (char *newfile, int cur, int lineno);
+extern void edit_temporary_file (char * filename, char * position, char * message);
 
 #endif /* LYEDIT_H */
diff --git a/src/LYEditmap.c b/src/LYEditmap.c
index 6ddffe04..fc3a01fc 100644
--- a/src/LYEditmap.c
+++ b/src/LYEditmap.c
@@ -25,14 +25,14 @@
 
 #endif  /* EXP_ALT_BINDINGS */
 
-PUBLIC int current_lineedit = 0;  /* Index into LYLineEditors[]   */
+int current_lineedit = 0;  /* Index into LYLineEditors[]   */
 
-PUBLIC int escape_bound = 0;      /* User wanted Escape to perform actions?  */
+int escape_bound = 0;      /* User wanted Escape to perform actions?  */
 
 /*
  * See LYStrings.h for the LYE definitions.
  */
-PRIVATE LYEditCode DefaultEditBinding[KEYMAP_SIZE-1]={
+static LYEditCode DefaultEditBinding[KEYMAP_SIZE-1]={
 
 LYE_NOP,        LYE_BOL,        LYE_DELPW,      LYE_ABORT,
 /* nul          ^A              ^B              ^C      */
@@ -278,7 +278,7 @@ LYE_NOP,        LYE_NOP,        LYE_NOP,        LYE_NOP,
 /* Why the difference for tab? - kw */
 
 #ifdef EXP_ALT_BINDINGS
-PRIVATE LYEditCode BetterEditBinding[KEYMAP_SIZE-1]={
+static LYEditCode BetterEditBinding[KEYMAP_SIZE-1]={
 
 LYE_NOP,        LYE_BOL,        LYE_BACK,       LYE_ABORT,
 /* nul          ^A              ^B              ^C      */
@@ -536,7 +536,7 @@ LYE_NOP,        LYE_NOP,        LYE_NOP,        LYE_NOP,
              /*         M-bs,M-del=delete-prev-word, M-d=delete-next-word, */
              /*                M-b=BACKW,            M-f=FORWW,            */
 
-PRIVATE LYEditCode BashlikeEditBinding[KEYMAP_SIZE-1]={
+static LYEditCode BashlikeEditBinding[KEYMAP_SIZE-1]={
 
 LYE_SETMARK,    LYE_BOL,        LYE_BACK,       LYE_ABORT,
 /* nul          ^A              ^B              ^C      */
@@ -779,7 +779,7 @@ LYE_NOP,        LYE_NOP,        LYE_NOP,        LYE_NOP,
  *  that map a lynxkeycode to LYE_SETMn.  ( This doesn't apply if
  *  the modifier is already being set in LYgetch(). ) - kw
  */
-PRIVATE short Mod1Binding[LAST_MOD1_LKC+1]={
+static short Mod1Binding[LAST_MOD1_LKC+1]={
 
 LYE_NOP,        LYE_BOL,        LYE_BACKW,      LYE_UNMOD,
 /* nul          ^A              ^B              ^C      */
@@ -918,8 +918,8 @@ LYE_UNMOD,      LYE_UNMOD,
 /*  Two more tables here, but currently they are all the same.
     In other words, we are cheating to save space, until there
     is a need for different tables. - kw */
-PRIVATE short *Mod2Binding = Mod1Binding;
-PRIVATE short *Mod3Binding = Mod1Binding;
+static short *Mod2Binding = Mod1Binding;
+static short *Mod3Binding = Mod1Binding;
 
 #endif /* EXP_ALT_BINDINGS */
 
@@ -928,7 +928,7 @@ PRIVATE short *Mod3Binding = Mod1Binding;
  * Add the array name to LYLineEditors
  */
 
-PUBLIC LYEditCode * LYLineEditors[]={
+LYEditCode * LYLineEditors[]={
         DefaultEditBinding,     /* You can't please everyone, so you ... DW */
 #ifdef EXP_ALT_BINDINGS
 	BetterEditBinding,      /* No, you certainly can't ... /ked 10/27/98*/
@@ -940,7 +940,7 @@ PUBLIC LYEditCode * LYLineEditors[]={
  * Add the name that the user will see below.
  * The order of LYLineEditors and LYLineditNames MUST be the same.
  */
-PUBLIC char * LYLineeditNames[]={
+char * LYLineeditNames[]={
 	"Default Binding",
 #ifdef EXP_ALT_BINDINGS
 	"Alternate Bindings",
@@ -955,7 +955,7 @@ PUBLIC char * LYLineeditNames[]={
  *
  * The order must correspond to that of LYLineditNames.
  */
-PUBLIC CONST char * LYLineeditHelpURLs[]={
+const char * LYLineeditHelpURLs[]={
 	EDIT_HELP,
 #ifdef EXP_ALT_BINDINGS
 	ALT_EDIT_HELP,
@@ -964,8 +964,8 @@ PUBLIC CONST char * LYLineeditHelpURLs[]={
 	(char *) 0
 };
 
-PUBLIC int EditBinding ARGS1(
-    int,	xlkc)
+int EditBinding (
+    int	xlkc)
 {
     int editaction, xleac = LYE_UNMOD;
     int c = xlkc & LKC_MASK;
@@ -1023,10 +1023,10 @@ PUBLIC int EditBinding ARGS1(
  *  as a result of re-parsing lynx.cfg), we don't remember the
  *  original editaction from the Bindings tables anywhere. - kw
  */
-PUBLIC BOOL LYRemapEditBinding ARGS3(
-    int,	xlkc,
-    int,	lec,
-    int,	select_edi)
+BOOL LYRemapEditBinding (
+    int	xlkc,
+    int	lec,
+    int	select_edi)
 {
     int j;
     int c = xlkc & LKC_MASK;
@@ -1091,8 +1091,8 @@ PUBLIC BOOL LYRemapEditBinding ARGS3(
 			(i==255) ? (-1) :i+1)
 #define FIRST_I 97
 
-PUBLIC int LYKeyForEditAction ARGS1(
-    int,		lec)
+int LYKeyForEditAction (
+    int		lec)
 {
     int editaction, i;
     for (i = FIRST_I; i >= 0; i = NEXT_I(i,KEYMAP_SIZE-2)) {
@@ -1122,9 +1122,9 @@ PUBLIC int LYKeyForEditAction ARGS1(
  *  This is all a bit long - it is general enough to continue to work
  *  should the three Mod<N>Binding[] become different tables. - kw
  */
-PUBLIC int LYEditKeyForAction ARGS2(
-    int,		lac,
-    int *,		pmodkey)
+int LYEditKeyForAction (
+    int		lac,
+    int *		pmodkey)
 {
     int editaction, i, c;
     int mod1found = -1, mod2found = -1, mod3found = -1;
@@ -1292,7 +1292,7 @@ PUBLIC int LYEditKeyForAction ARGS2(
  * if the external model is common block, and the
  * module is ever placed in a library. - FM
  */
-PUBLIC int LYEditmapDeclared NOARGS
+int LYEditmapDeclared (void)
 {
     int status = 1;
 
diff --git a/src/LYExtern.c b/src/LYExtern.c
index 2ea87a0c..aaed5c26 100644
--- a/src/LYExtern.c
+++ b/src/LYExtern.c
@@ -69,8 +69,8 @@ static char *decode_string(char *s)
 /*
  *  Quote the path to make it safe for shell command processing.
  */
-PUBLIC char * quote_pathname ARGS1(
-	char *, 	pathname)
+char * quote_pathname (
+	char * 	pathname)
 {
     char * result = NULL;
 
@@ -84,10 +84,10 @@ PUBLIC char * quote_pathname ARGS1(
 #endif /* WIN_EX */
 
 
-PRIVATE void format ARGS3(
-    char **,	result,
-    char *,	fmt,
-    char *,	parm)
+static void format (
+    char **	result,
+    char *	fmt,
+    char *	parm)
 {
     *result = NULL;
     HTAddParam(result, fmt, 1, parm);
@@ -102,9 +102,9 @@ PRIVATE void format ARGS3(
  * Prevent spoofing of the shell.  Dunno how this needs to be modified for VMS
  * or DOS.  - kw
  */
-PRIVATE char *format_command ARGS2(
-    char *,	command,
-    char *,	param)
+static char *format_command (
+    char *	command,
+    char *	param)
 {
     char *cmdbuf = NULL;
 
@@ -175,9 +175,9 @@ PRIVATE char *format_command ARGS2(
  * more than one possibility, make a popup menu of the matching commands and
  * allow the user to select one.  Return the selected command.
  */
-PRIVATE char *lookup_external ARGS2(
-    char *, 	param,
-    BOOL,	only_overriders)
+static char *lookup_external (
+    char * 	param,
+    BOOL	only_overriders)
 {
     int pass, num_disabled, num_matched, num_choices, cur_choice;
     int length = 0;
@@ -228,7 +228,7 @@ PRIVATE char *lookup_external ARGS2(
 			-1,
 			0,
 			old_x,
-			(CONST char **)choices,
+			(const char **)choices,
 			-1,
 			-1,
 			FALSE,
@@ -252,9 +252,9 @@ PRIVATE char *lookup_external ARGS2(
     return cmdbuf;
 }
 
-BOOL run_external ARGS2(
-    char *, 	param,
-    BOOL,	only_overriders)
+BOOL run_external (
+    char * 	param,
+    BOOL	only_overriders)
 {
 #ifdef WIN_EX
     int status;
diff --git a/src/LYExtern.h b/src/LYExtern.h
index 51bf855f..7208fa04 100644
--- a/src/LYExtern.h
+++ b/src/LYExtern.h
@@ -6,10 +6,10 @@
 #endif /* LYSTRUCTS_H */
 
 /*returns TRUE if something matching was executed*/
-BOOL run_external PARAMS((char * c, BOOL only_overriders));
+BOOL run_external (char * c, BOOL only_overriders);
 
 #ifdef WIN_EX
-extern char * quote_pathname PARAMS((char * pathname));
+extern char * quote_pathname (char * pathname);
 #endif
 
 #endif /* EXTERNALS_H */
diff --git a/src/LYForms.c b/src/LYForms.c
index a959a762..c0cef091 100644
--- a/src/LYForms.c
+++ b/src/LYForms.c
@@ -25,16 +25,16 @@
 #define CTRL_W_HACK 23  /* CTRL-W refresh without clearok */
 #endif /* VMS && !USE_SLANG */
 
-PRIVATE int form_getstr PARAMS((
+static int form_getstr (
 	int		cur,
 	BOOLEAN		use_last_tfpos,
-	BOOLEAN		redraw_only));
+	BOOLEAN		redraw_only);
 
 /*
  * Returns an array of pointers to the given list
  */
-PRIVATE char ** options_list ARGS1(
-	OptionType *,	opt_ptr)
+static char ** options_list (
+	OptionType *	opt_ptr)
 {
     char **result = 0;
     size_t len;
@@ -58,13 +58,13 @@ PRIVATE char ** options_list ARGS1(
     return result;
 }
 
-PUBLIC int change_form_link_ex ARGS6(
-	int,		cur,
-	DocInfo *,	newdoc,
-	BOOLEAN *,	refresh_screen,
-	BOOLEAN,	use_last_tfpos,
-	BOOLEAN,	immediate_submit,
-	BOOLEAN,	redraw_only)
+int change_form_link_ex (
+	int		cur,
+	DocInfo *	newdoc,
+	BOOLEAN *	refresh_screen,
+	BOOLEAN	use_last_tfpos,
+	BOOLEAN	immediate_submit,
+	BOOLEAN	redraw_only)
 {
     FormInfo *form = links[cur].l_form;
     char *link_name = form->name;
@@ -107,7 +107,7 @@ PUBLIC int change_form_link_ex ARGS6(
 		dummy = LYhandlePopupList(form->num_value,
 					  links[cur].ly,
 					  links[cur].lx,
-					  (CONST char **)my_data,
+					  (const char **)my_data,
 					  form->size,
 					  form->size_l,
 					  form->disabled,
@@ -125,7 +125,7 @@ PUBLIC int change_form_link_ex ARGS6(
 	    form->num_value = LYhandlePopupList(form->num_value,
 						links[cur].ly,
 						links[cur].lx,
-						(CONST char **)my_data,
+						(const char **)my_data,
 						form->size,
 						form->size_l,
 						form->disabled,
@@ -342,12 +342,12 @@ PUBLIC int change_form_link_ex ARGS6(
     return(c);
 }
 
-PUBLIC int change_form_link ARGS5(
-	int,		cur,
-	DocInfo *,	newdoc,
-	BOOLEAN *,	refresh_screen,
-	BOOLEAN,	use_last_tfpos,
-	BOOLEAN,	immediate_submit)
+int change_form_link (
+	int		cur,
+	DocInfo *	newdoc,
+	BOOLEAN *	refresh_screen,
+	BOOLEAN	use_last_tfpos,
+	BOOLEAN	immediate_submit)
 {
     /*pass all our args and FALSE as last arg*/
     return change_form_link_ex(cur,
@@ -358,18 +358,18 @@ PUBLIC int change_form_link ARGS5(
 			       FALSE /*redraw_only*/ );
 }
 
-PRIVATE int LastTFPos = -1;	/* remember last text field position */
+static int LastTFPos = -1;	/* remember last text field position */
 
-PRIVATE void LYSetLastTFPos ARGS1(
-    int,	pos)
+static void LYSetLastTFPos (
+    int	pos)
 {
     LastTFPos = pos;
 }
 
-PRIVATE int form_getstr ARGS3(
-	int,		cur,
-	BOOLEAN,	use_last_tfpos,
-	BOOLEAN,	redraw_only)
+static int form_getstr (
+	int		cur,
+	BOOLEAN	use_last_tfpos,
+	BOOLEAN	redraw_only)
 {
     FormInfo *form = links[cur].l_form;
     char *value = form->value;
@@ -854,9 +854,9 @@ again:
 /*
  *  Display statusline info tailored for the current form field.
  */
-PUBLIC void show_formlink_statusline ARGS2(
-    CONST FormInfo *,	form,
-    int,		for_what)
+void show_formlink_statusline (
+    const FormInfo *	form,
+    int		for_what)
 {
     switch(form->type) {
     case F_PASSWORD_TYPE:
diff --git a/src/LYGetFile.c b/src/LYGetFile.c
index 008ee5c6..57564159 100644
--- a/src/LYGetFile.c
+++ b/src/LYGetFile.c
@@ -33,7 +33,7 @@
 #include <LYexit.h>
 #include <LYLeaks.h>
 
-PRIVATE int fix_httplike_urls PARAMS((DocInfo *doc, UrlTypes type));
+static int fix_httplike_urls (DocInfo *doc, UrlTypes type);
 
 #ifdef VMS
 #define STRNADDRCOMP strncasecomp
@@ -41,7 +41,7 @@ PRIVATE int fix_httplike_urls PARAMS((DocInfo *doc, UrlTypes type));
 #define STRNADDRCOMP strncmp
 #endif /* !VMS */
 
-PUBLIC int HTNoDataOK = 0;
+int HTNoDataOK = 0;
 
 /*
  *  getfile is the main mechanism to load a new document (or a previously
@@ -66,8 +66,8 @@ PUBLIC int HTNoDataOK = 0;
  *  logging) errors inappropriately with -traversal, and from sending
  *  bogus error mail with MAIL_SYSTEM_ERROR_LOGGING:TRUE. - kw
  */
-PUBLIC int getfile ARGS1(
-	DocInfo *,	doc)
+int getfile (
+	DocInfo *	doc)
 {
     int url_type = 0;
     char *cp = NULL;
@@ -530,7 +530,7 @@ Try_Redirected_URL:
 		HTUserMsg(MAIL_DISABLED);
 	    } else {
 		HTParentAnchor *tmpanchor = HTAnchor_findAddress(&WWWDoc);
-		CONST char *title;
+		const char *title;
 		char *tmptitle = NULL;
 
 		title = "";
@@ -1097,8 +1097,8 @@ Try_Redirected_URL:
  *  mode ==  0: reset to normal if it was set to source
  *  - kw
  */
-PUBLIC void srcmode_for_next_retrieval ARGS1(
-    int,	mode)
+void srcmode_for_next_retrieval (
+    int	mode)
 {
     if (mode < 0) {
 	HTOutputFormat = WWW_PRESENT;
@@ -1142,11 +1142,11 @@ PUBLIC void srcmode_for_next_retrieval ARGS1(
  *  If follow_link_number returns DO_NOTHING nothing special
  *   will run after it.
  */
-PUBLIC int follow_link_number ARGS4(
-	int,		c,
-	int,		cur,
-	DocInfo *,	doc,
-	int *,		num)
+int follow_link_number (
+	int		c,
+	int		cur,
+	DocInfo *	doc,
+	int *		num)
 {
     char temp[120];
     char *p = temp;
@@ -1294,7 +1294,7 @@ static struct trust *always_trusted_exec = &always_trusted_exec_default;
 static struct trust *trusted_cgi = &trusted_cgi_default;
 
 #ifdef LY_FIND_LEAKS
-PRIVATE void LYTrusted_free NOARGS
+static void LYTrusted_free (void)
 {
     struct trust *cur;
     struct trust *next;
@@ -1336,9 +1336,9 @@ PRIVATE void LYTrusted_free NOARGS
 }
 #endif /* LY_FIND_LEAKS */
 
-PUBLIC void add_trusted ARGS2(
-	char *,		str,
-	int,		type)
+void add_trusted (
+	char *		str,
+	int		type)
 {
     struct trust *tp;
     char *path;
@@ -1393,14 +1393,14 @@ PUBLIC void add_trusted ARGS2(
 /*
  *  Check to see if the supplied paths is allowed to be executed.
  */
-PUBLIC BOOLEAN exec_ok ARGS3(
-	CONST char *,	source,
-	CONST char *,	linktext,
-	int,		type)
+BOOLEAN exec_ok (
+	const char *	source,
+	const char *	linktext,
+	int		type)
 {
     struct trust *tp;
-    CONST char *cp;
-    CONST char *allowed_extra_chars;
+    const char *cp;
+    const char *allowed_extra_chars;
     int Type = type;
 
     /*
@@ -1473,7 +1473,7 @@ PUBLIC BOOLEAN exec_ok ARGS3(
 check_tp_for_entry:
     while (tp) {
 	if (tp->type == Type) {
-	    char CONST *command = linktext;
+	    char const *command = linktext;
 
 	    if (strstr(command,"//") == linktext) {
 		command += 2;
@@ -1496,9 +1496,9 @@ check_tp_for_entry:
 }
 #endif /* EXEC_LINKS || LYNXCGI_LINKS */
 
-PRIVATE int fix_httplike_urls ARGS2(
-	DocInfo *,	doc,
-	UrlTypes,	type)
+static int fix_httplike_urls (
+	DocInfo *	doc,
+	UrlTypes	type)
 {
     char *slash;
 
diff --git a/src/LYGetFile.h b/src/LYGetFile.h
index 7dbc7b5b..c00e4403 100644
--- a/src/LYGetFile.h
+++ b/src/LYGetFile.h
@@ -7,15 +7,15 @@
 #define NORMAL 1
 #define NULLFILE 3
 
-extern int getfile PARAMS((DocInfo *doc));
-extern void srcmode_for_next_retrieval PARAMS((int));
-extern int follow_link_number PARAMS((
+extern int getfile (DocInfo *doc);
+extern void srcmode_for_next_retrieval (int);
+extern int follow_link_number (
 	int		c,
 	int		cur,
 	DocInfo *	doc,
-	int *		num));
-extern void add_trusted PARAMS((char *str, int type));
-extern BOOLEAN exec_ok PARAMS((CONST char *source, CONST char *linkpath, int type));
+	int *		num);
+extern void add_trusted (char *str, int type);
+extern BOOLEAN exec_ok (const char *source, const char *linkpath, int type);
 
 extern char * WWW_Download_File;
 
diff --git a/src/LYHash.c b/src/LYHash.c
index 93bc93f3..ac966639 100644
--- a/src/LYHash.c
+++ b/src/LYHash.c
@@ -13,10 +13,10 @@
 #define HASH_SIZE CSHASHSIZE
 #define HASH_OF(h, v) ((int)((h) * 3 + UCH(v)) % HASH_SIZE)
 
-PUBLIC int hash_code ARGS1 (CONST char*, string)
+int hash_code (const char* string)
 {
     int hash;
-    CONST char *p;
+    const char *p;
 
     for (p = string, hash = 0; *p; p++)
 	hash = HASH_OF(hash,*p);
@@ -24,10 +24,10 @@ PUBLIC int hash_code ARGS1 (CONST char*, string)
     return hash;
 }
 
-PUBLIC int hash_code_lowercase_on_fly ARGS1 (CONST char*, string)
+int hash_code_lowercase_on_fly (const char* string)
 {
     int hash;
-    CONST char *p;
+    const char *p;
 
     for (p = string, hash = 0; *p; p++)
 	hash = HASH_OF(hash, TOLOWER(*p));
@@ -35,15 +35,15 @@ PUBLIC int hash_code_lowercase_on_fly ARGS1 (CONST char*, string)
     return hash;
 }
 
-PUBLIC int hash_code_aggregate_char ARGS2 (char, c,int,hash)
+int hash_code_aggregate_char (char c,int hash)
 {
     return HASH_OF(hash,c);
 }
 
-PUBLIC int hash_code_aggregate_lower_str ARGS2 (CONST char*, string,int,hash_was)
+int hash_code_aggregate_lower_str (const char* string,int hash_was)
 {
     int hash;
-    CONST char *p;
+    const char *p;
 
     for (p = string, hash = hash_was ; *p; p++)
 	hash = HASH_OF(hash, TOLOWER(*p));
diff --git a/src/LYHash.h b/src/LYHash.h
index ebeabf41..141f3ceb 100644
--- a/src/LYHash.h
+++ b/src/LYHash.h
@@ -26,13 +26,13 @@ typedef struct _hashbucket bucket;
 #define NOSTYLE -1
 
 extern bucket hashStyles[CSHASHSIZE];
-extern int hash_code PARAMS((CONST char* string));
+extern int hash_code (const char* string);
 extern bucket nostyle_bucket;/*initialized properly - to be used in CTRACE when
             NOSTYLE is passed as 'style' to curses_w_style */
 
-extern int hash_code_lowercase_on_fly PARAMS((CONST char* string));
-extern int hash_code_aggregate_char PARAMS((char c,int hash));
-extern int hash_code_aggregate_lower_str PARAMS((CONST char* c, int hash_was));
+extern int hash_code_lowercase_on_fly (const char* string);
+extern int hash_code_aggregate_char (char c,int hash);
+extern int hash_code_aggregate_lower_str (const char* c, int hash_was);
 
 extern int	s_a;
 extern int	s_aedit;
diff --git a/src/LYHistory.c b/src/LYHistory.c
index 6713e777..3733cb6b 100644
--- a/src/LYHistory.c
+++ b/src/LYHistory.c
@@ -29,28 +29,28 @@
 #include <LYLeaks.h>
 #include <HTCJK.h>
 
-PUBLIC HTList * Visited_Links = NULL;	/* List of safe popped docs. */
-PUBLIC int Visited_Links_As = VISITED_LINKS_AS_LATEST | VISITED_LINKS_REVERSE;
-PRIVATE VisitedLink *PrevVisitedLink = NULL;	    /* NULL on auxillary */
-PRIVATE VisitedLink *PrevActiveVisitedLink = NULL;  /* Last non-auxillary */
-PRIVATE VisitedLink Latest_first;
-PRIVATE VisitedLink Latest_last;
-PRIVATE VisitedLink *Latest_tree;
-PRIVATE VisitedLink *First_tree;
-PRIVATE VisitedLink *Last_by_first;
+HTList * Visited_Links = NULL;	/* List of safe popped docs. */
+int Visited_Links_As = VISITED_LINKS_AS_LATEST | VISITED_LINKS_REVERSE;
+static VisitedLink *PrevVisitedLink = NULL;	    /* NULL on auxillary */
+static VisitedLink *PrevActiveVisitedLink = NULL;  /* Last non-auxillary */
+static VisitedLink Latest_first;
+static VisitedLink Latest_last;
+static VisitedLink *Latest_tree;
+static VisitedLink *First_tree;
+static VisitedLink *Last_by_first;
 
 int nhist_extra;
 
 #ifdef LY_FIND_LEAKS
-PRIVATE int already_registered_free_messages_stack = 0;
-PRIVATE int already_registered_clean_all_history = 0;
+static int already_registered_free_messages_stack = 0;
+static int already_registered_clean_all_history = 0;
 #endif
 
 #ifdef LY_FIND_LEAKS
 /*
  *  Utility for freeing the list of visited links. - FM
  */
-PRIVATE void Visited_Links_free NOARGS
+static void Visited_Links_free (void)
 {
     VisitedLink *vl;
     HTList *cur = Visited_Links;
@@ -75,8 +75,8 @@ PRIVATE void Visited_Links_free NOARGS
 #endif /* LY_FIND_LEAKS */
 
 #ifdef DEBUG
-PRIVATE void trace_history ARGS1(
-	CONST char *,	tag)
+static void trace_history (
+	const char *	tag)
 {
     if (TRACE) {
 	CTRACE((tfp, "HISTORY %s %d/%d (%d extra)\n",
@@ -92,8 +92,8 @@ PRIVATE void trace_history ARGS1(
  *  Utility for listing visited links, making any repeated
  *  links the most current in the list. - FM
  */
-PUBLIC void LYAddVisitedLink ARGS1(
-	DocInfo *,	doc)
+void LYAddVisitedLink (
+	DocInfo *	doc)
 {
     VisitedLink *new;
     HTList *cur;
@@ -228,9 +228,9 @@ PUBLIC void LYAddVisitedLink ARGS1(
  *  also check the URL whether it is (likely to be) a generated special
  *  page.
  */
-PUBLIC BOOLEAN LYwouldPush ARGS2(
-	CONST char *,	title,
-	CONST char *,	docurl)
+BOOLEAN LYwouldPush (
+	const char *	title,
+	const char *	docurl)
 {
     BOOLEAN rc = FALSE;
 
@@ -278,8 +278,8 @@ PUBLIC BOOLEAN LYwouldPush ARGS2(
 /*
  * Free post-data for 'DocInfo'
  */
-PUBLIC void LYFreePostData ARGS1(
-    DocInfo *,		doc)
+void LYFreePostData (
+    DocInfo *		doc)
 {
     BStrFree(doc->post_data);
     FREE(doc->post_content_type);
@@ -288,8 +288,8 @@ PUBLIC void LYFreePostData ARGS1(
 /*
  * Free strings associated with a 'DocInfo' struct.
  */
-PUBLIC void LYFreeDocInfo ARGS1(
-    DocInfo *,		doc)
+void LYFreeDocInfo (
+    DocInfo *		doc)
 {
     FREE(doc->title);
     FREE(doc->address);
@@ -300,7 +300,7 @@ PUBLIC void LYFreeDocInfo ARGS1(
 /*
  *  Free the information in the last history entry.
  */
-PRIVATE void clean_extra_history NOARGS
+static void clean_extra_history (void)
 {
     trace_history("clean_extra_history");
     nhist += nhist_extra;
@@ -316,7 +316,7 @@ PRIVATE void clean_extra_history NOARGS
  * Free the entire history stack, for auditing memory leaks.
  */
 #ifdef LY_FIND_LEAKS
-PRIVATE void clean_all_history NOARGS
+static void clean_all_history (void)
 {
     trace_history("clean_all_history");
     clean_extra_history();
@@ -329,9 +329,9 @@ PRIVATE void clean_all_history NOARGS
 #endif
 
 /* FIXME What is the relationship to are_different() from the mainloop?! */
-PRIVATE int are_identical ARGS2(
-	HistInfo *,	doc,
-	DocInfo *,	doc1)
+static int are_identical (
+	HistInfo *	doc,
+	DocInfo *	doc1)
 {
      return (	STREQ(doc1->address, doc->hdoc.address)
 		&& BINEQ(doc1->post_data, doc->hdoc.post_data)
@@ -343,9 +343,9 @@ PRIVATE int are_identical ARGS2(
 /*
  *  Push the current filename, link and line number onto the history list.
  */
-PUBLIC int LYpush ARGS2(
-	DocInfo *,	doc,
-	BOOLEAN,	force_push)
+int LYpush (
+	DocInfo *	doc,
+	BOOLEAN	force_push)
 {
     /*
      *	Don't push NULL file names.
@@ -527,8 +527,8 @@ PUBLIC int LYpush ARGS2(
 /*
  *  Pop the previous filename, link and line number from the history list.
  */
-PUBLIC void LYpop ARGS1(
-	DocInfo *,	doc)
+void LYpop (
+	DocInfo *	doc)
 {
     if (nhist > 0) {
 	clean_extra_history();
@@ -550,8 +550,8 @@ PUBLIC void LYpop ARGS1(
 /*
  *  Move to the previous filename, link and line number from the history list.
  */
-PUBLIC void LYhist_prev ARGS1(
-	DocInfo *,	doc)
+void LYhist_prev (
+	DocInfo *	doc)
 {
     trace_history("LYhist_prev");
     if (nhist > 0 && (nhist_extra || nhist < MAXHIST)) {
@@ -565,8 +565,8 @@ PUBLIC void LYhist_prev ARGS1(
 /*
  *  Called before calling LYhist_prev().
  */
-PUBLIC void LYhist_prev_register ARGS1(
-	DocInfo *,	doc)
+void LYhist_prev_register (
+	DocInfo *	doc)
 {
     trace_history("LYhist_prev_register");
     if (nhist > 1) {
@@ -587,9 +587,9 @@ PUBLIC void LYhist_prev_register ARGS1(
 /*
  *  Move to the next filename, link and line number from the history.
  */
-PUBLIC int LYhist_next ARGS2(
-	DocInfo *,	doc,
-	DocInfo *,	newdoc)
+int LYhist_next (
+	DocInfo *	doc,
+	DocInfo *	newdoc)
 {
     if (nhist_extra <= 1)	/* == 1 when we are the last one */
 	return 0;
@@ -607,9 +607,9 @@ PUBLIC int LYhist_next ARGS2(
  *  list but don't actually remove the entry, just return it.
  *  (This procedure is badly named :)
  */
-PUBLIC void LYpop_num ARGS2(
-	int,		number,
-	DocInfo *,	doc)
+void LYpop_num (
+	int		number,
+	DocInfo *	doc)
 {
     if (number >= 0 && nhist + nhist_extra > number) {
 	doc->link = HDOC(number).link;
@@ -632,8 +632,8 @@ PUBLIC void LYpop_num ARGS2(
 /*
  *  This procedure outputs the history buffer into a temporary file.
  */
-PUBLIC int showhistory ARGS1(
-	char **,	newfile)
+int showhistory (
+	char **	newfile)
 {
     static char tempfile[LY_MAXPATH] = "\0";
     char *Title = NULL;
@@ -703,8 +703,8 @@ PUBLIC int showhistory ARGS1(
  *  link structure.  We saved out the history number to a special URL.
  *  The info looks like:  LYNXHIST:#
  */
-PUBLIC BOOLEAN historytarget ARGS1(
-	DocInfo *,	newdoc)
+BOOLEAN historytarget (
+	DocInfo *	newdoc)
 {
     int number;
     DocAddress WWWDoc;
@@ -791,8 +791,8 @@ PUBLIC BOOLEAN historytarget ARGS1(
  *  This procedure outputs the Visited Links list into a temporary file. - FM
  *  Returns links's number to make active (1-based), or 0 if not required.
  */
-PUBLIC int LYShowVisitedLinks ARGS1(
-	char **,	newfile)
+int LYShowVisitedLinks (
+	char **	newfile)
 {
     static char tempfile[LY_MAXPATH] = "\0";
     char *Title = NULL;
@@ -940,11 +940,11 @@ PUBLIC int LYShowVisitedLinks ARGS1(
  *  Keep cycled buffer for statusline messages.
  */
 #define STATUSBUFSIZE   40
-PRIVATE char * buffstack[STATUSBUFSIZE];
-PRIVATE int topOfStack = 0;
+static char * buffstack[STATUSBUFSIZE];
+static int topOfStack = 0;
 
 #ifdef LY_FIND_LEAKS
-PRIVATE void free_messages_stack NOARGS
+static void free_messages_stack (void)
 {
     topOfStack = STATUSBUFSIZE;
 
@@ -954,7 +954,7 @@ PRIVATE void free_messages_stack NOARGS
 }
 #endif
 
-PRIVATE void to_stack ARGS1(char *, str)
+static void to_stack (char * str)
 {
     /*
      *  Cycle buffer:
@@ -988,8 +988,8 @@ PRIVATE void to_stack ARGS1(char *, str)
  * will be very useful on exit.
  * (Don't expect everyone will look a trace log in case of difficulties:))
  */
-PUBLIC void LYstatusline_messages_on_exit ARGS1(
-	char **,	buf)
+void LYstatusline_messages_on_exit (
+	char **	buf)
 {
     int i;
 
@@ -1014,9 +1014,9 @@ PUBLIC void LYstatusline_messages_on_exit ARGS1(
 }
 
 
-PUBLIC void LYstore_message2 ARGS2(
-	CONST char *,	message,
-	CONST char *,	argument)
+void LYstore_message2 (
+	const char *	message,
+	const char *	argument)
 {
 
     if (message != NULL) {
@@ -1026,8 +1026,8 @@ PUBLIC void LYstore_message2 ARGS2(
     }
 }
 
-PUBLIC void LYstore_message ARGS1(
-	CONST char *,	message)
+void LYstore_message (
+	const char *	message)
 {
     if (message != NULL) {
 	char *temp = NULL;
@@ -1048,11 +1048,11 @@ struct _HTStream
     HTStreamClass * isa;
 };
 
-PRIVATE int LYLoadMESSAGES ARGS4 (
-	CONST char *,		arg GCC_UNUSED,
-	HTParentAnchor *,	anAnchor,
-	HTFormat,		format_out,
-	HTStream*,		sink)
+static int LYLoadMESSAGES (
+	const char *		arg GCC_UNUSED,
+	HTParentAnchor *	anAnchor,
+	HTFormat		format_out,
+	HTStream*		sink)
 {
     HTFormat format_in = WWW_HTML;
     HTStream *target = NULL;
@@ -1138,5 +1138,5 @@ PRIVATE int LYLoadMESSAGES ARGS4 (
 #define _LYMESSAGES_C_GLOBALDEF_1_INIT { "LYNXMESSAGES", LYLoadMESSAGES, 0}
 GLOBALDEF (HTProtocol,LYLynxStatusMessages,_LYMESSAGES_C_GLOBALDEF_1_INIT);
 #else
-GLOBALDEF PUBLIC HTProtocol LYLynxStatusMessages = {"LYNXMESSAGES", LYLoadMESSAGES, 0};
+GLOBALDEF HTProtocol LYLynxStatusMessages = {"LYNXMESSAGES", LYLoadMESSAGES, 0};
 #endif /* GLOBALDEF_IS_MACRO */
diff --git a/src/LYHistory.h b/src/LYHistory.h
index fe12c1a3..c45fbc45 100644
--- a/src/LYHistory.h
+++ b/src/LYHistory.h
@@ -5,22 +5,22 @@
 #include <LYStructs.h>
 #endif /* LYSTRUCTS_H */
 
-extern BOOLEAN LYwouldPush PARAMS((CONST char *title, CONST char *docurl));
-extern BOOLEAN historytarget PARAMS((DocInfo *newdoc));
-extern int LYShowVisitedLinks PARAMS((char **newfile));
-extern int LYhist_next PARAMS((DocInfo *doc, DocInfo *newdoc));
-extern int LYpush PARAMS((DocInfo *doc, BOOLEAN force_push));
-extern int showhistory PARAMS((char **newfile));
-extern void LYAddVisitedLink PARAMS((DocInfo *doc));
-extern void LYFreePostData PARAMS((DocInfo * data));
-extern void LYFreeDocInfo PARAMS((DocInfo * data));
-extern void LYhist_prev PARAMS((DocInfo *doc));
-extern void LYhist_prev_register PARAMS((DocInfo *doc));
-extern void LYpop PARAMS((DocInfo *doc));
-extern void LYpop_num PARAMS((int number, DocInfo *doc));
-extern void LYstatusline_messages_on_exit PARAMS((char **buf));
-extern void LYstore_message PARAMS((CONST char *message));
-extern void LYstore_message2 PARAMS((CONST char *message, CONST char *argument));
+extern BOOLEAN LYwouldPush (const char *title, const char *docurl);
+extern BOOLEAN historytarget (DocInfo *newdoc);
+extern int LYShowVisitedLinks (char **newfile);
+extern int LYhist_next (DocInfo *doc, DocInfo *newdoc);
+extern int LYpush (DocInfo *doc, BOOLEAN force_push);
+extern int showhistory (char **newfile);
+extern void LYAddVisitedLink (DocInfo *doc);
+extern void LYFreePostData (DocInfo * data);
+extern void LYFreeDocInfo (DocInfo * data);
+extern void LYhist_prev (DocInfo *doc);
+extern void LYhist_prev_register (DocInfo *doc);
+extern void LYpop (DocInfo *doc);
+extern void LYpop_num (int number, DocInfo *doc);
+extern void LYstatusline_messages_on_exit (char **buf);
+extern void LYstore_message (const char *message);
+extern void LYstore_message2 (const char *message, const char *argument);
 
 extern int nhist_extra;
 
diff --git a/src/LYJump.c b/src/LYJump.c
index bed7133e..5be41975 100644
--- a/src/LYJump.c
+++ b/src/LYJump.c
@@ -19,10 +19,10 @@
 
 struct JumpTable *JThead = NULL;
 
-PRIVATE int LYCompare PARAMS((CONST void *e1, CONST void *e2));
-PRIVATE unsigned LYRead_Jumpfile PARAMS((struct JumpTable * jtp));
+static int LYCompare (const void *e1, const void *e2);
+static unsigned LYRead_Jumpfile (struct JumpTable * jtp);
 
-PUBLIC void LYJumpTable_free NOARGS
+void LYJumpTable_free (void)
 {
     struct JumpTable *cur = JThead;
     struct JumpTable *next;
@@ -56,7 +56,7 @@ PUBLIC void LYJumpTable_free NOARGS
  * Utility for listing shortcuts, making any repeated
  * shortcut the most current in the list. - FM
  */
-PUBLIC void LYAddJumpShortcut ARGS2(HTList *, historyp, char *, shortcut)
+void LYAddJumpShortcut (HTList * historyp, char * shortcut)
 {
     char *new = NULL;
     char *old;
@@ -79,7 +79,7 @@ PUBLIC void LYAddJumpShortcut ARGS2(HTList *, historyp, char *, shortcut)
     return;
 }
 
-PUBLIC BOOL LYJumpInit ARGS1(char *, config)
+BOOL LYJumpInit (char * config)
 {
     struct JumpTable *jtp;
     char *cp;
@@ -178,7 +178,7 @@ PUBLIC BOOL LYJumpInit ARGS1(char *, config)
     return TRUE;
 }
 
-PUBLIC char *LYJump ARGS1(int, key)
+char *LYJump (int key)
 {
     JumpDatum seeking;
     JumpDatum *found;
@@ -361,7 +361,7 @@ PUBLIC char *LYJump ARGS1(int, key)
     return found ? found->url : NULL;
 }
 
-PRIVATE unsigned LYRead_Jumpfile ARGS1(struct JumpTable *, jtp)
+static unsigned LYRead_Jumpfile (struct JumpTable * jtp)
 {
     struct stat st;
     unsigned int nel;
@@ -491,8 +491,8 @@ PRIVATE unsigned LYRead_Jumpfile ARGS1(struct JumpTable *, jtp)
     return i;
 }
 
-PRIVATE int LYCompare ARGS2(CONST void *, e1, CONST void *, e2)
+static int LYCompare (const void * e1, const void * e2)
 {
-    return strcasecomp(((CONST JumpDatum *) e1)->key,
-		       ((CONST JumpDatum *) e2)->key);
+    return strcasecomp(((const JumpDatum *) e1)->key,
+		       ((const JumpDatum *) e2)->key);
 }
diff --git a/src/LYJump.h b/src/LYJump.h
index 25e8d16b..9f44af2c 100644
--- a/src/LYJump.h
+++ b/src/LYJump.h
@@ -21,9 +21,9 @@ struct JumpTable {
 };
 
 extern struct JumpTable *JThead;
-extern void LYJumpTable_free NOPARAMS;
-extern void LYAddJumpShortcut PARAMS((HTList *the_history, char *shortcut));
-extern BOOL LYJumpInit PARAMS((char *config));
-extern char *LYJump PARAMS((int key));
+extern void LYJumpTable_free (void);
+extern void LYAddJumpShortcut (HTList *the_history, char *shortcut);
+extern BOOL LYJumpInit (char *config);
+extern char *LYJump (int key);
 
 #endif /* LYJUMP_H */
diff --git a/src/LYJustify.h b/src/LYJustify.h
index 61de5df1..4ca49b67 100644
--- a/src/LYJustify.h
+++ b/src/LYJustify.h
@@ -55,8 +55,8 @@ extern BOOL can_justify_stack_depth;/* can be 0 or 1 if all code is correct*/
 #define EMIT_IFDEF_EXP_JUSTIFY_ELTS(x) x
     /*defined in order not to wrap single line of code  into #ifdef/#endif */
 
-extern void ht_justify_cleanup NOPARAMS;
-extern void mark_justify_start_position PARAMS((void* text));
+extern void ht_justify_cleanup (void);
+extern void mark_justify_start_position (void* text);
 
 #else /* ! EXP_JUSTIFY_ELTS */
 
diff --git a/src/LYKeymap.c b/src/LYKeymap.c
index 4b841149..5e67a507 100644
--- a/src/LYKeymap.c
+++ b/src/LYKeymap.c
@@ -17,15 +17,15 @@
 #endif
 
 #ifdef EXP_KEYBOARD_LAYOUT
-PUBLIC int current_layout = 0;  /* Index into LYKbLayouts[]   */
+int current_layout = 0;  /* Index into LYKbLayouts[]   */
 
-PUBLIC LYKbLayout_t * LYKbLayouts[]={
+LYKbLayout_t * LYKbLayouts[]={
 	kb_layout_rot13,
 	kb_layout_jcuken,
 	kb_layout_yawerty
 };
 
-PUBLIC char * LYKbLayoutNames[]={
+char * LYKbLayoutNames[]={
 	"ROT13'd keyboard layout",
 	"JCUKEN Cyrillic, for AT 101-key kbd",
 	"YAWERTY Cyrillic, for DEC LK201 kbd",
@@ -620,7 +620,7 @@ LYK_TAG_LINK,      LYK_UPLOAD,         0,             0,
 
 #define DATA(code, name, doc) { code, name, doc }
 /* The order of this array must match the LYKeymapCode enum in LYKeymap.h */
-PRIVATE Kcmd revmap[] = {
+static Kcmd revmap[] = {
     DATA(
 	LYK_UNKNOWN, "UNMAPPED",
 	NULL ),
@@ -973,9 +973,9 @@ PRIVATE Kcmd revmap[] = {
 };
 #undef DATA
 
-PRIVATE CONST struct {
+static const struct {
     int key;
-    CONST char *name;
+    const char *name;
 } named_keys[] = {
     { '\t',		"<tab>" },
     { '\r',		"<return>" },
@@ -1004,12 +1004,12 @@ PRIVATE CONST struct {
 };
 
 struct emap {
-	CONST char *name;
-	CONST int   code;
-	CONST char *descr;
+	const char *name;
+	const int   code;
+	const char *descr;
 };
 
-PRIVATE struct emap ekmap[] = {
+static struct emap ekmap[] = {
   {"NOP",	LYE_NOP,	"Do Nothing"},
   {"CHAR",	LYE_CHAR,	"Insert printable char"},
   {"ENTER",	LYE_ENTER,	"Input complete, return char/lynxkeycode"},
@@ -1067,7 +1067,7 @@ PRIVATE struct emap ekmap[] = {
 /*
  * Build a list of Lynx's commands, for use in the tab-completion in LYgetstr.
  */
-PUBLIC HTList *LYcommandList NOARGS
+HTList *LYcommandList (void)
 {
     static HTList *myList = NULL;
 
@@ -1088,8 +1088,8 @@ PUBLIC HTList *LYcommandList NOARGS
 /*
  * Find the given keycode.
  */
-PUBLIC Kcmd * LYKeycodeToKcmd ARGS1(
-	LYKeymapCode,	code)
+Kcmd * LYKeycodeToKcmd (
+	LYKeymapCode	code)
 {
     unsigned j;
     Kcmd *result = 0;
@@ -1108,8 +1108,8 @@ PUBLIC Kcmd * LYKeycodeToKcmd ARGS1(
 /*
  * Find the given command-name, accepting an abbreviation if it is unique.
  */
-PUBLIC Kcmd * LYStringToKcmd ARGS1(
-	CONST char *,	name)
+Kcmd * LYStringToKcmd (
+	const char *	name)
 {
     unsigned need = strlen(name);
     unsigned j;
@@ -1139,9 +1139,9 @@ PUBLIC Kcmd * LYStringToKcmd ARGS1(
     return (result != 0) ? result : maybe;
 }
 
-PUBLIC char *LYKeycodeToString ARGS2 (
-	int,		c,
-	BOOLEAN,	upper8)
+char *LYKeycodeToString (
+	int		c,
+	BOOLEAN	upper8)
 {
     static char buf[30];
     unsigned n;
@@ -1174,8 +1174,8 @@ PUBLIC char *LYKeycodeToString ARGS2 (
     return buf;
 }
 
-PUBLIC int LYStringToKeycode ARGS1 (
-	char *,		src)
+int LYStringToKeycode (
+	char *		src)
 {
     unsigned n;
     int key = -1;
@@ -1209,14 +1209,14 @@ PUBLIC int LYStringToKeycode ARGS1 (
 
 #define PRETTY_LEN 11
 
-PRIVATE char *pretty_html ARGS1 (int, c)
+static char *pretty_html (int c)
 {
     char *src = LYKeycodeToString(c, TRUE);
 
     if (src != 0) {
-	static CONST struct {
+	static const struct {
 	    int	code;
-	    CONST char *name;
+	    const char *name;
 	} table[] = {
 	    { '<',	"&lt;" },
 	    { '>',	"&gt;" },
@@ -1255,9 +1255,9 @@ PRIVATE char *pretty_html ARGS1 (int, c)
     return 0;
 }
 
-PRIVATE char * format_binding ARGS2(
-	LYKeymap_t *,	table,
-	int,		i)
+static char * format_binding (
+	LYKeymap_t *	table,
+	int		i)
 {
     LYKeymap_t the_key = table[i];
     char *buf = 0;
@@ -1279,10 +1279,10 @@ PRIVATE char * format_binding ARGS2(
 
 /* if both is true, produce an additional line for the corresponding
    uppercase key if its binding is different. - kw */
-PRIVATE void print_binding ARGS3(
-    HTStream *,	target,
-    int,	i,
-    BOOLEAN, 	both)
+static void print_binding (
+    HTStream *	target,
+    int	i,
+    BOOLEAN 	both)
 {
     char *buf;
     LYKeymapCode lac1 = LYK_UNKNOWN; /* 0 */
@@ -1325,8 +1325,8 @@ PRIVATE void print_binding ARGS3(
  *  Return lynxactioncode whose name is the string func.
  *  returns -1 if not found. - kw
  */
-PUBLIC int lacname_to_lac ARGS1(
-	CONST char *,	func)
+int lacname_to_lac (
+	const char *	func)
 {
     Kcmd *mp = LYStringToKcmd(func);
 
@@ -1338,8 +1338,8 @@ PUBLIC int lacname_to_lac ARGS1(
  *  func must be present in the ekmap table.
  *  returns -1 if not found. - kw
  */
-PUBLIC int lecname_to_lec ARGS1(
-	CONST char *,	func)
+int lecname_to_lec (
+	const char *	func)
 {
     int i;
     struct emap *mp;
@@ -1361,8 +1361,8 @@ PUBLIC int lecname_to_lec ARGS1(
  *  USE_KEYMAP, but compatible with revmap() used for processing
  *  KEYMAP options in the configuration file. - kw
  */
-PUBLIC int lkcstring_to_lkc ARGS1(
-	CONST char *,	src)
+int lkcstring_to_lkc (
+	const char *	src)
 {
     int c = -1;
 
@@ -1394,11 +1394,11 @@ PUBLIC int lkcstring_to_lkc ARGS1(
 	return c;
 }
 
-PRIVATE int LYLoadKeymap ARGS4 (
-	CONST char *, 		arg GCC_UNUSED,
-	HTParentAnchor *,	anAnchor,
-	HTFormat,		format_out,
-	HTStream*,		sink)
+static int LYLoadKeymap (
+	const char * 		arg GCC_UNUSED,
+	HTParentAnchor *	anAnchor,
+	HTFormat		format_out,
+	HTStream*		sink)
 {
     HTFormat format_in = WWW_HTML;
     HTStream *target;
@@ -1451,7 +1451,7 @@ PRIVATE int LYLoadKeymap ARGS4 (
 #define _LYKEYMAP_C_GLOBALDEF_1_INIT { "LYNXKEYMAP", LYLoadKeymap, 0}
 GLOBALDEF (HTProtocol,LYLynxKeymap,_LYKEYMAP_C_GLOBALDEF_1_INIT);
 #else
-GLOBALDEF PUBLIC HTProtocol LYLynxKeymap = {"LYNXKEYMAP", LYLoadKeymap, 0};
+GLOBALDEF HTProtocol LYLynxKeymap = {"LYNXKEYMAP", LYLoadKeymap, 0};
 #endif /* GLOBALDEF_IS_MACRO */
 
 /*
@@ -1462,10 +1462,10 @@ GLOBALDEF PUBLIC HTProtocol LYLynxKeymap = {"LYNXKEYMAP", LYLoadKeymap, 0};
  * when for_dired is requested.
  * returns lynxkeycode value != 0 if the mapping was made, 0 if not.
  */
-PUBLIC int remap ARGS3(
-	char *,		key,
-	char *,		func,
-	BOOLEAN,	for_dired)
+int remap (
+	char *		key,
+	char *		func,
+	BOOLEAN	for_dired)
 {
     Kcmd *mp;
     int c;
@@ -1513,9 +1513,9 @@ typedef struct {
 /*
  * Save the given keys in the table, setting them to the map'd value.
  */
-PRIVATE void set_any_keys ARGS2(
-	ANY_KEYS *,	table,
-	int,		size)
+static void set_any_keys (
+	ANY_KEYS *	table,
+	int		size)
 {
     int j, k;
 
@@ -1529,9 +1529,9 @@ PRIVATE void set_any_keys ARGS2(
 /*
  * Restore the given keys from the table.
  */
-PRIVATE void reset_any_keys ARGS2(
-	ANY_KEYS *,	table,
-	int,		size)
+static void reset_any_keys (
+	ANY_KEYS *	table,
+	int		size)
 {
     int j, k;
 
@@ -1546,7 +1546,7 @@ static ANY_KEYS vms_keys_table[] = {
     { '$',  LYK_SHELL,   0 },
 };
 
-PUBLIC void set_vms_keys NOARGS
+void set_vms_keys (void)
 {
     set_any_keys(vms_keys_table, TABLESIZE(vms_keys_table));
 }
@@ -1560,13 +1560,13 @@ static ANY_KEYS vi_keys_table[] = {
 
 static BOOLEAN did_vi_keys;
 
-PUBLIC void set_vi_keys NOARGS
+void set_vi_keys (void)
 {
     set_any_keys(vi_keys_table, TABLESIZE(vi_keys_table));
     did_vi_keys = TRUE;
 }
 
-PUBLIC void reset_vi_keys NOARGS
+void reset_vi_keys (void)
 {
     if (did_vi_keys) {
 	reset_any_keys(vi_keys_table, TABLESIZE(vi_keys_table));
@@ -1583,13 +1583,13 @@ static ANY_KEYS emacs_keys_table[] = {
 
 static BOOLEAN did_emacs_keys;
 
-PUBLIC void set_emacs_keys NOARGS
+void set_emacs_keys (void)
 {
     set_any_keys(emacs_keys_table, TABLESIZE(emacs_keys_table));
     did_emacs_keys = TRUE;
 }
 
-PUBLIC void reset_emacs_keys NOARGS
+void reset_emacs_keys (void)
 {
     if (did_emacs_keys) {
 	reset_any_keys(emacs_keys_table, TABLESIZE(emacs_keys_table));
@@ -1615,13 +1615,13 @@ static ANY_KEYS number_keys_table[] = {
 
 static BOOLEAN did_number_keys;
 
-PUBLIC void set_numbers_as_arrows NOARGS
+void set_numbers_as_arrows (void)
 {
     set_any_keys(number_keys_table, TABLESIZE(number_keys_table));
     did_number_keys = TRUE;
 }
 
-PUBLIC void reset_numbers_as_arrows NOARGS
+void reset_numbers_as_arrows (void)
 {
     if (did_number_keys) {
 	reset_any_keys(number_keys_table, TABLESIZE(number_keys_table));
@@ -1629,8 +1629,8 @@ PUBLIC void reset_numbers_as_arrows NOARGS
     }
 }
 
-PUBLIC char *key_for_func ARGS1 (
-	int,	func)
+char *key_for_func (
+	int	func)
 {
     static char *buf;
     int i;
@@ -1651,9 +1651,9 @@ PUBLIC char *key_for_func ARGS1 (
  *  if no valid lynxkeycode is passed in (i.e., lkc_first < 0 or some other
  *  failure).  The caller must free the string. - kw
  */
-PUBLIC char *fmt_keys ARGS2(
-    int,	lkc_first,
-    int,	lkc_second)
+char *fmt_keys (
+    int	lkc_first,
+    int	lkc_second)
 {
     char *buf = NULL;
     BOOLEAN quotes = FALSE;
@@ -1705,8 +1705,8 @@ PUBLIC char *fmt_keys ARGS2(
 #define NEXT_I(i,imax) ((i==122) ? 32 : (i==96) ? 123 : (i==126) ? 0 :\
 			(i==31) ? 256 : (i==imax) ? 127 :\
 			(i==255) ? (-1) :i+1)
-PRIVATE int best_reverse_keymap ARGS1(
-	int,	lac)
+static int best_reverse_keymap (
+	int	lac)
 {
     int i, c;
 
@@ -1737,9 +1737,9 @@ PRIVATE int best_reverse_keymap ARGS1(
  *  an appropriate binding for use while in the (forms) line editor
  *  is sought.  - kw
  */
-PUBLIC char* key_for_func_ext ARGS2(
-    int,	lac,
-    int,	context_code)
+char* key_for_func_ext (
+    int	lac,
+    int	context_code)
 {
     int lkc, modkey = -1;
 
@@ -1770,9 +1770,9 @@ PUBLIC char* key_for_func_ext ARGS2(
  *  This function returns TRUE if the ch is non-alphanumeric
  *  and maps to KeyName (LYK_foo in the keymap[] array). - FM
  */
-PUBLIC BOOL LYisNonAlnumKeyname ARGS2(
-	int,	ch,
-	int,	KeyName)
+BOOL LYisNonAlnumKeyname (
+	int	ch,
+	int	KeyName)
 {
     if (ch < 0 || ch >= KEYMAP_SIZE)
 	return (FALSE);
@@ -1789,8 +1789,8 @@ abcdefghijklmnopqrstuvwxyz", ch) != NULL)
  *  This function returns the (int)ch mapped to the
  *  LYK_foo value passed to it as an argument. - FM
  */
-PUBLIC int LYReverseKeymap ARGS1(
-	int,	KeyName)
+int LYReverseKeymap (
+	int	KeyName)
 {
     int i;
 
@@ -1804,8 +1804,8 @@ PUBLIC int LYReverseKeymap ARGS1(
 }
 
 #ifdef EXP_KEYBOARD_LAYOUT
-PUBLIC int LYSetKbLayout ARGS1(
-	char *,	layout_id)
+int LYSetKbLayout (
+	char *	layout_id)
 {
     int i;
 
diff --git a/src/LYKeymap.h b/src/LYKeymap.h
index c159530e..ad46f614 100644
--- a/src/LYKeymap.h
+++ b/src/LYKeymap.h
@@ -5,26 +5,26 @@
 #include <HTList.h>
 #include <LYCurses.h>
 
-extern BOOLEAN LYisNonAlnumKeyname PARAMS((int ch, int KeyName));
-extern HTList *LYcommandList NOPARAMS;
-extern char *LYKeycodeToString PARAMS((int c, BOOLEAN upper8));
-extern char *fmt_keys PARAMS((int lkc_first, int lkc_second));
-extern char *key_for_func PARAMS((int func));
-extern char *key_for_func_ext PARAMS((int lac, int context_code));
-extern int LYReverseKeymap PARAMS((int KeyName));
-extern int LYStringToKeycode PARAMS((char *src));
-extern int lacname_to_lac PARAMS((CONST char *func));
-extern int lecname_to_lec PARAMS((CONST char *func));
-extern int lkcstring_to_lkc PARAMS((CONST char *src));
-extern int remap PARAMS((char *key, char *func, BOOLEAN for_dired));
-extern void print_keymap PARAMS((char **newfile));
-extern void reset_emacs_keys NOPARAMS;
-extern void reset_numbers_as_arrows NOPARAMS;
-extern void reset_vi_keys NOPARAMS;
-extern void set_emacs_keys NOPARAMS;
-extern void set_numbers_as_arrows NOPARAMS;
-extern void set_vi_keys NOPARAMS;
-extern void set_vms_keys NOPARAMS;
+extern BOOLEAN LYisNonAlnumKeyname (int ch, int KeyName);
+extern HTList *LYcommandList (void);
+extern char *LYKeycodeToString (int c, BOOLEAN upper8);
+extern char *fmt_keys (int lkc_first, int lkc_second);
+extern char *key_for_func (int func);
+extern char *key_for_func_ext (int lac, int context_code);
+extern int LYReverseKeymap (int KeyName);
+extern int LYStringToKeycode (char *src);
+extern int lacname_to_lac (const char *func);
+extern int lecname_to_lec (const char *func);
+extern int lkcstring_to_lkc (const char *src);
+extern int remap (char *key, char *func, BOOLEAN for_dired);
+extern void print_keymap (char **newfile);
+extern void reset_emacs_keys (void);
+extern void reset_numbers_as_arrows (void);
+extern void reset_vi_keys (void);
+extern void set_emacs_keys (void);
+extern void set_numbers_as_arrows (void);
+extern void set_vi_keys (void);
+extern void set_vms_keys (void);
 
 /* We only use unsigned keycodes; if there's a problem matching with enum
  * (which is supposed to be 'int'), that would be okay, but not as clean
@@ -40,7 +40,7 @@ typedef unsigned short LYKbLayout_t;
 extern int current_layout;
 extern LYKbLayout_t * LYKbLayouts[];
 extern char * LYKbLayoutNames[];
-extern int LYSetKbLayout PARAMS((char *layout_id));
+extern int LYSetKbLayout (char *layout_id);
 #endif
 
 #if defined(DIRED_SUPPORT) && defined(OK_OVERRIDE)
@@ -270,11 +270,11 @@ typedef enum {
  */
 typedef struct {
 	LYKeymapCode code;
-	CONST char *name;
-	CONST char *doc;
+	const char *name;
+	const char *doc;
 } Kcmd;
 
-extern Kcmd * LYKeycodeToKcmd PARAMS((LYKeymapCode code));
-extern Kcmd * LYStringToKcmd PARAMS((CONST char * name));
+extern Kcmd * LYKeycodeToKcmd (LYKeymapCode code);
+extern Kcmd * LYStringToKcmd (const char * name);
 
 #endif /* LYKEYMAP_H */
diff --git a/src/LYLeaks.c b/src/LYLeaks.c
index 84ef77f3..7de3c26e 100644
--- a/src/LYLeaks.c
+++ b/src/LYLeaks.c
@@ -22,22 +22,22 @@
 
 #ifdef LY_FIND_LEAKS
 
-PRIVATE AllocationList *ALp_RunTimeAllocations = NULL;
+static AllocationList *ALp_RunTimeAllocations = NULL;
 
 #define LEAK_SUMMARY
 
 #ifdef LEAK_SUMMARY
 
-PRIVATE long now_allocated = 0;
-PRIVATE long peak_alloced = 0;
+static long now_allocated = 0;
+static long peak_alloced = 0;
 
-PRIVATE long total_alloced = 0;
-PRIVATE long total_freed = 0;
+static long total_alloced = 0;
+static long total_freed = 0;
 
-PRIVATE long count_mallocs = 0;
-PRIVATE long count_frees = 0;
+static long count_mallocs = 0;
+static long count_frees = 0;
 
-PRIVATE void CountMallocs ARGS1(long, size)
+static void CountMallocs (long size)
 {
     ++count_mallocs;
     total_alloced += size;
@@ -46,7 +46,7 @@ PRIVATE void CountMallocs ARGS1(long, size)
 	peak_alloced = now_allocated;
 }
 
-PRIVATE void CountFrees ARGS1(long, size)
+static void CountFrees (long size)
 {
     ++count_frees;
     total_freed += size;
@@ -67,8 +67,8 @@ PRIVATE void CountFrees ARGS1(long, size)
 **  Revision History:
 **	05-26-94	created Lynx 2-3-1 Garrett Arch Blythe
 */
-PRIVATE void AddToList ARGS1(
-	AllocationList *,	ALp_new)
+static void AddToList (
+	AllocationList *	ALp_new)
 {
     /*
      *	Just make this the first item in the list.
@@ -89,8 +89,8 @@ PRIVATE void AddToList ARGS1(
 **  Revision History:
 **	05-26-94	created Lynx 2-3-1 Garrett Arch Blythe
 */
-PRIVATE AllocationList *FindInList ARGS1(
-	void *,		vp_find)
+static AllocationList *FindInList (
+	void *		vp_find)
 {
     AllocationList *ALp_find = ALp_RunTimeAllocations;
 
@@ -118,8 +118,8 @@ PRIVATE AllocationList *FindInList ARGS1(
 **  Revision History:
 **	05-26-94	created Lynx 2-3-1 Garrett Arch Blythe
 */
-PRIVATE void RemoveFromList ARGS1(
-	AllocationList *,	ALp_del)
+static void RemoveFromList (
+	AllocationList *	ALp_del)
 {
     AllocationList *ALp_findbefore = ALp_RunTimeAllocations;
 
@@ -150,10 +150,12 @@ PRIVATE void RemoveFromList ARGS1(
 /*
  *  Make the malloc-sequence available for debugging/tracing.
  */
-PUBLIC long LYLeakSequence NOARGS
+#ifndef LYLeakSequence
+long LYLeakSequence (void)
 {
     return count_mallocs;
 }
+#endif
 
 /*
 **  Purpose:	Print a report of all memory left unallocated by
@@ -169,7 +171,7 @@ PUBLIC long LYLeakSequence NOARGS
 **		All output of this function is sent to the file defined in
 **		the header LYLeaks.h (LEAKAGE_SINK).
 */
-PUBLIC void LYLeaks NOARGS
+void LYLeaks (void)
 {
     AllocationList *ALp_head;
     size_t st_total = (size_t)0;
@@ -337,10 +339,10 @@ PUBLIC void LYLeaks NOARGS
 **  Revision History:
 **	05-26-94	created Lynx 2-3-1 Garrett Arch Blythe
 */
-PUBLIC void *LYLeakMalloc ARGS3(
-	size_t,		st_bytes,
-	CONST char *,	cp_File,
-	CONST short,	ssi_Line)
+void *LYLeakMalloc (
+	size_t		st_bytes,
+	const char *	cp_File,
+	const short	ssi_Line)
 {
     void *vp_malloc;
 
@@ -406,11 +408,11 @@ PUBLIC void *LYLeakMalloc ARGS3(
 **  Revision History:
 **	1999-02-08	created, modelled after LYLeakMalloc - kw
 */
-PUBLIC AllocationList *LYLeak_mark_malloced ARGS4(
-	void *,		vp_malloced,
-	size_t,		st_bytes,
-	CONST char *,	cp_File,
-	CONST short,	ssi_Line)
+AllocationList *LYLeak_mark_malloced (
+	void *		vp_malloced,
+	size_t		st_bytes,
+	const char *	cp_File,
+	const short	ssi_Line)
 {
     AllocationList *ALp_new = NULL;
 
@@ -475,11 +477,11 @@ PUBLIC AllocationList *LYLeak_mark_malloced ARGS4(
 **  Revision History:
 **		05-26-94	created Lynx 2-3-1 Garrett Arch Blythe
 */
-PUBLIC void *LYLeakCalloc ARGS4(
-	size_t,		st_number,
-	size_t,		st_bytes,
-	CONST char *,	cp_File,
-	CONST short,	ssi_Line)
+void *LYLeakCalloc (
+	size_t		st_number,
+	size_t		st_bytes,
+	const char *	cp_File,
+	const short	ssi_Line)
 {
     void *vp_calloc;
 
@@ -548,11 +550,11 @@ PUBLIC void *LYLeakCalloc ARGS4(
 **  Revision History:
 **	05-26-94	created Lynx 2-3-1 Garrett Arch Blythe
 */
-PUBLIC void *LYLeakRealloc ARGS4(
-	void *,		vp_Alloced,
-	size_t,		st_newBytes,
-	CONST char *,	cp_File,
-	CONST short,	ssi_Line)
+void *LYLeakRealloc (
+	void *		vp_Alloced,
+	size_t		st_newBytes,
+	const char *	cp_File,
+	const short	ssi_Line)
 {
     void *vp_realloc;
     AllocationList *ALp_renew;
@@ -645,12 +647,12 @@ PUBLIC void *LYLeakRealloc ARGS4(
 **	1999-02-11	created kw
 */
 #if defined(LY_FIND_LEAKS) && defined(LY_FIND_LEAKS_EXTENDED)
-PRIVATE AllocationList *mark_realloced ARGS5(
-	AllocationList *, ALp_old,
-	void *,		vp_realloced,
-	size_t,		st_newBytes,
-	CONST char *,	cp_File,
-	CONST short,	ssi_Line)
+static AllocationList *mark_realloced (
+	AllocationList * ALp_old,
+	void *		vp_realloced,
+	size_t		st_newBytes,
+	const char *	cp_File,
+	const short	ssi_Line)
 {
     /*
      *	If there is no list entry for the old allocation, treat this
@@ -695,10 +697,10 @@ PRIVATE AllocationList *mark_realloced ARGS5(
 **  Revision History:
 **	05-26-94	created Lynx 2-3-1 Garrett Arch Blythe
 */
-PUBLIC void LYLeakFree ARGS3(
-	void *,		vp_Alloced,
-	CONST char *,	cp_File,
-	CONST short,	ssi_Line)
+void LYLeakFree (
+	void *		vp_Alloced,
+	const char *	cp_File,
+	const short	ssi_Line)
 {
     AllocationList *ALp_free;
 
@@ -755,11 +757,11 @@ PUBLIC void LYLeakFree ARGS3(
 **  Tracks allocations by using other LYLeakFoo functions.
 **  Equivalent to HTSACopy in HTUtils.c - KW
 */
-PUBLIC char * LYLeakSACopy ARGS4(
-	char **,	dest,
-	CONST char *,	src,
-	CONST char *,	cp_File,
-	CONST short,	ssi_Line)
+char * LYLeakSACopy (
+	char **	dest,
+	const char *	src,
+	const char *	cp_File,
+	const short	ssi_Line)
 {
     if (src != NULL && src == *dest) {
 	CTRACE((tfp,
@@ -785,11 +787,11 @@ PUBLIC char * LYLeakSACopy ARGS4(
 **  Tracks allocations by using other LYLeakFoo functions.
 **  Equivalent to HTSACat in HTUtils.c - KW
 */
-PUBLIC char * LYLeakSACat ARGS4(
-	char **,	dest,
-	CONST char *,	src,
-	CONST char *,	cp_File,
-	CONST short,	ssi_Line)
+char * LYLeakSACat (
+	char **	dest,
+	const char *	src,
+	const char *	cp_File,
+	const short	ssi_Line)
 {
     if (src && *src) {
 	if (src == *dest) {
@@ -821,8 +823,8 @@ PUBLIC char * LYLeakSACat ARGS4(
 
 #if defined(LY_FIND_LEAKS) && defined(LY_FIND_LEAKS_EXTENDED)
 
-PUBLIC CONST char * leak_cp_File_hack = __FILE__;
-PUBLIC short leak_ssi_Line_hack = __LINE__;
+const char * leak_cp_File_hack = __FILE__;
+short leak_ssi_Line_hack = __LINE__;
 
 /*
 ** Purpose:	A wrapper around StrAllocVsprintf (the workhorse of
@@ -863,18 +865,18 @@ PUBLIC short leak_ssi_Line_hack = __LINE__;
 **	1999-02-11	created kw
 **	1999-10-15	added comments kw
 */
-PRIVATE char * LYLeakSAVsprintf ARGS6(
-	char **,	dest,
-	CONST char *,	cp_File,
-	CONST short,	ssi_Line,
-	size_t,		inuse,
-	CONST char *,	fmt,
-	va_list *,	ap)
+static char * LYLeakSAVsprintf (
+	char **	dest,
+	const char *	cp_File,
+	const short	ssi_Line,
+	size_t		inuse,
+	const char *	fmt,
+	va_list *	ap)
 {
     AllocationList *ALp_old;
     void *vp_oldAlloced;
 
-    CONST char * old_cp_File = __FILE__;
+    const char * old_cp_File = __FILE__;
     short old_ssi_Line = __LINE__;
 
     if (!dest)
@@ -969,9 +971,9 @@ PRIVATE char * LYLeakSAVsprintf ARGS6(
 /* Note: the following may need updating if HTSprintf in HTString.c
  * is changed. - kw */
 #ifdef ANSI_VARARGS
-PRIVATE char * LYLeakHTSprintf (char **pstr, CONST char *fmt, ...)
+static char * LYLeakHTSprintf (char **pstr, const char *fmt, ...)
 #else
-PRIVATE char * LYLeakHTSprintf (va_alist)
+static char * LYLeakHTSprintf (va_alist)
     va_dcl
 #endif
 {
@@ -982,7 +984,7 @@ PRIVATE char * LYLeakHTSprintf (va_alist)
     {
 #ifndef ANSI_VARARGS
 	char **		pstr = va_arg(ap, char **);
-	CONST char *	fmt  = va_arg(ap, CONST char *);
+	const char *	fmt  = va_arg(ap, const char *);
 #endif
 	if (pstr != 0 && *pstr != 0)
 	    inuse = strlen(*pstr);
@@ -996,9 +998,9 @@ PRIVATE char * LYLeakHTSprintf (va_alist)
 /* Note: the following may need updating if HTSprintf0 in HTString.c
  * is changed. - kw */
 #ifdef ANSI_VARARGS
-PRIVATE char * LYLeakHTSprintf0 (char **pstr, CONST char *fmt, ...)
+static char * LYLeakHTSprintf0 (char **pstr, const char *fmt, ...)
 #else
-PRIVATE char * LYLeakHTSprintf0 (va_alist)
+static char * LYLeakHTSprintf0 (va_alist)
     va_dcl
 #endif
 {
@@ -1008,7 +1010,7 @@ PRIVATE char * LYLeakHTSprintf0 (va_alist)
     {
 #ifndef ANSI_VARARGS
 	char **		pstr = va_arg(ap, char **);
-	CONST char *	fmt  = va_arg(ap, CONST char *);
+	const char *	fmt  = va_arg(ap, const char *);
 #endif
 	str = LYLeakSAVsprintf(pstr, leak_cp_File_hack, leak_ssi_Line_hack,
 			       0, fmt, &ap);
@@ -1027,18 +1029,18 @@ PRIVATE char * LYLeakHTSprintf0 (va_alist)
  *  compared to all the time that memory tracking takes up for list
  *  traversal. - kw
  */
-PUBLIC HTSprintflike *Get_htsprintf_fn ARGS2(
-	CONST char *,	cp_File,
-	CONST short,	ssi_Line)
+HTSprintflike *Get_htsprintf_fn (
+	const char *	cp_File,
+	const short	ssi_Line)
 {
     leak_cp_File_hack = cp_File;
     leak_ssi_Line_hack = ssi_Line;
     return &LYLeakHTSprintf;
 }
 
-PUBLIC HTSprintflike *Get_htsprintf0_fn ARGS2(
-	CONST char *,	cp_File,
-	CONST short,	ssi_Line)
+HTSprintflike *Get_htsprintf0_fn (
+	const char *	cp_File,
+	const short	ssi_Line)
 {
     leak_cp_File_hack = cp_File;
     leak_ssi_Line_hack = ssi_Line;
@@ -1048,6 +1050,6 @@ PUBLIC HTSprintflike *Get_htsprintf0_fn ARGS2(
 #endif /* LY_FIND_LEAKS and LY_FIND_LEAKS_EXTENDED */
 #else
 /* Standard C forbids an empty file */
-void no_leak_checking NOPARAMS;
-void no_leak_checking NOARGS { }
+void no_leak_checking (void);
+void no_leak_checking (void) { }
 #endif /* LY_FIND_LEAKS */
diff --git a/src/LYList.c b/src/LYList.c
index 4fe9a117..00f5d8ef 100644
--- a/src/LYList.c
+++ b/src/LYList.c
@@ -35,9 +35,9 @@
 */
 
 
-PUBLIC int showlist ARGS2(
-	DocInfo *,	newdoc,
-	BOOLEAN,	titles)
+int showlist (
+	DocInfo *	newdoc,
+	BOOLEAN	titles)
 {
     int cnt;
     int refs, hidden_links;
@@ -102,7 +102,7 @@ PUBLIC int showlist ARGS2(
 	HTAnchor *dest;
 	HTParentAnchor *parent;
 	char *address;
-	CONST char *title;
+	const char *title;
 
 	if (child == 0) {
 	    /*
@@ -242,9 +242,9 @@ PUBLIC int showlist ARGS2(
 **	titles		Set:	if we want titles where available
 **			Clear:	we only get addresses.
 */
-PUBLIC void printlist ARGS2(
-	FILE *, 	fp,
-	BOOLEAN,	titles)
+void printlist (
+	FILE * 	fp,
+	BOOLEAN	titles)
 {
     int cnt;
     int refs, hidden_links;
@@ -270,7 +270,7 @@ PUBLIC void printlist ARGS2(
 	    HTChildAnchor *child = HText_childNextNumber(cnt, &helper);
 	    HTAnchor *dest;
 	    HTParentAnchor *parent;
-	    CONST char *title;
+	    const char *title;
 
 	    if (child == 0) {
 		/*
diff --git a/src/LYList.h b/src/LYList.h
index dd0dee9f..4ba4362c 100644
--- a/src/LYList.h
+++ b/src/LYList.h
@@ -3,7 +3,7 @@
 
 #include <LYStructs.h>
 
-extern int showlist PARAMS((DocInfo *newdoc, BOOLEAN titles));
-extern void printlist PARAMS((FILE *fp, BOOLEAN titles));
+extern int showlist (DocInfo *newdoc, BOOLEAN titles);
+extern void printlist (FILE *fp, BOOLEAN titles);
 
 #endif /* LYLIST_H */
diff --git a/src/LYLocal.c b/src/LYLocal.c
index 65c20190..5dd42f55 100644
--- a/src/LYLocal.c
+++ b/src/LYLocal.c
@@ -77,27 +77,27 @@
 #endif /* FNAMES_8_3 */
 #endif /* OK_INSTALL */
 
-PRIVATE char *get_filename PARAMS((
+static char *get_filename (
 	char *		prompt,
 	char *		buf,
-	size_t		bufsize));
+	size_t		bufsize);
 
 #ifdef OK_PERMIT
-PRIVATE int permit_location PARAMS((
+static int permit_location (
 	char *		destpath,
 	char *		srcpath,
-	char **		newpath));
+	char **		newpath);
 #endif /* OK_PERMIT */
 
-PRIVATE char *render_item PARAMS((
-	CONST char *	s,
-	CONST char *	path,
-	CONST char *	dir,
+static char *render_item (
+	const char *	s,
+	const char *	path,
+	const char *	dir,
 	char *		buf,
 	int		bufsize,
-	BOOLEAN		url_syntax));
+	BOOLEAN		url_syntax);
 
-PRIVATE struct dired_menu *menu_head = NULL;
+static struct dired_menu *menu_head = NULL;
 struct dired_menu {
     int cond;
 #define DE_TAG     1
@@ -262,7 +262,7 @@ struct dired_menu {
 		    NULL, NULL,					NULL }
 };
 
-PRIVATE BOOLEAN cannot_stat ARGS1(CONST char *, name)
+static BOOLEAN cannot_stat (const char * name)
 {
     char *tmpbuf = 0;
     HTSprintf0(&tmpbuf, gettext("Unable to get status of '%s'."), name);
@@ -273,7 +273,7 @@ PRIVATE BOOLEAN cannot_stat ARGS1(CONST char *, name)
 
 #define OK_STAT(name, sb) (stat(name, sb) == 0)
 
-PRIVATE BOOLEAN ok_stat ARGS2(CONST char *, name, struct stat*, sb)
+static BOOLEAN ok_stat (const char * name, struct stat* sb)
 {
     CTRACE((tfp, "testing ok_stat(%s)\n", name));
     if (!OK_STAT(name, sb)) {
@@ -283,7 +283,7 @@ PRIVATE BOOLEAN ok_stat ARGS2(CONST char *, name, struct stat*, sb)
 }
 
 #ifdef HAVE_LSTAT
-PRIVATE BOOLEAN ok_lstat ARGS2(char *, name, struct stat*, sb)
+static BOOLEAN ok_lstat (char * name, struct stat* sb)
 {
     CTRACE((tfp, "testing ok_lstat(%s)\n", name));
     if (lstat(name, sb) < 0) {
@@ -295,7 +295,7 @@ PRIVATE BOOLEAN ok_lstat ARGS2(char *, name, struct stat*, sb)
 #define ok_lstat(name,sb) ok_stat(name,sb)
 #endif
 
-PRIVATE BOOLEAN ok_file_or_dir ARGS1(struct stat*, sb)
+static BOOLEAN ok_file_or_dir (struct stat* sb)
 {
     if (!S_ISDIR(sb->st_mode)
      && !S_ISREG(sb->st_mode)) {
@@ -306,7 +306,7 @@ PRIVATE BOOLEAN ok_file_or_dir ARGS1(struct stat*, sb)
 }
 
 #ifdef OK_INSTALL		/* currently only used in local_install */
-PRIVATE BOOLEAN ok_localname ARGS2(char*, dst, CONST char*, src)
+static BOOLEAN ok_localname (char* dst, const char* src)
 {
     struct stat dir_info;
 
@@ -326,10 +326,10 @@ PRIVATE BOOLEAN ok_localname ARGS2(char*, dst, CONST char*, src)
 /*
  *  Execute DIRED command, return -1 or 0 on failure, 1 success.
  */
-PRIVATE int LYExecv ARGS3(
-	CONST char *,	path,
-	char **,	argv,
-	char *,		msg)
+static int LYExecv (
+	const char *	path,
+	char **	argv,
+	char *		msg)
 {
     int rc = 0;
 #if defined(VMS) || defined(_WINDOWS)
@@ -423,10 +423,10 @@ PRIVATE int LYExecv ARGS3(
     return(rc);
 }
 
-PRIVATE int make_directory ARGS1(char *, path)
+static int make_directory (char * path)
 {
     int code;
-    CONST char *program;
+    const char *program;
 
     if ((program = HTGetProgramPath(ppMKDIR)) != NULL) {
 	char *args[5];
@@ -448,10 +448,10 @@ PRIVATE int make_directory ARGS1(char *, path)
     return (code);
 }
 
-PRIVATE int remove_file ARGS1(char *, path)
+static int remove_file (char * path)
 {
     int code;
-    CONST char *program;
+    const char *program;
 
     if ((program = HTGetProgramPath(ppRM)) != NULL) {
 	char *args[5];
@@ -470,10 +470,10 @@ PRIVATE int remove_file ARGS1(char *, path)
     return (code);
 }
 
-PRIVATE int remove_directory ARGS1(char *, path)
+static int remove_directory (char * path)
 {
     int code;
-    CONST char *program;
+    const char *program;
 
     if ((program = HTGetProgramPath(ppRMDIR)) != NULL) {
 	char *args[5];
@@ -491,10 +491,10 @@ PRIVATE int remove_directory ARGS1(char *, path)
     return (code);
 }
 
-PRIVATE int touch_file ARGS1(char *, path)
+static int touch_file (char * path)
 {
     int code;
-    CONST char *program;
+    const char *program;
 
     if ((program = HTGetProgramPath(ppTOUCH)) != NULL) {
 	char *args[5];
@@ -518,10 +518,10 @@ PRIVATE int touch_file ARGS1(char *, path)
     return (code);
 }
 
-PRIVATE int move_file ARGS2(char *, source, char *, target)
+static int move_file (char * source, char * target)
 {
     int code;
-    CONST char *program;
+    const char *program;
 
     if ((program = HTGetProgramPath(ppMV)) != NULL) {
 	char *msg = 0;
@@ -556,7 +556,7 @@ PRIVATE int move_file ARGS2(char *, source, char *, target)
     return code;
 }
 
-PRIVATE BOOLEAN not_already_exists ARGS1(char *, name)
+static BOOLEAN not_already_exists (char * name)
 {
     struct stat dir_info;
 
@@ -576,7 +576,7 @@ PRIVATE BOOLEAN not_already_exists ARGS1(char *, name)
     return FALSE;
 }
 
-PRIVATE BOOLEAN dir_has_same_owner ARGS2(struct stat *, info, int, owner)
+static BOOLEAN dir_has_same_owner (struct stat * info, int owner)
 {
     if (S_ISDIR(info->st_mode)) {
 	if ((int) info->st_uid == owner) {
@@ -593,7 +593,7 @@ PRIVATE BOOLEAN dir_has_same_owner ARGS2(struct stat *, info, int, owner)
 /*
  *  Remove all tagged files and directories.
  */
-PRIVATE int remove_tagged NOARGS
+static int remove_tagged (void)
 {
     int ans;
     BOOL will_clear = TRUE;
@@ -649,8 +649,8 @@ PRIVATE int remove_tagged NOARGS
  *  If a user has enough permissions to move a file somewhere, the same
  *   uid with Lynx & dired can do the same thing.
  */
-PRIVATE int modify_tagged ARGS1(
-	char *,		testpath)
+static int modify_tagged (
+	char *		testpath)
 {
     char *cp;
     dev_t dev;
@@ -805,8 +805,8 @@ PRIVATE int modify_tagged ARGS1(
 /*
  *  Modify the name of the specified item.
  */
-PRIVATE int modify_name ARGS1(
-	char *,		testpath)
+static int modify_name (
+	char *		testpath)
 {
     char *cp;
     char tmpbuf[DIRED_MAXBUF];
@@ -861,8 +861,8 @@ PRIVATE int modify_name ARGS1(
 /*
  *  Change the location of a file or directory.
  */
-PRIVATE int modify_location ARGS1(
-	char *,		testpath)
+static int modify_location (
+	char *		testpath)
 {
     char *cp;
     dev_t dev;
@@ -956,9 +956,9 @@ PRIVATE int modify_location ARGS1(
 /*
  *  Modify name or location of a file or directory on localhost.
  */
-PUBLIC int local_modify ARGS2(
-	DocInfo *,	doc,
-	char **,	newpath)
+int local_modify (
+	DocInfo *	doc,
+	char **	newpath)
 {
     int ans;
     char *cp;
@@ -1029,8 +1029,8 @@ PUBLIC int local_modify ARGS2(
 /*
  *  Create a new empty file in the current directory.
  */
-PRIVATE int create_file ARGS1(
-	char *,		current_location)
+static int create_file (
+	char *		current_location)
 {
     int code = FALSE;
     char tmpbuf[DIRED_MAXBUF];
@@ -1071,8 +1071,8 @@ PRIVATE int create_file ARGS1(
 /*
  *  Create a new directory in the current directory.
  */
-PRIVATE int create_directory ARGS1(
-	char *,		current_location)
+static int create_directory (
+	char *		current_location)
 {
     int code = FALSE;
     char tmpbuf[DIRED_MAXBUF];
@@ -1110,8 +1110,8 @@ PRIVATE int create_directory ARGS1(
 /*
  *  Create a file or a directory at the current location.
  */
-PUBLIC int local_create ARGS1(
-	DocInfo *,	doc)
+int local_create (
+	DocInfo *	doc)
 {
     int ans;
     char *cp;
@@ -1140,8 +1140,8 @@ PUBLIC int local_create ARGS1(
 /*
  *  Remove a single file or directory.
  */
-PRIVATE int remove_single ARGS1(
-	char *,		testpath)
+static int remove_single (
+	char *		testpath)
 {
     int code = 0;
     char *cp;
@@ -1204,8 +1204,8 @@ PRIVATE int remove_single ARGS1(
 /*
  *  Remove a file or a directory.
  */
-PUBLIC int local_remove ARGS1(
-	DocInfo *,	doc)
+int local_remove (
+	DocInfo *	doc)
 {
     char *cp, *tp;
     char testpath[DIRED_MAXBUF];
@@ -1245,9 +1245,9 @@ PUBLIC int local_remove ARGS1(
 
 #ifdef OK_PERMIT
 
-PRIVATE char LYValidPermitFile[LY_MAXPATH] = "\0";
+static char LYValidPermitFile[LY_MAXPATH] = "\0";
 
-PRIVATE long permit_bits ARGS1(char *, string_mode)
+static long permit_bits (char * string_mode)
 {
     if (!strcmp(string_mode, "IRUSR")) return S_IRUSR;
     if (!strcmp(string_mode, "IWUSR")) return S_IWUSR;
@@ -1265,10 +1265,10 @@ PRIVATE long permit_bits ARGS1(char *, string_mode)
 /*
  *  Handle DIRED permissions.
  */
-PRIVATE int permit_location ARGS3(
-	char *,		destpath,
-	char *,		srcpath,
-	char **,	newpath)
+static int permit_location (
+	char *		destpath,
+	char *		srcpath,
+	char **	newpath)
 {
 #ifndef UNIX
     HTAlert(gettext("Sorry, don't know how to permit non-UNIX files yet."));
@@ -1278,7 +1278,7 @@ PRIVATE int permit_location ARGS3(
     char *cp;
     char tmpdst[LY_MAXPATH];
     struct stat dir_info;
-    CONST char *program;
+    const char *program;
 
     if (srcpath) {
 	/*
@@ -1519,9 +1519,9 @@ PRIVATE int permit_location ARGS3(
 /*
  *  Display or remove a tag from a given link.
  */
-PUBLIC void tagflag ARGS2(
-	int,		flag,
-	int,		cur)
+void tagflag (
+	int		flag,
+	int		cur)
 {
     if (nlinks > 0) {
 	LYmove(links[cur].ly, 2);
@@ -1549,8 +1549,8 @@ PUBLIC void tagflag ARGS2(
 /*
  *  Handle DIRED tags.
  */
-PUBLIC void showtags ARGS1(
-	HTList *,	t)
+void showtags (
+	HTList *	t)
 {
     int i;
     HTList *s;
@@ -1567,8 +1567,8 @@ PUBLIC void showtags ARGS1(
     }
 }
 
-PRIVATE char * DirectoryOf ARGS1(
-	char *,		pathname)
+static char * DirectoryOf (
+	char *		pathname)
 {
     char *result = 0;
     char *leaf;
@@ -1577,7 +1577,7 @@ PRIVATE char * DirectoryOf ARGS1(
     leaf = LYPathLeaf(result);
 
     if (leaf != result) {
-	CONST char *result1 = 0;
+	const char *result1 = 0;
 
 	*leaf = '\0';
 	if (!LYisRootPath(result))
@@ -1593,8 +1593,8 @@ PRIVATE char * DirectoryOf ARGS1(
  * Convert filenames to acceptable 8+3 names when necessary.  Make a copy of
  * the parameter if we must modify it.
  */
-PRIVATE char * LYonedot ARGS1(
-	char *,		line)
+static char * LYonedot (
+	char *		line)
 {
     char *dot;
     static char line1[LY_MAXPATH];
@@ -1619,9 +1619,9 @@ PRIVATE char * LYonedot ARGS1(
 #define LYonedot(path) path
 #endif /*  __DJGPP__ */
 
-PRIVATE char * match_op ARGS2(
-	CONST char *,	prefix,
-	char *,		data)
+static char * match_op (
+	const char *	prefix,
+	char *		data)
 {
     int len = strlen(prefix);
 
@@ -1642,14 +1642,14 @@ PRIVATE char * match_op ARGS2(
  *  Construct the appropriate system command taking care to
  *  escape all path references to avoid spoofing the shell.
  */
-PRIVATE char *build_command ARGS3(
-	char *,		line,
-	char *,		dirname,
-	char *,		arg)
+static char *build_command (
+	char *		line,
+	char *		dirname,
+	char *		arg)
 {
     char *buffer = NULL;
-    CONST char *program;
-    CONST char *tar_path = HTGetProgramPath(ppTAR);
+    const char *program;
+    const char *tar_path = HTGetProgramPath(ppTAR);
 
     if ((arg = match_op("DECOMPRESS", line)) != 0) {
 #define FMT_UNCOMPRESS "%s %s"
@@ -1844,8 +1844,8 @@ PRIVATE char *build_command ARGS3(
  *  about not escaping parsing '#' "the URL way" built into HTParse, but that
  *  doesn't look like a clean way.)
  */
-PUBLIC int local_dired ARGS1(
-	DocInfo *,	doc)
+int local_dired (
+	DocInfo *	doc)
 {
     char *line_url;    /* will point to doc's address, which is a URL */
     char *line = NULL; /* same as line_url, but HTUnEscaped, will be alloced */
@@ -1972,9 +1972,9 @@ PUBLIC int local_dired ARGS1(
 /*
  *  Provide a menu of file management options.
  */
-PUBLIC int dired_options ARGS2(
-	DocInfo *,	doc,
-	char **,	newfile)
+int dired_options (
+	DocInfo *	doc,
+	char **	newfile)
 {
     static char tempfile[LY_MAXPATH];
     char *path;
@@ -2128,10 +2128,10 @@ PUBLIC int dired_options ARGS2(
 /*
  *  Check DIRED filename.
  */
-PRIVATE char *get_filename ARGS3(
-	char *,		prompt,
-	char *,		buf,
-	size_t,		bufsize)
+static char *get_filename (
+	char *		prompt,
+	char *		buf,
+	size_t		bufsize)
 {
     char *cp;
 
@@ -2164,7 +2164,7 @@ PRIVATE char *get_filename ARGS3(
 static char ** install_argp = NULL;	/* args for execv install */
 static char * install_path = NULL;	/* auxiliary */
 #ifdef LY_FIND_LEAKS
-PRIVATE void clear_install_path NOARGS
+static void clear_install_path (void)
 {
     FREE(install_argp);
     FREE(install_path);
@@ -2183,12 +2183,12 @@ PRIVATE void clear_install_path NOARGS
  *  because INSTALL_ARGS may be significant, and someone may configure it
  *  with more than one significant flags. - kw
  */
-PRIVATE int fill_argv_for_execv ARGS5(
-    char ***,		argvp,
-    char **,		pathp,
-    char *,		cmd_path,
-    CONST char *,	cmd_args,
-    int,		reserve)
+static int fill_argv_for_execv (
+    char ***		argvp,
+    char **		pathp,
+    char *		cmd_path,
+    const char *	cmd_args,
+    int		reserve)
 {
     int n = 0;
 
@@ -2228,10 +2228,10 @@ PRIVATE int fill_argv_for_execv ARGS5(
 /*
  *  Install the specified file or directory.
  */
-PUBLIC BOOLEAN local_install ARGS3(
-	char *,		destpath,
-	char *,		srcpath,
-	char **,	newpath)
+BOOLEAN local_install (
+	char *		destpath,
+	char *		srcpath,
+	char **	newpath)
 {
     char *tmpbuf = NULL;
     static char savepath[DIRED_MAXBUF]; /* This will be the link that
@@ -2244,7 +2244,7 @@ PUBLIC BOOLEAN local_install ARGS3(
     int count = 0;
     int n = 0;		/* indices into 'args[]' */
     static int src = -1;
-    CONST char *program;
+    const char *program;
 
     if ((program = HTGetProgramPath(ppINSTALL)) == NULL) {
 	HTAlert(gettext("Install in the selected directory not permitted."));
@@ -2404,7 +2404,7 @@ PUBLIC BOOLEAN local_install ARGS3(
 /*
  *  Clear DIRED tags.
  */
-PUBLIC void clear_tags NOARGS
+void clear_tags (void)
 {
     char *cp = NULL;
 
@@ -2418,8 +2418,8 @@ PUBLIC void clear_tags NOARGS
 /*
  *  Handle DIRED menu item.
  */
-PUBLIC void add_menu_item ARGS1(
-	char *,		str)
+void add_menu_item (
+	char *		str)
 {
     struct dired_menu *new, *mp;
     char *cp;
@@ -2480,7 +2480,7 @@ PUBLIC void add_menu_item ARGS1(
 	menu_head = new;
 }
 
-PUBLIC void reset_dired_menu NOARGS
+void reset_dired_menu (void)
 {
     if (menu_head != defmenu) {
 	struct dired_menu *mp, *mp_next = NULL;
@@ -2499,15 +2499,15 @@ PUBLIC void reset_dired_menu NOARGS
 /*
  *  Create URL for DIRED HREF value.
  */
-PRIVATE char * render_item ARGS6(
-	CONST char *,	s,
-	CONST char *,	path,
-	CONST char *,	dir,
-	char *,		buf,
-	int,		bufsize,
-	BOOLEAN,	url_syntax)
+static char * render_item (
+	const char *	s,
+	const char *	path,
+	const char *	dir,
+	char *		buf,
+	int		bufsize,
+	BOOLEAN	url_syntax)
 {
-    CONST char *cp;
+    const char *cp;
     char *bp;
     char overrun = '\0';
     char *taglist = NULL;
diff --git a/src/LYLocal.h b/src/LYLocal.h
index 02044ee2..11ac1180 100644
--- a/src/LYLocal.h
+++ b/src/LYLocal.h
@@ -8,22 +8,22 @@
 /* Special return code for LYMainLoop.c */
 #define PERMIT_FORM_RESULT (-99)
 
-extern int local_create PARAMS((DocInfo *doc));
-extern int local_modify PARAMS((DocInfo *doc, char **newpath));
-extern int local_remove PARAMS((DocInfo *doc));
+extern int local_create (DocInfo *doc);
+extern int local_modify (DocInfo *doc, char **newpath);
+extern int local_remove (DocInfo *doc);
 #ifdef OK_INSTALL
-extern BOOLEAN local_install PARAMS((char *destpath, char *srcpath, char **newpath));
+extern BOOLEAN local_install (char *destpath, char *srcpath, char **newpath);
 #endif
 
 /* MainLoop needs to know about this one for atexit cleanup */
-extern void clear_tags NOPARAMS;
-
-extern int dired_options PARAMS ((DocInfo *doc, char ** newfile));
-extern int local_dired PARAMS((DocInfo *doc));
-extern void add_menu_item PARAMS((char *str));
-extern void reset_dired_menu NOPARAMS;
-extern void showtags PARAMS((HTList *tag));
-extern void tagflag PARAMS((int flag, int cur)); 
+extern void clear_tags (void);
+
+extern int dired_options (DocInfo *doc, char ** newfile);
+extern int local_dired (DocInfo *doc);
+extern void add_menu_item (char *str);
+extern void reset_dired_menu (void);
+extern void showtags (HTList *tag);
+extern void tagflag (int flag, int cur); 
 
 #endif /* DIRED_SUPPORT */
 
diff --git a/src/LYMail.c b/src/LYMail.c
index 6eaf7f69..89e9f13b 100644
--- a/src/LYMail.c
+++ b/src/LYMail.c
@@ -18,7 +18,7 @@
 
 BOOLEAN term_letter;	/* Global variable for async i/o. */
 
-PRIVATE void terminate_letter ARGS1(int,sig GCC_UNUSED)
+static void terminate_letter (int sig GCC_UNUSED)
 {
     term_letter = TRUE;
     /* Reassert the AST */
@@ -35,8 +35,8 @@ PRIVATE void terminate_letter ARGS1(int,sig GCC_UNUSED)
 }
 
 /* HTUnEscape with control-code nuking */
-PRIVATE void SafeHTUnEscape ARGS1(
-    char *,	string)
+static void SafeHTUnEscape (
+    char *	string)
 {
      int i;
      int flg = FALSE;
@@ -56,7 +56,7 @@ PRIVATE void SafeHTUnEscape ARGS1(
 	HTAlert(MAILTO_SQUASH_CTL);
 }
 
-PRIVATE void remove_tildes ARGS1(char *,string)
+static void remove_tildes (char *string)
 {
    /*
     *  Change the first character to
@@ -66,9 +66,9 @@ PRIVATE void remove_tildes ARGS1(char *,string)
 	*string = ' ';
 }
 
-PRIVATE void comma_append ARGS2(
-    char **,	dst,
-    char *,	src)
+static void comma_append (
+    char **	dst,
+    char *	src)
 {
     if (*src) {
 	while (*src == ',' || isspace(UCH(*src)))
@@ -84,10 +84,10 @@ PRIVATE void comma_append ARGS2(
     }
 }
 
-PRIVATE void extract_field ARGS3(
-    char **,	dst,
-    char *,	src,
-    char *,	keyword)
+static void extract_field (
+    char **	dst,
+    char *	src,
+    char *	keyword)
 {
     int len = strlen(keyword);
     char *cp, *cp1;
@@ -117,11 +117,11 @@ PRIVATE void extract_field ARGS3(
 /*
  * Seek and handle a subject=foo.  - FM
  */
-PRIVATE void extract_subject ARGS2(
-    char *,	dst,
-    char *,	src)
+static void extract_subject (
+    char *	dst,
+    char *	src)
 {
-    CONST char *keyword = "subject=";
+    const char *keyword = "subject=";
     int len = strlen(keyword);
     char *cp, *cp1;
 
@@ -153,11 +153,11 @@ PRIVATE void extract_subject ARGS2(
 /*
  * Seek and handle body=foo fields.  - FM
  */
-PRIVATE void extract_body ARGS2(
-    char **,	dst,
-    char *,	src)
+static void extract_body (
+    char **	dst,
+    char *	src)
 {
-    CONST char *keyword = "body=";
+    const char *keyword = "body=";
     int len = strlen(keyword);
     int i;
     char *cp, *cp0, *cp1, *temp = 0;
@@ -223,8 +223,8 @@ PRIVATE void extract_body ARGS2(
 /*
  * Convert any Explorer semi-colon Internet address separators to commas - FM
  */
-PRIVATE BOOLEAN trim_comma ARGS1(
-    char *,	address)
+static BOOLEAN trim_comma (
+    char *	address)
 {
     if (address[(strlen(address) - 1)] == ',')
 	address[(strlen(address) - 1)] = '\0';
@@ -234,8 +234,8 @@ PRIVATE BOOLEAN trim_comma ARGS1(
 /*
  * Convert any Explorer semi-colon Internet address separators to commas - FM
  */
-PRIVATE BOOLEAN convert_explorer ARGS1(
-    char *,	address)
+static BOOLEAN convert_explorer (
+    char *	address)
 {
     char *cp = address;
     char *cp0;
@@ -256,10 +256,10 @@ PRIVATE BOOLEAN convert_explorer ARGS1(
  * reply_by_mail() prompts line-by-line for header information, allowing
  * scrolling of the screen.
  */
-PRIVATE int header_prompt ARGS3(
-    char *,		label,
-    char **,		result,
-    unsigned,		limit)
+static int header_prompt (
+    char *		label,
+    char **		result,
+    unsigned		limit)
 {
     char buffer[LINESIZE];
     int ok;
@@ -287,8 +287,8 @@ PRIVATE int header_prompt ARGS3(
     return ok;
 }
 
-PRIVATE void show_addresses ARGS1(
-    char *,	addresses)
+static void show_addresses (
+    char *	addresses)
 {
     char *cp = addresses;
     char *cp1;
@@ -329,7 +329,7 @@ Blat <filename> -t <recipient> [optional switches (see below)]
 
 */
 
-PRIVATE char *blat_cmd(
+static char *blat_cmd(
 	char *mail_cmd,
 	char *filename,
 	char *address,
@@ -397,7 +397,7 @@ PRIVATE char *blat_cmd(
 #endif /* USE_BLAT_MAILER */
 
 #if USE_VMS_MAILER
-PUBLIC BOOLEAN LYMailPMDF(void)
+BOOLEAN LYMailPMDF(void)
 {
     return (system_mail != 0)
 	    ? !strncasecomp(system_mail, "PMDF SEND", 9)
@@ -407,7 +407,7 @@ PUBLIC BOOLEAN LYMailPMDF(void)
 /*
  * Add all of the people in the address field to the command
  */
-PRIVATE void vms_append_addrs (char **cmd, char *address, char *option)
+static void vms_append_addrs (char **cmd, char *address, char *option)
 {
     BOOLEAN first = TRUE;
     char *cp;
@@ -441,7 +441,7 @@ PRIVATE void vms_append_addrs (char **cmd, char *address, char *option)
     } while (address_ptr1 != NULL);
 }
 
-PRIVATE void remove_quotes (char * string)
+static void remove_quotes (char * string)
 {
     while (*string != 0) {
 	if (strchr("\"&|", *string) != 0)
@@ -455,7 +455,7 @@ PRIVATE void remove_quotes (char * string)
 /*
  * Open a pipe to the mailer
  */
-PUBLIC FILE *LYPipeToMailer NOARGS
+FILE *LYPipeToMailer (void)
 {
     char *buffer = NULL;
     FILE *fp = NULL;
@@ -470,12 +470,12 @@ PUBLIC FILE *LYPipeToMailer NOARGS
 }
 #else	/* DOS, Win32, etc. */
 
-PUBLIC int LYSendMailFile ARGS5(
-    char *,	the_address,
-    char *,	the_filename,
-    char *,	the_subject GCC_UNUSED,
-    char *,	the_ccaddr GCC_UNUSED,
-    char *,	message)
+int LYSendMailFile (
+    char *	the_address,
+    char *	the_filename,
+    char *	the_subject GCC_UNUSED,
+    char *	the_ccaddr GCC_UNUSED,
+    char *	message)
 {
     char *cmd = NULL;
 #ifdef __DJGPP__
@@ -548,11 +548,11 @@ PUBLIC int LYSendMailFile ARGS5(
 /*
 **  mailform() sends form content to the mailto address(es). - FM
 */
-PUBLIC void mailform ARGS4(
-    CONST char *,	mailto_address,
-    CONST char *,	mailto_subject,
-    CONST char *,	mailto_content,
-    CONST char *,	mailto_type)
+void mailform (
+    const char *	mailto_address,
+    const char *	mailto_subject,
+    const char *	mailto_content,
+    const char *	mailto_type)
 {
     FILE *fd;
     char *address = NULL;
@@ -877,11 +877,11 @@ cleanup:
 **  mailmsg() sends a message to the owner of the file, if one is defined,
 **  telling of errors (i.e., link not available).
 */
-PUBLIC void mailmsg ARGS4(
-	int,		cur,
-	char *,		owner_address,
-	char *,		filename,
-	char *,		linkname)
+void mailmsg (
+	int		cur,
+	char *		owner_address,
+	char *		filename,
+	char *		linkname)
 {
     FILE *fd, *fp;
     char *address = NULL;
@@ -1107,11 +1107,11 @@ PUBLIC void mailmsg ARGS4(
 **  reply_by_mail() invokes sendmail on Unix or mail on VMS to send
 **  a comment from the users to the owner
 */
-PUBLIC void reply_by_mail ARGS4(
-	char *,		mail_address,
-	char *,		filename,
-	CONST char *,	title,
-	CONST char *,	refid)
+void reply_by_mail (
+	char *		mail_address,
+	char *		filename,
+	const char *	title,
+	const char *	refid)
 {
 #ifndef NO_ANONYMOUS_EMAIL
     static char *personal_name = NULL;
@@ -1747,7 +1747,7 @@ cleanup:
 /*
  * Check that we have configured values for system mailer.
  */
-PUBLIC BOOLEAN LYSystemMail NOARGS
+BOOLEAN LYSystemMail (void)
 {
     if (system_mail == 0 || !strcmp(system_mail, "unknown")) {
 	HTAlert(gettext("No system mailer configured"));
diff --git a/src/LYMail.h b/src/LYMail.h
index 9d93d0e1..5bb5e8ac 100644
--- a/src/LYMail.h
+++ b/src/LYMail.h
@@ -29,29 +29,29 @@
 
 extern BOOLEAN term_letter;
 
-extern BOOLEAN LYSystemMail NOPARAMS;
-extern BOOLEAN LYMailPMDF NOPARAMS;
-extern FILE *LYPipeToMailer NOPARAMS;
-extern int LYSendMailFile PARAMS((
+extern BOOLEAN LYSystemMail (void);
+extern BOOLEAN LYMailPMDF (void);
+extern FILE *LYPipeToMailer (void);
+extern int LYSendMailFile (
 	char *		the_address,
 	char *		the_filename,
 	char *		the_subject,
 	char *		the_ccaddr,
-	char *		message));
-extern void mailform PARAMS((
-	CONST char *	mailto_address,
-	CONST char *	mailto_subject,
-	CONST char *	mailto_content,
-	CONST char *	mailto_type));
-extern void mailmsg PARAMS((
+	char *		message);
+extern void mailform (
+	const char *	mailto_address,
+	const char *	mailto_subject,
+	const char *	mailto_content,
+	const char *	mailto_type);
+extern void mailmsg (
 	int		cur,
 	char *		owner_address,
 	char *		filename,
-	char *		linkname));
-extern void reply_by_mail PARAMS((
+	char *		linkname);
+extern void reply_by_mail (
 	char *		mail_address,
 	char *		filename,
-	CONST char *	title,
-	CONST char *	refid));
+	const char *	title,
+	const char *	refid);
 
 #endif /* LYMAIL_H */
diff --git a/src/LYMain.c b/src/LYMain.c
index b85d70dc..cbf71f6a 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -68,394 +68,394 @@
 
 /* ahhhhhhhhhh!! Global variables :-< */
 #ifdef SOCKS
-PUBLIC BOOLEAN socks_flag=TRUE;
+BOOLEAN socks_flag=TRUE;
 #endif /* SOCKS */
 
 #ifdef IGNORE_CTRL_C
-PUBLIC BOOLEAN sigint = FALSE;
+BOOLEAN sigint = FALSE;
 #endif /* IGNORE_CTRL_C */
 
 #ifdef __DJGPP__
-PRIVATE char init_ctrl_break[1];
+static char init_ctrl_break[1];
 #endif /* __DJGPP__ */
 
 #if USE_VMS_MAILER
-PUBLIC char *mail_adrs = NULL;	/* the mask for a VMS mail transport */
+char *mail_adrs = NULL;	/* the mask for a VMS mail transport */
 #endif
 
 #ifdef VMS
 	       /* create FIXED 512 binaries */
-PUBLIC BOOLEAN UseFixedRecords = USE_FIXED_RECORDS;
+BOOLEAN UseFixedRecords = USE_FIXED_RECORDS;
 #endif /* VMS */
 
 #ifndef VMS
-PRIVATE char *lynx_version_putenv_command = NULL;
-PUBLIC char *list_format = NULL;	/* LONG_LIST formatting mask */
+static char *lynx_version_putenv_command = NULL;
+char *list_format = NULL;	/* LONG_LIST formatting mask */
 #ifdef SYSLOG_REQUESTED_URLS
-PUBLIC char *syslog_txt = NULL;		/* syslog arb text for session */
+char *syslog_txt = NULL;		/* syslog arb text for session */
 #endif /* SYSLOG_REQUESTED_URLS */
 #endif /* !VMS */
 
 #ifdef DIRED_SUPPORT
-PUBLIC BOOLEAN lynx_edit_mode = FALSE;
-PUBLIC BOOLEAN no_dired_support = FALSE;
-PUBLIC HTList *tagged = NULL;
-PUBLIC int LYAutoUncacheDirLists = 2; /* default dired uncaching behavior */
-PUBLIC int dir_list_order = ORDER_BY_NAME;
-PUBLIC int dir_list_style = MIXED_STYLE;
+BOOLEAN lynx_edit_mode = FALSE;
+BOOLEAN no_dired_support = FALSE;
+HTList *tagged = NULL;
+int LYAutoUncacheDirLists = 2; /* default dired uncaching behavior */
+int dir_list_order = ORDER_BY_NAME;
+int dir_list_style = MIXED_STYLE;
 
 #ifdef OK_OVERRIDE
-PUBLIC BOOLEAN prev_lynx_edit_mode = FALSE;
+BOOLEAN prev_lynx_edit_mode = FALSE;
 #endif /* OK_OVERRIDE */
 
 #ifdef OK_PERMIT
 #ifdef NO_CHANGE_EXECUTE_PERMS
-PUBLIC BOOLEAN no_change_exec_perms = TRUE;
+BOOLEAN no_change_exec_perms = TRUE;
 #else
-PUBLIC BOOLEAN no_change_exec_perms = FALSE;
+BOOLEAN no_change_exec_perms = FALSE;
 #endif /* NO_CHANGE_EXECUTE_PERMS */
 #endif /* OK_PERMIT */
 
 #endif /* DIRED_SUPPORT */
 
 	   /* Number of docs cached in memory */
-PUBLIC int HTCacheSize = DEFAULT_CACHE_SIZE;
+int HTCacheSize = DEFAULT_CACHE_SIZE;
 #if defined(VMS) && defined(VAXC) && !defined(__DECC)
 	   /* Don't dump doc cache unless this size is exceeded */
-PUBLIC int HTVirtualMemorySize = DEFAULT_VIRTUAL_MEMORY_SIZE;
+int HTVirtualMemorySize = DEFAULT_VIRTUAL_MEMORY_SIZE;
 #endif /* VMS && VAXC && !_DECC */
 
 #if defined(EXEC_LINKS) || defined(EXEC_SCRIPTS)
 #ifndef NEVER_ALLOW_REMOTE_EXEC
-PUBLIC BOOLEAN local_exec = LOCAL_EXECUTION_LINKS_ALWAYS_ON;
+BOOLEAN local_exec = LOCAL_EXECUTION_LINKS_ALWAYS_ON;
 #else
-PUBLIC BOOLEAN local_exec = FALSE;
+BOOLEAN local_exec = FALSE;
 #endif /* NEVER_ALLOW_REMOTE_EXEC */
-PUBLIC BOOLEAN local_exec_on_local_files =
+BOOLEAN local_exec_on_local_files =
 	       LOCAL_EXECUTION_LINKS_ON_BUT_NOT_REMOTE;
 #endif /* EXEC_LINKS || EXEC_SCRIPTS */
 
 #if defined(LYNXCGI_LINKS) && !defined(VMS)  /* WebSter Mods -jkt */
-PUBLIC char *LYCgiDocumentRoot = NULL; /* DOCUMENT_ROOT in the lynxcgi env */
+char *LYCgiDocumentRoot = NULL; /* DOCUMENT_ROOT in the lynxcgi env */
 #endif /* LYNXCGI_LINKS */
 
 #ifdef REVERSE_CLEAR_SCREEN_PROBLEM
-PUBLIC BOOLEAN enable_scrollback=TRUE;
+BOOLEAN enable_scrollback=TRUE;
 #else
-PUBLIC BOOLEAN enable_scrollback=FALSE;
+BOOLEAN enable_scrollback=FALSE;
 #endif /* REVERSE_CLEAR_SCREEN_PROBLEM */
 
-PUBLIC char *empty_string = "\0";
-PUBLIC int display_lines;  /* number of lines in display */
-PUBLIC int www_search_result= -1;
+char *empty_string = "\0";
+int display_lines;  /* number of lines in display */
+int www_search_result= -1;
 			       /* linked list of printers */
-PUBLIC lynx_list_item_type *printers = NULL;
+lynx_list_item_type *printers = NULL;
 			    /* linked list of download options */
-PUBLIC lynx_list_item_type *downloaders = NULL;
+lynx_list_item_type *downloaders = NULL;
 			    /* linked list of upload options */
 #ifdef USE_EXTERNALS
-PUBLIC lynx_list_item_type *externals = NULL;
+lynx_list_item_type *externals = NULL;
 			    /* linked list of external options */
 #endif
 
-PUBLIC lynx_list_item_type *uploaders = NULL;
-PUBLIC int port_syntax = 1;
-PUBLIC int LYShowColor = SHOW_COLOR_UNKNOWN; /* to show or not */
-PUBLIC int LYrcShowColor = SHOW_COLOR_UNKNOWN; /* ... last used */
+lynx_list_item_type *uploaders = NULL;
+int port_syntax = 1;
+int LYShowColor = SHOW_COLOR_UNKNOWN; /* to show or not */
+int LYrcShowColor = SHOW_COLOR_UNKNOWN; /* ... last used */
 
 #if !defined(NO_OPTION_FORMS) && !defined(NO_OPTION_MENU)
-PUBLIC BOOLEAN LYUseFormsOptions = TRUE; /* use forms-based options menu */
-#endif
-
-PUBLIC BOOLEAN LYJumpFileURL = FALSE;	 /* always FALSE the first time */
-PUBLIC BOOLEAN LYPermitURL = FALSE;
-PUBLIC BOOLEAN LYRestricted = FALSE; /* whether we have -anonymous option */
-PUBLIC BOOLEAN LYShowCursor = SHOW_CURSOR; /* to show or not to show */
-PUBLIC BOOLEAN LYUnderlineLinks = UNDERLINE_LINKS; /* Show the links underlined vs bold */
-PUBLIC BOOLEAN LYUseDefShoCur = TRUE;	/* Command line -show_cursor toggle */
-PUBLIC BOOLEAN LYUserSpecifiedURL = TRUE;/* always TRUE  the first time */
-PUBLIC BOOLEAN LYValidate = FALSE;
-PUBLIC BOOLEAN LYforce_no_cache = FALSE;
-PUBLIC BOOLEAN LYinternal_flag = FALSE; /* override no-cache b/c internal link*/
-PUBLIC BOOLEAN LYoverride_no_cache = FALSE;/*override no-cache b/c history etc*/
-PUBLIC BOOLEAN LYresubmit_posts = ALWAYS_RESUBMIT_POSTS;
-PUBLIC BOOLEAN LYtrimInputFields = FALSE;
-PUBLIC BOOLEAN bold_H1 = FALSE;
-PUBLIC BOOLEAN bold_headers = FALSE;
-PUBLIC BOOLEAN bold_name_anchors = FALSE;
-PUBLIC BOOLEAN case_sensitive = CASE_SENSITIVE_ALWAYS_ON;
-PUBLIC BOOLEAN check_mail = CHECKMAIL;
-PUBLIC BOOLEAN child_lynx = FALSE;
-PUBLIC BOOLEAN dump_output_immediately = FALSE;
-PUBLIC BOOLEAN emacs_keys = EMACS_KEYS_ALWAYS_ON;
-PUBLIC BOOLEAN error_logging = MAIL_SYSTEM_ERROR_LOGGING;
-PUBLIC BOOLEAN ftp_passive = FTP_PASSIVE; /* TRUE if doing ftp in passive mode */
-PUBLIC BOOLEAN ftp_local_passive;
-PUBLIC char *ftp_lasthost;
-PUBLIC BOOLEAN goto_buffer = GOTOBUFFER; /* TRUE if offering default goto URL */
-PUBLIC BOOLEAN historical_comments = FALSE;
-PUBLIC BOOLEAN is_www_index = FALSE;
-PUBLIC BOOLEAN jump_buffer = JUMPBUFFER; /* TRUE if offering default shortcut */
-PUBLIC BOOLEAN lynx_mode = NORMAL_LYNX_MODE;
-PUBLIC BOOLEAN minimal_comments = FALSE;
-PUBLIC BOOLEAN nolist = FALSE;
-PUBLIC BOOLEAN number_fields_on_left = TRUE;
-PUBLIC BOOLEAN number_links_on_left = TRUE;
-PUBLIC BOOLEAN recent_sizechange = FALSE;/* the window size changed recently? */
-PUBLIC BOOLEAN soft_dquotes = FALSE;
-PUBLIC BOOLEAN use_underscore = SUBSTITUTE_UNDERSCORES;
-PUBLIC BOOLEAN verbose_img = VERBOSE_IMAGES;  /* show filenames or not */
-PUBLIC BOOLEAN vi_keys = VI_KEYS_ALWAYS_ON;
-PUBLIC int keypad_mode = DEFAULT_KEYPAD_MODE;
-PUBLIC int user_mode = NOVICE_MODE;
-
-PUBLIC BOOLEAN telnet_ok = TRUE;
+BOOLEAN LYUseFormsOptions = TRUE; /* use forms-based options menu */
+#endif
+
+BOOLEAN LYJumpFileURL = FALSE;	 /* always FALSE the first time */
+BOOLEAN LYPermitURL = FALSE;
+BOOLEAN LYRestricted = FALSE; /* whether we have -anonymous option */
+BOOLEAN LYShowCursor = SHOW_CURSOR; /* to show or not to show */
+BOOLEAN LYUnderlineLinks = UNDERLINE_LINKS; /* Show the links underlined vs bold */
+BOOLEAN LYUseDefShoCur = TRUE;	/* Command line -show_cursor toggle */
+BOOLEAN LYUserSpecifiedURL = TRUE;/* always TRUE  the first time */
+BOOLEAN LYValidate = FALSE;
+BOOLEAN LYforce_no_cache = FALSE;
+BOOLEAN LYinternal_flag = FALSE; /* override no-cache b/c internal link*/
+BOOLEAN LYoverride_no_cache = FALSE;/*override no-cache b/c history etc*/
+BOOLEAN LYresubmit_posts = ALWAYS_RESUBMIT_POSTS;
+BOOLEAN LYtrimInputFields = FALSE;
+BOOLEAN bold_H1 = FALSE;
+BOOLEAN bold_headers = FALSE;
+BOOLEAN bold_name_anchors = FALSE;
+BOOLEAN case_sensitive = CASE_SENSITIVE_ALWAYS_ON;
+BOOLEAN check_mail = CHECKMAIL;
+BOOLEAN child_lynx = FALSE;
+BOOLEAN dump_output_immediately = FALSE;
+BOOLEAN emacs_keys = EMACS_KEYS_ALWAYS_ON;
+BOOLEAN error_logging = MAIL_SYSTEM_ERROR_LOGGING;
+BOOLEAN ftp_passive = FTP_PASSIVE; /* TRUE if doing ftp in passive mode */
+BOOLEAN ftp_local_passive;
+char *ftp_lasthost;
+BOOLEAN goto_buffer = GOTOBUFFER; /* TRUE if offering default goto URL */
+BOOLEAN historical_comments = FALSE;
+BOOLEAN is_www_index = FALSE;
+BOOLEAN jump_buffer = JUMPBUFFER; /* TRUE if offering default shortcut */
+BOOLEAN lynx_mode = NORMAL_LYNX_MODE;
+BOOLEAN minimal_comments = FALSE;
+BOOLEAN nolist = FALSE;
+BOOLEAN number_fields_on_left = TRUE;
+BOOLEAN number_links_on_left = TRUE;
+BOOLEAN recent_sizechange = FALSE;/* the window size changed recently? */
+BOOLEAN soft_dquotes = FALSE;
+BOOLEAN use_underscore = SUBSTITUTE_UNDERSCORES;
+BOOLEAN verbose_img = VERBOSE_IMAGES;  /* show filenames or not */
+BOOLEAN vi_keys = VI_KEYS_ALWAYS_ON;
+int keypad_mode = DEFAULT_KEYPAD_MODE;
+int user_mode = NOVICE_MODE;
+
+BOOLEAN telnet_ok = TRUE;
 #ifndef DISABLE_NEWS
-PUBLIC BOOLEAN news_ok = TRUE;
-#endif
-PUBLIC BOOLEAN rlogin_ok = TRUE;
-PUBLIC BOOLEAN long_url_ok = FALSE;
-PUBLIC BOOLEAN ftp_ok = TRUE;
-PUBLIC BOOLEAN system_editor = FALSE;
-
-PUBLIC BOOLEAN had_restrictions_default = FALSE;
-PUBLIC BOOLEAN had_restrictions_all = FALSE;
-
-PUBLIC BOOLEAN exec_frozen = FALSE;
-PUBLIC BOOLEAN no_bookmark = FALSE;
-PUBLIC BOOLEAN no_bookmark_exec = FALSE;
-PUBLIC BOOLEAN no_chdir = FALSE;
-PUBLIC BOOLEAN no_disk_save = FALSE;
-PUBLIC BOOLEAN no_dotfiles = NO_DOT_FILES;
-PUBLIC BOOLEAN no_download = FALSE;
-PUBLIC BOOLEAN no_editor = FALSE;
-PUBLIC BOOLEAN no_exec = FALSE;
-PUBLIC BOOLEAN no_file_url = FALSE;
-PUBLIC BOOLEAN no_goto = FALSE;
-PUBLIC BOOLEAN no_goto_configinfo = FALSE;
-PUBLIC BOOLEAN no_goto_cso = FALSE;
-PUBLIC BOOLEAN no_goto_file = FALSE;
-PUBLIC BOOLEAN no_goto_finger = FALSE;
-PUBLIC BOOLEAN no_goto_ftp = FALSE;
-PUBLIC BOOLEAN no_goto_gopher = FALSE;
-PUBLIC BOOLEAN no_goto_http = FALSE;
-PUBLIC BOOLEAN no_goto_https = FALSE;
-PUBLIC BOOLEAN no_goto_lynxcgi = FALSE;
-PUBLIC BOOLEAN no_goto_lynxexec = FALSE;
-PUBLIC BOOLEAN no_goto_lynxprog = FALSE;
-PUBLIC BOOLEAN no_goto_mailto = FALSE;
-PUBLIC BOOLEAN no_goto_rlogin = FALSE;
-PUBLIC BOOLEAN no_goto_telnet = FALSE;
-PUBLIC BOOLEAN no_goto_tn3270 = FALSE;
-PUBLIC BOOLEAN no_goto_wais = FALSE;
-PUBLIC BOOLEAN no_inside_ftp = FALSE;
-PUBLIC BOOLEAN no_inside_rlogin = FALSE;
-PUBLIC BOOLEAN no_inside_telnet = FALSE;
-PUBLIC BOOLEAN no_jump = FALSE;
-PUBLIC BOOLEAN no_lynxcfg_info = FALSE;
-PUBLIC BOOLEAN no_lynxcgi = FALSE;
-PUBLIC BOOLEAN no_mail = FALSE;
-PUBLIC BOOLEAN no_multibook = FALSE;
-PUBLIC BOOLEAN no_option_save = FALSE;
-PUBLIC BOOLEAN no_outside_ftp = FALSE;
-PUBLIC BOOLEAN no_outside_rlogin = FALSE;
-PUBLIC BOOLEAN no_outside_telnet = FALSE;
-PUBLIC BOOLEAN no_print = FALSE;
-PUBLIC BOOLEAN no_shell = FALSE;
-PUBLIC BOOLEAN no_suspend = FALSE;
-PUBLIC BOOLEAN no_telnet_port = FALSE;
-PUBLIC BOOLEAN no_useragent = FALSE;
+BOOLEAN news_ok = TRUE;
+#endif
+BOOLEAN rlogin_ok = TRUE;
+BOOLEAN long_url_ok = FALSE;
+BOOLEAN ftp_ok = TRUE;
+BOOLEAN system_editor = FALSE;
+
+BOOLEAN had_restrictions_default = FALSE;
+BOOLEAN had_restrictions_all = FALSE;
+
+BOOLEAN exec_frozen = FALSE;
+BOOLEAN no_bookmark = FALSE;
+BOOLEAN no_bookmark_exec = FALSE;
+BOOLEAN no_chdir = FALSE;
+BOOLEAN no_disk_save = FALSE;
+BOOLEAN no_dotfiles = NO_DOT_FILES;
+BOOLEAN no_download = FALSE;
+BOOLEAN no_editor = FALSE;
+BOOLEAN no_exec = FALSE;
+BOOLEAN no_file_url = FALSE;
+BOOLEAN no_goto = FALSE;
+BOOLEAN no_goto_configinfo = FALSE;
+BOOLEAN no_goto_cso = FALSE;
+BOOLEAN no_goto_file = FALSE;
+BOOLEAN no_goto_finger = FALSE;
+BOOLEAN no_goto_ftp = FALSE;
+BOOLEAN no_goto_gopher = FALSE;
+BOOLEAN no_goto_http = FALSE;
+BOOLEAN no_goto_https = FALSE;
+BOOLEAN no_goto_lynxcgi = FALSE;
+BOOLEAN no_goto_lynxexec = FALSE;
+BOOLEAN no_goto_lynxprog = FALSE;
+BOOLEAN no_goto_mailto = FALSE;
+BOOLEAN no_goto_rlogin = FALSE;
+BOOLEAN no_goto_telnet = FALSE;
+BOOLEAN no_goto_tn3270 = FALSE;
+BOOLEAN no_goto_wais = FALSE;
+BOOLEAN no_inside_ftp = FALSE;
+BOOLEAN no_inside_rlogin = FALSE;
+BOOLEAN no_inside_telnet = FALSE;
+BOOLEAN no_jump = FALSE;
+BOOLEAN no_lynxcfg_info = FALSE;
+BOOLEAN no_lynxcgi = FALSE;
+BOOLEAN no_mail = FALSE;
+BOOLEAN no_multibook = FALSE;
+BOOLEAN no_option_save = FALSE;
+BOOLEAN no_outside_ftp = FALSE;
+BOOLEAN no_outside_rlogin = FALSE;
+BOOLEAN no_outside_telnet = FALSE;
+BOOLEAN no_print = FALSE;
+BOOLEAN no_shell = FALSE;
+BOOLEAN no_suspend = FALSE;
+BOOLEAN no_telnet_port = FALSE;
+BOOLEAN no_useragent = FALSE;
 
 #ifndef DISABLE_NEWS
-PUBLIC BOOLEAN no_goto_news = FALSE;
-PUBLIC BOOLEAN no_goto_nntp = FALSE;
-PUBLIC BOOLEAN no_goto_snews = FALSE;
-PUBLIC BOOLEAN no_inside_news = FALSE;
-PUBLIC BOOLEAN no_newspost = FALSE;
-PUBLIC BOOLEAN no_outside_news = FALSE;
+BOOLEAN no_goto_news = FALSE;
+BOOLEAN no_goto_nntp = FALSE;
+BOOLEAN no_goto_snews = FALSE;
+BOOLEAN no_inside_news = FALSE;
+BOOLEAN no_newspost = FALSE;
+BOOLEAN no_outside_news = FALSE;
 #endif
 
 #ifdef USE_EXTERNALS
-PUBLIC BOOLEAN no_externals = FALSE;
+BOOLEAN no_externals = FALSE;
 #endif
 
 #ifndef NO_CONFIG_INFO
-PUBLIC BOOLEAN no_lynxcfg_xinfo = FALSE;
+BOOLEAN no_lynxcfg_xinfo = FALSE;
 #ifdef HAVE_CONFIG_H
-PUBLIC BOOLEAN no_compileopts_info = FALSE;
+BOOLEAN no_compileopts_info = FALSE;
 #endif
 #endif
 
-PUBLIC BOOLEAN no_statusline = FALSE;
-PUBLIC BOOLEAN no_filereferer = TRUE;
-PUBLIC char LYRefererWithQuery = 'D';	/* 'D' for drop */
-PUBLIC BOOLEAN local_host_only = FALSE;
-PUBLIC BOOLEAN override_no_download = FALSE;
-PUBLIC BOOLEAN show_dotfiles = FALSE;	/* From rcfile if no_dotfiles is false */
-PUBLIC BOOLEAN LYforce_HTML_mode = FALSE;
-PUBLIC BOOLEAN LYfind_leaks = TRUE;
+BOOLEAN no_statusline = FALSE;
+BOOLEAN no_filereferer = TRUE;
+char LYRefererWithQuery = 'D';	/* 'D' for drop */
+BOOLEAN local_host_only = FALSE;
+BOOLEAN override_no_download = FALSE;
+BOOLEAN show_dotfiles = FALSE;	/* From rcfile if no_dotfiles is false */
+BOOLEAN LYforce_HTML_mode = FALSE;
+BOOLEAN LYfind_leaks = TRUE;
 
 #ifdef __DJGPP__
-PUBLIC BOOLEAN watt_debug = FALSE;	/* WATT-32 debugging */
-PUBLIC BOOLEAN dj_is_bash = FALSE;  /* Check for bash shell under DJGPP */
+BOOLEAN watt_debug = FALSE;	/* WATT-32 debugging */
+BOOLEAN dj_is_bash = FALSE;  /* Check for bash shell under DJGPP */
 #endif /* __DJGPP__ */
 
 #ifdef WIN_EX
-PUBLIC BOOLEAN focus_window = FALSE;	/* 1998/10/05 (Mon) 17:18:42 */
-PUBLIC char windows_drive[4];		/* 1998/01/13 (Tue) 21:13:24 */
+BOOLEAN focus_window = FALSE;	/* 1998/10/05 (Mon) 17:18:42 */
+char windows_drive[4];		/* 1998/01/13 (Tue) 21:13:24 */
 #endif
 
 #ifdef _WINDOWS
 #define	TIMEOUT	180			/* 1998/03/30 (Mon) 14:50:44 */
-PUBLIC int lynx_timeout = TIMEOUT;
-PUBLIC CRITICAL_SECTION critSec_DNS;	/* 1998/09/03 (Thu) 22:01:56 */
-PUBLIC CRITICAL_SECTION critSec_READ;	/* 1998/09/03 (Thu) 22:01:56 */
+int lynx_timeout = TIMEOUT;
+CRITICAL_SECTION critSec_DNS;	/* 1998/09/03 (Thu) 22:01:56 */
+CRITICAL_SECTION critSec_READ;	/* 1998/09/03 (Thu) 22:01:56 */
 #endif /* _WINDOWS */
 
 #if defined(WIN_EX)
-PUBLIC BOOLEAN system_is_NT = FALSE;
+BOOLEAN system_is_NT = FALSE;
 #endif
 
 #ifdef SH_EX
-PUBLIC BOOLEAN show_cfg = FALSE;
+BOOLEAN show_cfg = FALSE;
 #endif
 
-PUBLIC BOOLEAN no_table_center = FALSE;	/* 1998/10/09 (Fri) 15:12:49 */
+BOOLEAN no_table_center = FALSE;	/* 1998/10/09 (Fri) 15:12:49 */
 
 #if USE_BLAT_MAILER
-PUBLIC BOOLEAN mail_is_blat = TRUE;
+BOOLEAN mail_is_blat = TRUE;
 #endif
 
 #ifdef USE_BLINK
 #  ifdef __EMX__
-PUBLIC BOOLEAN term_blink_is_boldbg = TRUE;
+BOOLEAN term_blink_is_boldbg = TRUE;
 #  else
-PUBLIC BOOLEAN term_blink_is_boldbg = FALSE;
+BOOLEAN term_blink_is_boldbg = FALSE;
 #  endif
 #endif
 
-PUBLIC BOOLEAN HEAD_request = FALSE;
-PUBLIC BOOLEAN LYAcceptAllCookies = ACCEPT_ALL_COOKIES; /* take all cookies? */
-PUBLIC BOOLEAN LYCancelledFetch = FALSE;/* TRUE if cancelled binary fetch */
-PUBLIC BOOLEAN LYCollapseBRs = COLLAPSE_BR_TAGS;  /* Collapse serial BRs? */
-PUBLIC BOOLEAN LYDefaultRawMode;
-PUBLIC BOOLEAN LYListNewsDates = LIST_NEWS_DATES;
-PUBLIC BOOLEAN LYListNewsNumbers = LIST_NEWS_NUMBERS;
-PUBLIC BOOLEAN LYMBMBlocked = BLOCK_MULTI_BOOKMARKS;
-PUBLIC BOOLEAN LYNewsPosting = NEWS_POSTING; /* News posting supported? */
-PUBLIC BOOLEAN LYNoFromHeader = TRUE;	/* Never send From header?	   */
-PUBLIC BOOLEAN LYNoRefererForThis=FALSE;/* No Referer header for this URL? */
-PUBLIC BOOLEAN LYNoRefererHeader=FALSE; /* Never send Referer header?	   */
-PUBLIC BOOLEAN LYRawMode;
-PUBLIC BOOLEAN LYSelectPopups = USE_SELECT_POPUPS;
-PUBLIC BOOLEAN LYSetCookies = SET_COOKIES; /* Process Set-Cookie headers? */
-PUBLIC BOOLEAN LYUseDefSelPop = TRUE;	/* Command line -popup toggle */
-PUBLIC BOOLEAN LYUseDefaultRawMode = TRUE;
-PUBLIC BOOLEAN LYUseMouse = FALSE;
-PUBLIC BOOLEAN LYisConfiguredForX = FALSE;
-PUBLIC BOOLEAN UCForce8bitTOUPPER = FALSE; /* override locale for case-conversion? */
-PUBLIC BOOLEAN UCSaveBookmarksInUnicode = FALSE;
-PUBLIC BOOLEAN bookmark_start = FALSE;
-PUBLIC BOOLEAN check_realm = FALSE;  /* Restrict to the starting realm? */
-PUBLIC BOOLEAN clickable_images = MAKE_LINKS_FOR_ALL_IMAGES;
-PUBLIC BOOLEAN crawl = FALSE;		/* Do crawl? */
-PUBLIC BOOLEAN keep_mime_headers = FALSE; /* Include mime headers with source dump */
-PUBLIC BOOLEAN more = FALSE;		/* is there more text to display? */
-PUBLIC BOOLEAN more_links = FALSE;	/* Links beyond a displayed page with no links? */
-PUBLIC BOOLEAN no_url_redirection = FALSE; /* Don't follow URL redirections */
-PUBLIC BOOLEAN pseudo_inline_alts = MAKE_PSEUDO_ALTS_FOR_INLINES;
-PUBLIC BOOLEAN scan_for_buried_news_references = TRUE;
-PUBLIC BOOLEAN startfile_ok = FALSE;
-PUBLIC BOOLEAN startfile_stdin = FALSE;
-PUBLIC BOOLEAN traversal = FALSE;	/* Do traversals? */
-PUBLIC char *BookmarkPage = NULL;	/* the name of the current bookmark page */
-PUBLIC char *LYCookieAcceptDomains = NULL; /* domains to accept all cookies */
-PUBLIC char *LYCookieLooseCheckDomains = NULL;  /* check loosely   */
-PUBLIC char *LYCookieQueryCheckDomains = NULL;  /* check w/a query */
-PUBLIC char *LYCookieRejectDomains = NULL; /* domains to reject all cookies */
-PUBLIC char *LYCookieSAcceptDomains = NULL; /* domains to accept all cookies */
-PUBLIC char *LYCookieSLooseCheckDomains = NULL;  /* check loosely   */
-PUBLIC char *LYCookieSQueryCheckDomains = NULL;  /* check w/a query */
-PUBLIC char *LYCookieSRejectDomains = NULL; /* domains to reject all cookies */
-PUBLIC char *LYCookieSStrictCheckDomains = NULL; /* check strictly  */
-PUBLIC char *LYCookieStrictCheckDomains = NULL; /* check strictly  */
-PUBLIC char *LYHostName = NULL;		/* treat as a local host name */
-PUBLIC char *LYLocalDomain = NULL;	/* treat as a local domain tail */
-PUBLIC char *LYUserAgent = NULL;	/* Lynx User-Agent header	   */
-PUBLIC char *LYUserAgentDefault = NULL; /* Lynx default User-Agent header  */
-PUBLIC char *LynxHome = NULL;		/* the default Home HREF. */
-PUBLIC char *LynxSigFile = NULL;	/* Signature file, in or off home */
-PUBLIC char *UCAssume_MIMEcharset = NULL;
-PUBLIC char *URLDomainPrefixes = NULL;
-PUBLIC char *URLDomainSuffixes = NULL;
-PUBLIC char *authentication_info[2] = {NULL, NULL}; /* Id:Password for protected documents */
-PUBLIC char *bookmark_page = NULL;	/* the name of the default bookmark page */
-PUBLIC char *editor = NULL;		/* the name of the current editor */
-PUBLIC char *form_get_data = NULL;	/* User data for get form */
-PUBLIC char *form_post_data = NULL;	/* User data for post form */
-PUBLIC char *global_extension_map = NULL;  /* global mime.types */
-PUBLIC char *global_type_map = NULL;	/* global mailcap */
-PUBLIC char *helpfile = NULL;		/* the main help file */
-PUBLIC char *helpfilepath = NULL;	/* the path to the help file set */
-PUBLIC char *homepage = NULL;		/* home page or main screen */
-PUBLIC char *http_error_file = NULL;	/* Place HTTP status code in this file */
-PUBLIC char *indexfile = NULL;		/* an index file if there is one */
-PUBLIC char *jumpfile = NULL;		/* the name of the default jumps file */
-PUBLIC char *jumpprompt = NULL;		/* the default jumps prompt */
-PUBLIC char *language = NULL;		/* preferred language */
-PUBLIC char *lynx_cfg_file = NULL;	/* location of active lynx.cfg */
-PUBLIC char *lynx_cmd_logfile;		/* file to write keystroke commands, if any */
-PUBLIC char *lynx_cmd_script;		/* file to read keystroke commands, if any */
-PUBLIC char *lynx_save_space = NULL;	/* The prefix for save to disk paths */
-PUBLIC char *lynx_temp_space = NULL;	/* The prefix for temporary file paths */
-PUBLIC char *lynxjumpfile = NULL;	/* the current jump file URL */
-PUBLIC char *lynxlinksfile = NULL;	/* the current visited links file URL */
-PUBLIC char *lynxlistfile = NULL;	/* the current list file URL */
-PUBLIC char *original_dir = NULL;	/* the original directory */
-PUBLIC char *personal_extension_map = NULL;/* .mime.types */
-PUBLIC char *personal_mail_address = NULL; /* the users mail address */
-PUBLIC char *personal_type_map = NULL;	   /* .mailcap */
-PUBLIC char *pref_charset = NULL;	/* preferred character set */
-PUBLIC char *proxyauth_info[2] = {NULL, NULL}; /* Id:Password for protected proxy servers */
-PUBLIC char *startfile = NULL;		/* the first file */
-PUBLIC char *startrealm = NULL;		/* the startfile realm */
-PUBLIC char *system_mail = NULL;	/* The path for sending mail */
-PUBLIC char *system_mail_flags = NULL;	/* Flags for sending mail */
-PUBLIC char *x_display = NULL;		/* display environment variable */
-PUBLIC HistInfo history[MAXHIST];
-PUBLIC int AlertSecs;			/* time-delay for HTAlert() messages   */
-PUBLIC int DebugSecs;			/* time-delay for HTProgress messages */
-PUBLIC int InfoSecs;			/* time-delay for Information messages */
-PUBLIC int LYMultiBookmarks = MULTI_BOOKMARK_SUPPORT;
-PUBLIC int LYStatusLine = -1;		/* Line for statusline() if > -1 */
-PUBLIC int LYcols = DFT_COLS;
-PUBLIC int LYlines = DFT_ROWS;
-PUBLIC int MessageSecs;			/* time-delay for important Messages   */
-PUBLIC int ReplaySecs;			/* time-delay for command-scripts */
-PUBLIC int ccount = 0;			/* Starting number for lnk#.dat files in crawls */
-PUBLIC int dump_output_width = 0;
-PUBLIC int lynx_temp_subspace = 0;	/* > 0 if we made temp-directory */
-PUBLIC int nhist = 0;			/* number of history entries */
-PUBLIC int nlinks = 0;			/* number of links in memory */
-PUBLIC int outgoing_mail_charset = -1;	/* translate mail to this charset */
-PUBLIC LinkInfo links[MAXLINKS];
+BOOLEAN HEAD_request = FALSE;
+BOOLEAN LYAcceptAllCookies = ACCEPT_ALL_COOKIES; /* take all cookies? */
+BOOLEAN LYCancelledFetch = FALSE;/* TRUE if cancelled binary fetch */
+BOOLEAN LYCollapseBRs = COLLAPSE_BR_TAGS;  /* Collapse serial BRs? */
+BOOLEAN LYDefaultRawMode;
+BOOLEAN LYListNewsDates = LIST_NEWS_DATES;
+BOOLEAN LYListNewsNumbers = LIST_NEWS_NUMBERS;
+BOOLEAN LYMBMBlocked = BLOCK_MULTI_BOOKMARKS;
+BOOLEAN LYNewsPosting = NEWS_POSTING; /* News posting supported? */
+BOOLEAN LYNoFromHeader = TRUE;	/* Never send From header?	   */
+BOOLEAN LYNoRefererForThis=FALSE;/* No Referer header for this URL? */
+BOOLEAN LYNoRefererHeader=FALSE; /* Never send Referer header?	   */
+BOOLEAN LYRawMode;
+BOOLEAN LYSelectPopups = USE_SELECT_POPUPS;
+BOOLEAN LYSetCookies = SET_COOKIES; /* Process Set-Cookie headers? */
+BOOLEAN LYUseDefSelPop = TRUE;	/* Command line -popup toggle */
+BOOLEAN LYUseDefaultRawMode = TRUE;
+BOOLEAN LYUseMouse = FALSE;
+BOOLEAN LYisConfiguredForX = FALSE;
+BOOLEAN UCForce8bitTOUPPER = FALSE; /* override locale for case-conversion? */
+BOOLEAN UCSaveBookmarksInUnicode = FALSE;
+BOOLEAN bookmark_start = FALSE;
+BOOLEAN check_realm = FALSE;  /* Restrict to the starting realm? */
+BOOLEAN clickable_images = MAKE_LINKS_FOR_ALL_IMAGES;
+BOOLEAN crawl = FALSE;		/* Do crawl? */
+BOOLEAN keep_mime_headers = FALSE; /* Include mime headers with source dump */
+BOOLEAN more = FALSE;		/* is there more text to display? */
+BOOLEAN more_links = FALSE;	/* Links beyond a displayed page with no links? */
+BOOLEAN no_url_redirection = FALSE; /* Don't follow URL redirections */
+BOOLEAN pseudo_inline_alts = MAKE_PSEUDO_ALTS_FOR_INLINES;
+BOOLEAN scan_for_buried_news_references = TRUE;
+BOOLEAN startfile_ok = FALSE;
+BOOLEAN startfile_stdin = FALSE;
+BOOLEAN traversal = FALSE;	/* Do traversals? */
+char *BookmarkPage = NULL;	/* the name of the current bookmark page */
+char *LYCookieAcceptDomains = NULL; /* domains to accept all cookies */
+char *LYCookieLooseCheckDomains = NULL;  /* check loosely   */
+char *LYCookieQueryCheckDomains = NULL;  /* check w/a query */
+char *LYCookieRejectDomains = NULL; /* domains to reject all cookies */
+char *LYCookieSAcceptDomains = NULL; /* domains to accept all cookies */
+char *LYCookieSLooseCheckDomains = NULL;  /* check loosely   */
+char *LYCookieSQueryCheckDomains = NULL;  /* check w/a query */
+char *LYCookieSRejectDomains = NULL; /* domains to reject all cookies */
+char *LYCookieSStrictCheckDomains = NULL; /* check strictly  */
+char *LYCookieStrictCheckDomains = NULL; /* check strictly  */
+char *LYHostName = NULL;		/* treat as a local host name */
+char *LYLocalDomain = NULL;	/* treat as a local domain tail */
+char *LYUserAgent = NULL;	/* Lynx User-Agent header	   */
+char *LYUserAgentDefault = NULL; /* Lynx default User-Agent header  */
+char *LynxHome = NULL;		/* the default Home HREF. */
+char *LynxSigFile = NULL;	/* Signature file, in or off home */
+char *UCAssume_MIMEcharset = NULL;
+char *URLDomainPrefixes = NULL;
+char *URLDomainSuffixes = NULL;
+char *authentication_info[2] = {NULL, NULL}; /* Id:Password for protected documents */
+char *bookmark_page = NULL;	/* the name of the default bookmark page */
+char *editor = NULL;		/* the name of the current editor */
+char *form_get_data = NULL;	/* User data for get form */
+char *form_post_data = NULL;	/* User data for post form */
+char *global_extension_map = NULL;  /* global mime.types */
+char *global_type_map = NULL;	/* global mailcap */
+char *helpfile = NULL;		/* the main help file */
+char *helpfilepath = NULL;	/* the path to the help file set */
+char *homepage = NULL;		/* home page or main screen */
+char *http_error_file = NULL;	/* Place HTTP status code in this file */
+char *indexfile = NULL;		/* an index file if there is one */
+char *jumpfile = NULL;		/* the name of the default jumps file */
+char *jumpprompt = NULL;		/* the default jumps prompt */
+char *language = NULL;		/* preferred language */
+char *lynx_cfg_file = NULL;	/* location of active lynx.cfg */
+char *lynx_cmd_logfile;		/* file to write keystroke commands, if any */
+char *lynx_cmd_script;		/* file to read keystroke commands, if any */
+char *lynx_save_space = NULL;	/* The prefix for save to disk paths */
+char *lynx_temp_space = NULL;	/* The prefix for temporary file paths */
+char *lynxjumpfile = NULL;	/* the current jump file URL */
+char *lynxlinksfile = NULL;	/* the current visited links file URL */
+char *lynxlistfile = NULL;	/* the current list file URL */
+char *original_dir = NULL;	/* the original directory */
+char *personal_extension_map = NULL;/* .mime.types */
+char *personal_mail_address = NULL; /* the users mail address */
+char *personal_type_map = NULL;	   /* .mailcap */
+char *pref_charset = NULL;	/* preferred character set */
+char *proxyauth_info[2] = {NULL, NULL}; /* Id:Password for protected proxy servers */
+char *startfile = NULL;		/* the first file */
+char *startrealm = NULL;		/* the startfile realm */
+char *system_mail = NULL;	/* The path for sending mail */
+char *system_mail_flags = NULL;	/* Flags for sending mail */
+char *x_display = NULL;		/* display environment variable */
+HistInfo history[MAXHIST];
+int AlertSecs;			/* time-delay for HTAlert() messages   */
+int DebugSecs;			/* time-delay for HTProgress messages */
+int InfoSecs;			/* time-delay for Information messages */
+int LYMultiBookmarks = MULTI_BOOKMARK_SUPPORT;
+int LYStatusLine = -1;		/* Line for statusline() if > -1 */
+int LYcols = DFT_COLS;
+int LYlines = DFT_ROWS;
+int MessageSecs;			/* time-delay for important Messages   */
+int ReplaySecs;			/* time-delay for command-scripts */
+int ccount = 0;			/* Starting number for lnk#.dat files in crawls */
+int dump_output_width = 0;
+int lynx_temp_subspace = 0;	/* > 0 if we made temp-directory */
+int nhist = 0;			/* number of history entries */
+int nlinks = 0;			/* number of links in memory */
+int outgoing_mail_charset = -1;	/* translate mail to this charset */
+LinkInfo links[MAXLINKS];
 
 #ifndef DISABLE_BIBP
-PUBLIC BOOLEAN BibP_bibhost_available = FALSE;  /* until check succeeds  */
-PUBLIC BOOLEAN BibP_bibhost_checked = FALSE;  /*  until LYCheckBibHost   */
-PUBLIC BOOLEAN no_goto_bibp = FALSE;
-PUBLIC char *BibP_bibhost = NULL;	 /* local server for bibp: links  */
-PUBLIC char *BibP_globalserver = NULL;   /* global server for bibp: links */
+BOOLEAN BibP_bibhost_available = FALSE;  /* until check succeeds  */
+BOOLEAN BibP_bibhost_checked = FALSE;  /*  until LYCheckBibHost   */
+BOOLEAN no_goto_bibp = FALSE;
+char *BibP_bibhost = NULL;	 /* local server for bibp: links  */
+char *BibP_globalserver = NULL;   /* global server for bibp: links */
 #endif
 
 #ifdef USE_PERSISTENT_COOKIES
-PUBLIC BOOLEAN persistent_cookies = FALSE; /* disabled by default! */
-PUBLIC char *LYCookieFile = NULL;	/* cookie read file */
-PUBLIC char *LYCookieSaveFile = NULL;	/* cookie save file */
+BOOLEAN persistent_cookies = FALSE; /* disabled by default! */
+char *LYCookieFile = NULL;	/* cookie read file */
+char *LYCookieSaveFile = NULL;	/* cookie save file */
 #endif /* USE_PERSISTENT_COOKIES */
 
 #ifdef EXP_NESTED_TABLES
-PUBLIC BOOLEAN nested_tables =
+BOOLEAN nested_tables =
 #if defined(USE_COLOR_STYLE)
     TRUE
 #else
@@ -464,100 +464,100 @@ PUBLIC BOOLEAN nested_tables =
     ;
 #endif
 
-PUBLIC BOOLEAN LYShowTransferRate = TRUE;
-PUBLIC int LYTransferRate = rateKB;
-PUBLIC char * LYTransferName = NULL;
+BOOLEAN LYShowTransferRate = TRUE;
+int LYTransferRate = rateKB;
+char * LYTransferName = NULL;
 
-PUBLIC char *XLoadImageCommand = NULL;	/* Default image viewer for X */
-PUBLIC BOOLEAN LYNoISMAPifUSEMAP = FALSE; /* Omit ISMAP link if MAP present? */
-PUBLIC int LYHiddenLinks = HIDDENLINKS_SEPARATE; /* Show hidden links? */
+char *XLoadImageCommand = NULL;	/* Default image viewer for X */
+BOOLEAN LYNoISMAPifUSEMAP = FALSE; /* Omit ISMAP link if MAP present? */
+int LYHiddenLinks = HIDDENLINKS_SEPARATE; /* Show hidden links? */
 
-PUBLIC int Old_DTD = NO;
-PRIVATE BOOL DTD_recovery = NO;
+int Old_DTD = NO;
+static BOOL DTD_recovery = NO;
 
 #ifndef NO_LYNX_TRACE
-PUBLIC FILE *LYTraceLogFP = NULL;		/* Pointer for TRACE log  */
+FILE *LYTraceLogFP = NULL;		/* Pointer for TRACE log  */
 #endif
-PUBLIC char *LYTraceLogPath = NULL;		/* Path for TRACE log	   */
-PUBLIC BOOLEAN LYUseTraceLog = USE_TRACE_LOG;	/* Use a TRACE log?	   */
+char *LYTraceLogPath = NULL;		/* Path for TRACE log	   */
+BOOLEAN LYUseTraceLog = USE_TRACE_LOG;	/* Use a TRACE log?	   */
 
-PUBLIC BOOLEAN LYSeekFragMAPinCur = TRUE;
-PUBLIC BOOLEAN LYSeekFragAREAinCur = TRUE;
-PUBLIC BOOLEAN LYStripDotDotURLs = TRUE;	/* Try to fix ../ in some URLs? */
-PUBLIC BOOLEAN LYForceSSLCookiesSecure = FALSE;
-PUBLIC BOOLEAN LYNoCc = FALSE;
-PUBLIC BOOLEAN LYPreparsedSource = FALSE;	/* Show source as preparsed? */
-PUBLIC BOOLEAN LYPrependBaseToSource = TRUE;
-PUBLIC BOOLEAN LYPrependCharsetToSource = TRUE;
-PUBLIC BOOLEAN LYQuitDefaultYes = QUIT_DEFAULT_YES;
-PUBLIC BOOLEAN dont_wrap_pre = FALSE;
+BOOLEAN LYSeekFragMAPinCur = TRUE;
+BOOLEAN LYSeekFragAREAinCur = TRUE;
+BOOLEAN LYStripDotDotURLs = TRUE;	/* Try to fix ../ in some URLs? */
+BOOLEAN LYForceSSLCookiesSecure = FALSE;
+BOOLEAN LYNoCc = FALSE;
+BOOLEAN LYPreparsedSource = FALSE;	/* Show source as preparsed? */
+BOOLEAN LYPrependBaseToSource = TRUE;
+BOOLEAN LYPrependCharsetToSource = TRUE;
+BOOLEAN LYQuitDefaultYes = QUIT_DEFAULT_YES;
+BOOLEAN dont_wrap_pre = FALSE;
 
-PUBLIC int cookie_noprompt;
+int cookie_noprompt;
 
 #ifdef USE_SSL
-PUBLIC int ssl_noprompt = FORCE_PROMPT_DFT;
+int ssl_noprompt = FORCE_PROMPT_DFT;
 #endif
 
-PUBLIC int connect_timeout = 18000; /*=180000*0.1 - used in HTDoConnect.*/
+int connect_timeout = 18000; /*=180000*0.1 - used in HTDoConnect.*/
 
 #ifdef EXP_JUSTIFY_ELTS
-PUBLIC BOOL ok_justify = TRUE;
-PUBLIC int justify_max_void_percent = 35;
+BOOL ok_justify = TRUE;
+int justify_max_void_percent = 35;
 #endif
 
 #ifdef EXP_LOCALE_CHARSET
-PUBLIC BOOLEAN LYLocaleCharset = FALSE;
+BOOLEAN LYLocaleCharset = FALSE;
 #endif
 
 #ifndef NO_DUMP_WITH_BACKSPACES
-PUBLIC BOOLEAN with_backspaces = FALSE;
+BOOLEAN with_backspaces = FALSE;
 #endif
 
 #if defined(PDCURSES) && defined(PDC_BUILD) && PDC_BUILD >= 2401
-PUBLIC int scrsize_x = 0;
-PUBLIC int scrsize_y = 0;
+int scrsize_x = 0;
+int scrsize_y = 0;
 #endif
 
-PUBLIC BOOL force_empty_hrefless_a = FALSE;
+BOOL force_empty_hrefless_a = FALSE;
 
 #ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
-PUBLIC BOOL textfields_need_activation = FALSE;
-PUBLIC BOOL textfields_activation_option = FALSE;
+BOOL textfields_need_activation = FALSE;
+BOOL textfields_activation_option = FALSE;
 #endif
 
-PUBLIC BOOLEAN textfield_prompt_at_left_edge = FALSE;
+BOOLEAN textfield_prompt_at_left_edge = FALSE;
 
 #ifdef MARK_HIDDEN_LINKS
-PUBLIC char* hidden_link_marker = NULL;
+char* hidden_link_marker = NULL;
 #endif
 
 #ifdef DISP_PARTIAL
-PUBLIC BOOLEAN display_partial_flag = TRUE; /* Display document during download */
-PUBLIC BOOLEAN debug_display_partial = FALSE; /* Show with MessageSecs delay */
-PUBLIC int partial_threshold = -1;  /* # of lines to be d/l'ed until we repaint */
+BOOLEAN display_partial_flag = TRUE; /* Display document during download */
+BOOLEAN debug_display_partial = FALSE; /* Show with MessageSecs delay */
+int partial_threshold = -1;  /* # of lines to be d/l'ed until we repaint */
 #endif
 
-PUBLIC BOOLEAN LYNonRestartingSIGWINCH = FALSE;
-PUBLIC BOOLEAN LYReuseTempfiles = FALSE;
-PUBLIC BOOLEAN LYUseBuiltinSuffixes = TRUE;
+BOOLEAN LYNonRestartingSIGWINCH = FALSE;
+BOOLEAN LYReuseTempfiles = FALSE;
+BOOLEAN LYUseBuiltinSuffixes = TRUE;
 
 #ifdef MISC_EXP
-PUBLIC int LYNoZapKey = 0; /* 0: off (do z checking), 1: full, 2: initially */
+int LYNoZapKey = 0; /* 0: off (do z checking), 1: full, 2: initially */
 #endif
 
 #ifndef DISABLE_NEWS
 #include <HTNews.h>
 #endif
 
-PUBLIC BOOLEAN FileInitAlreadyDone = FALSE;
+BOOLEAN FileInitAlreadyDone = FALSE;
 
-PRIVATE BOOLEAN stack_dump = FALSE;
-PRIVATE char *terminal = NULL;
-PRIVATE char *pgm;
-PRIVATE BOOLEAN number_links = FALSE;
-PRIVATE BOOLEAN number_fields = FALSE;
-PRIVATE BOOLEAN LYPrependBase = FALSE;
-PRIVATE HTList *LYStdinArgs = NULL;
+static BOOLEAN stack_dump = FALSE;
+static char *terminal = NULL;
+static char *pgm;
+static BOOLEAN number_links = FALSE;
+static BOOLEAN number_fields = FALSE;
+static BOOLEAN LYPrependBase = FALSE;
+static HTList *LYStdinArgs = NULL;
 
 #ifndef EXTENDED_OPTION_LOGIC
 /* if set then '--' will be recognized as the end of options */
@@ -577,31 +577,31 @@ PRIVATE HTList *LYStdinArgs = NULL;
 #endif
 
 #if EXTENDED_OPTION_LOGIC
-PRIVATE BOOLEAN no_options_further=FALSE; /* set to TRUE after '--' argument */
+static BOOLEAN no_options_further=FALSE; /* set to TRUE after '--' argument */
 #endif
 
-PRIVATE BOOL parse_arg PARAMS((char **arg, unsigned mask, int *i));
-PRIVATE void print_help_and_exit PARAMS((int exit_status)) GCC_NORETURN;
-PRIVATE void print_help_strings PARAMS((CONST char * name, CONST char * help, CONST char * value, BOOLEAN option));
+static BOOL parse_arg (char **arg, unsigned mask, int *i);
+static void print_help_and_exit (int exit_status) GCC_NORETURN;
+static void print_help_strings (const char * name, const char * help, const char * value, BOOLEAN option);
 
 #ifndef VMS
-PUBLIC BOOLEAN LYNoCore = NO_FORCED_CORE_DUMP;
-PUBLIC BOOLEAN restore_sigpipe_for_children = FALSE;
-PRIVATE void FatalProblem PARAMS((int sig));
+BOOLEAN LYNoCore = NO_FORCED_CORE_DUMP;
+BOOLEAN restore_sigpipe_for_children = FALSE;
+static void FatalProblem (int sig);
 #endif /* !VMS */
 
 #if defined(USE_COLOR_STYLE)
-PUBLIC char *lynx_lss_file = NULL;
+char *lynx_lss_file = NULL;
 #endif
 
 #ifdef __DJGPP__
-PRIVATE void LY_set_ctrl_break(int setting)
+static void LY_set_ctrl_break(int setting)
 {
     (void)signal(SIGINT, (setting ? SIG_DFL : SIG_IGN));
     setcbrk(setting);
 }
 
-PRIVATE int LY_get_ctrl_break(void)
+static int LY_get_ctrl_break(void)
 {
     __dpmi_regs regs;
     regs.h.ah = 0x33;
@@ -610,14 +610,14 @@ PRIVATE int LY_get_ctrl_break(void)
     return ((int) regs.h.dl);
 }
 
-PRIVATE void reset_break(void)
+static void reset_break(void)
 {
     LY_set_ctrl_break(init_ctrl_break[0]);
 }
 #endif /* __DJGPP__ */
 
 #if defined(WIN_EX)
-PRIVATE int is_windows_nt(void)
+static int is_windows_nt(void)
 {
     DWORD version;
 
@@ -631,7 +631,7 @@ PRIVATE int is_windows_nt(void)
 
 
 #ifdef LY_FIND_LEAKS
-PRIVATE void free_lynx_globals NOARGS
+static void free_lynx_globals (void)
 {
     int i;
 
@@ -735,7 +735,7 @@ PRIVATE void free_lynx_globals NOARGS
 /*
  *  This function frees the LYStdinArgs list. - FM
  */
-PRIVATE void LYStdinArgs_free NOARGS
+static void LYStdinArgs_free (void)
 {
     char *argument;
     HTList *cur = LYStdinArgs;
@@ -751,8 +751,8 @@ PRIVATE void LYStdinArgs_free NOARGS
     return;
 }
 
-PUBLIC void exit_immediately ARGS1(
-	int,		code)
+void exit_immediately (
+	int		code)
 {
 #ifndef NOSIGHUP
     (void) signal(SIGHUP, SIG_DFL);
@@ -790,7 +790,7 @@ unsigned char IBM1047[ 256 ] = /* ATOE OEMVS311 */
 0x8c,0x49,0xcd,0xce,0xcb,0xcf,0xcc,0xe1,0x70,0xdd,0xde,0xdb,0xdc,0x8d,0x8e,0xdf
 } ;
 
-PRIVATE void FixCharacters(void)
+static void FixCharacters(void)
 {
     int c;
     int work1[256],
@@ -808,9 +808,9 @@ PRIVATE void FixCharacters(void)
 }
 #endif /* EBCDIC */
 
-PRIVATE int argncmp ARGS2(
-	char*,		str,
-	char*,		what)
+static int argncmp (
+	char*		str,
+	char*		what)
 {
     if (str[0] == '-' && str[1] == '-' ) ++str;
 #if OPTNAME_ALLOW_DASHES
@@ -821,9 +821,9 @@ PRIVATE int argncmp ARGS2(
 #endif
 }
 
-PRIVATE void tildeExpand ARGS2(
-	char **,	pathname,
-	BOOLEAN,	embedded)
+static void tildeExpand (
+	char **	pathname,
+	BOOLEAN	embedded)
 {
     char *temp = *pathname;
 
@@ -853,9 +853,9 @@ PRIVATE void tildeExpand ARGS2(
     }
 }
 
-PRIVATE BOOL GetStdin ARGS2(
-	char **,	buf,
-	BOOL,		marker)
+static BOOL GetStdin (
+	char **	buf,
+	BOOL		marker)
 {
     if (LYSafeGets(buf, stdin) != 0
      && (!marker || strncmp(*buf, "---", 3) != 0)) {
@@ -868,7 +868,7 @@ PRIVATE BOOL GetStdin ARGS2(
 }
 
 #ifdef WIN32
-PRIVATE BOOL cleanup_win32(DWORD fdwCtrlType)
+static BOOL cleanup_win32(DWORD fdwCtrlType)
 {
     switch (fdwCtrlType) {
     case CTRL_CLOSE_EVENT:
@@ -884,9 +884,9 @@ PRIVATE BOOL cleanup_win32(DWORD fdwCtrlType)
  * Append the SSL version to lynx version or user-agent string.
  */
 #ifdef USE_SSL
-PRIVATE void append_ssl_version ARGS2(
-	char **,	target,
-	char *,		separator)
+static void append_ssl_version (
+	char **	target,
+	char *		separator)
 {
     char SSLLibraryVersion[256];
     char *SSLcp;
@@ -926,9 +926,9 @@ PRIVATE void append_ssl_version ARGS2(
 /*
  * Wow!  Someone wants to start up Lynx.
  */
-PUBLIC int main ARGS2(
-	int,		argc,
-	char **,	argv)
+int main (
+	int		argc,
+	char **	argv)
 {
     int  i;		/* indexing variable */
     int status = 0;	/* exit status */
@@ -2151,7 +2151,7 @@ GLOBALREF  HTProtocol LYLynxCookies;
 GLOBALREF  HTProtocol LYLynxStatusMessages;
 #endif /* GLOBALREF_IS_MACRO */
 
-PUBLIC void LYRegisterLynxProtocols NOARGS
+void LYRegisterLynxProtocols (void)
 {
     HTRegisterProtocol(&LYLynxKeymap);
     HTRegisterProtocol(&LYLynxCGI);
@@ -2178,7 +2178,7 @@ PUBLIC void LYRegisterLynxProtocols NOARGS
  *
  *	All work "somewhat", but not exactly as the first time.
  */
-PUBLIC void reload_read_cfg NOARGS
+void reload_read_cfg (void)
 {
     char *tempfile;
     FILE *rcfp;
@@ -2322,7 +2322,7 @@ PUBLIC void reload_read_cfg NOARGS
 }
 #endif /* !NO_CONFIG_INFO */
 
-PRIVATE void disable_pausing NOARGS
+static void disable_pausing (void)
 {
     AlertSecs = 0;
     DebugSecs = 0;
@@ -2331,7 +2331,7 @@ PRIVATE void disable_pausing NOARGS
     ReplaySecs = 0;
 }
 
-PRIVATE void force_dump_mode NOARGS
+static void force_dump_mode (void)
 {
     dump_output_immediately = TRUE;
     disable_pausing();
@@ -2356,7 +2356,7 @@ PRIVATE void force_dump_mode NOARGS
 
 typedef struct parse_args_type
 {
-   CONST char *name;
+   const char *name;
    int type;
 
 #define TOGGLE_ARG		0x0010
@@ -2381,14 +2381,14 @@ typedef struct parse_args_type
     */
 
    ParseData;
-   CONST char *help_string;
+   const char *help_string;
 }
 Config_Type;
 
 /* -auth, -pauth */
-PRIVATE int parse_authentication ARGS2(
-	char *,			next_arg,
-	char **,		result)
+static int parse_authentication (
+	char *			next_arg,
+	char **		result)
 {
     /*
      *  Authentication information for protected documents.
@@ -2418,8 +2418,8 @@ PRIVATE int parse_authentication ARGS2(
 }
 
 /* -anonymous */
-PRIVATE int anonymous_fun ARGS1(
-	char *,			next_arg GCC_UNUSED)
+static int anonymous_fun (
+	char *			next_arg GCC_UNUSED)
 {
     if (!LYValidate && !LYRestricted)
 	parse_restrictions("default");
@@ -2428,8 +2428,8 @@ PRIVATE int anonymous_fun ARGS1(
 }
 
 /* -assume_charset */
-PRIVATE int assume_charset_fun ARGS1(
-	char *,			next_arg)
+static int assume_charset_fun (
+	char *			next_arg)
 {
     UCLYhndl_for_unspec = safeUCGetLYhndl_byMIME(next_arg);
     StrAllocCopy(UCAssume_MIMEcharset,
@@ -2442,32 +2442,32 @@ PRIVATE int assume_charset_fun ARGS1(
 }
 
 /* -assume_local_charset */
-PRIVATE int assume_local_charset_fun ARGS1(
-	char *,			next_arg)
+static int assume_local_charset_fun (
+	char *			next_arg)
 {
     UCLYhndl_HTFile_for_unspec = safeUCGetLYhndl_byMIME(next_arg);
     return 0;
 }
 
 /* -assume_unrec_charset */
-PRIVATE int assume_unrec_charset_fun ARGS1(
-	char *,			next_arg)
+static int assume_unrec_charset_fun (
+	char *			next_arg)
 {
     UCLYhndl_for_unrec = safeUCGetLYhndl_byMIME(next_arg);
     return 0;
 }
 
 /* -auth */
-PRIVATE int auth_fun ARGS1(
-	char *,			next_arg)
+static int auth_fun (
+	char *			next_arg)
 {
     parse_authentication(next_arg, authentication_info);
     return 0;
 }
 
 /* -base */
-PRIVATE int base_fun ARGS1(
-	char *,			next_arg GCC_UNUSED)
+static int base_fun (
+	char *			next_arg GCC_UNUSED)
 {
     /*
      *  Treat -source equivalently to an interactive download with
@@ -2485,8 +2485,8 @@ PRIVATE int base_fun ARGS1(
 }
 
 /* -cache */
-PRIVATE int cache_fun ARGS1(
-	char *,			next_arg)
+static int cache_fun (
+	char *			next_arg)
 {
     if (next_arg != 0)
 	HTCacheSize = atoi(next_arg);
@@ -2499,8 +2499,8 @@ PRIVATE int cache_fun ARGS1(
 }
 
 /* -child */
-PRIVATE int child_fun ARGS1(
-	char *,			next_arg GCC_UNUSED)
+static int child_fun (
+	char *			next_arg GCC_UNUSED)
 {
     child_lynx = TRUE;
     no_disk_save = TRUE;
@@ -2509,8 +2509,8 @@ PRIVATE int child_fun ARGS1(
 
 #ifdef USE_SLANG
 /* -color */
-PRIVATE int color_fun ARGS1(
-	char *,			next_arg GCC_UNUSED)
+static int color_fun (
+	char *			next_arg GCC_UNUSED)
 {
     Lynx_Color_Flags |= SL_LYNX_USE_COLOR;
 
@@ -2523,8 +2523,8 @@ PRIVATE int color_fun ARGS1(
 
 #ifdef MISC_EXP
 /* -convert_to */
-PRIVATE int convert_to_fun ARGS1(
-	char *,			next_arg)
+static int convert_to_fun (
+	char *			next_arg)
 {
     if (next_arg != 0) {
 	char *outformat = NULL;
@@ -2566,8 +2566,8 @@ PRIVATE int convert_to_fun ARGS1(
 #endif
 
 /* -crawl */
-PRIVATE int crawl_fun ARGS1(
-	char *,			next_arg GCC_UNUSED)
+static int crawl_fun (
+	char *			next_arg GCC_UNUSED)
 {
     crawl = TRUE;
     LYcols = DFT_COLS;
@@ -2575,8 +2575,8 @@ PRIVATE int crawl_fun ARGS1(
 }
 
 /* -display */
-PRIVATE int display_fun ARGS1(
-	char *,			next_arg)
+static int display_fun (
+	char *			next_arg)
 {
     if (next_arg != 0) {
 	LYsetXDisplay(next_arg);
@@ -2586,8 +2586,8 @@ PRIVATE int display_fun ARGS1(
 }
 
 /* -display_charset */
-PRIVATE int display_charset_fun ARGS1(
-	char *,			next_arg)
+static int display_charset_fun (
+	char *			next_arg)
 {
     int i = UCGetLYhndl_byMIME(next_arg);
 
@@ -2605,16 +2605,16 @@ PRIVATE int display_charset_fun ARGS1(
 }
 
 /* -dump */
-PRIVATE int dump_output_fun ARGS1(
-	char *,			next_arg GCC_UNUSED)
+static int dump_output_fun (
+	char *			next_arg GCC_UNUSED)
 {
     force_dump_mode();
     return 0;
 }
 
 /* -editor */
-PRIVATE int editor_fun ARGS1(
-	char *,			next_arg)
+static int editor_fun (
+	char *			next_arg)
 {
     if (next_arg != 0)
 	StrAllocCopy(editor, next_arg);
@@ -2623,8 +2623,8 @@ PRIVATE int editor_fun ARGS1(
 }
 
 /* -error_file */
-PRIVATE int error_file_fun ARGS1(
-	char *,			next_arg)
+static int error_file_fun (
+	char *			next_arg)
 {
     /*
      *  Output return (success/failure) code
@@ -2637,8 +2637,8 @@ PRIVATE int error_file_fun ARGS1(
 
 #if defined(EXEC_LINKS) || defined(EXEC_SCRIPTS)
 /* -exec */
-PRIVATE int exec_fun ARGS1(
-	char *,			next_arg GCC_UNUSED)
+static int exec_fun (
+	char *			next_arg GCC_UNUSED)
 {
 #ifndef NEVER_ALLOW_REMOTE_EXEC
     local_exec = TRUE;
@@ -2650,8 +2650,8 @@ PRIVATE int exec_fun ARGS1(
 #endif
 
 /* -get_data */
-PRIVATE int get_data_fun ARGS1(
-	char *,			next_arg GCC_UNUSED)
+static int get_data_fun (
+	char *			next_arg GCC_UNUSED)
 {
     /*
      *  User data for GET form.
@@ -2685,16 +2685,16 @@ PRIVATE int get_data_fun ARGS1(
 }
 
 /* -help */
-PRIVATE int help_fun ARGS1(
-	char *,			next_arg GCC_UNUSED)
+static int help_fun (
+	char *			next_arg GCC_UNUSED)
 {
     print_help_and_exit (0);
     return 0;
 }
 
 /* -hiddenlinks */
-PRIVATE int hiddenlinks_fun ARGS1(
-	char *,			next_arg)
+static int hiddenlinks_fun (
+	char *			next_arg)
 {
     static Config_Enum table[] = {
 	{ "merge",	HIDDENLINKS_MERGE },
@@ -2714,8 +2714,8 @@ PRIVATE int hiddenlinks_fun ARGS1(
 }
 
 /* -homepage */
-PRIVATE int homepage_fun ARGS1(
-	char *,			next_arg)
+static int homepage_fun (
+	char *			next_arg)
 {
     if (next_arg != 0) {
 	StrAllocCopy(homepage, next_arg);
@@ -2725,8 +2725,8 @@ PRIVATE int homepage_fun ARGS1(
 }
 
 /* -mime_header */
-PRIVATE int mime_header_fun ARGS1(
-	char *,			next_arg GCC_UNUSED)
+static int mime_header_fun (
+	char *			next_arg GCC_UNUSED)
 {
     /*
      *  Include mime headers and force source dump.
@@ -2741,8 +2741,8 @@ PRIVATE int mime_header_fun ARGS1(
 
 #ifndef DISABLE_NEWS
 /* -newschunksize */
-PRIVATE int newschunksize_fun ARGS1(
-	char *,			next_arg)
+static int newschunksize_fun (
+	char *			next_arg)
 {
     if (next_arg != 0) {
 	HTNewsChunkSize = atoi(next_arg);
@@ -2757,8 +2757,8 @@ PRIVATE int newschunksize_fun ARGS1(
 }
 
 /* -newsmaxchunk */
-PRIVATE int newsmaxchunk_fun ARGS1(
-	char *,			next_arg)
+static int newsmaxchunk_fun (
+	char *			next_arg)
 {
     if (next_arg) {
 	HTNewsMaxChunk = atoi(next_arg);
@@ -2774,24 +2774,24 @@ PRIVATE int newsmaxchunk_fun ARGS1(
 #endif /* not DISABLE_NEWS */
 
 /* -nobold */
-PRIVATE int nobold_fun ARGS1(
-	char *,			next_arg GCC_UNUSED)
+static int nobold_fun (
+	char *			next_arg GCC_UNUSED)
 {
    LYnoVideo(1);
    return 0;
 }
 
 /* -nobrowse */
-PRIVATE int nobrowse_fun ARGS1(
-	char *,			next_arg GCC_UNUSED)
+static int nobrowse_fun (
+	char *			next_arg GCC_UNUSED)
 {
    HTDirAccess = HT_DIR_FORBID;
    return 0;
 }
 
 /* -nocolor */
-PRIVATE int nocolor_fun ARGS1(
-	char *,			next_arg GCC_UNUSED)
+static int nocolor_fun (
+	char *			next_arg GCC_UNUSED)
 {
     LYShowColor = SHOW_COLOR_NEVER;
 #ifdef USE_SLANG
@@ -2802,24 +2802,24 @@ PRIVATE int nocolor_fun ARGS1(
 }
 
 /* -nopause */
-PRIVATE int nopause_fun ARGS1(
-	char *,			next_arg GCC_UNUSED)
+static int nopause_fun (
+	char *			next_arg GCC_UNUSED)
 {
     disable_pausing();
     return 0;
 }
 
 /* -noreverse */
-PRIVATE int noreverse_fun ARGS1(
-	char *,			next_arg GCC_UNUSED)
+static int noreverse_fun (
+	char *			next_arg GCC_UNUSED)
 {
    LYnoVideo(2);
    return 0;
 }
 
 /* -nounderline */
-PRIVATE int nounderline_fun ARGS1(
-	char *,			next_arg GCC_UNUSED)
+static int nounderline_fun (
+	char *			next_arg GCC_UNUSED)
 {
    LYnoVideo(4);
    return 0;
@@ -2827,8 +2827,8 @@ PRIVATE int nounderline_fun ARGS1(
 
 #ifdef MISC_EXP
 /* -nozap */
-PRIVATE int nozap_fun ARGS1(
-	char *,			next_arg)
+static int nozap_fun (
+	char *			next_arg)
 {
     LYNoZapKey = 1; /* everything but "initially" treated as "full" - kw */
     if (next_arg != 0) {
@@ -2841,16 +2841,16 @@ PRIVATE int nozap_fun ARGS1(
 #endif /* MISC_EXP */
 
 /* -pauth */
-PRIVATE int pauth_fun ARGS1(
-	char *,			next_arg)
+static int pauth_fun (
+	char *			next_arg)
 {
     parse_authentication(next_arg, proxyauth_info);
     return 0;
 }
 
 /* -post_data */
-PRIVATE int post_data_fun ARGS1(
-	char *,			next_arg GCC_UNUSED)
+static int post_data_fun (
+	char *			next_arg GCC_UNUSED)
 {
     /*
      *  User data for POST form.
@@ -2881,8 +2881,8 @@ PRIVATE int post_data_fun ARGS1(
     return 0;
 }
 
-PRIVATE char *show_restriction ARGS1(
-	CONST char *,		name)
+static char *show_restriction (
+	const char *		name)
 {
     char *value = 0;
 
@@ -2901,12 +2901,12 @@ PRIVATE char *show_restriction ARGS1(
 }
 
 /* -restrictions */
-PRIVATE int restrictions_fun ARGS1(
-	char *,			next_arg)
+static int restrictions_fun (
+	char *			next_arg)
 {
-    static CONST struct {
-	CONST char *name;
-	CONST char *help;
+    static const struct {
+	const char *name;
+	const char *help;
     } table[] = {
 	{ "all", "restricts all options." },
 	{ "bookmark", "disallow changing the location of the bookmark file" },
@@ -3021,7 +3021,7 @@ G)oto's" },
 	{ "telnet_port", "disallow specifying a port in telnet G)oto's" },
 	{ "useragent", "disallow modifications of the User-Agent header" },
     };
-    static CONST char *Usage[] = {
+    static const char *Usage[] = {
  ""
 ,"USAGE: lynx -restrictions=[option][,option][,option]"
 ,"List of Options:"
@@ -3029,8 +3029,8 @@ G)oto's" },
 
     };
     unsigned j, k, column = 0;
-    CONST char *name;
-    CONST char *value;
+    const char *name;
+    const char *value;
     BOOLEAN found, first;
 
     if (isEmpty(next_arg)) {
@@ -3089,16 +3089,16 @@ G)oto's" },
 }
 
 /* -selective */
-PRIVATE int selective_fun ARGS1(
-	char *,			next_arg GCC_UNUSED)
+static int selective_fun (
+	char *			next_arg GCC_UNUSED)
 {
    HTDirAccess = HT_DIR_SELECTIVE;
    return 0;
 }
 
 /* -source */
-PRIVATE int source_fun ARGS1(
-	char *,			next_arg GCC_UNUSED)
+static int source_fun (
+	char *			next_arg GCC_UNUSED)
 {
     force_dump_mode();
     HTOutputFormat = (LYPrependBase ?
@@ -3108,8 +3108,8 @@ PRIVATE int source_fun ARGS1(
 }
 
 /* -traversal */
-PRIVATE int traversal_fun ARGS1(
-	char *,			next_arg GCC_UNUSED)
+static int traversal_fun (
+	char *			next_arg GCC_UNUSED)
 {
     traversal = TRUE;
 #ifdef USE_SLANG
@@ -3122,8 +3122,8 @@ PRIVATE int traversal_fun ARGS1(
 }
 
 /* -version */
-PRIVATE int version_fun ARGS1(
-	char *,			next_arg GCC_UNUSED)
+static int version_fun (
+	char *			next_arg GCC_UNUSED)
 {
     char *result = NULL;
 
@@ -3197,8 +3197,8 @@ PRIVATE int version_fun ARGS1(
 }
 
 /* -width */
-PRIVATE int width_fun ARGS1(
-	char *,			next_arg)
+static int width_fun (
+	char *			next_arg)
 {
     if (next_arg != 0) {
 	int w = atoi(next_arg);
@@ -3211,8 +3211,8 @@ PRIVATE int width_fun ARGS1(
 
 #if defined(PDCURSES) && defined(PDC_BUILD) && PDC_BUILD >= 2401
 /* -scrsize */
-PRIVATE int scrsize_fun ARGS1(
-	char *,			next_arg)
+static int scrsize_fun (
+	char *			next_arg)
 {
     if (next_arg != 0) {
 	char *cp;
@@ -3238,7 +3238,7 @@ PRIVATE int scrsize_fun ARGS1(
 #endif
 
 /* NOTE: This table is sorted by name to make the help message useful */
-PRIVATE Config_Type Arg_Table [] =
+static Config_Type Arg_Table [] =
 {
    PARSE_SET(
       "accept_all_cookies", 4|SET_ARG,		LYAcceptAllCookies,
@@ -3872,11 +3872,11 @@ treated '>' as a co-terminator for double-quotes and tags"
    PARSE_NIL
 };
 
-PRIVATE void print_help_strings ARGS4(
-	CONST char *,	name,
-	CONST char *,	help,
-	CONST char *,	value,
-	BOOLEAN,	option)
+static void print_help_strings (
+	const char *	name,
+	const char *	help,
+	const char *	value,
+	BOOLEAN	option)
 {
     int pad;
     int c;
@@ -3924,7 +3924,7 @@ PRIVATE void print_help_strings ARGS4(
     fputc ('\n', stdout);
 }
 
-PRIVATE void print_help_and_exit ARGS1(int, exit_status)
+static void print_help_and_exit (int exit_status)
 {
     Config_Type *p;
 
@@ -3985,10 +3985,10 @@ in double-quotes (\"-\") on VMS)", NULL, TRUE);
  * be pointed to that character.  (+/- added for toggle processing - BL.)
  * If a and b match, it returns 1.  Otherwise 0 is returned.
  */
-PRIVATE int arg_eqs_parse ARGS3(
-	CONST char *,	a,
-	char *,		b,
-	char **,	c)
+static int arg_eqs_parse (
+	const char *	a,
+	char *		b,
+	char **	c)
 {
     int result = -1;
 
@@ -4044,10 +4044,10 @@ PRIVATE int arg_eqs_parse ARGS3(
 #define is_true(s)  (*s == '1' || *s == '+' || !strcmp(s, "on"))
 #define is_false(s) (*s == '0' || *s == '-' || !strcmp(s, "off"))
 
-PRIVATE BOOL parse_arg ARGS3(
-	char **,	argv,
-	unsigned,	mask,
-	int *,		i)
+static BOOL parse_arg (
+	char **	argv,
+	unsigned	mask,
+	int *		i)
 {
     Config_Type *p;
     char *arg_name;
@@ -4210,8 +4210,8 @@ PRIVATE BOOL parse_arg ARGS3(
 }
 
 #ifndef VMS
-PRIVATE void FatalProblem ARGS1(
-	int,		sig)
+static void FatalProblem (
+	int		sig)
 {
     /*
      *	Ignore further interrupts. - mhc: 11/2/91
diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c
index c157166a..95134f5b 100644
--- a/src/LYMainLoop.c
+++ b/src/LYMainLoop.c
@@ -44,7 +44,7 @@
 #endif
 
 #ifdef KANJI_CODE_OVERRIDE
-PUBLIC char *str_kcode(HTkcode code)
+char *str_kcode(HTkcode code)
 {
     char *p;
     static char buff[8];
@@ -90,7 +90,7 @@ PUBLIC char *str_kcode(HTkcode code)
 
 #ifdef WIN_EX
 
-PRIVATE char *str_sjis(char *to, char *from)
+static char *str_sjis(char *to, char *from)
 {
     if (!LYRawMode) {
 	strcpy(to, from);
@@ -106,7 +106,7 @@ PRIVATE char *str_sjis(char *to, char *from)
     return to;
 }
 
-PRIVATE void set_ws_title(char * str)
+static void set_ws_title(char * str)
 {
     SetConsoleTitle(str);
 }
@@ -118,7 +118,7 @@ PRIVATE void set_ws_title(char * str)
 
 #define NOT_EQU	1
 
-PRIVATE int str_n_cmp(const char *p, const char *q, int n)
+static int str_n_cmp(const char *p, const char *q, int n)
 {
     if (n == 0)
 	return 0;
@@ -154,8 +154,8 @@ PRIVATE int str_n_cmp(const char *p, const char *q, int n)
 #include <LYLeaks.h>
 
 /* two constants: */
-PUBLIC HTLinkType * HTInternalLink = 0;
-PUBLIC HTAtom * WWW_SOURCE = 0;
+HTLinkType * HTInternalLink = 0;
+HTAtom * WWW_SOURCE = 0;
 
 #ifndef DONT_TRACK_INTERNAL_LINKS
 #define NO_INTERNAL_OR_DIFFERENT(c,n) TRUE
@@ -167,54 +167,54 @@ PUBLIC HTAtom * WWW_SOURCE = 0;
 #endif /* TRACK_INTERNAL_LINKS */
 
 
-PRIVATE void exit_immediately_with_error_message PARAMS((int state, BOOLEAN first_file));
-PRIVATE void status_link PARAMS((char *curlink_name, BOOLEAN show_more, BOOLEAN show_indx));
-PRIVATE void show_main_statusline PARAMS((CONST LinkInfo curlink, int for_what));
-PRIVATE void form_noviceline PARAMS((int));
-PRIVATE int are_different PARAMS((DocInfo *doc1, DocInfo *doc2));
+static void exit_immediately_with_error_message (int state, BOOLEAN first_file);
+static void status_link (char *curlink_name, BOOLEAN show_more, BOOLEAN show_indx);
+static void show_main_statusline (const LinkInfo curlink, int for_what);
+static void form_noviceline (int);
+static int are_different (DocInfo *doc1, DocInfo *doc2);
 
 #ifndef DONT_TRACK_INTERNAL_LINKS
-PRIVATE int are_phys_different PARAMS((DocInfo *doc1, DocInfo *doc2));
+static int are_phys_different (DocInfo *doc1, DocInfo *doc2);
 #endif
 
 #define FASTTAB
 
-PRIVATE int sametext ARGS2(
-	char *,		een,
-	char *,		twee)
+static int sametext (
+	char *		een,
+	char *		twee)
 {
     if (een && twee)
 	return (strcmp(een, twee) == 0);
     return TRUE;
 }
 
-PUBLIC	HTList * Goto_URLs = NULL;  /* List of Goto URLs */
+HTList * Goto_URLs = NULL;  /* List of Goto URLs */
 
-PUBLIC char * LYRequestTitle = NULL; /* newdoc.title in calls to getfile() */
-PUBLIC char * LYRequestReferer = NULL; /* Referer, may be set in getfile() */
+char * LYRequestTitle = NULL; /* newdoc.title in calls to getfile() */
+char * LYRequestReferer = NULL; /* Referer, may be set in getfile() */
 
-PRIVATE char prev_target[512];
+static char prev_target[512];
 
 #ifdef DISP_PARTIAL
-PUBLIC BOOLEAN display_partial = FALSE; /* could be enabled in HText_new() */
-PUBLIC int NumOfLines_partial = 0;  /* number of lines displayed in partial mode */
+BOOLEAN display_partial = FALSE; /* could be enabled in HText_new() */
+int NumOfLines_partial = 0;  /* number of lines displayed in partial mode */
 #endif
 
-PRIVATE int Newline = 0;
-PRIVATE DocInfo newdoc;
-PRIVATE DocInfo curdoc;
-PRIVATE char *traversal_host = NULL;
-PRIVATE char *traversal_link_to_add = NULL;
-PRIVATE char *owner_address = NULL;  /* Holds the responsible owner's address     */
-PRIVATE char *ownerS_address = NULL; /* Holds owner's address during source fetch */
+static int Newline = 0;
+static DocInfo newdoc;
+static DocInfo curdoc;
+static char *traversal_host = NULL;
+static char *traversal_link_to_add = NULL;
+static char *owner_address = NULL;  /* Holds the responsible owner's address     */
+static char *ownerS_address = NULL; /* Holds owner's address during source fetch */
 
 #ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
-PRIVATE BOOL textinput_activated = FALSE;
+static BOOL textinput_activated = FALSE;
 #else
 #define textinput_activated TRUE /* a current text input is always active */
 #endif
 #ifdef INACTIVE_INPUT_STYLE_VH
-PUBLIC BOOL textinput_redrawn = FALSE;
+BOOL textinput_redrawn = FALSE;
     /*must be public since used in LYhighlight(..)*/
 #endif
 
@@ -222,7 +222,7 @@ PUBLIC BOOL textinput_redrawn = FALSE;
 /*
  *  Function for freeing allocated mainloop() variables. - FM
  */
-PRIVATE void free_mainloop_variables NOARGS
+static void free_mainloop_variables (void)
 {
     LYFreeDocInfo(&newdoc);
     LYFreeDocInfo(&curdoc);
@@ -247,7 +247,7 @@ PRIVATE void free_mainloop_variables NOARGS
 #endif /* LY_FIND_LEAKS */
 
 #ifndef NO_LYNX_TRACE
-PRIVATE void TracelogOpenFailed NOARGS
+static void TracelogOpenFailed (void)
 {
     WWW_TraceFlag = FALSE;
     if (LYCursesON) {
@@ -258,7 +258,7 @@ PRIVATE void TracelogOpenFailed NOARGS
     }
 }
 
-PRIVATE BOOLEAN LYReopenTracelog ARGS1(BOOLEAN *, trace_flag_ptr)
+static BOOLEAN LYReopenTracelog (BOOLEAN * trace_flag_ptr)
 {
     CTRACE((tfp, "\nTurning off TRACE for fetch of log.\n"));
     LYCloseTracelog();
@@ -273,7 +273,7 @@ PRIVATE BOOLEAN LYReopenTracelog ARGS1(BOOLEAN *, trace_flag_ptr)
     return TRUE;
 }
 
-PRIVATE void turn_trace_back_on ARGS1(BOOLEAN *, trace_flag_ptr)
+static void turn_trace_back_on (BOOLEAN * trace_flag_ptr)
 {
     if (*trace_flag_ptr == TRUE) {
 	WWW_TraceFlag = TRUE;
@@ -286,7 +286,7 @@ PRIVATE void turn_trace_back_on ARGS1(BOOLEAN *, trace_flag_ptr)
 #define turn_trace_back_on(flag) /*nothing*/
 #endif /* NO_LYNX_TRACE */
 
-PUBLIC FILE *TraceFP NOARGS
+FILE *TraceFP (void)
 {
 #ifndef NO_LYNX_TRACE
     if (LYTraceLogFP != 0) {
@@ -296,7 +296,7 @@ PUBLIC FILE *TraceFP NOARGS
     return stderr;
 }
 
-PUBLIC BOOLEAN LYOpenTraceLog NOARGS
+BOOLEAN LYOpenTraceLog (void)
 {
 #ifndef NO_LYNX_TRACE
     if (TRACE && LYUseTraceLog && LYTraceLogFP == NULL) {
@@ -358,7 +358,7 @@ PUBLIC BOOLEAN LYOpenTraceLog NOARGS
     return TRUE;
 }
 
-PUBLIC void LYCloseTracelog NOARGS
+void LYCloseTracelog (void)
 {
 #ifndef NO_LYNX_TRACE
     if (LYTraceLogFP != 0) {
@@ -370,7 +370,7 @@ PUBLIC void LYCloseTracelog NOARGS
 #endif /* NO_LYNX_TRACE */
 }
 
-PUBLIC void handle_LYK_TRACE_TOGGLE NOARGS
+void handle_LYK_TRACE_TOGGLE (void)
 {
 #ifndef NO_LYNX_TRACE
     WWW_TraceFlag = ! WWW_TraceFlag;
@@ -381,24 +381,24 @@ PUBLIC void handle_LYK_TRACE_TOGGLE NOARGS
 #endif /* NO_LYNX_TRACE */
 }
 
-PUBLIC void LYSetNewline ARGS1(
-	int,		value)
+void LYSetNewline (
+	int		value)
 {
     Newline = value;
 }
 
-PUBLIC int LYGetNewline NOARGS
+int LYGetNewline (void)
 {
     return Newline;
 }
 
 #ifdef USE_SOURCE_CACHE
-PRIVATE BOOLEAN from_source_cache = FALSE;
+static BOOLEAN from_source_cache = FALSE;
 
 /*
  * Like HTreparse_document(), but also set the flag.
  */
-PRIVATE BOOLEAN reparse_document NOARGS
+static BOOLEAN reparse_document (void)
 {
     BOOLEAN ok;
     from_source_cache = TRUE;	/* set for LYMainLoop_pageDisplay() */
@@ -415,8 +415,8 @@ PRIVATE BOOLEAN reparse_document NOARGS
  * Prefer reparsing if we can, but reload if we must - to force regeneration
  * of the display.
  */
-PRIVATE BOOLEAN reparse_or_reload ARGS1(
-    int *,	cmd)
+static BOOLEAN reparse_or_reload (
+    int *	cmd)
 {
 #ifdef USE_SOURCE_CACHE
     if (reparse_document()) {
@@ -430,29 +430,29 @@ PRIVATE BOOLEAN reparse_or_reload ARGS1(
 /*
  * Functions for setting the current address
  */
-PRIVATE void set_address ARGS2(
-	DocInfo *,	doc,
-	CONST char *,	address)
+static void set_address (
+	DocInfo *	doc,
+	const char *	address)
 {
     StrAllocCopy(doc->address, address);
 }
 
-PRIVATE void copy_address ARGS2(
-	DocInfo *,	dst,
-	DocInfo *,	src)
+static void copy_address (
+	DocInfo *	dst,
+	DocInfo *	src)
 {
     StrAllocCopy(dst->address, src->address);
 }
 
-PRIVATE void free_address ARGS1(
-	DocInfo *,	doc)
+static void free_address (
+	DocInfo *	doc)
 {
     FREE(doc->address);
 }
 
-PRIVATE void move_address ARGS2(
-	DocInfo *,	dst,
-	DocInfo *,	src)
+static void move_address (
+	DocInfo *	dst,
+	DocInfo *	src)
 {
     copy_address(dst, src);
     free_address(src);
@@ -462,13 +462,13 @@ PRIVATE void move_address ARGS2(
 /*
  * This is for traversal call from within partial mode in LYUtils.c
  * and HTFormat.c  It simply calls HText_pageDisplay() but utilizes
- * LYMainLoop.c PRIVATE variables to manage proper newline position
+ * LYMainLoop.c static variables to manage proper newline position
  * in case of #fragment
  */
-PUBLIC BOOL LYMainLoop_pageDisplay ARGS1(
-	int,		line_num)
+BOOL LYMainLoop_pageDisplay (
+	int		line_num)
 {
-    CONST char * pound;
+    const char * pound;
     int prev_newline = Newline;
 
     /*
@@ -513,8 +513,8 @@ PUBLIC BOOL LYMainLoop_pageDisplay ARGS1(
 #endif /* DISP_PARTIAL */
 
 
-PRIVATE void set_curdoc_link ARGS1(
-    int,	nextlink)
+static void set_curdoc_link (
+    int	nextlink)
 {
     if (curdoc.link != nextlink
      && nextlink >= 0
@@ -525,7 +525,7 @@ PRIVATE void set_curdoc_link ARGS1(
     }
 }
 
-PRIVATE int do_change_link NOARGS
+static int do_change_link (void)
 {
 #ifdef USE_MOUSE
     /* Is there a mouse-clicked link waiting? */
@@ -554,14 +554,14 @@ PRIVATE int do_change_link NOARGS
 			else HTuncache_current_document()
 #endif /* DIRED_SUPPORT */
 
-PRIVATE void do_check_goto_URL ARGS3(
-    char *,	user_input_buffer,
-    char **,	old_user_input,
-    BOOLEAN *,	force_load)
+static void do_check_goto_URL (
+    char *	user_input_buffer,
+    char **	old_user_input,
+    BOOLEAN *	force_load)
 {
     static BOOLEAN always = TRUE;
     static struct {
-	CONST char *name;
+	const char *name;
 	BOOLEAN *flag;
     } table[] = {
 	{ STR_FILE_URL,		&no_file_url },
@@ -668,14 +668,14 @@ PRIVATE void do_check_goto_URL ARGS3(
 }
 
 /* returns FALSE if user cancelled input or URL was invalid, TRUE otherwise */
-PRIVATE BOOL do_check_recall ARGS7(
-    int,	ch,
-    char *,	user_input_buffer,
-    char **,	old_user_input,
-    int,	URLTotal,
-    int *,	URLNum,
-    int,	recall,
-    BOOLEAN *,	FirstURLRecall)
+static BOOL do_check_recall (
+    int	ch,
+    char *	user_input_buffer,
+    char **	old_user_input,
+    int	URLTotal,
+    int *	URLNum,
+    int	recall,
+    BOOLEAN *	FirstURLRecall)
 {
     char *cp;
     BOOL ret = FALSE;
@@ -815,7 +815,7 @@ PRIVATE BOOL do_check_recall ARGS7(
     return ret;
 }
 
-PRIVATE void do_cleanup_after_delete NOARGS
+static void do_cleanup_after_delete (void)
 {
     HTuncache_current_document();
     move_address(&newdoc, &curdoc);
@@ -830,9 +830,9 @@ PRIVATE void do_cleanup_after_delete NOARGS
     }
 }
 
-PRIVATE int find_link_near_col ARGS2(
-	int,	col,
-	int,	delta)
+static int find_link_near_col (
+	int	col,
+	int	delta)
 {
     int i;
 
@@ -867,9 +867,9 @@ PRIVATE int find_link_near_col ARGS2(
  * with "traversal_host" are searched - this keeps the search from crossing to
  * other servers (a feature, not a bug!).
  */
-PRIVATE int DoTraversal ARGS2(
-    int,	c,
-    BOOLEAN *,	crawl_ok)
+static int DoTraversal (
+    int	c,
+    BOOLEAN *	crawl_ok)
 {
     BOOLEAN rlink_rejected = FALSE;
     BOOLEAN rlink_exists;
@@ -949,9 +949,9 @@ PRIVATE int DoTraversal ARGS2(
 }
 
 #ifndef DONT_TRACK_INTERNAL_LINKS
-PRIVATE BOOLEAN check_history NOARGS
+static BOOLEAN check_history (void)
 {
-    CONST char *base;
+    const char *base;
 
     if (!curdoc.post_data)
 	/*
@@ -985,13 +985,13 @@ PRIVATE BOOLEAN check_history NOARGS
 }
 #endif
 
-PRIVATE int handle_LYK_ACTIVATE ARGS6(
-    int *,	c,
-    int,	cmd GCC_UNUSED,
-    BOOLEAN *,	try_internal GCC_UNUSED,
-    BOOLEAN *,	refresh_screen,
-    BOOLEAN *,	force_load,
-    int,	real_cmd)
+static int handle_LYK_ACTIVATE (
+    int *	c,
+    int	cmd GCC_UNUSED,
+    BOOLEAN *	try_internal GCC_UNUSED,
+    BOOLEAN *	refresh_screen,
+    BOOLEAN *	force_load,
+    int	real_cmd)
 {
     if (do_change_link() == -1) {
 	LYforce_no_cache = FALSE;
@@ -1439,8 +1439,8 @@ gettext("Enctype multipart/form-data not yet supported!  Cannot submit."));
 }
 
 #ifdef EXP_ADDRLIST_PAGE
-PRIVATE BOOLEAN handle_LYK_ADDRLIST ARGS1(
-    int *,     cmd)
+static BOOLEAN handle_LYK_ADDRLIST (
+    int *     cmd)
 {
     /*
      *	Don't do if already viewing list addresses page.
@@ -1474,10 +1474,10 @@ PRIVATE BOOLEAN handle_LYK_ADDRLIST ARGS1(
 }
 #endif /* EXP_ADDRLIST_PAGE */
 
-PRIVATE void handle_LYK_ADD_BOOKMARK ARGS3(
-    BOOLEAN *,	refresh_screen,
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_ADD_BOOKMARK (
+    BOOLEAN *	refresh_screen,
+    int *	old_c,
+    int	real_c)
 {
     int c;
 
@@ -1621,9 +1621,9 @@ check_add_bookmark_to_self:
     }
 }
 
-PRIVATE void handle_LYK_CLEAR_AUTH ARGS2(
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_CLEAR_AUTH (
+    int *	old_c,
+    int	real_c)
 {
     if (*old_c != real_c) {
 	*old_c = real_c;
@@ -1646,8 +1646,8 @@ PRIVATE void handle_LYK_CLEAR_AUTH ARGS2(
     }
 }
 
-PRIVATE int handle_LYK_COMMAND ARGS1(
-    char *,	user_input_buffer)
+static int handle_LYK_COMMAND (
+    char *	user_input_buffer)
 {
     int ch;
     Kcmd *mp;
@@ -1670,11 +1670,11 @@ PRIVATE int handle_LYK_COMMAND ARGS1(
     return 0;
 }
 
-PRIVATE void handle_LYK_COMMENT ARGS4(
-    BOOLEAN *,	refresh_screen,
-    char **,	owner_address_p,
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_COMMENT (
+    BOOLEAN *	refresh_screen,
+    char **	owner_address_p,
+    int *	old_c,
+    int	real_c)
 {
     int	c;
 
@@ -1742,8 +1742,8 @@ PRIVATE void handle_LYK_COMMENT ARGS4(
 		/*
 		 *  The owner_address is a mailto: URL.
 		 */
-		CONST char *kp = HText_getRevTitle();
-		CONST char *id = HText_getMessageID();
+		const char *kp = HText_getRevTitle();
+		const char *id = HText_getMessageID();
 		char *tmptitle = NULL;
 		if (!kp && HTMainAnchor) {
 		    kp = HTAnchor_subject(HTMainAnchor);
@@ -1774,8 +1774,8 @@ PRIVATE void handle_LYK_COMMENT ARGS4(
     }
 }
 
-PRIVATE BOOLEAN handle_LYK_COOKIE_JAR ARGS1(
-    int *,	cmd)
+static BOOLEAN handle_LYK_COOKIE_JAR (
+    int *	cmd)
 {
     /*
      *	Don't do if already viewing the cookie jar.
@@ -1802,7 +1802,7 @@ PRIVATE BOOLEAN handle_LYK_COOKIE_JAR ARGS1(
 }
 
 #if defined(DIRED_SUPPORT)
-PRIVATE void handle_LYK_CREATE NOARGS
+static void handle_LYK_CREATE (void)
 {
     if (lynx_edit_mode && !no_dired_support) {
 	if (local_create(&curdoc) > 0) {
@@ -1820,10 +1820,10 @@ PRIVATE void handle_LYK_CREATE NOARGS
 }
 #endif /* DIRED_SUPPORT */
 
-PRIVATE void handle_LYK_DEL_BOOKMARK ARGS3(
-    BOOLEAN *,	refresh_screen,
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_DEL_BOOKMARK (
+    BOOLEAN *	refresh_screen,
+    int *	old_c,
+    int	real_c)
 {
     if (curdoc.bookmark != NULL) {
 	if (HTConfirmDefault(CONFIRM_BOOKMARK_DELETE,NO) != YES)
@@ -1842,10 +1842,10 @@ PRIVATE void handle_LYK_DEL_BOOKMARK ARGS3(
 }
 
 #if defined(DIRED_SUPPORT) || defined(VMS)
-PRIVATE void handle_LYK_DIRED_MENU ARGS3(
-    BOOLEAN *,	refresh_screen,
-    int *,	old_c GCC_UNUSED,
-    int,	real_c GCC_UNUSED)
+static void handle_LYK_DIRED_MENU (
+    BOOLEAN *	refresh_screen,
+    int *	old_c GCC_UNUSED,
+    int	real_c GCC_UNUSED)
 {
 #ifdef VMS
     char *cp, *temp = 0;
@@ -1967,10 +1967,10 @@ PRIVATE void handle_LYK_DIRED_MENU ARGS3(
 }
 #endif /* defined(DIRED_SUPPORT) || defined(VMS) */
 
-PRIVATE int handle_LYK_DOWNLOAD ARGS3(
-    int *,	cmd,
-    int *,	old_c,
-    int,	real_c)
+static int handle_LYK_DOWNLOAD (
+    int *	cmd,
+    int *	old_c,
+    int	real_c)
 {
 
     /*
@@ -2179,9 +2179,9 @@ PRIVATE int handle_LYK_DOWNLOAD ARGS3(
     return 0;
 }
 
-PRIVATE void handle_LYK_DOWN_HALF ARGS2(
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_DOWN_HALF (
+    int *	old_c,
+    int	real_c)
 {
     int i;
 
@@ -2199,10 +2199,10 @@ PRIVATE void handle_LYK_DOWN_HALF ARGS2(
     }
 }
 
-PRIVATE void handle_LYK_DOWN_LINK ARGS3(
-    int *,	follow_col,
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_DOWN_LINK (
+    int *	follow_col,
+    int *	old_c,
+    int	real_c)
 {
     if (curdoc.link < (nlinks-1)) {	/* more links? */
 	int newlink;
@@ -2234,9 +2234,9 @@ PRIVATE void handle_LYK_DOWN_LINK ARGS3(
     }
 }
 
-PRIVATE void handle_LYK_DOWN_TWO ARGS2(
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_DOWN_TWO (
+    int *	old_c,
+    int	real_c)
 {
     int i;
 
@@ -2254,10 +2254,10 @@ PRIVATE void handle_LYK_DOWN_TWO ARGS2(
     }
 }
 
-PRIVATE int handle_LYK_DWIMEDIT ARGS3(
-    int *,	cmd,
-    int *,	old_c,
-    int,	real_c)
+static int handle_LYK_DWIMEDIT (
+    int *	cmd,
+    int *	old_c,
+    int	real_c)
 {
 #ifdef TEXTAREA_AUTOEXTEDIT
     /*
@@ -2301,12 +2301,12 @@ PRIVATE int handle_LYK_DWIMEDIT ARGS3(
     return 0;
 }
 
-PRIVATE int handle_LYK_ECGOTO ARGS5(
-    int *,	ch,
-    char *,	user_input_buffer,
-    char **,	old_user_input,
-    int *,	old_c,
-    int,	real_c)
+static int handle_LYK_ECGOTO (
+    int *	ch,
+    char *	user_input_buffer,
+    char **	old_user_input,
+    int *	old_c,
+    int	real_c)
 {
     if (no_goto && !LYValidate) {
 	/*
@@ -2372,9 +2372,9 @@ PRIVATE int handle_LYK_ECGOTO ARGS5(
     return 0;
 }
 
-PRIVATE void handle_LYK_EDIT ARGS2(
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_EDIT (
+    int *	old_c,
+    int	real_c)
 {
 #ifdef DIRED_SUPPORT
     char *cp;
@@ -2464,8 +2464,8 @@ PRIVATE void handle_LYK_EDIT ARGS2(
     }
 }
 
-PRIVATE void handle_LYK_DWIMHELP ARGS1(
-    CONST char **,	cshelpfile)
+static void handle_LYK_DWIMHELP (
+    const char **	cshelpfile)
 {
     /*
      *  Currently a help file different from the main
@@ -2480,10 +2480,10 @@ PRIVATE void handle_LYK_DWIMHELP ARGS1(
     }
 }
 
-PRIVATE void handle_LYK_EDIT_TEXTAREA ARGS3(
-    BOOLEAN *,	refresh_screen,
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_EDIT_TEXTAREA (
+    BOOLEAN *	refresh_screen,
+    int *	old_c,
+    int	real_c)
 {
     int n;
 
@@ -2531,12 +2531,12 @@ PRIVATE void handle_LYK_EDIT_TEXTAREA ARGS3(
     }
 }
 
-PRIVATE int handle_LYK_ELGOTO ARGS5(
-    int *,	ch,
-    char *,	user_input_buffer,
-    char **,	old_user_input,
-    int *,	old_c,
-    int,	real_c)
+static int handle_LYK_ELGOTO (
+    int *	ch,
+    char *	user_input_buffer,
+    char **	old_user_input,
+    int *	old_c,
+    int	real_c)
 {
     if (no_goto && !LYValidate) {
 	/*
@@ -2629,8 +2629,8 @@ PRIVATE int handle_LYK_ELGOTO ARGS5(
 }
 
 #ifdef USE_EXTERNALS
-PRIVATE void handle_LYK_EXTERN_LINK ARGS1(
-    BOOLEAN *,	refresh_screen)
+static void handle_LYK_EXTERN_LINK (
+    BOOLEAN *	refresh_screen)
 {
     if ((nlinks > 0) && (links[curdoc.link].lname != NULL))
     {
@@ -2639,8 +2639,8 @@ PRIVATE void handle_LYK_EXTERN_LINK ARGS1(
     }
 }
 
-PRIVATE void handle_LYK_EXTERN_PAGE ARGS1(
-    BOOLEAN *,	refresh_screen)
+static void handle_LYK_EXTERN_PAGE (
+    BOOLEAN *	refresh_screen)
 {
     if (curdoc.address != NULL)
     {
@@ -2650,10 +2650,10 @@ PRIVATE void handle_LYK_EXTERN_PAGE ARGS1(
 }
 #endif
 
-PRIVATE BOOLEAN handle_LYK_FASTBACKW_LINK ARGS3(
-    int *,	cmd,
-    int *,	old_c,
-    int,	real_c)
+static BOOLEAN handle_LYK_FASTBACKW_LINK (
+    int *	cmd,
+    int *	old_c,
+    int	real_c)
 {
     int samepage = 0, nextlink = curdoc.link;
     int res;
@@ -2759,9 +2759,9 @@ PRIVATE BOOLEAN handle_LYK_FASTBACKW_LINK ARGS3(
     return FALSE;
 }
 
-PRIVATE void handle_LYK_FASTFORW_LINK ARGS2(
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_FASTFORW_LINK (
+    int *	old_c,
+    int	real_c)
 {
     int samepage = 0, nextlink = curdoc.link;
 
@@ -2825,7 +2825,7 @@ PRIVATE void handle_LYK_FASTFORW_LINK ARGS2(
     return;
 }
 
-PRIVATE void handle_LYK_FIRST_LINK NOARGS
+static void handle_LYK_FIRST_LINK (void)
 {
     int i = curdoc.link;
 
@@ -2838,16 +2838,16 @@ PRIVATE void handle_LYK_FIRST_LINK NOARGS
     }
 }
 
-PRIVATE BOOLEAN handle_LYK_GOTO ARGS9(
-    int *,	ch,
-    char *,	user_input_buffer,
-    char **,	old_user_input,
-    int *,	recall,
-    int *,	URLTotal,
-    int *,	URLNum,
-    BOOLEAN *,	FirstURLRecall,
-    int *,	old_c,
-    int,	real_c)
+static BOOLEAN handle_LYK_GOTO (
+    int *	ch,
+    char *	user_input_buffer,
+    char **	old_user_input,
+    int *	recall,
+    int *	URLTotal,
+    int *	URLNum,
+    BOOLEAN *	FirstURLRecall,
+    int *	old_c,
+    int	real_c)
 {
 
     if (no_goto && !LYValidate) {
@@ -2891,8 +2891,8 @@ PRIVATE BOOLEAN handle_LYK_GOTO ARGS9(
     return TRUE;
 }
 
-PRIVATE void handle_LYK_GROW_TEXTAREA ARGS1(
-    BOOLEAN *,	refresh_screen)
+static void handle_LYK_GROW_TEXTAREA (
+    BOOLEAN *	refresh_screen)
 {
     /*
      *  See if the current link is in a form TEXTAREA.
@@ -2910,8 +2910,8 @@ PRIVATE void handle_LYK_GROW_TEXTAREA ARGS1(
     }
 }
 
-PRIVATE BOOLEAN handle_LYK_HEAD ARGS1(
-    int *,	cmd)
+static BOOLEAN handle_LYK_HEAD (
+    int *	cmd)
 {
     int c;
 
@@ -3036,8 +3036,8 @@ PRIVATE BOOLEAN handle_LYK_HEAD ARGS1(
     return FALSE;
 }
 
-PRIVATE void handle_LYK_HELP ARGS1(
-    CONST char **,	cshelpfile)
+static void handle_LYK_HELP (
+    const char **	cshelpfile)
 {
     if (*cshelpfile == NULL)
 	*cshelpfile = helpfile;
@@ -3059,7 +3059,7 @@ PRIVATE void handle_LYK_HELP ARGS1(
     *cshelpfile = NULL;		/* reset pointer - kw */
 }
 
-PRIVATE void handle_LYK_HISTORICAL NOARGS
+static void handle_LYK_HISTORICAL (void)
 {
 #ifdef USE_SOURCE_CACHE
     if (!HTcan_reparse_document()) {
@@ -3096,8 +3096,8 @@ PRIVATE void handle_LYK_HISTORICAL NOARGS
     return;
 }
 
-PRIVATE BOOLEAN handle_LYK_HISTORY ARGS1(
-    BOOLEAN,	ForcePush)
+static BOOLEAN handle_LYK_HISTORY (
+    BOOLEAN	ForcePush)
 {
     if (curdoc.title && !LYIsUIPage(curdoc.address, UIP_HISTORY)) {
 	/*
@@ -3141,8 +3141,8 @@ PRIVATE BOOLEAN handle_LYK_HISTORY ARGS1(
     return FALSE;
 }
 
-PRIVATE BOOLEAN handle_LYK_IMAGE_TOGGLE ARGS1(
-    int *,	cmd)
+static BOOLEAN handle_LYK_IMAGE_TOGGLE (
+    int *	cmd)
 {
     clickable_images = !clickable_images;
 
@@ -3151,9 +3151,9 @@ PRIVATE BOOLEAN handle_LYK_IMAGE_TOGGLE ARGS1(
     return reparse_or_reload(cmd);
 }
 
-PRIVATE void handle_LYK_INDEX ARGS2(
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_INDEX (
+    int *	old_c,
+    int	real_c)
 {
     /*
      *	Make sure we are not in the index already.
@@ -3183,11 +3183,11 @@ PRIVATE void handle_LYK_INDEX ARGS2(
     }  /* end if */
 }
 
-PRIVATE void handle_LYK_INDEX_SEARCH ARGS4(
-    BOOLEAN *,	force_load,
-    BOOLEAN,	ForcePush,
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_INDEX_SEARCH (
+    BOOLEAN *	force_load,
+    BOOLEAN	ForcePush,
+    int *	old_c,
+    int	real_c)
 {
     if (is_www_index) {
 	/*
@@ -3263,8 +3263,8 @@ PRIVATE void handle_LYK_INDEX_SEARCH ARGS4(
     }
 }
 
-PRIVATE BOOLEAN handle_LYK_INFO ARGS1(
-    int *,	cmd)
+static BOOLEAN handle_LYK_INFO (
+    int *	cmd)
 {
     /*
      *	Don't do if already viewing info page.
@@ -3294,8 +3294,8 @@ PRIVATE BOOLEAN handle_LYK_INFO ARGS1(
     return FALSE;
 }
 
-PRIVATE BOOLEAN handle_LYK_INLINE_TOGGLE ARGS1(
-    int *,	cmd)
+static BOOLEAN handle_LYK_INLINE_TOGGLE (
+    int *	cmd)
 {
     pseudo_inline_alts = !pseudo_inline_alts;
 
@@ -3304,10 +3304,10 @@ PRIVATE BOOLEAN handle_LYK_INLINE_TOGGLE ARGS1(
     return reparse_or_reload(cmd);
 }
 
-PRIVATE void handle_LYK_INSERT_FILE ARGS3(
-    BOOLEAN *,	refresh_screen,
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_INSERT_FILE (
+    BOOLEAN *	refresh_screen,
+    int *	old_c,
+    int	real_c)
 {
     int n;
 
@@ -3365,24 +3365,24 @@ PRIVATE void handle_LYK_INSERT_FILE ARGS3(
 }
 
 #if defined(DIRED_SUPPORT) && defined(OK_INSTALL)
-PRIVATE void handle_LYK_INSTALL NOARGS
+static void handle_LYK_INSTALL (void)
 {
     if (lynx_edit_mode && nlinks > 0 && !no_dired_support)
 	local_install(NULL, links[curdoc.link].lname, &newdoc.address);
 }
 #endif
 
-PRIVATE BOOLEAN handle_LYK_JUMP ARGS10(
-    int,	c,
-    char *,	user_input_buffer,
-    char **,	old_user_input GCC_UNUSED,
-    int *,	recall GCC_UNUSED,
-    BOOLEAN *,	FirstURLRecall GCC_UNUSED,
-    int *,	URLNum GCC_UNUSED,
-    int *,	URLTotal GCC_UNUSED,
-    int *,	ch GCC_UNUSED,
-    int *,	old_c,
-    int,	real_c)
+static BOOLEAN handle_LYK_JUMP (
+    int	c,
+    char *	user_input_buffer,
+    char **	old_user_input GCC_UNUSED,
+    int *	recall GCC_UNUSED,
+    BOOLEAN *	FirstURLRecall GCC_UNUSED,
+    int *	URLNum GCC_UNUSED,
+    int *	URLTotal GCC_UNUSED,
+    int *	ch GCC_UNUSED,
+    int *	old_c,
+    int	real_c)
 {
     char *ret;
 
@@ -3440,11 +3440,11 @@ PRIVATE BOOLEAN handle_LYK_JUMP ARGS10(
     return FALSE;
 }
 
-PRIVATE void handle_LYK_KEYMAP ARGS4(
-    BOOLEAN *,	vi_keys_flag,
-    BOOLEAN *,	emacs_keys_flag,
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_KEYMAP (
+    BOOLEAN *	vi_keys_flag,
+    BOOLEAN *	emacs_keys_flag,
+    int *	old_c,
+    int	real_c)
 {
     if (*old_c != real_c) {
 	*old_c = real_c;
@@ -3478,7 +3478,7 @@ PRIVATE void handle_LYK_KEYMAP ARGS4(
     }
 }
 
-PRIVATE void handle_LYK_LAST_LINK NOARGS
+static void handle_LYK_LAST_LINK (void)
 {
     int i = curdoc.link;
 
@@ -3491,7 +3491,7 @@ PRIVATE void handle_LYK_LAST_LINK NOARGS
     }
 }
 
-PRIVATE void handle_LYK_LEFT_LINK NOARGS
+static void handle_LYK_LEFT_LINK (void)
 {
     if (curdoc.link>0 &&
 		links[curdoc.link].ly == links[curdoc.link-1].ly) {
@@ -3499,8 +3499,8 @@ PRIVATE void handle_LYK_LEFT_LINK NOARGS
     }
 }
 
-PRIVATE BOOLEAN handle_LYK_LIST ARGS1(
-    int *,     cmd)
+static BOOLEAN handle_LYK_LIST (
+    int *     cmd)
 {
     /*
      *	Don't do if already viewing list page.
@@ -3534,9 +3534,9 @@ PRIVATE BOOLEAN handle_LYK_LIST ARGS1(
     return FALSE;
 }
 
-PRIVATE void handle_LYK_MAIN_MENU ARGS2(
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_MAIN_MENU (
+    int *	old_c,
+    int	real_c)
 {
     /*
      *	If its already the homepage then don't reload it.
@@ -3566,7 +3566,7 @@ PRIVATE void handle_LYK_MAIN_MENU ARGS2(
     }
 }
 
-PRIVATE void handle_LYK_MINIMAL NOARGS
+static void handle_LYK_MINIMAL (void)
 {
     if (!historical_comments) {
 #ifdef USE_SOURCE_CACHE
@@ -3606,8 +3606,8 @@ PRIVATE void handle_LYK_MINIMAL NOARGS
 }
 
 #if defined(DIRED_SUPPORT)
-PRIVATE void handle_LYK_MODIFY ARGS1(
-    BOOLEAN *,	refresh_screen)
+static void handle_LYK_MODIFY (
+    BOOLEAN *	refresh_screen)
 {
     if (lynx_edit_mode && nlinks > 0 && !no_dired_support) {
 	int ret;
@@ -3632,8 +3632,8 @@ PRIVATE void handle_LYK_MODIFY ARGS1(
 #endif /* DIRED_SUPPORT */
 
 #ifdef EXP_NESTED_TABLES
-PRIVATE BOOLEAN handle_LYK_NESTED_TABLES ARGS1(
-    int *,	cmd)
+static BOOLEAN handle_LYK_NESTED_TABLES (
+    int *	cmd)
 {
     nested_tables = !nested_tables;
     HTUserMsg(nested_tables ? NESTED_TABLES_ON : NESTED_TABLES_OFF);
@@ -3641,9 +3641,9 @@ PRIVATE BOOLEAN handle_LYK_NESTED_TABLES ARGS1(
 }
 #endif
 
-PRIVATE BOOLEAN handle_LYK_OPTIONS ARGS2(
-    int *,	cmd,
-    BOOLEAN *,	refresh_screen)
+static BOOLEAN handle_LYK_OPTIONS (
+    int *	cmd,
+    BOOLEAN *	refresh_screen)
 {
 #ifndef NO_OPTION_MENU
     if (!LYUseFormsOptions) {
@@ -3814,7 +3814,7 @@ PRIVATE BOOLEAN handle_LYK_OPTIONS ARGS2(
     return FALSE;
 }
 
-PRIVATE void handle_NEXT_DOC NOARGS
+static void handle_NEXT_DOC (void)
 {
     if (LYhist_next(&curdoc, &newdoc)) {
 	free_address(&curdoc);	/* avoid push */
@@ -3823,10 +3823,10 @@ PRIVATE void handle_NEXT_DOC NOARGS
     HTUserMsg(gettext("No next document present"));
 }
 
-PRIVATE void handle_LYK_NEXT_LINK ARGS3(
-    int,	c,
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_NEXT_LINK (
+    int	c,
+    int *	old_c,
+    int	real_c)
 {
     if (curdoc.link < nlinks-1) {	/* next link */
 	LYhighlight(OFF, curdoc.link, prev_target);
@@ -3868,9 +3868,9 @@ PRIVATE void handle_LYK_NEXT_LINK ARGS3(
     }
 }
 
-PRIVATE void handle_LYK_NEXT_PAGE ARGS2(
-    int	*,	old_c,
-    int,	real_c)
+static void handle_LYK_NEXT_PAGE (
+    int	*	old_c,
+    int	real_c)
 {
     if (more) {
 	Newline += display_lines;
@@ -3882,9 +3882,9 @@ PRIVATE void handle_LYK_NEXT_PAGE ARGS2(
     }
 }
 
-PRIVATE BOOLEAN handle_LYK_NOCACHE ARGS2(
-    int *,	old_c,
-    int,	real_c)
+static BOOLEAN handle_LYK_NOCACHE (
+    int *	old_c,
+    int	real_c)
 {
     if (nlinks > 0) {
 	if (links[curdoc.link].type == WWW_FORM_LINK_TYPE &&
@@ -3904,10 +3904,10 @@ PRIVATE BOOLEAN handle_LYK_NOCACHE ARGS2(
     return TRUE;
 }
 
-PRIVATE void handle_LYK_PREV_LINK ARGS3(
-    int *,	arrowup,
-    int	*,	old_c,
-    int,	real_c)
+static void handle_LYK_PREV_LINK (
+    int *	arrowup,
+    int	*	old_c,
+    int	real_c)
 {
     if (curdoc.link > 0) {	     /* previous link */
 	set_curdoc_link(curdoc.link - 1);
@@ -3944,10 +3944,10 @@ PRIVATE void handle_LYK_PREV_LINK ARGS3(
     }
 }
 
-PRIVATE int handle_PREV_DOC ARGS3(
-    int *,	cmd,
-    int *,	old_c,
-    int,	real_c)
+static int handle_PREV_DOC (
+    int *	cmd,
+    int *	old_c,
+    int	real_c)
 {
     if (nhist > 0) {  /* if there is anything to go back to */
 	/*
@@ -4055,9 +4055,9 @@ PRIVATE int handle_PREV_DOC ARGS3(
     return 0;
 }
 
-PRIVATE void handle_LYK_PREV_PAGE ARGS2(
-    int	*,	old_c,
-    int,	real_c)
+static void handle_LYK_PREV_PAGE (
+    int	*	old_c,
+    int	real_c)
 {
     if (Newline > 1) {
 	Newline -= display_lines;
@@ -4069,10 +4069,10 @@ PRIVATE void handle_LYK_PREV_PAGE ARGS2(
     }
 }
 
-PRIVATE void handle_LYK_PRINT ARGS3(
-    BOOLEAN *,	ForcePush,
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_PRINT (
+    BOOLEAN *	ForcePush,
+    int *	old_c,
+    int	real_c)
 {
     if (LYValidate) {
 	if (*old_c != real_c)	{
@@ -4100,7 +4100,7 @@ PRIVATE void handle_LYK_PRINT ARGS3(
     }
 }
 
-PRIVATE BOOLEAN handle_LYK_QUIT NOARGS
+static BOOLEAN handle_LYK_QUIT (void)
 {
     int c;
 
@@ -4123,8 +4123,8 @@ PRIVATE BOOLEAN handle_LYK_QUIT NOARGS
     return FALSE;
 }
 
-PRIVATE BOOLEAN handle_LYK_RAW_TOGGLE ARGS1(
-    int *,	cmd)
+static BOOLEAN handle_LYK_RAW_TOGGLE (
+    int *	cmd)
 {
     if (HTLoadedDocumentCharset()) {
 	HTUserMsg(gettext("charset for this document specified explicitly, sorry..."));
@@ -4137,8 +4137,8 @@ PRIVATE BOOLEAN handle_LYK_RAW_TOGGLE ARGS1(
     }
 }
 
-PRIVATE void handle_LYK_RELOAD ARGS1(
-    int,	real_cmd)
+static void handle_LYK_RELOAD (
+    int	real_cmd)
 {
     /*
      * Check if this is a reply from a POST, and if so,
@@ -4198,8 +4198,8 @@ PRIVATE void handle_LYK_RELOAD ARGS1(
 }
 
 #ifdef DIRED_SUPPORT
-PRIVATE void handle_LYK_REMOVE ARGS1(
-    BOOLEAN *,	refresh_screen)
+static void handle_LYK_REMOVE (
+    BOOLEAN *	refresh_screen)
 {
     if (lynx_edit_mode && nlinks > 0 && !no_dired_support) {
 	int linkno = curdoc.link; /* may be changed in local_remove - kw */
@@ -4212,7 +4212,7 @@ PRIVATE void handle_LYK_REMOVE ARGS1(
 }
 #endif /* DIRED_SUPPORT */
 
-PRIVATE void handle_LYK_RIGHT_LINK NOARGS
+static void handle_LYK_RIGHT_LINK (void)
 {
     if (curdoc.link<nlinks-1 &&
 		links[curdoc.link].ly == links[curdoc.link+1].ly) {
@@ -4220,10 +4220,10 @@ PRIVATE void handle_LYK_RIGHT_LINK NOARGS
     }
 }
 
-PRIVATE void handle_LYK_SHELL ARGS3(
-    BOOLEAN *,	refresh_screen,
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_SHELL (
+    BOOLEAN *	refresh_screen,
+    int *	old_c,
+    int	real_c)
 {
     if (!no_shell) {
 	stop_curses();
@@ -4245,7 +4245,7 @@ PRIVATE void handle_LYK_SHELL ARGS3(
     }
 }
 
-PRIVATE void handle_LYK_SOFT_DQUOTES NOARGS
+static void handle_LYK_SOFT_DQUOTES (void)
 {
 #ifdef USE_SOURCE_CACHE
     if (!HTcan_reparse_document()) {
@@ -4277,8 +4277,8 @@ PRIVATE void handle_LYK_SOFT_DQUOTES NOARGS
     return;
 }
 
-PRIVATE void handle_LYK_SOURCE ARGS1(
-    char **,	ownerS_address_p)
+static void handle_LYK_SOURCE (
+    char **	ownerS_address_p)
 {
     /*
      * Check if this is a reply from a POST, and if so,
@@ -4338,7 +4338,7 @@ PRIVATE void handle_LYK_SOURCE ARGS1(
     LYforce_no_cache = TRUE;
 }
 
-PRIVATE void handle_LYK_SWITCH_DTD NOARGS
+static void handle_LYK_SWITCH_DTD (void)
 {
 #ifdef USE_SOURCE_CACHE
     BOOLEAN canreparse = FALSE;
@@ -4398,7 +4398,7 @@ PRIVATE void handle_LYK_SWITCH_DTD NOARGS
 }
 
 #ifdef DIRED_SUPPORT
-PRIVATE void handle_LYK_TAG_LINK NOARGS
+static void handle_LYK_TAG_LINK (void)
 {
     if (lynx_edit_mode && nlinks > 0 && !no_dired_support) {
 	if (!strcmp(LYGetHiliteStr(curdoc.link, 0), ".."))
@@ -4445,7 +4445,7 @@ PRIVATE void handle_LYK_TAG_LINK NOARGS
 }
 #endif /* DIRED_SUPPORT */
 
-PRIVATE void handle_LYK_TOGGLE_HELP NOARGS
+static void handle_LYK_TOGGLE_HELP (void)
 {
     if (user_mode == NOVICE_MODE) {
 	toggle_novice_line();
@@ -4453,11 +4453,11 @@ PRIVATE void handle_LYK_TOGGLE_HELP NOARGS
     }
 }
 
-PRIVATE void handle_LYK_TOOLBAR ARGS4(
-    BOOLEAN *,	try_internal,
-    BOOLEAN *,	force_load,
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_TOOLBAR (
+    BOOLEAN *	try_internal,
+    BOOLEAN *	force_load,
+    int *	old_c,
+    int	real_c)
 {
     char *cp;
     char *toolbar = NULL;
@@ -4479,8 +4479,8 @@ PRIVATE void handle_LYK_TOOLBAR ARGS4(
     }
 }
 
-PRIVATE void handle_LYK_TRACE_LOG ARGS1(
-    BOOLEAN *,	trace_flag_ptr)
+static void handle_LYK_TRACE_LOG (
+    BOOLEAN *	trace_flag_ptr)
 {
 #ifndef NO_LYNX_TRACE
     /*
@@ -4530,7 +4530,7 @@ PRIVATE void handle_LYK_TRACE_LOG ARGS1(
 }
 
 #ifdef DIRED_SUPPORT
-PRIVATE void handle_LYK_UPLOAD NOARGS
+static void handle_LYK_UPLOAD (void)
 {
     /*
      *	Don't do if already viewing upload options page.
@@ -4556,10 +4556,10 @@ PRIVATE void handle_LYK_UPLOAD NOARGS
 }
 #endif /* DIRED_SUPPORT */
 
-PRIVATE void handle_LYK_UP_HALF ARGS3(
-    int *,	arrowup,
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_UP_HALF (
+    int *	arrowup,
+    int *	old_c,
+    int	real_c)
 {
     if (Newline > 1) {
 	int scrollamount = display_lines/2;
@@ -4582,11 +4582,11 @@ PRIVATE void handle_LYK_UP_HALF ARGS3(
     }
 }
 
-PRIVATE void handle_LYK_UP_LINK ARGS4(
-    int *,	follow_col,
-    int *,	arrowup,
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_UP_LINK (
+    int *	follow_col,
+    int *	arrowup,
+    int *	old_c,
+    int	real_c)
 {
     if (curdoc.link > 0 &&
 	(links[0].ly != links[curdoc.link].ly ||
@@ -4631,10 +4631,10 @@ PRIVATE void handle_LYK_UP_LINK ARGS4(
     }
 }
 
-PRIVATE void handle_LYK_UP_TWO ARGS3(
-    int *,	arrowup,
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_UP_TWO (
+    int *	arrowup,
+    int *	old_c,
+    int	real_c)
 {
     if (Newline > 1) {
 	int scrollamount = (Newline > 2 ? 2 : 1);
@@ -4654,10 +4654,10 @@ PRIVATE void handle_LYK_UP_TWO ARGS3(
     }
 }
 
-PRIVATE void handle_LYK_VIEW_BOOKMARK ARGS3(
-    BOOLEAN *,	refresh_screen,
-    int *,	old_c,
-    int,	real_c)
+static void handle_LYK_VIEW_BOOKMARK (
+    BOOLEAN *	refresh_screen,
+    int *	old_c,
+    int	real_c)
 {
     char *cp;
 
@@ -4704,9 +4704,9 @@ PRIVATE void handle_LYK_VIEW_BOOKMARK ARGS3(
     }
 }
 
-PRIVATE BOOLEAN handle_LYK_VLINKS ARGS2(
-    int *,	cmd,
-    BOOLEAN *,	newdoc_link_is_absolute)
+static BOOLEAN handle_LYK_VLINKS (
+    int *	cmd,
+    BOOLEAN *	newdoc_link_is_absolute)
 {
     int c;
 
@@ -4744,9 +4744,9 @@ PRIVATE BOOLEAN handle_LYK_VLINKS ARGS2(
     return FALSE;
 }
 
-PUBLIC void handle_LYK_WHEREIS ARGS2(
-    int,	cmd,
-    BOOLEAN *,	refresh_screen)
+void handle_LYK_WHEREIS (
+    int	cmd,
+    BOOLEAN *	refresh_screen)
 {
     BOOLEAN have_target_onscreen = (BOOLEAN) (*prev_target != '\0' &&
 				    HText_pageHasPrevTarget());
@@ -4807,13 +4807,13 @@ PUBLIC void handle_LYK_WHEREIS ARGS2(
 /*
  * Get a number from the user and follow that link number.
  */
-PRIVATE void handle_LYK_digit ARGS6(
-    int,	c,
-    BOOLEAN *,	force_load,
-    char *,	user_input_buffer,
-    int *,	old_c,
-    int,	real_c,
-    BOOLEAN *,	try_internal GCC_UNUSED)
+static void handle_LYK_digit (
+    int	c,
+    BOOLEAN *	force_load,
+    char *	user_input_buffer,
+    int *	old_c,
+    int	real_c,
+    BOOLEAN *	try_internal GCC_UNUSED)
 {
     int lindx = ((nlinks > 0) ? curdoc.link : 0);
     int number;
@@ -4990,7 +4990,7 @@ PRIVATE void handle_LYK_digit ARGS6(
 #ifdef SUPPORT_CHDIR
 
 /* original implementation by VH */
-PUBLIC void handle_LYK_CHDIR NOARGS
+void handle_LYK_CHDIR (void)
 {
     static char buf[LY_MAXPATH];
     char *p = NULL;
@@ -5077,7 +5077,7 @@ PUBLIC void handle_LYK_CHDIR NOARGS
  * repeat is not important, even if we overshoot again, it is going to be by 30
  * steps, which is easy to fix by reversing the direction again.
  */
-PRIVATE int repeat_to_delta ARGS1(int, n)
+static int repeat_to_delta (int n)
 {
     int threshold = LYcols / 3;
 
@@ -5091,7 +5091,7 @@ PRIVATE int repeat_to_delta ARGS1(int, n)
     return n;
 }
 
-PRIVATE void handle_LYK_SHIFT_LEFT ARGS2(BOOLEAN *, flag, int, count)
+static void handle_LYK_SHIFT_LEFT (BOOLEAN * flag, int count)
 {
     if (!LYwideLines) {
 	HTAlert(SHIFT_VS_LINEWRAP);
@@ -5105,7 +5105,7 @@ PRIVATE void handle_LYK_SHIFT_LEFT ARGS2(BOOLEAN *, flag, int, count)
 	LYshiftWin = 0;
 }
 
-PRIVATE void handle_LYK_SHIFT_RIGHT ARGS2(BOOLEAN *, flag, int, count)
+static void handle_LYK_SHIFT_RIGHT (BOOLEAN * flag, int count)
 {
     if (!LYwideLines) {
 	HTAlert(SHIFT_VS_LINEWRAP);
@@ -5115,9 +5115,9 @@ PRIVATE void handle_LYK_SHIFT_RIGHT ARGS2(BOOLEAN *, flag, int, count)
     *flag = TRUE;
 }
 
-PRIVATE BOOLEAN handle_LYK_LINEWRAP_TOGGLE ARGS2(
-    int *,	cmd,
-    BOOLEAN *,	flag)
+static BOOLEAN handle_LYK_LINEWRAP_TOGGLE (
+    int *	cmd,
+    BOOLEAN *	flag)
 {
     static char *choices[] = {
 	"Try to fit screen width",
@@ -5178,7 +5178,7 @@ PRIVATE BOOLEAN handle_LYK_LINEWRAP_TOGGLE ARGS2(
  *					(memoir from the original Lynx - FM)
  */
 
-int mainloop NOARGS
+int mainloop (void)
 {
 #if defined(WIN_EX)	/* 1997/10/08 (Wed) 14:52:06 */
 #undef	STRING_MAX
@@ -5193,7 +5193,7 @@ int mainloop NOARGS
     int getresult;
     int arrowup = FALSE, show_help = FALSE;
     char user_input_buffer[MAX_LINE];
-    CONST char *cshelpfile = NULL;
+    const char *cshelpfile = NULL;
     BOOLEAN first_file = TRUE;
     BOOLEAN popped_doc = FALSE;
     BOOLEAN refresh_screen = FALSE;
@@ -5784,7 +5784,7 @@ try_again:
 				  BOOKMARK_TITLE))) &&
 			(temp = HTParse(newdoc.address, "",
 				     PARSE_PATH+PARSE_PUNCTUATION)) != NULL) {
-			CONST char *name = wwwName(Home_Dir());
+			const char *name = wwwName(Home_Dir());
 			len = strlen(name);
 #ifdef VMS
 			if (!strncasecomp(temp, name, len) &&
@@ -7383,9 +7383,9 @@ new_cmd:  /*
     }
 }
 
-PRIVATE int are_different ARGS2(
-	DocInfo *,	doc1,
-	DocInfo *,	doc2)
+static int are_different (
+	DocInfo *	doc1,
+	DocInfo *	doc2)
 {
     char *cp1, *cp2;
 
@@ -7441,9 +7441,9 @@ PRIVATE int are_different ARGS2(
  * meaning they are "from different files". - kw
  */
 #ifndef DONT_TRACK_INTERNAL_LINKS
-PRIVATE int are_phys_different ARGS2(
-	DocInfo *,	doc1,
-	DocInfo *,	doc2)
+static int are_phys_different (
+	DocInfo *	doc1,
+	DocInfo *	doc2)
 {
     char *cp1, *cp2, *ap1 = doc1->address, *ap2 = doc2->address;
 
@@ -7515,7 +7515,7 @@ PRIVATE int are_phys_different ARGS2(
  *  Utility for freeing the list of goto URLs. - FM
  */
 #ifdef LY_FIND_LEAKS
-PRIVATE void HTGotoURLs_free NOARGS
+static void HTGotoURLs_free (void)
 {
     char *url;
     HTList *cur = Goto_URLs;
@@ -7534,8 +7534,8 @@ PRIVATE void HTGotoURLs_free NOARGS
  *  Utility for listing Goto URLs, making any
  *  repeated URLs the most current in the list. - FM
  */
-PUBLIC void HTAddGotoURL ARGS1(
-	char *,		url)
+void HTAddGotoURL (
+	char *		url)
 {
     char *new = NULL;
     char *old;
@@ -7574,9 +7574,9 @@ PUBLIC void HTAddGotoURL ARGS1(
  *  put a message on the screen
  *  to tell the user other misc info.
  */
-PRIVATE void show_main_statusline ARGS2(
-    CONST LinkInfo,	curlink,
-    int,		for_what)
+static void show_main_statusline (
+    const LinkInfo	curlink,
+    int		for_what)
 {
     /*
      *	Make sure form novice lines are replaced.
@@ -7671,15 +7671,15 @@ PRIVATE void show_main_statusline ARGS2(
  *  selected link.  It should only be called at times when curdoc.link,
  *  nlinks, and the links[] array are valid. - kw
  */
-PUBLIC void repaint_main_statusline ARGS1(
-    int,	for_what)
+void repaint_main_statusline (
+    int	for_what)
 {
     if (curdoc.link >= 0 && curdoc.link < nlinks)
 	show_main_statusline(links[curdoc.link], for_what);
 }
 
-PRIVATE void form_noviceline ARGS1(
-    int,	disabled)
+static void form_noviceline (
+    int	disabled)
 {
     LYmove(LYlines-2,0); LYclrtoeol();
     if (!disabled) {
@@ -7711,9 +7711,9 @@ PRIVATE void form_noviceline ARGS1(
     }
 }
 
-PRIVATE void exit_immediately_with_error_message ARGS2(
-	int,		state,
-	BOOLEAN,	first_file)
+static void exit_immediately_with_error_message (
+	int		state,
+	BOOLEAN	first_file)
 {
     char *buf = 0;
     char *buf2 = 0;
@@ -7769,10 +7769,10 @@ PRIVATE void exit_immediately_with_error_message ARGS2(
 }
 
 
-PRIVATE void status_link ARGS3(
-	char *,		curlink_name,
-	BOOLEAN,	show_more,
-	BOOLEAN,	show_indx)
+static void status_link (
+	char *		curlink_name,
+	BOOLEAN	show_more,
+	BOOLEAN	show_indx)
 {
 #define MAX_STATUS (LYcols - 2)
 #define MIN_STATUS 0
@@ -7843,8 +7843,8 @@ PRIVATE void status_link ARGS3(
     }
 }
 
-PUBLIC char*
-LYDownLoadAddress NOARGS
+char*
+LYDownLoadAddress (void)
 {
     char *s = newdoc.address ? newdoc.address : "";
     return s;
diff --git a/src/LYMainLoop.h b/src/LYMainLoop.h
index 798f9d77..44ee9105 100644
--- a/src/LYMainLoop.h
+++ b/src/LYMainLoop.h
@@ -6,21 +6,21 @@
 #endif
 
 #ifdef DISP_PARTIAL
-extern BOOL LYMainLoop_pageDisplay PARAMS((int line_num));
+extern BOOL LYMainLoop_pageDisplay (int line_num);
 #endif
-extern BOOLEAN LYOpenTraceLog NOPARAMS;
-extern char* LYDownLoadAddress NOPARAMS;
-extern int LYGetNewline NOPARAMS;
-extern int mainloop NOPARAMS;
-extern void HTAddGotoURL PARAMS((char *url));
-extern void LYCloseTracelog NOPARAMS;
-extern void LYSetNewline PARAMS((int value));
-extern void handle_LYK_TRACE_TOGGLE NOPARAMS;
-extern void handle_LYK_WHEREIS PARAMS((int cmd, BOOLEAN *refresh_screen));
-extern void repaint_main_statusline PARAMS((int for_what));
+extern BOOLEAN LYOpenTraceLog (void);
+extern char* LYDownLoadAddress (void);
+extern int LYGetNewline (void);
+extern int mainloop (void);
+extern void HTAddGotoURL (char *url);
+extern void LYCloseTracelog (void);
+extern void LYSetNewline (int value);
+extern void handle_LYK_TRACE_TOGGLE (void);
+extern void handle_LYK_WHEREIS (int cmd, BOOLEAN *refresh_screen);
+extern void repaint_main_statusline (int for_what);
 
 #ifdef SUPPORT_CHDIR
-extern void handle_LYK_CHDIR NOPARAMS; 
+extern void handle_LYK_CHDIR (void); 
 #endif
 
 #endif /* LYMAINLOOP_H */
diff --git a/src/LYMap.c b/src/LYMap.c
index c25898d1..db46045c 100644
--- a/src/LYMap.c
+++ b/src/LYMap.c
@@ -47,15 +47,15 @@ struct _HTStream
   HTStreamClass * isa;
 };
 
-PRIVATE HTList * LynxMaps = NULL;
+static HTList * LynxMaps = NULL;
 
-PUBLIC BOOL LYMapsOnly = FALSE;
+BOOL LYMapsOnly = FALSE;
 
 /*
  *  Utility for freeing a list of MAPs.
  */
-PUBLIC void ImageMapList_free ARGS1(
-    HTList *,		theList)
+void ImageMapList_free (
+    HTList *		theList)
 {
     LYImageMap *map;
     LYMapElement *element;
@@ -89,7 +89,7 @@ PUBLIC void ImageMapList_free ARGS1(
 /*
  *  Utility for freeing the global list of MAPs. - kw
  */
-PRIVATE void LYLynxMaps_free NOARGS
+static void LYLynxMaps_free (void)
 {
     ImageMapList_free(LynxMaps);
     LynxMaps = NULL;
@@ -123,10 +123,10 @@ PRIVATE void LYLynxMaps_free NOARGS
  *  it will have only those from AREA tags for the current analysis of
  *  MAP element content. - FM
  */
-PUBLIC BOOL LYAddImageMap ARGS3(
-	char *,		address,
-	char *,		title,
-	HTParentAnchor *, node_anchor)
+BOOL LYAddImageMap (
+	char *		address,
+	char *		title,
+	HTParentAnchor * node_anchor)
 {
     LYImageMap *new = NULL;
     LYImageMap *old = NULL;
@@ -211,12 +211,12 @@ PUBLIC BOOL LYAddImageMap ARGS3(
  * Utility for adding LYMapElements to LYImageMaps
  * in the appropriate list. - FM
  */
-PUBLIC BOOL LYAddMapElement ARGS5(
-	char *,		map,
-	char *,		address,
-	char *,		title,
-	HTParentAnchor *, node_anchor,
-	BOOL,		intern_flag GCC_UNUSED)
+BOOL LYAddMapElement (
+	char *		map,
+	char *		address,
+	char *		title,
+	HTParentAnchor * node_anchor,
+	BOOL		intern_flag GCC_UNUSED)
 {
     LYMapElement *new = NULL;
     LYImageMap *theMap = NULL;
@@ -298,8 +298,8 @@ PUBLIC BOOL LYAddMapElement ARGS5(
  *  with a given address already exists in the LynxMaps
  *  structure. - FM
  */
-PUBLIC BOOL LYHaveImageMap ARGS1(
-	char *,		address)
+BOOL LYHaveImageMap (
+	char *		address)
 {
     LYImageMap *Map;
     HTList *cur = LynxMaps;
@@ -327,11 +327,11 @@ PUBLIC BOOL LYHaveImageMap ARGS1(
  *  anAnchor is the LYNXIMGMAP: anchor; if it is associated with POST
  *	     data, we want the specific list, otherwise the global list.
  */
-PRIVATE void fill_DocAddress ARGS4(
-    DocAddress *,	wwwdoc,
-    char *,		address,
-    HTParentAnchor *,	anAnchor,
-    HTParentAnchor **,	punderlying)
+static void fill_DocAddress (
+    DocAddress *	wwwdoc,
+    char *		address,
+    HTParentAnchor *	anAnchor,
+    HTParentAnchor **	punderlying)
 {
     HTParentAnchor * underlying;
     if (anAnchor && anAnchor->post_data) {
@@ -375,11 +375,11 @@ PRIVATE void fill_DocAddress ARGS4(
  * LYLoadIMGmap() will never have post_data, so that the global list
  * will be used. - kw
  */
-PRIVATE HTList * get_the_list ARGS4(
-    DocAddress *,	wwwdoc,
-    char *,		address,
-    HTParentAnchor *,	anchor,
-    HTParentAnchor **,	punderlying)
+static HTList * get_the_list (
+    DocAddress *	wwwdoc,
+    char *		address,
+    HTParentAnchor *	anchor,
+    HTParentAnchor **	punderlying)
 {
     if (anchor && anchor->post_data) {
 	fill_DocAddress(wwwdoc, address, anchor, punderlying);
@@ -398,11 +398,11 @@ PRIVATE HTList * get_the_list ARGS4(
 **	for HyperText References in AREAs of a MAP.
 */
 
-PRIVATE int LYLoadIMGmap ARGS4 (
-	CONST char *,		arg,
-	HTParentAnchor *,	anAnchor,
-	HTFormat,		format_out,
-	HTStream*,		sink)
+static int LYLoadIMGmap (
+	const char *		arg,
+	HTParentAnchor *	anAnchor,
+	HTFormat		format_out,
+	HTStream*		sink)
 {
     HTFormat format_in = WWW_HTML;
     HTStream *target = NULL;
@@ -620,5 +620,5 @@ PRIVATE int LYLoadIMGmap ARGS4 (
 #define _LYIMGMAP_C_GLOBALDEF_1_INIT { "LYNXIMGMAP", LYLoadIMGmap, 0}
 GLOBALDEF (HTProtocol,LYLynxIMGmap,_LYIMGMAP_C_GLOBALDEF_1_INIT);
 #else
-GLOBALDEF PUBLIC HTProtocol LYLynxIMGmap = {"LYNXIMGMAP", LYLoadIMGmap, 0};
+GLOBALDEF HTProtocol LYLynxIMGmap = {"LYNXIMGMAP", LYLoadIMGmap, 0};
 #endif /* GLOBALDEF_IS_MACRO */
diff --git a/src/LYMap.h b/src/LYMap.h
index 077347a8..98378591 100644
--- a/src/LYMap.h
+++ b/src/LYMap.h
@@ -10,12 +10,12 @@
 
 extern BOOL LYMapsOnly;
 
-extern void ImageMapList_free PARAMS((HTList * list));
-extern BOOL LYAddImageMap PARAMS((char *address, char *title,
-				  HTParentAnchor *node_anchor));
-extern BOOL LYAddMapElement PARAMS((char *map, char *address, char *title,
+extern void ImageMapList_free (HTList * list);
+extern BOOL LYAddImageMap (char *address, char *title,
+				  HTParentAnchor *node_anchor);
+extern BOOL LYAddMapElement (char *map, char *address, char *title,
 				    HTParentAnchor *node_anchor,
-				    BOOL intern_flag));
-extern BOOL LYHaveImageMap PARAMS((char *address));
+				    BOOL intern_flag);
+extern BOOL LYHaveImageMap (char *address);
 
 #endif /* LYMAP_H */
diff --git a/src/LYNews.c b/src/LYNews.c
index 93bd65e9..76e60ceb 100644
--- a/src/LYNews.c
+++ b/src/LYNews.c
@@ -24,11 +24,11 @@
 **  Global variable for async i/o.
 */
 BOOLEAN term_message = FALSE;
-PRIVATE void terminate_message  PARAMS((int sig));
+static void terminate_message  (int sig);
 
-PRIVATE BOOLEAN message_has_content ARGS2(
-    CONST char *,	filename,
-    BOOLEAN *,		nonspaces)
+static BOOLEAN message_has_content (
+    const char *	filename,
+    BOOLEAN *		nonspaces)
 {
     FILE *fp;
     char *buffer = NULL;
@@ -79,14 +79,14 @@ PRIVATE BOOLEAN message_has_content ARGS2(
 **  a lead slash, and followup is TRUE for newsreply or
 **  snewsreply URLs.  - FM
 */
-PUBLIC char *LYNewsPost ARGS2(
-	char *,		newsgroups,
-	BOOLEAN,	followup)
+char *LYNewsPost (
+	char *		newsgroups,
+	BOOLEAN	followup)
 {
     char user_input[1024];
     char CJKinput[1024];
     char *cp = NULL;
-    CONST char *kp = NULL;
+    const char *kp = NULL;
     int c = 0;  /* user input */
     int len;
     FILE *fd = NULL;
@@ -224,11 +224,11 @@ PUBLIC char *LYNewsPost ARGS2(
 	    CJKinput[0] = '\0';
 	    switch(kanji_code) {
 	    case EUC:
-		TO_EUC((CONST unsigned char *)kp, (unsigned char *)CJKinput);
+		TO_EUC((const unsigned char *)kp, (unsigned char *)CJKinput);
 		kp = CJKinput;
 		break;
 	    case SJIS:
-		TO_SJIS((CONST unsigned char *)kp, (unsigned char *)CJKinput);
+		TO_SJIS((const unsigned char *)kp, (unsigned char *)CJKinput);
 		kp = CJKinput;
 		break;
 	    default:
@@ -491,8 +491,8 @@ cleanup:
     return(postfile);
 }
 
-PRIVATE void terminate_message ARGS1(
-	int,	sig GCC_UNUSED)
+static void terminate_message (
+	int	sig GCC_UNUSED)
 {
     term_message = TRUE;
     /*
diff --git a/src/LYNews.h b/src/LYNews.h
index 096062d3..07ff22b1 100644
--- a/src/LYNews.h
+++ b/src/LYNews.h
@@ -7,6 +7,6 @@
 
 extern BOOLEAN term_message;
 
-extern char *LYNewsPost PARAMS((char *newsgroups, BOOLEAN followup));
+extern char *LYNewsPost (char *newsgroups, BOOLEAN followup);
 
 #endif /* LYNEWSPOST_H */
diff --git a/src/LYOptions.c b/src/LYOptions.c
index 8749a59a..054d9729 100644
--- a/src/LYOptions.c
+++ b/src/LYOptions.c
@@ -27,19 +27,19 @@
 
 BOOLEAN term_options;
 
-PRIVATE int LYChosenShowColor = SHOW_COLOR_UNKNOWN; /* whether to show and save */
+static int LYChosenShowColor = SHOW_COLOR_UNKNOWN; /* whether to show and save */
 
-PRIVATE void terminate_options	PARAMS((int sig));
+static void terminate_options	(int sig);
 
 #if !defined(NO_OPTION_MENU) || (defined(USE_MOUSE) && (defined(NCURSES) || defined(PDCURSES)))
 #define COL_OPTION_VALUES 36  /* display column where option values start */
 #endif
 
 #if defined(USE_SLANG) || defined(COLOR_CURSES)
-PRIVATE BOOLEAN can_do_colors = FALSE;
+static BOOLEAN can_do_colors = FALSE;
 #endif
 
-PUBLIC BOOLEAN LYCheckUserAgent NOARGS
+BOOLEAN LYCheckUserAgent (void)
 {
     if (LYUserAgent && *LYUserAgent) {
 	if (strstr(LYUserAgent, "Lynx") == 0
@@ -52,7 +52,7 @@ PUBLIC BOOLEAN LYCheckUserAgent NOARGS
     return TRUE;
 }
 
-PRIVATE void SetupChosenShowColor NOARGS
+static void SetupChosenShowColor (void)
 {
 #if defined(USE_SLANG) || defined(COLOR_CURSES)
     can_do_colors = TRUE;
@@ -86,7 +86,7 @@ PRIVATE void SetupChosenShowColor NOARGS
 #endif /* USE_SLANG || COLOR_CURSES */
 }
 
-PRIVATE void validate_x_display NOPARAMS
+static void validate_x_display (void)
 {
     char *cp;
     if ((cp = LYgetXDisplay()) != NULL) {
@@ -96,8 +96,8 @@ PRIVATE void validate_x_display NOPARAMS
     }
 }
 
-PRIVATE void summarize_x_display ARGS1(
-    char *,	display_option)
+static void summarize_x_display (
+    char *	display_option)
 {
     if ((x_display == NULL && *display_option == '\0') ||
 	(x_display != NULL && !strcmp(x_display, display_option))) {
@@ -119,13 +119,13 @@ PRIVATE void summarize_x_display ARGS1(
 
 
 #ifndef NO_OPTION_MENU
-PRIVATE int boolean_choice PARAMS((
+static int boolean_choice (
 	int		status,
 	int		line,
 	int		column,
-	CONST char **	choices));
+	const char **	choices);
 #define LYChooseBoolean(status, line, column, choices) \
-	boolean_choice(status, line, column, (CONST char **)choices)
+	boolean_choice(status, line, column, (const char **)choices)
 
 #define MAXCHOICES 10
 
@@ -207,7 +207,7 @@ PRIVATE int boolean_choice PARAMS((
 #define LPAREN '('
 #define RPAREN ')'
 
-PRIVATE int add_it ARGS2(char *, text, int, len)
+static int add_it (char * text, int len)
 {
     if (len) {
 	text[len] = '\0';
@@ -220,7 +220,7 @@ PRIVATE int add_it ARGS2(char *, text, int, len)
  * addlbl() is used instead of plain LYaddstr() in old-style options menu
  * to show hot keys in bold.
  */
-PRIVATE void addlbl ARGS1(CONST char *, text)
+static void addlbl (const char * text)
 {
     char actual[80];
     int s, d;
@@ -259,7 +259,7 @@ PRIVATE void addlbl ARGS1(CONST char *, text)
 			goto draw_options
 #endif /* !VMS || USE_SLANG */
 
-PUBLIC void LYoptions NOARGS
+void LYoptions (void)
 {
 #define ShowBool(value) LYaddstr((value) ? "ON " : "OFF")
     static char *bool_choices[] = {
@@ -879,8 +879,8 @@ draw_options:
 	    case '\001':	/* Change assume_charset setting. */
 		if (use_assume_charset) {
 		    int i, curval;
-		    CONST char ** assume_list;
-		    assume_list = typecallocn(CONST char *,(LYNumCharsets + 1));
+		    const char ** assume_list;
+		    assume_list = typecallocn(const char *,(LYNumCharsets + 1));
 		    if (!assume_list) {
 			outofmem(__FILE__, "options");
 		    }
@@ -1550,8 +1550,8 @@ draw_options:
     signal(SIGINT, cleanup_sig);
 }
 
-PRIVATE int widest_choice ARGS1(
-	CONST char **,	choices)
+static int widest_choice (
+	const char **	choices)
 {
     int n, width = 0;
     for (n = 0; choices[n] != NULL; ++n) {
@@ -1562,9 +1562,9 @@ PRIVATE int widest_choice ARGS1(
     return width;
 }
 
-PRIVATE void show_choice ARGS2(
-	CONST char *,	choice,
-	int,		width)
+static void show_choice (
+	const char *	choice,
+	int		width)
 {
     int len = strlen(choice);
     LYaddstr(choice);
@@ -1575,11 +1575,11 @@ PRIVATE void show_choice ARGS2(
 /*
  *  Take a status code, prompt the user for a new status, and return it.
  */
-PRIVATE int boolean_choice ARGS4(
-	int,		cur_choice,
-	int,		line,
-	int,		column,
-	CONST char **,	choices)
+static int boolean_choice (
+	int		cur_choice,
+	int		line,
+	int		column,
+	const char **	choices)
 {
     int response = 0;
     int cmd = 0;
@@ -1720,8 +1720,8 @@ PRIVATE int boolean_choice ARGS4(
 }
 #endif /* !NO_OPTION_MENU */
 
-PRIVATE void terminate_options ARGS1(
-	int,		sig GCC_UNUSED)
+static void terminate_options (
+	int		sig GCC_UNUSED)
 {
     term_options = TRUE;
     /*
@@ -1742,7 +1742,7 @@ PRIVATE void terminate_options ARGS1(
 /*
  *  Multi-Bookmark On-Line editing support. - FMG & FM
  */
-PUBLIC void edit_bookmarks NOARGS
+void edit_bookmarks (void)
 {
     int response = 0, def_response = 0, ch;
     int MBM_current = 1;
@@ -2035,14 +2035,14 @@ draw_bookmark_list:
  *  Also used for mouse popups with ncurses; this is indicated
  *  by for_mouse.
  */
-PUBLIC int popup_choice ARGS7(
-	int,		cur_choice,
-	int,		line,
-	int,		column,
-	CONST char **,	choices,
-	int,		i_length,
-	int,		disabled,
-	BOOLEAN,	for_mouse)
+int popup_choice (
+	int		cur_choice,
+	int		line,
+	int		column,
+	const char **	choices,
+	int		i_length,
+	int		disabled,
+	BOOLEAN	for_mouse)
 {
     if (column < 0)
 	column = (COL_OPTION_VALUES - 1);
@@ -2051,7 +2051,7 @@ PUBLIC int popup_choice ARGS7(
     cur_choice = LYhandlePopupList(cur_choice,
 				   line,
 				   column,
-				   (CONST char **)choices,
+				   (const char **)choices,
 				   -1,
 				   i_length,
 				   disabled,
@@ -2089,8 +2089,8 @@ PUBLIC int popup_choice ARGS7(
 
 typedef struct {
     int value;
-    CONST char *LongName;
-    CONST char *HtmlName;
+    const char *LongName;
+    const char *HtmlName;
 } OptValues;
 
 typedef struct {
@@ -2098,12 +2098,12 @@ typedef struct {
     char * value;
 } PostPair;
 
-static CONST char selected_string[] = "selected";
-static CONST char disabled_string[] = "disabled";
-static CONST char on_string[]	    = N_("ON");
-static CONST char off_string[]	    = N_("OFF");
-static CONST char never_string[]    = N_("NEVER");
-static CONST char always_string[]   = N_("ALWAYS");
+static const char selected_string[] = "selected";
+static const char disabled_string[] = "disabled";
+static const char on_string[]	    = N_("ON");
+static const char off_string[]	    = N_("OFF");
+static const char never_string[]    = N_("NEVER");
+static const char always_string[]   = N_("ALWAYS");
 static OptValues bool_values[] = {
 	{ FALSE,	     N_("OFF"),		  "OFF"		},
 	{ TRUE,		     N_("ON"),		  "ON"		},
@@ -2180,9 +2180,9 @@ static char * underline_links_string	= RC_UNDERLINE_LINKS;
 static char * show_scrollbar_string	= RC_SCROLLBAR;
 #endif
 
-static CONST char prompt_dft_string[]	= N_("prompt normally");
-static CONST char prompt_yes_string[]	= N_("force yes-response");
-static CONST char prompt_no_string[]	= N_("force no-response");
+static const char prompt_dft_string[]	= N_("prompt normally");
+static const char prompt_yes_string[]	= N_("force yes-response");
+static const char prompt_no_string[]	= N_("force no-response");
 static OptValues prompt_values[] = {
 	{ FORCE_PROMPT_DFT,	prompt_dft_string, prompt_dft_string },
 	{ FORCE_PROMPT_YES,	prompt_yes_string, prompt_yes_string },
@@ -2334,10 +2334,10 @@ static char * user_agent_string		= RC_USERAGENT;
 #define EndSelect(fp)\
 	fprintf(fp,"</select>\n")
 
-PRIVATE void PutOptValues ARGS3(
-	FILE *,		fp,
-	int,		value,
-	OptValues *,	table)
+static void PutOptValues (
+	FILE *		fp,
+	int		value,
+	OptValues *	table)
 {
     while (table->LongName != 0) {
 	if (table->HtmlName) {
@@ -2350,10 +2350,10 @@ PRIVATE void PutOptValues ARGS3(
     }
 }
 
-PRIVATE BOOLEAN GetOptValues ARGS3(
-	OptValues *,	table,
-	char *,		value,
-	int *,		result)
+static BOOLEAN GetOptValues (
+	OptValues *	table,
+	char *		value,
+	int *		result)
 {
     while (table->LongName != 0) {
 	if (table->HtmlName && !strcmp(value, table->HtmlName)) {
@@ -2375,8 +2375,8 @@ PRIVATE BOOLEAN GetOptValues ARGS3(
  * Not pretty, but works.  Hey, if strings can be null terminate arrays...
  */
 
-PRIVATE PostPair * break_data ARGS1(
-    bstring *,	data)
+static PostPair * break_data (
+    bstring *	data)
 {
     char * p;
     PostPair * q = NULL;
@@ -2448,7 +2448,7 @@ PRIVATE PostPair * break_data ARGS1(
     return q;
 }
 
-PRIVATE int gen_options PARAMS((char **newfile));
+static int gen_options (char **newfile);
 
 /*
  * Handle options from the pseudo-post.  I think we really only need
@@ -2482,8 +2482,8 @@ PRIVATE int gen_options PARAMS((char **newfile));
  *             (use 'need_end_reload' flag).
  */
 
-PUBLIC int postoptions ARGS1(
-    DocInfo *,		newdoc)
+int postoptions (
+    DocInfo *		newdoc)
 {
     PostPair *data = 0;
     DocAddress WWWDoc;  /* need on exit */
@@ -3111,7 +3111,7 @@ PUBLIC int postoptions ARGS1(
     /******** Done! **************************************************/
 }
 
-PRIVATE char *NewSecureValue NOARGS
+static char *NewSecureValue (void)
 {
     FREE(secure_value);
     if ((secure_value = malloc(80)) != 0) {
@@ -3132,10 +3132,10 @@ PRIVATE char *NewSecureValue NOARGS
  * Note: the 'value' we are passing here is a local copy of the "same" string
  * as is used in LYrcFile.c to index the savable options.
  */
-PRIVATE void PutLabel ARGS3(
-	FILE *,		fp,
-	char *,		name,
-	char *,		value)
+static void PutLabel (
+	FILE *		fp,
+	char *		name,
+	char *		value)
 {
     if (will_save_rc(value) && !no_option_save) {
 	fprintf(fp, "  %-*s: ", LABEL_LEN, name);
@@ -3154,7 +3154,7 @@ PRIVATE void PutLabel ARGS3(
  * so, return that name, so the subsequence will_save_rc() check in PutLabel()
  * will flag the composite as not-saved.
  */
-PRIVATE char *check_if_write_lynxrc ARGS1(char **, table)
+static char *check_if_write_lynxrc (char ** table)
 {
     int n;
     char *result = NULL;
@@ -3172,7 +3172,7 @@ PRIVATE char *check_if_write_lynxrc ARGS1(char **, table)
  * from lynx.cfg (and perhaps .lynxrc) as a set of booleans.  Check if any are
  * not writable to .lynxrc, so we can show the user. 
  */
-PRIVATE char *will_save_cookies NOARGS
+static char *will_save_cookies (void)
 {
     static char *table[] = {
 	RC_SET_COOKIES,			/* LYSetCookies */
@@ -3187,7 +3187,7 @@ PRIVATE char *will_save_cookies NOARGS
  * read from lynx.cfg (and perhaps .lynxrc) as a set of booleans.  Check if any
  * are not writable to .lynxrc, so we can show the user. 
  */
-PRIVATE char *will_save_images NOARGS
+static char *will_save_images (void)
 {
     static char *table[] = {
 	RC_MAKE_PSEUDO_ALTS_FOR_INLINES, /* pseudo_inline_alts */
@@ -3201,9 +3201,9 @@ PRIVATE char *will_save_images NOARGS
  * The visited-links menu is used from the visited-links page as well as the
  * options page.
  */
-PUBLIC void LYMenuVisitedLinks ARGS2(
-	FILE *,		fp0,
-	int,		disable_all)
+void LYMenuVisitedLinks (
+	FILE *		fp0,
+	int		disable_all)
 {
     BeginSelect(fp0, visited_links_string);
     PutOptValues(fp0, Visited_Links_As, visited_links_values);
@@ -3221,8 +3221,8 @@ PUBLIC void LYMenuVisitedLinks ARGS2(
  * This function is synchronized with postoptions().  Read the comments in
  * postoptions() header if you change something in gen_options().
  */
-PRIVATE int gen_options ARGS1(
-	char **,	newfile)
+static int gen_options (
+	char **	newfile)
 {
     int i;
     static char tempfile[LY_MAXPATH] = "\0";
diff --git a/src/LYOptions.h b/src/LYOptions.h
index 16b4394e..d9a11c36 100644
--- a/src/LYOptions.h
+++ b/src/LYOptions.h
@@ -6,27 +6,27 @@
 
 extern BOOLEAN term_options; /* for LYgetstr() */
 
-extern BOOLEAN LYCheckUserAgent NOPARAMS;
-extern void edit_bookmarks NOPARAMS;
-extern  int popup_choice PARAMS((
+extern BOOLEAN LYCheckUserAgent (void);
+extern void edit_bookmarks (void);
+extern  int popup_choice (
 	int		cur_choice,
 	int		line,
 	int		column,
-	CONST char ** 	choices,
+	const char ** 	choices,
 	int		length,
 	int		disabled,
-	BOOLEAN		mouse));
+	BOOLEAN		mouse);
 
 #define LYChoosePopup(cur, line, column, choices, length, disabled, mouse) \
-	popup_choice(cur, line, column, (CONST char **)choices, length, disabled, mouse)
+	popup_choice(cur, line, column, (const char **)choices, length, disabled, mouse)
 
 #ifndef NO_OPTION_FORMS
-extern void LYMenuVisitedLinks PARAMS((FILE * fp0, int disable_all));
-extern int postoptions PARAMS((DocInfo *newdoc));
+extern void LYMenuVisitedLinks (FILE * fp0, int disable_all);
+extern int postoptions (DocInfo *newdoc);
 #endif /* !NO_OPTION_FORMS */
 
 #ifndef NO_OPTION_MENU
-extern void LYoptions NOPARAMS;
+extern void LYoptions (void);
 #endif /* !NO_OPTION_MENU */
 
 #endif /* LYOPTIONS_H */
diff --git a/src/LYPrettySrc.c b/src/LYPrettySrc.c
index 1c5a5e49..a22d7bd2 100644
--- a/src/LYPrettySrc.c
+++ b/src/LYPrettySrc.c
@@ -14,20 +14,20 @@
 
 #ifdef USE_PRETTYSRC
 BOOL psrc_convert_string = FALSE;
-PUBLIC BOOL psrc_view = FALSE;/* this is read by SGML_put_character - TRUE
+BOOL psrc_view = FALSE;/* this is read by SGML_put_character - TRUE
 	when viewing pretty source */
-PUBLIC BOOL LYpsrc = FALSE; /* this tells what will be shown on '\':
+BOOL LYpsrc = FALSE; /* this tells what will be shown on '\':
   if TRUE, then pretty source, normal source view otherwise. Toggled by
   -prettysrc commandline option.  */
-PUBLIC BOOL sgml_in_psrc_was_initialized;
-PUBLIC BOOL psrc_nested_call;
-PUBLIC BOOL psrc_first_tag;
-PUBLIC BOOL mark_htext_as_source=FALSE;
+BOOL sgml_in_psrc_was_initialized;
+BOOL psrc_nested_call;
+BOOL psrc_first_tag;
+BOOL mark_htext_as_source=FALSE;
   /* tagspecs from lynx.cfg are read here. After .lss file is read (is with lss
      support), the style cache and markup are created before entering the
      mainloop. */
-PUBLIC BOOL psrcview_no_anchor_numbering = FALSE;
-PRIVATE char* HTL_tagspecs_defaults[HTL_num_lexemes] = {
+BOOL psrcview_no_anchor_numbering = FALSE;
+static char* HTL_tagspecs_defaults[HTL_num_lexemes] = {
  /* these values are defaults. They are also listed in comments of distibution's
      lynx.cfg.*/
 #ifdef USE_COLOR_STYLE
@@ -59,19 +59,19 @@ PRIVATE char* HTL_tagspecs_defaults[HTL_num_lexemes] = {
 #endif
 };
 
-PUBLIC char* HTL_tagspecs[HTL_num_lexemes];
+char* HTL_tagspecs[HTL_num_lexemes];
 
  /* these are pointers since tagspec can be empty (the pointer will be NULL
     in that case) */
-PUBLIC HT_tagspec* lexeme_start[HTL_num_lexemes];
-PUBLIC HT_tagspec* lexeme_end[HTL_num_lexemes];
+HT_tagspec* lexeme_start[HTL_num_lexemes];
+HT_tagspec* lexeme_end[HTL_num_lexemes];
 
-PUBLIC int tagname_transform = 2;
-PUBLIC int attrname_transform = 2;
+int tagname_transform = 2;
+int attrname_transform = 2;
 
 
-PRIVATE int html_src_tag_index ARGS1(
-	    char*, tagname)
+static int html_src_tag_index (
+	    char* tagname)
 {
     HTTag* tag = SGMLFindTag(&HTML_dtd, tagname);
     return (tag && tag != &HTTag_unrecognized ) ? tag - HTML_dtd.tags : -1;
@@ -84,10 +84,10 @@ typedef enum {
     HTSRC_CK_seen_dot
 } html_src_check_state;
 
-PRIVATE void append_close_tag ARGS3(
-	    char*,	  tagname,
-	    HT_tagspec**, head,
-	    HT_tagspec**, tail)
+static void append_close_tag (
+	    char*	  tagname,
+	    HT_tagspec** head,
+	    HT_tagspec** tail)
 {
     int idx, nattr;
     HTTag* tag;
@@ -121,11 +121,11 @@ PRIVATE void append_close_tag ARGS3(
 
 /* this will allocate node, initialize all members, and node
    append to the list, possibly modifying head and modifying tail */
-PRIVATE void append_open_tag ARGS4(
-	    char*,	  tagname,
-	    char*,	  classname GCC_UNUSED,
-	    HT_tagspec**, head,
-	    HT_tagspec**, tail)
+static void append_open_tag (
+	    char*	  tagname,
+	    char*	  classname GCC_UNUSED,
+	    HT_tagspec** head,
+	    HT_tagspec** tail)
 {
     HT_tagspec* subj;
     HTTag* tag;
@@ -166,11 +166,11 @@ PRIVATE void append_open_tag ARGS4(
 }
 
 /* returns 1 if incorrect */
-PUBLIC int html_src_parse_tagspec ARGS4(
-	char*,		ts,
-	HTlexeme,	lexeme,
-	BOOL,		checkonly,
-	BOOL,		isstart)
+int html_src_parse_tagspec (
+	char*		ts,
+	HTlexeme	lexeme,
+	BOOL		checkonly,
+	BOOL		isstart)
 {
     char *p = ts;
     char *tagstart = 0;
@@ -285,8 +285,8 @@ PUBLIC int html_src_parse_tagspec ARGS4(
 }
 
 /*this will clean the data associated with lexeme 'l' */
-PUBLIC void html_src_clean_item ARGS1(
-	HTlexeme, l)
+void html_src_clean_item (
+	HTlexeme l)
 {
     int i;
 
@@ -314,21 +314,21 @@ PUBLIC void html_src_clean_item ARGS1(
 }
 
 /*this will be registered with atexit*/
-PUBLIC void html_src_clean_data NOARGS
+void html_src_clean_data (void)
 {
     int i;
     for (i = 0; i < HTL_num_lexemes; ++i)
 	html_src_clean_item(i);
 }
 
-PUBLIC void html_src_on_lynxcfg_reload NOARGS
+void html_src_on_lynxcfg_reload (void)
 {
     html_src_clean_data();
     HTMLSRC_init_caches(TRUE);
 }
 
-PUBLIC void HTMLSRC_init_caches ARGS1(
-	BOOL,	dont_exit)
+void HTMLSRC_init_caches (
+	BOOL	dont_exit)
 {
     int i;
     char* p;
diff --git a/src/LYPrettySrc.h b/src/LYPrettySrc.h
index 59a4573f..276715ed 100644
--- a/src/LYPrettySrc.h
+++ b/src/LYPrettySrc.h
@@ -59,12 +59,12 @@ extern char* HTL_tagspecs[HTL_num_lexemes];
 extern HT_tagspec* lexeme_start[HTL_num_lexemes];
 extern HT_tagspec* lexeme_end[HTL_num_lexemes];
 
-extern int html_src_parse_tagspec PARAMS((char* ts, HTlexeme lexeme,
-                     BOOL checkonly,BOOL isstart));
-extern void HTMLSRC_init_caches PARAMS((BOOL dont_exit));
-extern void html_src_clean_item PARAMS((HTlexeme l));
-extern void html_src_clean_data NOPARAMS;
-extern void html_src_on_lynxcfg_reload NOPARAMS;
+extern int html_src_parse_tagspec (char* ts, HTlexeme lexeme,
+                     BOOL checkonly,BOOL isstart);
+extern void HTMLSRC_init_caches (BOOL dont_exit);
+extern void html_src_clean_item (HTlexeme l);
+extern void html_src_clean_data (void);
+extern void html_src_on_lynxcfg_reload (void);
 
 /* these 2 vars tell what kind of transform should be appiled to tag names
   and attribute names. 0 - lowercase, 1 - as is, 2 uppercase. */
diff --git a/src/LYPrint.c b/src/LYPrint.c
index a54a341c..09f4e632 100644
--- a/src/LYPrint.c
+++ b/src/LYPrint.c
@@ -57,10 +57,10 @@
 #define PRINTER   5
 
 #if USE_VMS_MAILER
-PRIVATE int remove_quotes PARAMS((char *string));
+static int remove_quotes (char *string);
 #endif /* USE_VMS_MAILER */
 
-PRIVATE  char* subject_translate8bit PARAMS((char *source));
+static  char* subject_translate8bit (char *source);
 
 #define LYNX_PRINT_TITLE   0
 #define LYNX_PRINT_URL     1
@@ -69,12 +69,12 @@ PRIVATE  char* subject_translate8bit PARAMS((char *source));
 
 #define MAX_PUTENV 4
 
-PRIVATE void set_environ ARGS3(
-	int,		name,
-	CONST char *,	value,
-	CONST char *,	no_value)
+static void set_environ (
+	int		name,
+	const char *	value,
+	const char *	no_value)
 {
-    static CONST char *names[MAX_PUTENV] = {
+    static const char *names[MAX_PUTENV] = {
 	"LYNX_PRINT_TITLE",
 	"LYNX_PRINT_URL",
 	"LYNX_PRINT_DATE",
@@ -105,8 +105,8 @@ PRIVATE void set_environ ARGS3(
 #endif
 }
 
-PRIVATE char *suggested_filename ARGS1(
-	DocInfo *,	newdoc)
+static char *suggested_filename (
+	DocInfo *	newdoc)
 {
     char *cp, *sug_filename = 0;
 
@@ -140,9 +140,9 @@ PRIVATE char *suggested_filename ARGS1(
     return sug_filename;
 }
 
-PRIVATE void SetupFilename ARGS2(
-	char *,		filename,
-	char *,		sug_filename)
+static void SetupFilename (
+	char *		filename,
+	char *		sug_filename)
 {
     HTFormat format;
     HTAtom *encoding;
@@ -170,12 +170,12 @@ PRIVATE void SetupFilename ARGS2(
 #define PRINT_FLAG   0
 #define GENERIC_FLAG 1
 
-PRIVATE int RecallFilename ARGS5(
-	char *,		filename,
-	BOOLEAN *,	first,
-	int *,		now,
-	int *,		total,
-	int,		flag)
+static int RecallFilename (
+	char *		filename,
+	BOOLEAN *	first,
+	int *		now,
+	int *		total,
+	int		flag)
 {
     int ch;
     char *cp;
@@ -272,10 +272,10 @@ PRIVATE int RecallFilename ARGS5(
     return FN_DONE;
 }
 
-PRIVATE BOOLEAN confirm_by_pages ARGS3(
-	char *,		prompt,
-	int,		lines_in_file,
-	int,		lines_per_page)
+static BOOLEAN confirm_by_pages (
+	char *		prompt,
+	int		lines_in_file,
+	int		lines_per_page)
 {
     int pages = lines_in_file/(lines_per_page+1);
     int c;
@@ -301,14 +301,14 @@ PRIVATE BOOLEAN confirm_by_pages ARGS3(
     return TRUE;
 }
 
-PRIVATE void send_file_to_file ARGS3(
-	DocInfo *,	newdoc,
-	char *,		content_base,
-	char *,		sug_filename)
+static void send_file_to_file (
+	DocInfo *	newdoc,
+	char *		content_base,
+	char *		sug_filename)
 {
     BOOLEAN FirstRecall = TRUE;
     BOOLEAN use_cte;
-    CONST char *disp_charset;
+    const char *disp_charset;
     FILE *outfile_fp;
     char buffer[LY_MAXPATH];
     char filename[LY_MAXPATH];
@@ -472,10 +472,10 @@ done:
     return;
 }
 
-PRIVATE void send_file_to_mail ARGS3(
-	DocInfo *,	newdoc,
-	char *,		content_base,
-	char *,		content_location)
+static void send_file_to_mail (
+	DocInfo *	newdoc,
+	char *		content_base,
+	char *		content_location)
 {
     static BOOLEAN first_mail_preparsed = TRUE;
 
@@ -491,7 +491,7 @@ PRIVATE void send_file_to_mail ARGS3(
 
     BOOL use_cte;
     BOOL use_type;
-    CONST char *disp_charset;
+    const char *disp_charset;
     FILE *outfile_fp;
     char *buffer = NULL;
     char *subject = NULL;
@@ -796,11 +796,11 @@ done:	/* send_file_to_mail() */
     return;
 }
 
-PRIVATE void send_file_to_printer ARGS4(
-	DocInfo *,	newdoc,
-	char *,		content_base,
-	char *,		sug_filename,
-	int,		printer_number)
+static void send_file_to_printer (
+	DocInfo *	newdoc,
+	char *		content_base,
+	char *		sug_filename,
+	int		printer_number)
 {
     BOOLEAN FirstRecall = TRUE;
     FILE *outfile_fp;
@@ -960,10 +960,10 @@ done:	/* send_file_to_printer() */
     return;
 }
 
-PRIVATE void send_file_to_screen ARGS3(
-	DocInfo *,	newdoc,
-	char *,		content_base,
-	BOOLEAN,	Lpansi)
+static void send_file_to_screen (
+	DocInfo *	newdoc,
+	char *		content_base,
+	BOOLEAN	Lpansi)
 {
     FILE *outfile_fp;
     char prompt[80];
@@ -1035,8 +1035,8 @@ done:	/* send_file_to_screen() */
     return;
 }
 
-PUBLIC int printfile ARGS1(
-	DocInfo *,	newdoc)
+int printfile (
+	DocInfo *	newdoc)
 {
     BOOLEAN Lpansi = FALSE;
     DocAddress WWWDoc;
@@ -1184,8 +1184,8 @@ PUBLIC int printfile ARGS1(
 }
 
 #if USE_VMS_MAILER
-PRIVATE int remove_quotes ARGS1(
-	char *,		string)
+static int remove_quotes (
+	char *		string)
 {
    int i;
 
@@ -1219,7 +1219,7 @@ PRIVATE int remove_quotes ARGS1(
  *  Always returns a new allocated string which has to be freed.
  */
 #include <LYCharUtils.h>
-PRIVATE char* subject_translate8bit ARGS1(char *, source)
+static char* subject_translate8bit (char * source)
 {
     char *target = NULL;
 
@@ -1254,10 +1254,10 @@ PRIVATE char* subject_translate8bit ARGS1(char *, source)
  *  LYNXPRINT://MAIL_FILE/lines=#	     mail the file
  *  LYNXPRINT://PRINTER/lines=#/number=#   print to printer number #
  */
-PUBLIC int print_options ARGS3(
-	char **,	newfile,
-	CONST char *,	printed_url,
-	int,		lines_in_file)
+int print_options (
+	char **	newfile,
+	const char *	printed_url,
+	int		lines_in_file)
 {
     static char my_temp[LY_MAXPATH] = "\0";
     char *buffer = 0;
@@ -1358,7 +1358,7 @@ PUBLIC int print_options ARGS3(
  *
  *  --KED  02/21/99
  */
-PUBLIC char * GetFileName NOARGS
+char * GetFileName (void)
 {
     struct stat stat_info;
 
diff --git a/src/LYPrint.h b/src/LYPrint.h
index 249b12b6..b0d06dab 100644
--- a/src/LYPrint.h
+++ b/src/LYPrint.h
@@ -5,9 +5,9 @@
 #include <LYStructs.h>
 #endif /* LYSTRUCTS_H */
 
-extern int printfile PARAMS((DocInfo *newdoc));
-extern int print_options PARAMS((char **newfile,
-				 CONST char *printed_url, int lines_in_file));
-extern char * GetFileName NOPARAMS;
+extern int printfile (DocInfo *newdoc);
+extern int print_options (char **newfile,
+				 const char *printed_url, int lines_in_file);
+extern char * GetFileName (void);
 
 #endif /* LYPRINT_H */
diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c
index 4a24a940..acb5afa3 100644
--- a/src/LYReadCFG.c
+++ b/src/LYReadCFG.c
@@ -39,14 +39,14 @@
 #include <HTNews.h>
 #endif
 
-PUBLIC BOOLEAN have_read_cfg = FALSE;
-PUBLIC BOOLEAN LYUseNoviceLineTwo = TRUE;
+BOOLEAN have_read_cfg = FALSE;
+BOOLEAN LYUseNoviceLineTwo = TRUE;
 
 /*
  *  Translate a TRUE/FALSE field in a string buffer.
  */
-PRIVATE BOOL is_true ARGS1(
-	char *, string)
+static BOOL is_true (
+	char * string)
 {
     if (!strncasecomp(string,"TRUE",4))
 	return(TRUE);
@@ -57,8 +57,8 @@ PRIVATE BOOL is_true ARGS1(
 /*
  *  Find an unescaped colon in a string buffer.
  */
-PRIVATE char *find_colon ARGS1(
-	char *, buffer)
+static char *find_colon (
+	char * buffer)
 {
     char ch, *buf = buffer;
 
@@ -78,8 +78,8 @@ PRIVATE char *find_colon ARGS1(
     return NULL;
 }
 
-PRIVATE void free_item_list ARGS1(
-    lynx_list_item_type **,	ptr)
+static void free_item_list (
+    lynx_list_item_type **	ptr)
 {
     lynx_list_item_type *cur = *ptr;
     lynx_list_item_type *next;
@@ -97,7 +97,7 @@ PRIVATE void free_item_list ARGS1(
 /*
  *  Function for freeing the DOWNLOADER and UPLOADER menus list. - FM
  */
-PRIVATE void free_all_item_lists NOARGS
+static void free_all_item_lists (void)
 {
     free_item_list(&printers);
     free_item_list(&downloaders);
@@ -115,10 +115,10 @@ PRIVATE void free_all_item_lists NOARGS
 /*
  *  Process string buffer fields for DOWNLOADER or UPLOADER menus.
  */
-PRIVATE void add_item_to_list ARGS3(
-	char *,			buffer,
-	lynx_list_item_type **, list_ptr,
-	int,			special)
+static void add_item_to_list (
+	char *			buffer,
+	lynx_list_item_type ** list_ptr,
+	int			special)
 {
     char *colon, *next_colon;
     lynx_list_item_type *cur_item, *prev_item;
@@ -203,9 +203,9 @@ PRIVATE void add_item_to_list ARGS3(
     }
 }
 
-PUBLIC lynx_list_item_type *find_item_by_number ARGS2(
-	lynx_list_item_type *,	list_ptr,
-	char *,			number)
+lynx_list_item_type *find_item_by_number (
+	lynx_list_item_type *	list_ptr,
+	char *			number)
 {
     int value = atoi(number);
     while (value-- >= 0 && list_ptr != 0) {
@@ -214,10 +214,10 @@ PUBLIC lynx_list_item_type *find_item_by_number ARGS2(
     return list_ptr;
 }
 
-PUBLIC int match_item_by_name ARGS3(
-    lynx_list_item_type *,	ptr,
-    char *,			name,
-    BOOLEAN,			only_overriders)
+int match_item_by_name (
+    lynx_list_item_type *	ptr,
+    char *			name,
+    BOOLEAN			only_overriders)
 {
     return
 	(ptr->command != 0
@@ -243,7 +243,7 @@ int default_fg = COLOR_WHITE;
 int default_bg = COLOR_BLACK;
 #endif
 
-PRIVATE CONST char *Color_Strings[16] =
+static const char *Color_Strings[16] =
 {
     "black",
     "red",
@@ -268,8 +268,8 @@ PRIVATE CONST char *Color_Strings[16] =
  * PDCurses (and possibly some other implementations) use a non-ANSI set of
  * codes for colors.
  */
-PRIVATE int ColorCode ARGS1(
-	int,	color)
+static int ColorCode (
+	int	color)
 {
 	static int map[] = {
 		0,  4,	2,  6, 1,  5,  3,  7,
@@ -285,9 +285,9 @@ BOOL default_color_reset = FALSE;
 /*
  *  Validator for COLOR fields.
  */
-PUBLIC int check_color ARGS2(
-	char *, color,
-	int,	the_default)
+int check_color (
+	char * color,
+	int	the_default)
 {
     int i;
 
@@ -315,8 +315,8 @@ PUBLIC int check_color ARGS2(
     return ERR_COLOR;
 }
 
-PUBLIC CONST char *lookup_color ARGS1(
-    int,	code)
+const char *lookup_color (
+    int	code)
 {
     unsigned n;
     for (n = 0; n < 16; n++) {
@@ -332,8 +332,8 @@ PUBLIC CONST char *lookup_color ARGS1(
 /*
  *  Exit routine for failed COLOR parsing.
  */
-PRIVATE void exit_with_color_syntax ARGS1(
-	char *,		error_line)
+static void exit_with_color_syntax (
+	char *		error_line)
 {
     unsigned int i;
     fprintf (stderr, gettext("\
@@ -358,8 +358,8 @@ The special strings 'nocolor' or 'default', or\n")
 /*
  *  Process string buffer fields for COLOR setting.
  */
-PRIVATE void parse_color ARGS1(
-	char *, buffer)
+static void parse_color (
+	char * buffer)
 {
     int color;
     char *fg, *bg;
@@ -443,15 +443,15 @@ typedef enum {
 
 typedef struct
 {
-   CONST char *name;
+   const char *name;
    Conf_Types type;
    ParseData;
    Config_Enum *table;
 }
 Config_Type;
 
-PRIVATE int assume_charset_fun ARGS1(
-	char *,		value)
+static int assume_charset_fun (
+	char *		value)
 {
     UCLYhndl_for_unspec = safeUCGetLYhndl_byMIME(value);
     StrAllocCopy(UCAssume_MIMEcharset,
@@ -463,22 +463,22 @@ PRIVATE int assume_charset_fun ARGS1(
     return 0;
 }
 
-PRIVATE int assume_local_charset_fun ARGS1(
-	char *,		value)
+static int assume_local_charset_fun (
+	char *		value)
 {
     UCLYhndl_HTFile_for_unspec = safeUCGetLYhndl_byMIME(value);
     return 0;
 }
 
-PRIVATE int assume_unrec_charset_fun ARGS1(
-	char *,		value)
+static int assume_unrec_charset_fun (
+	char *		value)
 {
     UCLYhndl_for_unrec = safeUCGetLYhndl_byMIME(value);
     return 0;
 }
 
-PRIVATE int character_set_fun ARGS1(
-	char *,		value)
+static int character_set_fun (
+	char *		value)
 {
     int i = UCGetLYhndl_byAnyName(value); /* by MIME or full name */
 
@@ -497,8 +497,8 @@ PRIVATE int character_set_fun ARGS1(
     return 0;
 }
 
-PRIVATE int outgoing_mail_charset_fun ARGS1(
-	char *,		value)
+static int outgoing_mail_charset_fun (
+	char *		value)
 {
     outgoing_mail_charset = UCGetLYhndl_byMIME(value);
     /* -1 if NULL or not recognized value: no translation (compatibility) */
@@ -510,8 +510,8 @@ PRIVATE int outgoing_mail_charset_fun ARGS1(
 /*
  *  Process string buffer fields for ASSUMED_COLOR setting.
  */
-PRIVATE int assumed_color_fun ARGS1(
-	char *, buffer)
+static int assumed_color_fun (
+	char * buffer)
 {
     char *fg = buffer, *bg;
     char *temp = 0;
@@ -547,38 +547,38 @@ PRIVATE int assumed_color_fun ARGS1(
 #endif /* EXP_ASSUMED_COLOR */
 
 #ifdef USE_COLOR_TABLE
-PRIVATE int color_fun ARGS1(
-	char *,		value)
+static int color_fun (
+	char *		value)
 {
     parse_color (value);
     return 0;
 }
 #endif
 
-PRIVATE int default_bookmark_file_fun ARGS1(
-	char *,		value)
+static int default_bookmark_file_fun (
+	char *		value)
 {
     set_default_bookmark_page(value);
     return 0;
 }
 
-PRIVATE int default_cache_size_fun ARGS1(
-	char *,		value)
+static int default_cache_size_fun (
+	char *		value)
 {
     HTCacheSize = atoi(value);
     if (HTCacheSize < 2) HTCacheSize = 2;
     return 0;
 }
 
-PRIVATE int default_editor_fun ARGS1(
-	char *,		value)
+static int default_editor_fun (
+	char *		value)
 {
     if (!system_editor) StrAllocCopy(editor, value);
     return 0;
 }
 
-PRIVATE int numbers_as_arrows_fun ARGS1(
-	char *,		value)
+static int numbers_as_arrows_fun (
+	char *		value)
 {
     if (is_true(value))
 	keypad_mode = NUMBERS_AS_ARROWS;
@@ -589,16 +589,16 @@ PRIVATE int numbers_as_arrows_fun ARGS1(
 }
 
 #ifdef DIRED_SUPPORT
-PRIVATE int dired_menu_fun ARGS1(
-	char *,		value)
+static int dired_menu_fun (
+	char *		value)
 {
     add_menu_item(value);
     return 0;
 }
 #endif
 
-PRIVATE int jumpfile_fun ARGS1(
-	char *,		value)
+static int jumpfile_fun (
+	char *		value)
 {
     char *buffer = NULL;
 
@@ -611,8 +611,8 @@ PRIVATE int jumpfile_fun ARGS1(
 }
 
 #ifdef EXP_KEYBOARD_LAYOUT
-PRIVATE int keyboard_layout_fun ARGS1(
-	char *,		key)
+static int keyboard_layout_fun (
+	char *		key)
 {
     if (!LYSetKbLayout(key))
 	CTRACE((tfp, "Failed to set keyboard layout %s\n", key));
@@ -620,8 +620,8 @@ PRIVATE int keyboard_layout_fun ARGS1(
 }
 #endif /* EXP_KEYBOARD_LAYOUT */
 
-PRIVATE int keymap_fun ARGS1(
-	char *,		key)
+static int keymap_fun (
+	char *		key)
 {
     char *func, *efunc;
 
@@ -718,24 +718,24 @@ PRIVATE int keymap_fun ARGS1(
     return 0;
 }
 
-PRIVATE int localhost_alias_fun ARGS1(
-	char *,		value)
+static int localhost_alias_fun (
+	char *		value)
 {
     LYAddLocalhostAlias(value);
     return 0;
 }
 
 #ifdef LYNXCGI_LINKS
-PRIVATE int lynxcgi_environment_fun ARGS1(
-	char *,		value)
+static int lynxcgi_environment_fun (
+	char *		value)
 {
     add_lynxcgi_environment(value);
     return 0;
 }
 #endif
 
-PRIVATE int lynx_sig_file_fun ARGS1(
-	char *,		value)
+static int lynx_sig_file_fun (
+	char *		value)
 {
     char temp[LY_MAXPATH];
     LYstrncpy(temp, value, sizeof(temp)-1);
@@ -751,8 +751,8 @@ PRIVATE int lynx_sig_file_fun ARGS1(
 }
 
 #ifndef DISABLE_NEWS
-PRIVATE int news_chunk_size_fun ARGS1(
-	char *,		value)
+static int news_chunk_size_fun (
+	char *		value)
 {
     HTNewsChunkSize = atoi(value);
     /*
@@ -764,8 +764,8 @@ PRIVATE int news_chunk_size_fun ARGS1(
     return 0;
 }
 
-PRIVATE int news_max_chunk_fun ARGS1(
-	char *,		value)
+static int news_max_chunk_fun (
+	char *		value)
 {
     HTNewsMaxChunk = atoi(value);
     /*
@@ -777,8 +777,8 @@ PRIVATE int news_max_chunk_fun ARGS1(
     return 0;
 }
 
-PRIVATE int news_posting_fun ARGS1(
-	char *,		value)
+static int news_posting_fun (
+	char *		value)
 {
     LYNewsPosting = is_true(value);
     no_newspost = (BOOL) (LYNewsPosting == FALSE);
@@ -787,8 +787,8 @@ PRIVATE int news_posting_fun ARGS1(
 #endif /* DISABLE_NEWS */
 
 #ifndef NO_RULES
-PRIVATE int cern_rulesfile_fun ARGS1(
-	char *,		value)
+static int cern_rulesfile_fun (
+	char *		value)
 {
     char *rulesfile1 = NULL;
     char *rulesfile2 = NULL;
@@ -821,15 +821,15 @@ PRIVATE int cern_rulesfile_fun ARGS1(
 }
 #endif /* NO_RULES */
 
-PRIVATE int printer_fun ARGS1(
-	char *,		value)
+static int printer_fun (
+	char *		value)
 {
     add_item_to_list(value, &printers, TRUE);
     return 0;
 }
 
-PRIVATE int referer_with_query_fun ARGS1(
-	char *,		value)
+static int referer_with_query_fun (
+	char *		value)
 {
     if (!strncasecomp(value, "SEND", 4))
 	LYRefererWithQuery = 'S';
@@ -840,8 +840,8 @@ PRIVATE int referer_with_query_fun ARGS1(
     return 0;
 }
 
-PRIVATE int suffix_fun ARGS1(
-	char *,		value)
+static int suffix_fun (
+	char *		value)
 {
     char *mime_type, *p;
     char *encoding = NULL, *sq = NULL, *description = NULL;
@@ -918,8 +918,8 @@ PRIVATE int suffix_fun ARGS1(
     return 0;
 }
 
-PRIVATE int suffix_order_fun ARGS1(
-	char *,		value)
+static int suffix_order_fun (
+	char *		value)
 {
     char *p = value;
     char *optn;
@@ -946,16 +946,16 @@ PRIVATE int suffix_order_fun ARGS1(
     return 0;
 }
 
-PRIVATE int system_editor_fun ARGS1(
-	char *,		value)
+static int system_editor_fun (
+	char *		value)
 {
     StrAllocCopy(editor, value);
     system_editor = TRUE;
     return 0;
 }
 
-PRIVATE int viewer_fun ARGS1(
-	char *,		value)
+static int viewer_fun (
+	char *		value)
 {
     char *mime_type;
     char *viewer;
@@ -998,8 +998,8 @@ PRIVATE int viewer_fun ARGS1(
     return 0;
 }
 
-PRIVATE int nonrest_sigwinch_fun ARGS1(
-	char *,		value)
+static int nonrest_sigwinch_fun (
+	char *		value)
 {
     if (!strncasecomp(value, "XWINDOWS", 8)) {
 	LYNonRestartingSIGWINCH = (BOOL) (LYgetXDisplay() != NULL);
@@ -1010,9 +1010,9 @@ PRIVATE int nonrest_sigwinch_fun ARGS1(
 }
 
 #ifdef EXP_CHARSET_CHOICE
-PRIVATE void matched_charset_choice ARGS2(
-	BOOL,	display_charset,
-	int,	i)
+static void matched_charset_choice (
+	BOOL	display_charset,
+	int	i)
 {
     int j;
 
@@ -1029,9 +1029,9 @@ PRIVATE void matched_charset_choice ARGS2(
 	charset_subsets[i].hide_assumed = FALSE;
 }
 
-PRIVATE int parse_charset_choice ARGS2(
-	char *,	p,
-	BOOL,	display_charset) /*if FALSE, then assumed doc charset*/
+static int parse_charset_choice (
+	char *	p,
+	BOOL	display_charset) /*if FALSE, then assumed doc charset*/
 {
     int len, i;
     int matches = 0;
@@ -1082,12 +1082,12 @@ PRIVATE int parse_charset_choice ARGS2(
     }
 }
 
-PRIVATE int parse_display_charset_choice ARGS1(char*,p)
+static int parse_display_charset_choice (char*p)
 {
     return parse_charset_choice(p,1);
 }
 
-PRIVATE int parse_assumed_doc_charset_choice ARGS1(char*,p)
+static int parse_assumed_doc_charset_choice (char*p)
 {
     return parse_charset_choice(p,0);
 }
@@ -1095,9 +1095,9 @@ PRIVATE int parse_assumed_doc_charset_choice ARGS1(char*,p)
 #endif /* EXP_CHARSET_CHOICE */
 
 #ifdef USE_PRETTYSRC
-PRIVATE void html_src_bad_syntax ARGS2(
-	    char*, value,
-	    char*, option_name)
+static void html_src_bad_syntax (
+	    char* value,
+	    char* option_name)
 {
     char *buf = 0;
 
@@ -1107,10 +1107,10 @@ PRIVATE void html_src_bad_syntax ARGS2(
     exit_immediately(EXIT_FAILURE);
 }
 
-PRIVATE int parse_html_src_spec ARGS3(
-	    HTlexeme, lexeme_code,
-	    char*, value,
-	    char*, option_name)
+static int parse_html_src_spec (
+	    HTlexeme lexeme_code,
+	    char* value,
+	    char* option_name)
 {
    /* Now checking the value for being correct.  Since HTML_dtd is not
     * initialized completely (member tags points to non-initiailized data), we
@@ -1142,7 +1142,7 @@ PRIVATE int parse_html_src_spec ARGS3(
     return 0;
 }
 
-PRIVATE int psrcspec_fun ARGS1(char*,s)
+static int psrcspec_fun (char*s)
 {
     char* e;
     static Config_Enum lexemnames[] =
@@ -1177,7 +1177,7 @@ PRIVATE int psrcspec_fun ARGS1(char*,s)
     return 0;
 }
 
-PRIVATE int read_htmlsrc_attrname_xform ARGS1( char*,str)
+static int read_htmlsrc_attrname_xform ( char*str)
 {
     int val;
     if ( 1 == sscanf(str, "%d", &val) ) {
@@ -1192,7 +1192,7 @@ PRIVATE int read_htmlsrc_attrname_xform ARGS1( char*,str)
     return 0;
 }
 
-PRIVATE int read_htmlsrc_tagname_xform ARGS1( char*,str)
+static int read_htmlsrc_tagname_xform ( char*str)
 {
     int val;
     if ( 1 == sscanf(str,"%d",&val) ) {
@@ -1209,8 +1209,8 @@ PRIVATE int read_htmlsrc_tagname_xform ARGS1( char*,str)
 #endif
 
 #if defined(PDCURSES) && defined(PDC_BUILD) && PDC_BUILD >= 2401
-PRIVATE int screen_size_fun ARGS1(
-	char *,		value)
+static int screen_size_fun (
+	char *		value)
 {
     char *cp;
 
@@ -1234,7 +1234,7 @@ PRIVATE int screen_size_fun ARGS1(
 #endif
 
 /* This table is searched ignoring case */
-PRIVATE Config_Type Config_Table [] =
+static Config_Type Config_Table [] =
 {
      PARSE_SET(RC_ACCEPT_ALL_COOKIES,   LYAcceptAllCookies),
      PARSE_TIM(RC_ALERTSECS,            AlertSecs),
@@ -1531,15 +1531,15 @@ PRIVATE Config_Type Config_Table [] =
      PARSE_NIL
 };
 
-PRIVATE char *lynxcfginfo_url = NULL;	/* static */
+static char *lynxcfginfo_url = NULL;	/* static */
 #if defined(HAVE_CONFIG_H) && !defined(NO_CONFIG_INFO)
-PRIVATE char *configinfo_url = NULL;	/* static */
+static char *configinfo_url = NULL;	/* static */
 #endif
 
 /*
  * Free memory allocated in 'read_cfg()'
  */
-PUBLIC void free_lynx_cfg NOARGS
+void free_lynx_cfg (void)
 {
     Config_Type *tbl;
 
@@ -1585,8 +1585,8 @@ PUBLIC void free_lynx_cfg NOARGS
 #endif
 }
 
-PRIVATE Config_Type *lookup_config ARGS1(
-	char *,		name)
+static Config_Type *lookup_config (
+	char *		name)
 {
     Config_Type *tbl = Config_Table;
     char ch = (char) TOUPPER(*name);
@@ -1611,10 +1611,10 @@ PRIVATE Config_Type *lookup_config ARGS1(
  * Note:  only read files from the current directory if there's no parent
  * filename, otherwise it leads to user surprise.
  */
-PRIVATE char *actual_filename ARGS3(
-    char *,	cfg_filename,
-    char *,	parent_filename,
-    char *,	dft_filename)
+static char *actual_filename (
+    char *	cfg_filename,
+    char *	parent_filename,
+    char *	dft_filename)
 {
     char *my_filename = NULL;
 
@@ -1643,10 +1643,10 @@ PRIVATE char *actual_filename ARGS3(
     return my_filename;
 }
 
-PUBLIC FILE *LYOpenCFG ARGS3(
-    char *,	cfg_filename,
-    char *,	parent_filename,
-    char *,	dft_filename)
+FILE *LYOpenCFG (
+    char *	cfg_filename,
+    char *	parent_filename,
+    char *	dft_filename)
 {
     char *my_file = actual_filename(cfg_filename, parent_filename, dft_filename);
     FILE *result;
@@ -1673,9 +1673,9 @@ typedef BOOL (optidx_set_t) [ NOPTS_ ];
  * For simple (boolean, string, integer, time) values, set the corresponding
  * configuration variable.
  */
-PUBLIC void LYSetConfigValue ARGS2(
-    char *,	name,
-    char *,	value)
+void LYSetConfigValue (
+    char *	name,
+    char *	value)
 {
     Config_Type *tbl = lookup_config(name);
     ParseUnionPtr q = ParseUnionOf(tbl);
@@ -1766,12 +1766,12 @@ PUBLIC void LYSetConfigValue ARGS2(
  * file can also include other files with a list of acceptable options, these
  * lists are ANDed.
  */
-PRIVATE void do_read_cfg ARGS5(
-	char *, cfg_filename,
-	char *, parent_filename,
-	int,	nesting_level,
-	FILE *,	fp0,
-	optidx_set_t*, allowed)
+static void do_read_cfg (
+	char * cfg_filename,
+	char * parent_filename,
+	int	nesting_level,
+	FILE *	fp0,
+	optidx_set_t* allowed)
 {
     FILE *fp;
     char *buffer = 0;
@@ -2056,21 +2056,21 @@ PRIVATE void do_read_cfg ARGS5(
 }
 
 /* this is a public interface to do_read_cfg */
-PUBLIC void read_cfg ARGS4(
-	char *, cfg_filename,
-	char *, parent_filename,
-	int,	nesting_level,
-	FILE *,	fp0)
+void read_cfg (
+	char * cfg_filename,
+	char * parent_filename,
+	int	nesting_level,
+	FILE *	fp0)
 {
     HTInitProgramPaths();
     do_read_cfg(cfg_filename, parent_filename, nesting_level, fp0, NULL);
 }
 
 #ifndef NO_CONFIG_INFO
-PRIVATE void extra_cfg_link ARGS3(
-	FILE *,	fp,
-	char *,	href,
-	char *,	name)
+static void extra_cfg_link (
+	FILE *	fp,
+	char *	href,
+	char *	name)
 {
     fprintf(fp, "<a href=\"%s\">%s</a>",
 	    href, name);
@@ -2082,8 +2082,8 @@ PRIVATE void extra_cfg_link ARGS3(
  *  Called from getfile() cycle:
  *  we create and load the page just in place and return to mainloop().
  */
-PUBLIC int lynx_cfg_infopage ARGS1(
-    DocInfo *,		       newdoc)
+int lynx_cfg_infopage (
+    DocInfo *		       newdoc)
 {
     static char tempfile[LY_MAXPATH] = "\0";
     DocAddress WWWDoc;  /* need on exit */
@@ -2300,8 +2300,8 @@ PUBLIC int lynx_cfg_infopage ARGS1(
  *  Compile-time definitions info, LYNXCOMPILEOPTS:/ internal page,
  *  from getfile() cycle.
  */
-PUBLIC int lynx_compile_opts ARGS1(
-    DocInfo *,		       newdoc)
+int lynx_compile_opts (
+    DocInfo *		       newdoc)
 {
     static char tempfile[LY_MAXPATH] = "\0";
 #define PutDefs(table, N) fprintf(fp0, "%-35s %s\n", table[N].name, table[N].value)
diff --git a/src/LYReadCFG.h b/src/LYReadCFG.h
index 87b73de9..f295de25 100644
--- a/src/LYReadCFG.h
+++ b/src/LYReadCFG.h
@@ -42,23 +42,23 @@ extern int default_bg;
 extern BOOL default_color_reset;
 
 #if defined(HAVE_USE_DEFAULT_COLORS) && defined(USE_DEFAULT_COLORS)
-extern int lynx_default_colors NOPARAMS;
+extern int lynx_default_colors (void);
 #endif
 
-extern int check_color PARAMS((char * color, int the_default));
-extern CONST char * lookup_color PARAMS((int code));
+extern int check_color (char * color, int the_default);
+extern const char * lookup_color (int code);
 #endif
 
-extern void read_cfg PARAMS((char *cfg_filename, char *parent_filename, int nesting_level, FILE *fp0));
-extern void free_lynx_cfg NOPARAMS;
+extern void read_cfg (char *cfg_filename, char *parent_filename, int nesting_level, FILE *fp0);
+extern void free_lynx_cfg (void);
 extern BOOLEAN have_read_cfg;
 
-extern FILE *LYOpenCFG PARAMS((char *cfg_filename, char *parent_filename, char *dft_filename));
-extern int lynx_cfg_infopage PARAMS((DocInfo *newdoc));
-extern int lynx_compile_opts PARAMS((DocInfo *newdoc));
-extern int match_item_by_name PARAMS((lynx_list_item_type * ptr, char * name, BOOLEAN only_overriders));
-extern lynx_list_item_type *find_item_by_number PARAMS((lynx_list_item_type * list_ptr, char * number));
-extern void reload_read_cfg NOPARAMS; /* implemented in LYMain.c */
-extern void LYSetConfigValue PARAMS((char *name, char *value));
+extern FILE *LYOpenCFG (char *cfg_filename, char *parent_filename, char *dft_filename);
+extern int lynx_cfg_infopage (DocInfo *newdoc);
+extern int lynx_compile_opts (DocInfo *newdoc);
+extern int match_item_by_name (lynx_list_item_type * ptr, char * name, BOOLEAN only_overriders);
+extern lynx_list_item_type *find_item_by_number (lynx_list_item_type * list_ptr, char * number);
+extern void reload_read_cfg (void); /* implemented in LYMain.c */
+extern void LYSetConfigValue (char *name, char *value);
 
 #endif /* LYREADCFG_H */
diff --git a/src/LYSearch.c b/src/LYSearch.c
index 61517cb4..571cd2df 100644
--- a/src/LYSearch.c
+++ b/src/LYSearch.c
@@ -8,9 +8,9 @@
 
 #include <LYLeaks.h>
 
-PRIVATE BOOL link_has_target ARGS2(
-	int,		cur,
-	char *,		target)
+static BOOL link_has_target (
+	int		cur,
+	char *		target)
 {
     LinkInfo *a = &links[cur];
     OptionType *option;
@@ -110,9 +110,9 @@ PRIVATE BOOL link_has_target ARGS2(
  *  If not found do not reset cur and return FALSE.
  */
 
-PRIVATE int check_next_target_in_links ARGS2(
-	int *,		cur,
-	char *,		target)
+static int check_next_target_in_links (
+	int *		cur,
+	char *		target)
 {
     int i;
 
@@ -127,9 +127,9 @@ PRIVATE int check_next_target_in_links ARGS2(
     return FALSE;
 }
 
-PRIVATE int check_prev_target_in_links ARGS2(
-	int *,		cur,
-	char *,		target)
+static int check_prev_target_in_links (
+	int *		cur,
+	char *		target)
 {
     int i;
 
@@ -154,11 +154,11 @@ PRIVATE int check_prev_target_in_links ARGS2(
  *  or case insensitive depending on the 'case_sensitive' global
  *  variable
  */
-PUBLIC BOOL textsearch ARGS4(
-	DocInfo *,	cur_doc,
-	char *,		prev_target,
-	int,		target_size,
-	int,		direction)
+BOOL textsearch (
+	DocInfo *	cur_doc,
+	char *		prev_target,
+	int		target_size,
+	int		direction)
 {
     int offset;
     int oldcur = cur_doc->link;
diff --git a/src/LYSearch.h b/src/LYSearch.h
index e4dbd7a8..d6d50f2c 100644
--- a/src/LYSearch.h
+++ b/src/LYSearch.h
@@ -6,8 +6,8 @@
 #include <LYStructs.h>
 #endif /* LYSTRUCT_H */
 
-extern BOOL textsearch PARAMS((DocInfo *cur_doc,
-			       char *prev_target, int target_size, int direction));
+extern BOOL textsearch (DocInfo *cur_doc,
+			       char *prev_target, int target_size, int direction);
 
 #define IN_FILE 1
 #define IN_LINKS 2
diff --git a/src/LYShowInfo.c b/src/LYShowInfo.c
index 1548b9b0..77fdb795 100644
--- a/src/LYShowInfo.c
+++ b/src/LYShowInfo.c
@@ -34,12 +34,12 @@
  *	{status} is one of "dev", "pre" or "rel", and
  *	{patch} is a number assigned by PRCS.
  */
-PUBLIC BOOL LYVersionIsRelease NOARGS
+BOOL LYVersionIsRelease (void)
 {
     return (BOOL)(strstr(LYNX_VERSION, "rel") != 0);
 }
 
-PUBLIC char *LYVersionStatus NOARGS
+char *LYVersionStatus (void)
 {
     if (LYVersionIsRelease())
 	return REL_VERSION;
@@ -48,7 +48,7 @@ PUBLIC char *LYVersionStatus NOARGS
     return DEV_VERSION;
 }
 
-PUBLIC char *LYVersionDate NOARGS
+char *LYVersionDate (void)
 {
     static char temp[LYNX_DATE_LEN+1];
     LYstrncpy(temp, &LYNX_DATE[LYNX_DATE_OFF], LYNX_DATE_LEN);
@@ -60,18 +60,18 @@ PUBLIC char *LYVersionDate NOARGS
  *  that the cursor is on.
  */
 
-PUBLIC int LYShowInfo ARGS4(
-	DocInfo *,	doc,
-	int,		size_of_file,
-	DocInfo *,	newdoc,
-	char *, 	owner_address)
+int LYShowInfo (
+	DocInfo *	doc,
+	int		size_of_file,
+	DocInfo *	newdoc,
+	char * 	owner_address)
 {
     static char tempfile[LY_MAXPATH] = "\0";
     int url_type;
     FILE *fp0;
     char *Address = NULL, *Title = NULL;
     char *name;
-    CONST char *cp;
+    const char *cp;
 #ifdef ADVANCED_INFO
     BOOLEAN LYInfoAdvanced = (BOOL) (user_mode == ADVANCED_MODE);
 #endif
diff --git a/src/LYShowInfo.h b/src/LYShowInfo.h
index 623eaf44..f2689522 100644
--- a/src/LYShowInfo.h
+++ b/src/LYShowInfo.h
@@ -5,10 +5,10 @@
 #include <LYStructs.h>
 #endif /* LYSTRUCTS_H */
 
-extern BOOL LYVersionIsRelease NOPARAMS;
-extern char *LYVersionStatus NOPARAMS;
-extern char *LYVersionDate NOPARAMS;
-extern int LYShowInfo PARAMS((DocInfo *doc, int size_of_file, DocInfo *newdoc,
-							char *owner_address));
+extern BOOL LYVersionIsRelease (void);
+extern char *LYVersionStatus (void);
+extern char *LYVersionDate (void);
+extern int LYShowInfo (DocInfo *doc, int size_of_file, DocInfo *newdoc,
+							char *owner_address);
 
 #endif /* LYSHOWINFO_H */
diff --git a/src/LYSignal.h b/src/LYSignal.h
index 9faf619b..c3acf43d 100644
--- a/src/LYSignal.h
+++ b/src/LYSignal.h
@@ -5,7 +5,7 @@
 #include <signal.h>
 
 #ifdef VMS
-extern void VMSsignal PARAMS((int sig, void (*func)()));
+extern void VMSsignal (int sig, void (*func)());
 #ifdef signal
 #undef signal
 #endif /* signal */
@@ -13,9 +13,9 @@ extern void VMSsignal PARAMS((int sig, void (*func)()));
 #endif /* VMS */
 
 #ifdef HAVE_SIGACTION
-typedef void LYSigHandlerFunc_t PARAMS((int));
+typedef void LYSigHandlerFunc_t (int);
 /* implementation in LYUtils.c */
-extern void LYExtSignal PARAMS((int sig, LYSigHandlerFunc_t * handler));
+extern void LYExtSignal (int sig, LYSigHandlerFunc_t * handler);
 #else
 #define LYExtSignal(sig,h) signal(sig, h)
 #endif
diff --git a/src/LYStrings.c b/src/LYStrings.c
index 58fa79ea..856a929d 100644
--- a/src/LYStrings.c
+++ b/src/LYStrings.c
@@ -76,7 +76,7 @@ static MEVENT levent;
 #endif
 
 /* Return the value of mouse_link */
-PUBLIC int peek_mouse_levent NOARGS
+int peek_mouse_levent (void)
 {
 #if defined(USE_MOUSE) && defined(NCURSES)
     if (have_levent > 0) {
@@ -89,7 +89,7 @@ PUBLIC int peek_mouse_levent NOARGS
 }
 
 /* Return the value of mouse_link, erasing it */
-PUBLIC int get_mouse_link NOARGS
+int get_mouse_link (void)
 {
     int t;
     t = mouse_link;
@@ -100,16 +100,16 @@ PUBLIC int get_mouse_link NOARGS
 }
 
 /* Return the value of mouse_link */
-PUBLIC int peek_mouse_link NOARGS
+int peek_mouse_link (void)
 {
     return mouse_link;
 }
 
 
-PUBLIC int fancy_mouse ARGS3(
-    WINDOW *,	win,
-    int,	row,
-    int *,	position)
+int fancy_mouse (
+    WINDOW *	win,
+    int	row,
+    int *	position)
 {
     int cmd = LYK_DO_NOTHING;
 #ifdef USE_MOUSE
@@ -254,8 +254,8 @@ PUBLIC int fancy_mouse ARGS3(
 /*
  * Manage the collection of edit-histories
  */
-PRIVATE HTList *whichRecall ARGS1(
-    RecallType,		recall)
+static HTList *whichRecall (
+    RecallType		recall)
 {
     HTList **list;
 
@@ -277,7 +277,7 @@ PRIVATE HTList *whichRecall ARGS1(
 /*
  * Remove the oldest item in the closet
  */
-PRIVATE void LYRemoveFromCloset ARGS1(HTList *, list)
+static void LYRemoveFromCloset (HTList * list)
 {
     char *data = HTList_removeFirstObject(list);
 
@@ -285,7 +285,7 @@ PRIVATE void LYRemoveFromCloset ARGS1(HTList *, list)
 	FREE(data);
 }
 
-PUBLIC void LYCloseCloset ARGS1(RecallType, recall)
+void LYCloseCloset (RecallType recall)
 {
     HTList *list = whichRecall(recall);
 
@@ -300,7 +300,7 @@ PUBLIC void LYCloseCloset ARGS1(RecallType, recall)
  * match, i.e., the newest since we search from the top.  This should be made
  * more intelligent, but works for now.
  */
-PRIVATE char * LYFindInCloset ARGS2(RecallType, recall, char*, base)
+static char * LYFindInCloset (RecallType recall, char* base)
 {
     HTList *list = whichRecall(recall);
     char *data;
@@ -315,7 +315,7 @@ PRIVATE char * LYFindInCloset ARGS2(RecallType, recall, char*, base)
     return(0);
 }
 
-PRIVATE void LYAddToCloset ARGS2(RecallType, recall, char*, str)
+static void LYAddToCloset (RecallType recall, char* str)
 {
     HTList *list = whichRecall(recall);
     char *data = NULL;
@@ -327,12 +327,12 @@ PRIVATE void LYAddToCloset ARGS2(RecallType, recall, char*, str)
 }
 
 #ifdef USE_MOUSE
-PRIVATE int XYdist ARGS5(
-    int,	x1,
-    int,	y1,
-    int,	x2,
-    int,	y2,
-    int,	dx2)
+static int XYdist (
+    int	x1,
+    int	y1,
+    int	x2,
+    int	y2,
+    int	dx2)
 {
     int xerr = 3 * (x2 - x1), yerr = 9 * (y2 - y1);
 
@@ -369,11 +369,11 @@ now: (kw 1999-10-23)
 ** link.
 **/
 
-PRIVATE int set_clicked_link ARGS4(
-    int,	x,
-    int,	y,
-    int,	code,
-    int,	clicks)
+static int set_clicked_link (
+    int	x,
+    int	y,
+    int	code,
+    int	clicks)
 {
     int left = 6;
     int right = LYcols-6;
@@ -560,10 +560,10 @@ PRIVATE int set_clicked_link ARGS4(
  *  LYstrncpy() terminates strings with a null byte.
  *  Writes a null byte into the n+1 byte of dst.
  */
-PUBLIC char *LYstrncpy ARGS3(
-	char *,		dst,
-	CONST char *,	src,
-	int,		n)
+char *LYstrncpy (
+	char *		dst,
+	const char *	src,
+	int		n)
 {
     char *val;
     int len;
@@ -593,12 +593,12 @@ PUBLIC char *LYstrncpy ARGS3(
  *  either bytes or glyphs (mbcs sequences) (CJK or UTF8).  The utf_flag
  *  argument should be TRUE for UTF8. - KW & FM
  */
-PUBLIC char * LYmbcsstrncpy ARGS5(
-	char *,		dst,
-	CONST char *,	src,
-	int,		n_bytes,
-	int,		n_glyphs,
-	BOOL,		utf_flag)
+char * LYmbcsstrncpy (
+	char *		dst,
+	const char *	src,
+	int		n_bytes,
+	int		n_glyphs,
+	BOOL		utf_flag)
 {
     char *val = dst;
     int i_bytes = 0, i_glyphs = 0;
@@ -627,10 +627,10 @@ PUBLIC char * LYmbcsstrncpy ARGS5(
  *  in a string and returns the resulting pointer.  It takes account
  *  of UTF-8 encoded characters. - KW
  */
-PUBLIC char * LYmbcs_skip_glyphs ARGS3(
-	char *,		data,
-	int,		n_glyphs,
-	BOOL,		utf_flag)
+char * LYmbcs_skip_glyphs (
+	char *		data,
+	int		n_glyphs,
+	BOOL		utf_flag)
 {
     int i_glyphs = 0;
 
@@ -662,10 +662,10 @@ PUBLIC char * LYmbcs_skip_glyphs ARGS3(
  *  Counts character glyphs if count_gcells is unset. (Full-
  *  width characters in CJK mode count as one.) - kw
  */
-PUBLIC int LYmbcsstrlen ARGS3(
-	char *,		str,
-	BOOL,		utf_flag,
-	BOOL,		count_gcells)
+int LYmbcsstrlen (
+	char *		str,
+	BOOL		utf_flag,
+	BOOL		count_gcells)
 {
     int i, j, len = 0;
 
@@ -727,7 +727,7 @@ PUBLIC int LYmbcsstrlen ARGS3(
 /* PDCurses sends back key-modifiers that we don't use, but would waste time
  * upon, e.g., repainting the status line
  */
-PRIVATE int myGetChar NOARGS
+static int myGetChar (void)
 {
     int c;
     BOOL done = FALSE;
@@ -773,7 +773,7 @@ PRIVATE int myGetChar NOARGS
 #endif /* !defined(GetChar) */
 
 #if defined(USE_SLANG) && defined(USE_MOUSE)
-PRIVATE int sl_parse_mouse_event ARGS3(int *, x, int *, y, int *, button)
+static int sl_parse_mouse_event (int * x, int * y, int * button)
 {
     /* "ESC [ M" has already been processed.  There more characters are
      * expected:  BUTTON X Y
@@ -805,8 +805,8 @@ PRIVATE int sl_parse_mouse_event ARGS3(int *, x, int *, y, int *, button)
     return 0;
 }
 
-PRIVATE int sl_read_mouse_event ARGS1(
-    int,	code)
+static int sl_read_mouse_event (
+    int	code)
 {
    int mouse_x, mouse_y, button;
 
@@ -836,9 +836,9 @@ PRIVATE int sl_read_mouse_event ARGS1(
 #endif  /* USE_SLANG and USE_MOUSE */
 
 
-PRIVATE BOOLEAN csi_is_csi = TRUE;
-PUBLIC void ena_csi ARGS1(
-    BOOLEAN,	flag)
+static BOOLEAN csi_is_csi = TRUE;
+void ena_csi (
+    BOOLEAN	flag)
 {
     csi_is_csi = flag;
 }
@@ -910,7 +910,7 @@ static Keysym_String_List Keysym_Strings [] =
  * Ncurses stores the termcap/terminfo names in arrays sorted to match the
  * array of strings in the TERMTYPE struct.
  */
-PRIVATE int lookup_tiname (char *name, NCURSES_CONST char *CONST *names)
+static int lookup_tiname (char *name, NCURSES_CONST char *const *names)
 {
     int code;
 
@@ -920,7 +920,7 @@ PRIVATE int lookup_tiname (char *name, NCURSES_CONST char *CONST *names)
     return -1;
 }
 
-PRIVATE CONST char *expand_tiname (CONST char *first, size_t len, char **result, char *final)
+static const char *expand_tiname (const char *first, size_t len, char **result, char *final)
 {
     char name[BUFSIZ];
     int code;
@@ -937,7 +937,7 @@ PRIVATE CONST char *expand_tiname (CONST char *first, size_t len, char **result,
     return first + len;
 }
 
-PRIVATE CONST char *expand_tichar (CONST char *first, char **result, char *final)
+static const char *expand_tichar (const char *first, char **result, char *final)
 {
     int ch;
     int limit = 0;
@@ -986,7 +986,7 @@ PRIVATE CONST char *expand_tichar (CONST char *first, char **result, char *final
     return first;
 }
 
-PRIVATE int expand_substring (char* dst, CONST char* first, CONST char* last, char *final)
+static int expand_substring (char* dst, const char* first, const char* last, char *final)
 {
     int ch;
 
@@ -998,7 +998,7 @@ PRIVATE int expand_substring (char* dst, CONST char* first, CONST char* last, ch
 	case '^':
 	    ch = *first++;
 	    if (ch == LPAREN) {
-		CONST char *s = strchr(first, RPAREN);
+		const char *s = strchr(first, RPAREN);
 		char *was = dst;
 		if (s == 0)
 		    s = first + strlen(first);
@@ -1029,7 +1029,7 @@ PRIVATE int expand_substring (char* dst, CONST char* first, CONST char* last, ch
 }
 #endif
 
-PRIVATE void unescaped_char ARGS2(CONST char*, parse, int*,keysym)
+static void unescaped_char (const char* parse, int* keysym)
 {
     size_t len = strlen(parse);
     char buf[BUFSIZ];
@@ -1041,7 +1041,7 @@ PRIVATE void unescaped_char ARGS2(CONST char*, parse, int*,keysym)
     }
 }
 
-PRIVATE BOOLEAN unescape_string ARGS3(char*, src, char *, dst, char *, final)
+static BOOLEAN unescape_string (char* src, char * dst, char * final)
 {
     BOOLEAN ok = FALSE;
 
@@ -1058,7 +1058,7 @@ PRIVATE BOOLEAN unescape_string ARGS3(char*, src, char *, dst, char *, final)
     return ok;
 }
 
-PUBLIC int map_string_to_keysym ARGS2(CONST char*, str, int*,keysym)
+int map_string_to_keysym (const char* str, int* keysym)
 {
     int modifier = 0;
     *keysym = -1;
@@ -1142,7 +1142,7 @@ PUBLIC int map_string_to_keysym ARGS2(CONST char*, str, int*,keysym)
  * Starting at a nonblank character, skip over a token, counting quoted and
  * escaped characters.
  */
-PRIVATE char *skip_keysym ARGS1(char *, parse)
+static char *skip_keysym (char * parse)
 {
     int quoted = 0;
     int escaped = 0;
@@ -1172,7 +1172,7 @@ PRIVATE char *skip_keysym ARGS1(char *, parse)
  * The first token is the string to define, the second is the name (of the
  * keysym) to define it to.
  */
-PRIVATE int setkey_cmd (char *parse)
+static int setkey_cmd (char *parse)
 {
     char *s, *t;
     int keysym;
@@ -1215,7 +1215,7 @@ PRIVATE int setkey_cmd (char *parse)
     return -1;
 }
 
-PRIVATE int unsetkey_cmd (char *parse)
+static int unsetkey_cmd (char *parse)
 {
     char *s = skip_keysym(parse);
     if (s != parse) {
@@ -1249,11 +1249,11 @@ PRIVATE int unsetkey_cmd (char *parse)
 #define FNAME_LYNX_KEYMAPS ".lynx-keymaps"
 #endif /* FNAMES_8_3 */
 
-PRIVATE int read_keymap_file NOARGS
+static int read_keymap_file (void)
 {
     static struct {
-	CONST char *name;
-	int (*func) PARAMS((char *s));
+	const char *name;
+	int (*func) (char *s);
     } table[] = {
 	{"setkey",   setkey_cmd },
 	{"unsetkey", unsetkey_cmd },
@@ -1292,7 +1292,7 @@ PRIVATE int read_keymap_file NOARGS
     return 0;
 }
 
-PRIVATE void setup_vtXXX_keymap NOARGS
+static void setup_vtXXX_keymap (void)
 {
     static Keysym_String_List table[] = {
 	INTERN_KEY( "\033[A",	UPARROW,	KEY_UP ),
@@ -1350,7 +1350,7 @@ PRIVATE void setup_vtXXX_keymap NOARGS
 	define_key(table[n].string, table[n].value);
 }
 
-PUBLIC int lynx_initialize_keymaps NOARGS
+int lynx_initialize_keymaps (void)
 {
 #ifdef USE_SLANG
     int i;
@@ -1386,7 +1386,7 @@ PUBLIC int lynx_initialize_keymaps NOARGS
 
 
 #if defined(USE_MOUSE) && (defined(NCURSES))
-PRIVATE int LYmouse_menu ARGS4(int, x, int, y, int, atlink, int, code)
+static int LYmouse_menu (int x, int y, int atlink, int code)
 {
 #define ENT_ONLY_DOC	1
 #define ENT_ONLY_LINK	2
@@ -1502,10 +1502,10 @@ PRIVATE int LYmouse_menu ARGS4(int, x, int, y, int, atlink, int, code)
 #if defined(USE_KEYMAPS) && defined(USE_SLANG)
 /************************************************************************/
 
-PRIVATE int current_sl_modifier = 0;
+static int current_sl_modifier = 0;
 
 /* We cannot guarantee the type for 'GetChar', and should not use a cast. */
-PRIVATE int myGetChar NOARGS
+static int myGetChar (void)
 {
     int i = GetChar();
     if (i == 0)			/* trick to get NUL char through - kw */
@@ -1513,8 +1513,8 @@ PRIVATE int myGetChar NOARGS
     return i;
 }
 
-PRIVATE int LYgetch_for ARGS1(
-	int,	code)
+static int LYgetch_for (
+	int	code)
 {
    SLang_Key_Type *key;
    int keysym;
@@ -1580,8 +1580,8 @@ PRIVATE int LYgetch_for ARGS1(
  */
 #define found_CSI(first,second) ((second) == '[' || (first) == 155)
 
-PRIVATE int LYgetch_for ARGS1(
-	int,	code)
+static int LYgetch_for (
+	int	code)
 {
     int a, b, c, d = -1;
     int current_modifier = 0;
@@ -2374,7 +2374,7 @@ re_read:
 #endif	/* NOT  defined(USE_KEYMAPS) && defined(USE_SLANG) */
 
 
-PUBLIC int LYgetch NOARGS
+int LYgetch (void)
 {
     return LYReadCmdKey(FOR_PANEL);
 }
@@ -2382,7 +2382,7 @@ PUBLIC int LYgetch NOARGS
 /*
  * Read a single keystroke, allows mouse-selection.
  */
-PUBLIC int LYgetch_choice NOARGS
+int LYgetch_choice (void)
 {
     int ch = LYReadCmdKey(FOR_CHOICE);
     if (ch == LYCharINTERRUPT1)
@@ -2393,7 +2393,7 @@ PUBLIC int LYgetch_choice NOARGS
 /*
  * Read a single keystroke, allows mouse events.
  */
-PUBLIC int LYgetch_input NOARGS
+int LYgetch_input (void)
 {
     int ch = LYReadCmdKey(FOR_INPUT);
     if (ch == LYCharINTERRUPT1)
@@ -2405,7 +2405,7 @@ PUBLIC int LYgetch_input NOARGS
  * Read a single keystroke, ignoring case by translating it to uppercase.
  * Ignore mouse events, if any.
  */
-PUBLIC int LYgetch_single NOARGS
+int LYgetch_single (void)
 {
     int ch = LYReadCmdKey(FOR_SINGLEKEY);
     if (ch == LYCharINTERRUPT1)
@@ -2418,8 +2418,8 @@ PUBLIC int LYgetch_single NOARGS
 /*
  * Convert a null-terminated string to lowercase
  */
-PUBLIC void LYLowerCase ARGS1(
-	 char *,	arg_buffer)
+void LYLowerCase (
+	 char *	arg_buffer)
 {
     register unsigned char *buffer = (unsigned char *) arg_buffer;
     size_t i;
@@ -2444,8 +2444,8 @@ PUBLIC void LYLowerCase ARGS1(
 /*
  * Convert a null-terminated string to uppercase
  */
-PUBLIC void LYUpperCase ARGS1(
-	 char *,	arg_buffer)
+void LYUpperCase (
+	 char *	arg_buffer)
 {
     register unsigned char *buffer = (unsigned char *) arg_buffer;
     size_t i;
@@ -2470,8 +2470,8 @@ PUBLIC void LYUpperCase ARGS1(
 /*
  * Remove newlines from a string, returning true if we removed any.
  */
-PUBLIC BOOLEAN LYRemoveNewlines ARGS1(
-	char *,		buffer)
+BOOLEAN LYRemoveNewlines (
+	char *		buffer)
 {
     if (buffer != 0) {
 	register char* buf = buffer;
@@ -2495,8 +2495,8 @@ PUBLIC BOOLEAN LYRemoveNewlines ARGS1(
  * Remove ALL whitespace from a string (including embedded blanks), and returns
  * a pointer to the end of the trimmed string.
  */
-PUBLIC char * LYRemoveBlanks ARGS1(
-	char *,		buffer)
+char * LYRemoveBlanks (
+	char *		buffer)
 {
     if (buffer != 0) {
 	register char* buf = buffer;
@@ -2519,8 +2519,8 @@ PUBLIC char * LYRemoveBlanks ARGS1(
 /*
  * Skip whitespace
  */
-PUBLIC char * LYSkipBlanks ARGS1(
-	char *,		buffer)
+char * LYSkipBlanks (
+	char *		buffer)
 {
     while (isspace(UCH((*buffer))))
 	buffer++;
@@ -2530,8 +2530,8 @@ PUBLIC char * LYSkipBlanks ARGS1(
 /*
  * Skip non-whitespace
  */
-PUBLIC char * LYSkipNonBlanks ARGS1(
-	char *,		buffer)
+char * LYSkipNonBlanks (
+	char *		buffer)
 {
     while (*buffer != 0 && !isspace(UCH((*buffer))))
 	buffer++;
@@ -2539,10 +2539,10 @@ PUBLIC char * LYSkipNonBlanks ARGS1(
 }
 
 /*
- * Skip CONST whitespace
+ * Skip const whitespace
  */
-PUBLIC CONST char * LYSkipCBlanks ARGS1(
-	CONST char *,	buffer)
+const char * LYSkipCBlanks (
+	const char *	buffer)
 {
     while (isspace(UCH((*buffer))))
 	buffer++;
@@ -2550,10 +2550,10 @@ PUBLIC CONST char * LYSkipCBlanks ARGS1(
 }
 
 /*
- * Skip CONST non-whitespace
+ * Skip const non-whitespace
  */
-PUBLIC CONST char * LYSkipCNonBlanks ARGS1(
-	CONST char *,	buffer)
+const char * LYSkipCNonBlanks (
+	const char *	buffer)
 {
     while (*buffer != 0 && !isspace(UCH((*buffer))))
 	buffer++;
@@ -2563,8 +2563,8 @@ PUBLIC CONST char * LYSkipCNonBlanks ARGS1(
 /*
  * Trim leading blanks from a string
  */
-PUBLIC void LYTrimLeading ARGS1(
-	char *,		buffer)
+void LYTrimLeading (
+	char *		buffer)
 {
     char *skipped = LYSkipBlanks(buffer);
     while ((*buffer++ = *skipped++) != 0)
@@ -2574,8 +2574,8 @@ PUBLIC void LYTrimLeading ARGS1(
 /*
  * Trim trailing newline(s) from a string
  */
-PUBLIC char * LYTrimNewline ARGS1(
-	char *,		buffer)
+char * LYTrimNewline (
+	char *		buffer)
 {
     size_t i = strlen(buffer);
     while (i != 0 && (buffer[i-1] == '\n' || buffer[i-1] == '\r'))
@@ -2586,8 +2586,8 @@ PUBLIC char * LYTrimNewline ARGS1(
 /*
  * Trim trailing blanks from a string
  */
-PUBLIC void LYTrimTrailing ARGS1(
-	char *,		buffer)
+void LYTrimTrailing (
+	char *		buffer)
 {
     size_t i = strlen(buffer);
     while (i != 0 && isspace(UCH(buffer[i-1])))
@@ -2597,9 +2597,9 @@ PUBLIC void LYTrimTrailing ARGS1(
 /* 1997/11/10 (Mon) 14:26:10, originally string_short() in LYExterns.c, but
  * moved here because LYExterns is not always configured.
  */
-PUBLIC char *LYElideString ARGS2(
-	char *,		str,
-	int,		cut_pos)
+char *LYElideString (
+	char *		str,
+	int		cut_pos)
 {
     char buff[MAX_LINE], *s, *d;
     static char s_str[MAX_LINE];
@@ -2626,8 +2626,8 @@ PUBLIC char *LYElideString ARGS2(
 /*
  * Trim a startfile, returning true if it looks like one of the Lynx tags.
  */
-PUBLIC BOOLEAN LYTrimStartfile ARGS1(
-	char *,		buffer)
+BOOLEAN LYTrimStartfile (
+	char *		buffer)
 {
     LYTrimHead(buffer);
     if (isLYNXEXEC(buffer) ||
@@ -2649,8 +2649,8 @@ PUBLIC BOOLEAN LYTrimStartfile ARGS1(
 /*
  * Escape unsafe characters in startfile, except for lynx internal URLs.
  */
-PUBLIC void LYEscapeStartfile ARGS1(
-	char **,		buffer)
+void LYEscapeStartfile (
+	char **		buffer)
 {
     if (!LYTrimStartfile(*buffer)) {
 	char *escaped = HTEscapeUnsafe(*buffer);
@@ -2662,8 +2662,8 @@ PUBLIC void LYEscapeStartfile ARGS1(
 /*
  * Trim all blanks from startfile, except for lynx internal URLs.
  */
-PUBLIC void LYTrimAllStartfile ARGS1(
-	char *,		buffer)
+void LYTrimAllStartfile (
+	char *		buffer)
 {
     if (!LYTrimStartfile(buffer)) {
 	LYRemoveBlanks(buffer);
@@ -2692,14 +2692,14 @@ PUBLIC void LYTrimAllStartfile ARGS1(
 #endif
 
 #ifdef ENHANCED_LINEEDIT
-PRIVATE char killbuffer[1024] = "\0";
+static char killbuffer[1024] = "\0";
 #endif
 
-PUBLIC void LYSetupEdit ARGS4(
-	EDREC *,	edit,
-	char *,		old,
-	int,		maxstr,
-	int,		maxdsp)
+void LYSetupEdit (
+	EDREC *	edit,
+	char *		old,
+	int		maxstr,
+	int		maxdsp)
 {
     /*
      *	Initialize edit record
@@ -2740,9 +2740,9 @@ PUBLIC void LYSetupEdit ARGS4(
 
 #ifdef SUPPORT_MULTIBYTE_EDIT
 
-PRIVATE int prev_pos ARGS2(
-	EDREC *,	edit,
-	int,		pos)
+static int prev_pos (
+	EDREC *	edit,
+	int		pos)
 {
     int i = 0;
 
@@ -2774,12 +2774,12 @@ static int map_active = 0;
 #define map_active 0
 #endif
 
-PUBLIC int LYEditInsert ARGS5(
-	EDREC *,	edit,
-	unsigned char *,s,
-	int,		len,
-	int,		map,
-	BOOL,		maxMessage)
+int LYEditInsert (
+	EDREC *	edit,
+	unsigned char *s,
+	int		len,
+	int		map,
+	BOOL		maxMessage)
 {
     int length = strlen(Buf);
     int remains = MaxLen - (length + len);
@@ -2886,11 +2886,11 @@ PUBLIC int LYEditInsert ARGS5(
     return edited;
 }
 
-PUBLIC int LYEdit1 ARGS4(
-	EDREC *,	edit,
-	int,		ch,
-	int,		action,
-	BOOL,		maxMessage)
+int LYEdit1 (
+	EDREC *	edit,
+	int		ch,
+	int		action,
+	BOOL		maxMessage)
 {   /* returns 0    character processed
      *         -ch  if action should be performed outside of line-editing mode
      *	       ch   otherwise
@@ -3316,10 +3316,10 @@ PUBLIC int LYEdit1 ARGS4(
 **  If a 'g' or 'p' suffix is included, that will be
 **  loaded into c.  Otherwise, c is zeroed. - FM & LE
 */
-PUBLIC int get_popup_number ARGS3(
-	char *,		msg,
-	int *,		c,
-	int *,		rel)
+int get_popup_number (
+	char *		msg,
+	int *		c,
+	int *		rel)
 {
     char temp[120];
     char *p = temp;
@@ -3383,8 +3383,8 @@ PUBLIC int get_popup_number ARGS3(
 #  define TmpStyleOff(s)
 #endif	/* defined USE_COLOR_STYLE */
 
-PUBLIC void LYRefreshEdit ARGS1(
-	EDREC *,	edit)
+void LYRefreshEdit (
+	EDREC *	edit)
 {
     int i;
     int length;
@@ -3611,9 +3611,9 @@ PUBLIC void LYRefreshEdit ARGS1(
     LYrefresh();
 }
 
-PRIVATE void reinsertEdit ARGS2(
-    EditFieldData *,	edit,
-    char *,		result)
+static void reinsertEdit (
+    EditFieldData *	edit,
+    char *		result)
 {
     if (result != 0) {
 	LYEdit1(edit, '\0', LYE_ERASE, FALSE);
@@ -3624,23 +3624,23 @@ PRIVATE void reinsertEdit ARGS2(
     }
 }
 
-PRIVATE int caselessCmpList ARGS2(
-    CONST void *,	a,
-    CONST void *,	b)
+static int caselessCmpList (
+    const void *	a,
+    const void *	b)
 {
-    return strcasecomp(*(CONST char *CONST *)a, *(CONST char *CONST *)b);
+    return strcasecomp(*(const char *const *)a, *(const char *const *)b);
 }
 
-PRIVATE int normalCmpList ARGS2(
-    CONST void *,	a,
-    CONST void *,	b)
+static int normalCmpList (
+    const void *	a,
+    const void *	b)
 {
-    return strcmp(*(CONST char *CONST *)a, *(CONST char *CONST *)b);
+    return strcmp(*(const char *const *)a, *(const char *const *)b);
 }
 
-PRIVATE char **sortedList ARGS2(
-    HTList *,	list,
-    BOOL,	ignorecase)
+static char **sortedList (
+    HTList *	list,
+    BOOL	ignorecase)
 {
     unsigned count = HTList_count(list);
     unsigned j = 0;
@@ -3678,8 +3678,8 @@ PRIVATE char **sortedList ARGS2(
     return result;
 }
 
-PUBLIC int LYarrayLength ARGS1(
-    CONST char **,	list)
+int LYarrayLength (
+    const char **	list)
 {
     int result = 0;
 
@@ -3688,8 +3688,8 @@ PUBLIC int LYarrayLength ARGS1(
     return result;
 }
 
-PUBLIC int LYarrayWidth ARGS1(
-    CONST char **,	list)
+int LYarrayWidth (
+    const char **	list)
 {
     int result = 0;
     int check;
@@ -3702,11 +3702,11 @@ PUBLIC int LYarrayWidth ARGS1(
     return result;
 }
 
-PRIVATE void FormatChoiceNum ARGS4(
-	char *,		dst,
-	int,		num_choices,
-	int,		choice,
-	CONST char *,	value)
+static void FormatChoiceNum (
+	char *		dst,
+	int		num_choices,
+	int		choice,
+	const char *	value)
 {
     if (num_choices >= 0) {
 	int digits = (num_choices > 9) ? 2 : 1;
@@ -3718,8 +3718,8 @@ PRIVATE void FormatChoiceNum ARGS4(
     }
 }
 
-PRIVATE unsigned options_width ARGS1(
-	CONST char **,	list)
+static unsigned options_width (
+	const char **	list)
 {
     unsigned width = 0;
     int count = 0;
@@ -3733,14 +3733,14 @@ PRIVATE unsigned options_width ARGS1(
     return width;
 }
 
-PRIVATE void draw_option ARGS7(
-    WINDOW *,		win,
-    int,		entry,
-    int,		width,
-    BOOL,		reversed,
-    int,		num_choices,
-    int,		number,
-    CONST char *,	value)
+static void draw_option (
+    WINDOW *		win,
+    int		entry,
+    int		width,
+    BOOL		reversed,
+    int		num_choices,
+    int		number,
+    const char *	value)
 {
     char Cnum[MAX_LINE];
 
@@ -3788,16 +3788,16 @@ PRIVATE void draw_option ARGS7(
  *  Also used for mouse popups with ncurses; this is indicated
  *  by for_mouse.
  */
-PUBLIC int LYhandlePopupList ARGS9(
-	int,		cur_choice,
-	int,		ly,
-	int,		lx,
-	CONST char **,	choices,
-	int,		width,
-	int,		i_length,
-	int,		disabled,
-	BOOLEAN,	for_mouse,
-	BOOLEAN,	numbered)
+int LYhandlePopupList (
+	int		cur_choice,
+	int		ly,
+	int		lx,
+	const char **	choices,
+	int		width,
+	int		i_length,
+	int		disabled,
+	BOOLEAN	for_mouse,
+	BOOLEAN	numbered)
 {
     int c = 0, cmd = 0, i = 0, j = 0, rel = 0;
     int orig_choice;
@@ -3822,7 +3822,7 @@ PUBLIC int LYhandlePopupList ARGS9(
     int number;
     char buffer[MAX_LINE];
     char *popup_status_msg = NULL;
-    CONST char **Cptr = NULL;
+    const char **Cptr = NULL;
 #define CAN_SCROLL_DOWN	1
 #define CAN_SCROLL_UP	2
 #define CAN_SCROLL	4
@@ -4719,11 +4719,11 @@ restore_popup_statusline:
 
 #define CurModif MyEdit.current_modifiers
 
-PUBLIC int LYgetstr ARGS4(
-	char *,		inputline,
-	int,		hidden,
-	size_t,		bufsize,
-	RecallType,	recall)
+int LYgetstr (
+	char *		inputline,
+	int		hidden,
+	size_t		bufsize,
+	RecallType	recall)
 {
     int x, y, MaxStringSize;
     int ch;
@@ -4823,7 +4823,7 @@ again:
 		    char **data = sortedList(list, (BOOL)(recall == RECALL_CMD));
 		    int old_y, old_x;
 		    int cur_choice = 0;
-		    int num_options = LYarrayLength((CONST char **)data);
+		    int num_options = LYarrayLength((const char **)data);
 
 		    while (cur_choice < num_options
 		     && strcasecomp(data[cur_choice], MyEdit.buffer) < 0)
@@ -4834,7 +4834,7 @@ again:
 			cur_choice,
 			0,
 			old_x,
-			(CONST char **)data,
+			(const char **)data,
 			-1,
 			-1,
 			FALSE,
@@ -4985,7 +4985,7 @@ again:
     }
 }
 
-PUBLIC CONST char * LYLineeditHelpURL NOARGS
+const char * LYLineeditHelpURL (void)
 {
     static int lasthelp_lineedit = -1;
     static char helpbuf[LY_MAXPATH] = "\0";
@@ -5011,9 +5011,9 @@ PUBLIC CONST char * LYLineeditHelpURL NOARGS
 /*
  *  A replacement for 'strsep()'
  */
-PUBLIC char *LYstrsep ARGS2(
-	char **,	stringp,
-	CONST char *,	delim)
+char *LYstrsep (
+	char **	stringp,
+	const char *	delim)
 {
     char *tmp, *out;
 
@@ -5037,9 +5037,9 @@ PUBLIC char *LYstrsep ARGS2(
  *  It returns NULL if string not found.
  *  It is a case insensitive search.
  */
-PUBLIC char * LYstrstr ARGS2(
-	char *,		chptr,
-	CONST char *,	tarptr)
+char * LYstrstr (
+	char *		chptr,
+	const char *	tarptr)
 {
     int len = strlen(tarptr);
 
@@ -5064,9 +5064,9 @@ PUBLIC char * LYstrstr ARGS2(
  *			       if present in chptr.
  *  It is a case insensitive search.
  */
-PUBLIC char * LYno_attr_char_case_strstr ARGS2(
-	char *,		chptr,
-	char *,		tarptr)
+char * LYno_attr_char_case_strstr (
+	char *		chptr,
+	char *		tarptr)
 {
     register char *tmpchptr, *tmptarptr;
 
@@ -5118,9 +5118,9 @@ PUBLIC char * LYno_attr_char_case_strstr ARGS2(
  *			       if present in chptr.
  *  It is a case sensitive search.
  */
-PUBLIC char * LYno_attr_char_strstr ARGS2(
-	char *,		chptr,
-	char *,		tarptr)
+char * LYno_attr_char_strstr (
+	char *		chptr,
+	char *		tarptr)
 {
     register char *tmpchptr, *tmptarptr;
 
@@ -5181,16 +5181,16 @@ PUBLIC char * LYno_attr_char_strstr ARGS2(
  * It assumes UTF8 if utf_flag is set.
  *  It is a case insensitive search. - KW & FM
  */
-PUBLIC char * LYno_attr_mbcs_case_strstr ARGS6(
-	char *,		chptr,
-	CONST char *,	tarptr,
-	BOOL,		utf_flag,
-	BOOL,		count_gcells,
-	int *,		nstartp,
-	int *,		nendp)
+char * LYno_attr_mbcs_case_strstr (
+	char *		chptr,
+	const char *	tarptr,
+	BOOL		utf_flag,
+	BOOL		count_gcells,
+	int *		nstartp,
+	int *		nendp)
 {
     char *tmpchptr;
-    CONST char *tmptarptr;
+    const char *tmptarptr;
     int len = 0;
     int offset;
 
@@ -5334,16 +5334,16 @@ PUBLIC char * LYno_attr_mbcs_case_strstr ARGS6(
  * It assumes UTF8 if utf_flag is set.
  *  It is a case sensitive search. - KW & FM
  */
-PUBLIC char * LYno_attr_mbcs_strstr ARGS6(
-	char *,		chptr,
-	CONST char *,	tarptr,
-	BOOL,		utf_flag,
-	BOOL,		count_gcells,
-	int *,		nstartp,
-	int *,		nendp)
+char * LYno_attr_mbcs_strstr (
+	char *		chptr,
+	const char *	tarptr,
+	BOOL		utf_flag,
+	BOOL		count_gcells,
+	int *		nstartp,
+	int *		nendp)
 {
     char *tmpchptr;
-    CONST char *tmptarptr;
+    const char *tmptarptr;
     int len = 0;
     int offset;
 
@@ -5464,10 +5464,10 @@ PUBLIC char * LYno_attr_mbcs_strstr ARGS6(
 /*
  *  Allocate a new copy of a string, and returns it.
  */
-PUBLIC char * SNACopy ARGS3(
-	char **,	dest,
-	CONST char *,	src,
-	int,		n)
+char * SNACopy (
+	char **	dest,
+	const char *	src,
+	int		n)
 {
     FREE(*dest);
     if (src) {
@@ -5485,10 +5485,10 @@ PUBLIC char * SNACopy ARGS3(
 /*
  *  String Allocate and Concatenate.
  */
-PUBLIC char * SNACat ARGS3(
-	char **,	dest,
-	CONST char *,	src,
-	int,		n)
+char * SNACat (
+	char **	dest,
+	const char *	src,
+	int		n)
 {
     if (non_empty(src)) {
 	if (*dest) {
@@ -5515,7 +5515,7 @@ PUBLIC char * SNACat ARGS3(
  * Returns lowercase equivalent for unicode,
  * transparent output if no equivalent found.
  */
-PRIVATE long UniToLowerCase ARGS1(long, upper)
+static long UniToLowerCase (long upper)
 {
     size_t i, high, low;
     long diff = 0;
@@ -5561,7 +5561,7 @@ PRIVATE long UniToLowerCase ARGS1(long, upper)
 **
 **   So use unicode case mapping.
 */
-PUBLIC int UPPER8 ARGS2(int,ch1, int,ch2)
+int UPPER8 (int ch1, int ch2)
 {
     /* if they are the same or one is a null characters return immediately. */
     if (ch1 == ch2)
@@ -5600,9 +5600,9 @@ PUBLIC int UPPER8 ARGS2(int,ch1, int,ch2)
  * that is allocated.  When an EOF or error is found, the buffer is freed
  * automatically.
  */
-PUBLIC char *LYSafeGets ARGS2(
-	char **,	src,
-	FILE *,		fp)
+char *LYSafeGets (
+	char **	src,
+	FILE *		fp)
 {
     char buffer[BUFSIZ];
     char *result = 0;
@@ -5634,12 +5634,12 @@ PUBLIC char *LYSafeGets ARGS2(
 }
 
 #ifdef EXP_CMD_LOGGING
-PRIVATE FILE *cmd_logfile;
-PRIVATE FILE *cmd_script;
+static FILE *cmd_logfile;
+static FILE *cmd_script;
 
-PUBLIC void LYOpenCmdLogfile ARGS2(
-	int,		argc,
-	char **,	argv)
+void LYOpenCmdLogfile (
+	int		argc,
+	char **	argv)
 {
     int n;
 
@@ -5655,12 +5655,12 @@ PUBLIC void LYOpenCmdLogfile ARGS2(
     }
 }
 
-PUBLIC BOOL LYHaveCmdScript NOARGS
+BOOL LYHaveCmdScript (void)
 {
     return (BOOL)(cmd_script != 0);
 }
 
-PUBLIC void LYOpenCmdScript NOARGS
+void LYOpenCmdScript (void)
 {
     if (lynx_cmd_script != 0) {
 	cmd_script = fopen(lynx_cmd_script, TXT_R);
@@ -5670,8 +5670,8 @@ PUBLIC void LYOpenCmdScript NOARGS
     }
 }
 
-PUBLIC int LYReadCmdKey ARGS1(
-	int,	mode)
+int LYReadCmdKey (
+	int	mode)
 {
     int ch = -1;
 
@@ -5731,15 +5731,15 @@ PUBLIC int LYReadCmdKey ARGS1(
 /*
  * Write a LYKeymapCode 'ch' to the logfile.
  */
-PUBLIC void LYWriteCmdKey ARGS1(
-	int,	ch)
+void LYWriteCmdKey (
+	int	ch)
 {
     if (cmd_logfile != 0) {
 	fprintf(cmd_logfile, "key %s\n", LYKeycodeToString(ch, FALSE));
     }
 }
 
-PUBLIC void LYCloseCmdLogfile NOARGS
+void LYCloseCmdLogfile (void)
 {
     if (cmd_logfile != 0) {
 	LYCloseOutput(cmd_logfile);
diff --git a/src/LYStrings.h b/src/LYStrings.h
index a834a8f3..7cc617e5 100644
--- a/src/LYStrings.h
+++ b/src/LYStrings.h
@@ -13,70 +13,70 @@ typedef enum {
 #define is8bits(ch) (UCH(ch) >= 128)	/* isascii(ch) is not POSIX */
 
 /*  UPPER8(ch1,ch2) is an extension of (TOUPPER(ch1) - TOUPPER(ch2))  */
-extern int UPPER8  PARAMS((
+extern int UPPER8  (
 	int		ch1,
-	int		ch2));
+	int		ch2);
 
-extern int get_mouse_link NOPARAMS;
-extern int peek_mouse_link NOPARAMS;
-extern int peek_mouse_levent NOPARAMS;
-extern int fancy_mouse PARAMS((WINDOW *win, int row, int *position));
+extern int get_mouse_link (void);
+extern int peek_mouse_link (void);
+extern int peek_mouse_levent (void);
+extern int fancy_mouse (WINDOW *win, int row, int *position);
 
-extern char * LYstrncpy PARAMS((
+extern char * LYstrncpy (
 	char *		dst,
-	CONST char *	src,
-	int		n));
-extern void ena_csi PARAMS((BOOLEAN flag));
-extern int get_popup_number PARAMS((
+	const char *	src,
+	int		n);
+extern void ena_csi (BOOLEAN flag);
+extern int get_popup_number (
 	char *		msg,
 	int *		c,
-	int *		rel));
-extern int LYarrayLength PARAMS((CONST char ** list));
-extern int LYarrayWidth PARAMS((CONST char ** list));
-extern int LYgetch NOPARAMS;
-extern int LYgetch_choice NOPARAMS;
-extern int LYgetch_input NOPARAMS;
-extern int LYgetch_single NOPARAMS;
-extern int LYgetstr PARAMS((
+	int *		rel);
+extern int LYarrayLength (const char ** list);
+extern int LYarrayWidth (const char ** list);
+extern int LYgetch (void);
+extern int LYgetch_choice (void);
+extern int LYgetch_input (void);
+extern int LYgetch_single (void);
+extern int LYgetstr (
 	char *		inputline,
 	int		hidden,
 	size_t		bufsize,
-	RecallType	recall));
-extern char *LYstrsep PARAMS((
+	RecallType	recall);
+extern char *LYstrsep (
 	char **		stringp,
-	CONST char *	delim));
-extern char * LYstrstr PARAMS((
+	const char *	delim);
+extern char * LYstrstr (
 	char *		chptr,
-	CONST char *	tarptr));
-extern char * LYmbcsstrncpy PARAMS((
+	const char *	tarptr);
+extern char * LYmbcsstrncpy (
 	char *		dst,
-	CONST char *	src,
+	const char *	src,
 	int		n_bytes,
 	int		n_glyphs,
-	BOOL		utf_flag));
-extern char * LYmbcs_skip_glyphs PARAMS((
+	BOOL		utf_flag);
+extern char * LYmbcs_skip_glyphs (
 	char *		data,
 	int		n_glyphs,
-	BOOL		utf_flag));
-extern int LYmbcsstrlen PARAMS((
+	BOOL		utf_flag);
+extern int LYmbcsstrlen (
 	char *		str,
 	BOOL		utf_flag,
-	BOOL		count_gcells));
+	BOOL		count_gcells);
 
-extern char * LYno_attr_mbcs_strstr PARAMS((
+extern char * LYno_attr_mbcs_strstr (
 	char *		chptr,
-	CONST char *	tarptr,
+	const char *	tarptr,
 	BOOL		utf_flag,
 	BOOL		count_gcells,
 	int *		nstartp,
-	int *		nendp));
-extern char * LYno_attr_mbcs_case_strstr PARAMS((
+	int *		nendp);
+extern char * LYno_attr_mbcs_case_strstr (
 	char *		chptr,
-	CONST char *	tarptr,
+	const char *	tarptr,
 	BOOL		utf_flag,
 	BOOL		count_gcells,
 	int *		nstartp,
-	int *		nendp));
+	int *		nendp);
 
 #define non_empty(s) !isEmpty(s)
 
@@ -85,38 +85,38 @@ extern char * LYno_attr_mbcs_case_strstr PARAMS((
 	    ? LYno_attr_mbcs_strstr(chptr, tarptr, utf_flag, count_gcells, nstartp, nendp) \
 	    : LYno_attr_mbcs_case_strstr(chptr, tarptr, utf_flag, count_gcells, nstartp, nendp))
 
-extern char * LYno_attr_char_strstr PARAMS((
+extern char * LYno_attr_char_strstr (
 	char *		chptr,
-	char *		tarptr));
-extern char * LYno_attr_char_case_strstr PARAMS((
+	char *		tarptr);
+extern char * LYno_attr_char_case_strstr (
 	char *		chptr,
-	char *		tarptr));
+	char *		tarptr);
 
 #define LYno_attr_strstr(chptr, tarptr) \
 	(case_sensitive \
 	? LYno_attr_char_strstr(chptr, tarptr) \
 	: LYno_attr_char_case_strstr(chptr, tarptr))
 
-extern char * SNACopy PARAMS((
+extern char * SNACopy (
 	char **		dest,
-	CONST char *	src,
-	int		n));
-extern char * SNACat PARAMS((
+	const char *	src,
+	int		n);
+extern char * SNACat (
 	char **		dest,
-	CONST char *	src,
-	int		n));
+	const char *	src,
+	int		n);
 #define StrnAllocCopy(dest, src, n)  SNACopy (&(dest), src, n)
 #define StrnAllocCat(dest, src, n)   SNACat  (&(dest), src, n)
 
-extern char *LYSafeGets PARAMS((char ** src, FILE * fp));
+extern char *LYSafeGets (char ** src, FILE * fp);
 
 #ifdef EXP_CMD_LOGGING
-extern BOOL LYHaveCmdScript NOPARAMS;
-extern int LYReadCmdKey PARAMS((int mode));
-extern void LYCloseCmdLogfile NOPARAMS;
-extern void LYOpenCmdLogfile PARAMS((int argc, char **argv));
-extern void LYOpenCmdScript NOPARAMS;
-extern void LYWriteCmdKey PARAMS((int ch));
+extern BOOL LYHaveCmdScript (void);
+extern int LYReadCmdKey (int mode);
+extern void LYCloseCmdLogfile (void);
+extern void LYOpenCmdLogfile (int argc, char **argv);
+extern void LYOpenCmdScript (void);
+extern void LYWriteCmdKey (int ch);
 #else
 #define LYHaveCmdScript() FALSE
 #define LYReadCmdKey(mode) LYgetch_for(mode)
@@ -287,88 +287,88 @@ typedef enum {
 
 
 #if defined(USE_KEYMAPS)
-extern int lynx_initialize_keymaps NOPARAMS;
-extern int map_string_to_keysym PARAMS((CONST char * src, int *lec));
+extern int lynx_initialize_keymaps (void);
+extern int map_string_to_keysym (const char * src, int *lec);
 #endif
 
-extern char *LYElideString PARAMS((
+extern char *LYElideString (
 	char *		str,
-	int		cut_pos));
-extern void LYEscapeStartfile PARAMS((
-	char **		buffer));
-extern void LYLowerCase PARAMS((
-	char *		buffer));
-extern void LYUpperCase PARAMS((
-	char *		buffer));
-extern BOOLEAN LYRemoveNewlines PARAMS((
-	char *		buffer));
-extern char * LYRemoveBlanks PARAMS((
-	char *		buffer));
-extern char * LYSkipBlanks PARAMS((
-	char *		buffer));
-extern char * LYSkipNonBlanks PARAMS((
-	char *		buffer));
-extern CONST char * LYSkipCBlanks PARAMS((
-	CONST char *	buffer));
-extern CONST char * LYSkipCNonBlanks PARAMS((
-	CONST char *	buffer));
-extern void LYTrimLeading PARAMS((
-	char *		buffer));
-extern char * LYTrimNewline PARAMS((
-	char *		buffer));
-extern void LYTrimTrailing PARAMS((
-	char *		buffer));
-extern void LYTrimAllStartfile PARAMS((
-	char *		buffer));
-extern BOOLEAN LYTrimStartfile PARAMS((
-	char *		buffer));
-extern void LYSetupEdit PARAMS((
+	int		cut_pos);
+extern void LYEscapeStartfile (
+	char **		buffer);
+extern void LYLowerCase (
+	char *		buffer);
+extern void LYUpperCase (
+	char *		buffer);
+extern BOOLEAN LYRemoveNewlines (
+	char *		buffer);
+extern char * LYRemoveBlanks (
+	char *		buffer);
+extern char * LYSkipBlanks (
+	char *		buffer);
+extern char * LYSkipNonBlanks (
+	char *		buffer);
+extern const char * LYSkipCBlanks (
+	const char *	buffer);
+extern const char * LYSkipCNonBlanks (
+	const char *	buffer);
+extern void LYTrimLeading (
+	char *		buffer);
+extern char * LYTrimNewline (
+	char *		buffer);
+extern void LYTrimTrailing (
+	char *		buffer);
+extern void LYTrimAllStartfile (
+	char *		buffer);
+extern BOOLEAN LYTrimStartfile (
+	char *		buffer);
+extern void LYSetupEdit (
 	EditFieldData *	edit,
 	char *		old,
 	int		maxstr,
-	int		maxdsp));
-extern void LYRefreshEdit PARAMS((
-	EditFieldData *	edit));
-extern int EditBinding PARAMS((int ch));		   /* in LYEditmap.c */
-extern BOOL LYRemapEditBinding PARAMS((
+	int		maxdsp);
+extern void LYRefreshEdit (
+	EditFieldData *	edit);
+extern int EditBinding (int ch);		   /* in LYEditmap.c */
+extern BOOL LYRemapEditBinding (
 	int		xlkc,
 	int		lec,
-	int 		select_edi));			   /* in LYEditmap.c */
-extern int LYKeyForEditAction PARAMS((int lec));	   /* in LYEditmap.c */
-extern int LYEditKeyForAction PARAMS((int lac, int *pmodkey));/* LYEditmap.c */
-extern int LYEdit1 PARAMS((
+	int 		select_edi);			   /* in LYEditmap.c */
+extern int LYKeyForEditAction (int lec);	   /* in LYEditmap.c */
+extern int LYEditKeyForAction (int lac, int *pmodkey);/* LYEditmap.c */
+extern int LYEdit1 (
 	EditFieldData *	edit,
 	int		ch,
 	int		action,
-	BOOL		maxMessage));
-extern void LYCloseCloset PARAMS((RecallType recall));
-extern int LYhandlePopupList PARAMS((
+	BOOL		maxMessage);
+extern void LYCloseCloset (RecallType recall);
+extern int LYhandlePopupList (
 	int		cur_choice,
 	int		ly,
 	int		lx,
-	CONST char **	choices,
+	const char **	choices,
 	int		width,
 	int		i_length,
 	int		disabled,
 	BOOLEAN		for_mouse,
-	BOOLEAN		numbered));
+	BOOLEAN		numbered);
 
 typedef unsigned char LYEditCode;
 
 extern int current_lineedit;
 extern char * LYLineeditNames[];
 extern LYEditCode * LYLineEditors[];
-extern CONST char * LYLineeditHelpURLs[];
+extern const char * LYLineeditHelpURLs[];
 
-extern CONST char * LYLineeditHelpURL NOPARAMS;
+extern const char * LYLineeditHelpURL (void);
 
 extern int escape_bound;
 
 #define LYLineEdit(e,c,m) LYEdit1(e,c,EditBinding(c)&~LYE_DF,m)
 
 /* Dummy initializer for LYEditmap.c */
-extern int LYEditmapDeclared NOPARAMS;
+extern int LYEditmapDeclared (void);
 
-int LYEditInsert PARAMS((EditFieldData *edit, unsigned char *s,	int len, int map_active, BOOL maxMessage));
+int LYEditInsert (EditFieldData *edit, unsigned char *s,	int len, int map_active, BOOL maxMessage);
 
 #endif /* LYSTRINGS_H */
diff --git a/src/LYStructs.h b/src/LYStructs.h
index 1fe9dc66..2bebe03d 100644
--- a/src/LYStructs.h
+++ b/src/LYStructs.h
@@ -127,12 +127,12 @@ extern lynx_list_item_type *externals;
 
 typedef struct
 {
-    CONST char *name;
+    const char *name;
     int value;
 }
 Config_Enum;
 
-typedef int (*ParseFunc) PARAMS((char *));
+typedef int (*ParseFunc) (char *);
 
 #define ParseUnionMembers \
 	lynx_list_item_type** add_value; \
diff --git a/src/LYStyle.c b/src/LYStyle.c
index 74d1b368..74e571e6 100644
--- a/src/LYStyle.c
+++ b/src/LYStyle.c
@@ -1,6 +1,6 @@
 /* character level styles for Lynx
  * (c) 1996 Rob Partington -- donated to the Lyncei (if they want it :-)
- * @Id: LYStyle.c 1.54 Mon, 19 Jan 2004 04:16:02 -0800 dickey @
+ * @Id: LYStyle.c 1.55 Tue, 27 Apr 2004 13:06:18 -0700 dickey @
  */
 #include <HTUtils.h>
 #include <HTML.h>
@@ -25,66 +25,66 @@
 
 #ifdef USE_COLOR_STYLE
 
-PRIVATE void style_initialiseHashTable NOPARAMS;
+static void style_initialiseHashTable (void);
 
 /* stack of attributes during page rendering */
-PUBLIC int last_styles[128] = { 0 };
-PUBLIC int last_colorattr_ptr = 0;
+int last_styles[128] = { 0 };
+int last_colorattr_ptr = 0;
 
-PUBLIC bucket hashStyles[CSHASHSIZE];
-PUBLIC bucket special_bucket =
+bucket hashStyles[CSHASHSIZE];
+bucket special_bucket =
 {
     "<special>", /* in order something to be in trace. */
     0, 0, 0, 0, NULL
 };
-PUBLIC bucket nostyle_bucket =
+bucket nostyle_bucket =
 {
     "<NOSTYLE>", /* in order something to be in trace. */
     0, 0, 0, 0, NULL
 };
 
-PUBLIC int cached_tag_styles[HTML_ELEMENTS];
-PUBLIC int current_tag_style;
-PUBLIC BOOL force_current_tag_style = FALSE;
-PUBLIC char* forced_classname;
-PUBLIC BOOL force_classname;
+int cached_tag_styles[HTML_ELEMENTS];
+int current_tag_style;
+BOOL force_current_tag_style = FALSE;
+char* forced_classname;
+BOOL force_classname;
 
 /* Remember the hash codes for common elements */
-PUBLIC int s_a			= NOSTYLE;
-PUBLIC int s_aedit		= NOSTYLE;
-PUBLIC int s_aedit_arr		= NOSTYLE;
-PUBLIC int s_aedit_pad		= NOSTYLE;
-PUBLIC int s_aedit_sel		= NOSTYLE;
-PUBLIC int s_alert		= NOSTYLE;
-PUBLIC int s_alink		= NOSTYLE;
-PUBLIC int s_curedit		= NOSTYLE;
-PUBLIC int s_forw_backw		= NOSTYLE;
-PUBLIC int s_hot_paste		= NOSTYLE;
-PUBLIC int s_menu_active	= NOSTYLE;
-PUBLIC int s_menu_bg		= NOSTYLE;
-PUBLIC int s_menu_entry		= NOSTYLE;
-PUBLIC int s_menu_frame		= NOSTYLE;
-PUBLIC int s_menu_number	= NOSTYLE;
-PUBLIC int s_menu_sb		= NOSTYLE;
-PUBLIC int s_normal		= NOSTYLE;
-PUBLIC int s_prompt_edit	= NOSTYLE;
-PUBLIC int s_prompt_edit_arr	= NOSTYLE;
-PUBLIC int s_prompt_edit_pad	= NOSTYLE;
-PUBLIC int s_prompt_sel		= NOSTYLE;
-PUBLIC int s_status		= NOSTYLE;
-PUBLIC int s_title		= NOSTYLE;
-PUBLIC int s_whereis		= NOSTYLE;
+int s_a			= NOSTYLE;
+int s_aedit		= NOSTYLE;
+int s_aedit_arr		= NOSTYLE;
+int s_aedit_pad		= NOSTYLE;
+int s_aedit_sel		= NOSTYLE;
+int s_alert		= NOSTYLE;
+int s_alink		= NOSTYLE;
+int s_curedit		= NOSTYLE;
+int s_forw_backw		= NOSTYLE;
+int s_hot_paste		= NOSTYLE;
+int s_menu_active	= NOSTYLE;
+int s_menu_bg		= NOSTYLE;
+int s_menu_entry		= NOSTYLE;
+int s_menu_frame		= NOSTYLE;
+int s_menu_number	= NOSTYLE;
+int s_menu_sb		= NOSTYLE;
+int s_normal		= NOSTYLE;
+int s_prompt_edit	= NOSTYLE;
+int s_prompt_edit_arr	= NOSTYLE;
+int s_prompt_edit_pad	= NOSTYLE;
+int s_prompt_sel		= NOSTYLE;
+int s_status		= NOSTYLE;
+int s_title		= NOSTYLE;
+int s_whereis		= NOSTYLE;
 
 #ifdef USE_SCROLLBAR
-PUBLIC int s_sb_aa		= NOSTYLE;
-PUBLIC int s_sb_bar		= NOSTYLE;
-PUBLIC int s_sb_bg		= NOSTYLE;
-PUBLIC int s_sb_naa		= NOSTYLE;
+int s_sb_aa		= NOSTYLE;
+int s_sb_bar		= NOSTYLE;
+int s_sb_bg		= NOSTYLE;
+int s_sb_naa		= NOSTYLE;
 #endif
 
 /* start somewhere safe */
 #define MAX_COLOR 16
-PRIVATE int colorPairs = 0;
+static int colorPairs = 0;
 
 #ifdef USE_BLINK
 #  define MAX_BLINK	2
@@ -94,7 +94,7 @@ PRIVATE int colorPairs = 0;
 #  define M_BLINK	0
 #endif
 
-PRIVATE unsigned char our_pairs[2]
+static unsigned char our_pairs[2]
 				[MAX_BLINK]
 				[MAX_COLOR + 1]
 				[MAX_COLOR + 1];
@@ -102,11 +102,11 @@ PRIVATE unsigned char our_pairs[2]
 /*
  * Parse a string containing a combination of video attributes and color.
  */
-PRIVATE void parse_either ARGS4(
-    char *,	attrs,
-    int,	dft_color,
-    int *,	monop,
-    int *,	colorp)
+static void parse_either (
+    char *	attrs,
+    int	dft_color,
+    int *	monop,
+    int *	colorp)
 {
     int value;
 
@@ -131,12 +131,12 @@ PRIVATE void parse_either ARGS4(
 }
 
 /* icky parsing of the style options */
-PRIVATE void parse_attributes ARGS5(
-    char *,	mono,
-    char *,	fg,
-    char *,	bg,
-    int,	style,
-    char *,	element)
+static void parse_attributes (
+    char *	mono,
+    char *	fg,
+    char *	bg,
+    int	style,
+    char *	element)
 {
     int mA = A_NORMAL;
     int fA = default_fg;
@@ -224,7 +224,7 @@ PRIVATE void parse_attributes ARGS5(
 /* parse a style option of the format
  * STYLE:<OBJECT>:FG:BG
  */
-PRIVATE void parse_style ARGS1(char*, param)
+static void parse_style (char* param)
 {
     static struct {
 	char *name;
@@ -359,7 +359,7 @@ where OBJECT is one of EM,STRONG,B,I,U,BLINK etc.\n\n"), buffer);
 }
 
 #ifdef LY_FIND_LEAKS
-PRIVATE void free_colorstylestuff NOARGS
+static void free_colorstylestuff (void)
 {
     style_initialiseHashTable();
     style_deleteStyleList();
@@ -370,9 +370,9 @@ PRIVATE void free_colorstylestuff NOARGS
  * initialise the default style sheet
  * This should be able to be read from a file in CSS format :-)
  */
-PRIVATE void initialise_default_stylesheet NOARGS
+static void initialise_default_stylesheet (void)
 {
-    static CONST char *table[] = {
+    static const char *table[] = {
 	"a:bold:green",
 	"alert:bold:yellow:red",
 	"alink:reverse:yellow:black",
@@ -390,7 +390,7 @@ PRIVATE void initialise_default_stylesheet NOARGS
 }
 
 /* Set all the buckets in the hash table to be empty */
-PRIVATE void style_initialiseHashTable NOARGS
+static void style_initialiseHashTable (void)
 {
     int i;
     static int firsttime = 1;
@@ -428,9 +428,9 @@ PRIVATE void style_initialiseHashTable NOARGS
  * need to remember the STYLE: lines we encounter and parse them
  * after curses has started
  */
-PRIVATE HTList *lss_styles = NULL;
+static HTList *lss_styles = NULL;
 
-PUBLIC void parse_userstyles NOARGS
+void parse_userstyles (void)
 {
     char *name;
     HTList *cur = lss_styles;
@@ -471,7 +471,7 @@ PUBLIC void parse_userstyles NOARGS
 /* Add a STYLE: option line to our list.  Process "default:" early
    for it to have the same semantic as other lines: works at any place
    of the style file, the first line overrides the later ones. */
-PRIVATE void HStyle_addStyle ARGS1(char*, buffer)
+static void HStyle_addStyle (char* buffer)
 {
     char *name = NULL;
 
@@ -493,7 +493,7 @@ PRIVATE void HStyle_addStyle ARGS1(char*, buffer)
     HTList_addObject (lss_styles, name);
 }
 
-PUBLIC void style_deleteStyleList NOARGS
+void style_deleteStyleList (void)
 {
     char *name;
     while ((name = HTList_removeLastObject(lss_styles)) != NULL)
@@ -502,9 +502,9 @@ PUBLIC void style_deleteStyleList NOARGS
     lss_styles = NULL;
 }
 
-PRIVATE int style_readFromFileREC ARGS2(
-    char *,	lss_filename,
-    char *,	parent_filename)
+static int style_readFromFileREC (
+    char *	lss_filename,
+    char *	parent_filename)
 {
     FILE *fh;
     char *buffer = NULL;
@@ -540,17 +540,17 @@ PRIVATE int style_readFromFileREC ARGS2(
     return 0;
 }
 
-PUBLIC int style_readFromFile ARGS1(char*, filename)
+int style_readFromFile (char* filename)
 {
     return style_readFromFileREC(filename, (char *)0);
 }
 
 /* Used in HTStructured methods: - kw */
 
-PUBLIC void TrimColorClass ARGS3(
-    CONST char *,	tagname,
-    char *,		styleclassname,
-    int *,		phcode)
+void TrimColorClass (
+    const char *	tagname,
+    char *		styleclassname,
+    int *		phcode)
 {
     char *end, *start=NULL, *lookfrom;
     char tmp[64];
@@ -578,12 +578,12 @@ PUBLIC void TrimColorClass ARGS3(
 /* This function is designed as faster analog to TrimColorClass.
    It assumes that tag_name is present in stylename! -HV
 */
-PUBLIC void FastTrimColorClass ARGS5 (
-	    CONST char*,	 tag_name,
-	    int,		 name_len,
-	    char*,		 stylename,
-	    char**,		 pstylename_end,/*will be modified*/
-	    int*,		 phcode)	/*will be modified*/
+void FastTrimColorClass (
+	    const char*	 tag_name,
+	    int		 name_len,
+	    char*		 stylename,
+	    char**		 pstylename_end,/*will be modified*/
+	    int*		 phcode)	/*will be modified*/
 {
     char* tag_start = *pstylename_end;
     BOOLEAN found = FALSE;
@@ -612,7 +612,7 @@ PUBLIC void FastTrimColorClass ARGS5 (
  /* This is called each time lss styles are read. It will fill
     each elt of 'cached_tag_styles' -HV
  */
-PUBLIC void cache_tag_styles NOARGS
+void cache_tag_styles (void)
 {
     char buf[200];
     int i;
diff --git a/src/LYStyle.h b/src/LYStyle.h
index 66f87127..52357a64 100644
--- a/src/LYStyle.h
+++ b/src/LYStyle.h
@@ -9,7 +9,7 @@
 #include <HTMLDTD.h>
 
 /* list of elements */
-extern CONST SGML_dtd HTML_dtd;
+extern const SGML_dtd HTML_dtd;
 
 /* array of currently set styles */
 extern HTCharStyle displayStyles[DSTYLE_ELEMENTS];
@@ -18,18 +18,18 @@ extern HTCharStyle displayStyles[DSTYLE_ELEMENTS];
 extern int lynx_has_color;
 
 /* Set all the buckets in the hash table to be empty */
-extern void parse_userstyles NOPARAMS;
+extern void parse_userstyles (void);
 
-extern void style_deleteStyleList NOPARAMS;
+extern void style_deleteStyleList (void);
 
-extern void style_defaultStyleSheet NOPARAMS;
+extern void style_defaultStyleSheet (void);
 
-extern int style_readFromFile PARAMS((char* file));
+extern int style_readFromFile (char* file);
 
-extern void TrimColorClass PARAMS((
-    CONST char *	tagname,
+extern void TrimColorClass (
+    const char *	tagname,
     char *		styleclassname,
-    int *		phcode));
+    int *		phcode);
 
  /* this is an array of styles for tags that don't specify 'class' - the
     values from that array will be suggested by SGML.c by setting the
@@ -52,16 +52,16 @@ extern char* forced_classname; /* if force_current_tag_style =TRUE, then here
 
  /* This is called each time lss styles are read. It will fill
     each elt of 'cached_tag_styles' -HV */
-extern void cache_tag_styles NOPARAMS;
+extern void cache_tag_styles (void);
  /* this is global var - it can be used for reading the end of string found
    during last invokation of TrimColorClass.
  */
-extern void FastTrimColorClass PARAMS ((
-	    CONST char*		 tag_name,
+extern void FastTrimColorClass (
+	    const char*		 tag_name,
 	    int			 name_len,
 	    char*		 stylename,
 	    char**		 pstylename_end,
-	    int*		 hcode));
+	    int*		 hcode);
 
 #endif /* USE_COLOR_STYLE */
 
diff --git a/src/LYTraversal.c b/src/LYTraversal.c
index 3beb48d0..74becae2 100644
--- a/src/LYTraversal.c
+++ b/src/LYTraversal.c
@@ -11,7 +11,7 @@
 
 /* routines to handle special traversal feature */
 
-PRIVATE void final_perror ARGS2(CONST char *,msg, BOOLEAN, clean_flag)
+static void final_perror (const char *msg, BOOLEAN clean_flag)
 {
     int saved_errno = errno;
     if (LYCursesON) {
@@ -24,13 +24,13 @@ PRIVATE void final_perror ARGS2(CONST char *,msg, BOOLEAN, clean_flag)
     perror(msg);
 }
 
-PRIVATE void exit_with_perror ARGS1(CONST char *,msg)
+static void exit_with_perror (const char *msg)
 {
     final_perror(msg, TRUE);
     exit_immediately(EXIT_FAILURE);
 }
 
-PUBLIC BOOLEAN lookup ARGS1(char *,target)
+BOOLEAN lookup (char *target)
 {
     FILE *ifp;
     char *buffer = NULL;
@@ -61,7 +61,7 @@ PUBLIC BOOLEAN lookup ARGS1(char *,target)
     return (BOOL) (result);
 }
 
-PUBLIC void add_to_table ARGS1(char *,target)
+void add_to_table (char *target)
 {
 
     FILE *ifp;
@@ -75,7 +75,7 @@ PUBLIC void add_to_table ARGS1(char *,target)
     LYCloseOutput(ifp);
 }
 
-PUBLIC void add_to_traverse_list ARGS2(char *,fname, char *,prev_link_name)
+void add_to_traverse_list (char *fname, char *prev_link_name)
 {
 
     FILE *ifp;
@@ -89,7 +89,7 @@ PUBLIC void add_to_traverse_list ARGS2(char *,fname, char *,prev_link_name)
     LYCloseOutput(ifp);
 }
 
-PUBLIC void dump_traversal_history NOARGS
+void dump_traversal_history (void)
 {
     int x;
     FILE *ifp;
@@ -113,7 +113,7 @@ PUBLIC void dump_traversal_history NOARGS
     LYCloseOutput(ifp);
 }
 
-PUBLIC void add_to_reject_list ARGS1(char *,target)
+void add_to_reject_list (char *target)
 {
 
     FILE *ifp;
@@ -136,7 +136,7 @@ PUBLIC void add_to_reject_list ARGS1(char *,target)
    everything" it shouldn't come up much!
  */
 
-PUBLIC BOOLEAN lookup_reject ARGS1(char *,target)
+BOOLEAN lookup_reject (char *target)
 {
     FILE *ifp;
     char *buffer = NULL;
diff --git a/src/LYTraversal.h b/src/LYTraversal.h
index 052570d3..2bfc937d 100644
--- a/src/LYTraversal.h
+++ b/src/LYTraversal.h
@@ -4,14 +4,14 @@
 #define TRAVERSAL_H
 
 #ifndef HTUTILS_H
-#include <HTUtils.h>            /* BOOL, PARAMS, ARGS */
+#include <HTUtils.h>            /* BOOL, ARGS */
 #endif
 
-extern BOOLEAN lookup PARAMS((char * target));
-extern void add_to_table PARAMS((char * target));
-extern void add_to_traverse_list PARAMS((char * fname, char * prev_link_name));
-extern void dump_traversal_history NOPARAMS;
-extern void add_to_reject_list PARAMS((char * target));
-extern BOOLEAN lookup_reject PARAMS((char * target));
+extern BOOLEAN lookup (char * target);
+extern void add_to_table (char * target);
+extern void add_to_traverse_list (char * fname, char * prev_link_name);
+extern void dump_traversal_history (void);
+extern void add_to_reject_list (char * target);
+extern BOOLEAN lookup_reject (char * target);
 
 #endif /* TRAVERSAL_H */
diff --git a/src/LYUpload.c b/src/LYUpload.c
index d8b0d10d..2aa18ccb 100644
--- a/src/LYUpload.c
+++ b/src/LYUpload.c
@@ -38,8 +38,8 @@
  *  that looks like:
  *	LYNXDIRED://UPLOAD=<#>/TO=<STRING>
  */
-PUBLIC int LYUpload ARGS1(
-	char *, 	line)
+int LYUpload (
+	char * 	line)
 {
     char *method, *directory;
     int method_number;
@@ -174,9 +174,9 @@ cancelled:
  *  they select all other links.  Upload links look like:
  *	LYNXDIRED://UPLOAD=<#>/TO=<STRING>
  */
-PUBLIC int LYUpload_options ARGS2(
-	char **,	newfile,
-	char *, 	directory)
+int LYUpload_options (
+	char **	newfile,
+	char * 	directory)
 {
     static char tempfile[LY_MAXPATH];
     FILE *fp0;
diff --git a/src/LYUpload.h b/src/LYUpload.h
index 563c063e..46939b67 100644
--- a/src/LYUpload.h
+++ b/src/LYUpload.h
@@ -6,8 +6,8 @@
 #include <LYStructs.h>
 #endif /* LYSTRUCTS_H */
 
-extern int LYUpload PARAMS((char *line));
-extern int LYUpload_options PARAMS((char **newfile, char *directory));
+extern int LYUpload (char *line);
+extern int LYUpload_options (char **newfile, char *directory);
 
 #endif /* LYUPLOAD_H */
 
diff --git a/src/LYUtils.c b/src/LYUtils.c
index 869ebf14..b1fb9527 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -103,8 +103,8 @@ extern int exec_command(char * cmd, int wait_flag); /* xsystem.c */
 #endif
 
 #ifdef SVR4_BSDSELECT
-extern int BSDselect PARAMS((int nfds, fd_set * readfds, fd_set * writefds,
-			     fd_set * exceptfds, struct timeval * timeout));
+extern int BSDselect (int nfds, fd_set * readfds, fd_set * writefds,
+			     fd_set * exceptfds, struct timeval * timeout);
 #ifdef select
 #undef select
 #endif /* select */
@@ -147,10 +147,10 @@ extern int BSDselect PARAMS((int nfds, fd_set * readfds, fd_set * writefds,
 
 #define COPY_COMMAND "%s %s %s"
 
-PRIVATE HTList * localhost_aliases = NULL;	/* Hosts to treat as local */
-PRIVATE char *HomeDir = NULL;			/* HOME directory */
+static HTList * localhost_aliases = NULL;	/* Hosts to treat as local */
+static char *HomeDir = NULL;			/* HOME directory */
 
-PUBLIC	HTList * sug_filenames = NULL;		/* Suggested filenames	 */
+HTList * sug_filenames = NULL;		/* Suggested filenames	 */
 
 /*
  * Maintain a list of all of the temp-files we create so that we can remove
@@ -163,9 +163,9 @@ typedef struct _LYTemp {
     FILE *file;
 } LY_TEMP;
 
-PRIVATE LY_TEMP *ly_temp;
+static LY_TEMP *ly_temp;
 
-PRIVATE LY_TEMP *FindTempfileByName ARGS1(CONST char *, name)
+static LY_TEMP *FindTempfileByName (const char * name)
 {
     LY_TEMP *p;
 
@@ -177,7 +177,7 @@ PRIVATE LY_TEMP *FindTempfileByName ARGS1(CONST char *, name)
     return p;
 }
 
-PRIVATE LY_TEMP *FindTempfileByFP ARGS1(FILE *, fp)
+static LY_TEMP *FindTempfileByFP (FILE * fp)
 {
     LY_TEMP *p;
 
@@ -192,7 +192,7 @@ PRIVATE LY_TEMP *FindTempfileByFP ARGS1(FILE *, fp)
 /*
  * Get an environment variable, rejecting empty strings
  */
-PUBLIC char *LYGetEnv ARGS1(CONST char *, name)
+char *LYGetEnv (const char * name)
 {
     char *result = getenv(name);
     return non_empty(result) ? result : 0;
@@ -204,7 +204,7 @@ PUBLIC char *LYGetEnv ARGS1(CONST char *, name)
  * sensitive operations with charset names, HTML tags etc.
  */
 #ifdef EXP_ASCII_CTYPES
-PUBLIC int ascii_tolower ARGS1(int, i)
+int ascii_tolower (int i)
 {
     if ( 91 > i && i > 64 )
 	return (i+32);
@@ -212,7 +212,7 @@ PUBLIC int ascii_tolower ARGS1(int, i)
 	return i;
 }
 
-PUBLIC int ascii_toupper ARGS1(int, i)
+int ascii_toupper (int i)
 {
     if ( 123 > i && i > 96 )
 	return (i-32);
@@ -220,7 +220,7 @@ PUBLIC int ascii_toupper ARGS1(int, i)
 	return i;
 }
 
-PUBLIC int ascii_isupper ARGS1(int, i)
+int ascii_isupper (int i)
 {
     if ( 91 > i && i > 64 )
 	return 1;
@@ -233,9 +233,9 @@ PUBLIC int ascii_isupper ARGS1(int, i)
  * Check for UTF-8 data, returning the length past the first character.
  * Return zero if we found an ordinary character rather than UTF-8.
  */
-PUBLIC size_t utf8_length ARGS2(
-	BOOL,		utf_flag,
-	CONST char *,	data)
+size_t utf8_length (
+	BOOL		utf_flag,
+	const char *	data)
 {
     size_t utf_extra = 0;
 
@@ -269,9 +269,9 @@ PUBLIC size_t utf8_length ARGS2(
 /*
  * Set the initial highlight information for a given link.
  */
-PUBLIC void LYSetHilite ARGS2(
-	int,		cur,
-	char *,		text)
+void LYSetHilite (
+	int		cur,
+	char *		text)
 {
     links[cur].list.hl_base.hl_text = text;
     links[cur].list.hl_len = (text != NULL) ? 1 : 0;
@@ -281,10 +281,10 @@ PUBLIC void LYSetHilite ARGS2(
 /*
  * Add highlight information for the next line of a link.
  */
-PUBLIC void LYAddHilite ARGS3(
-	int,		cur,
-	char *,		text,
-	int,		x)
+void LYAddHilite (
+	int		cur,
+	char *		text,
+	int		x)
 {
     HiliteList *list = &(links[cur].list);
     HiliteInfo *have = list->hl_info;
@@ -304,9 +304,9 @@ PUBLIC void LYAddHilite ARGS3(
 /*
  * Get the highlight text, counting from zero.
  */
-PUBLIC char *LYGetHiliteStr ARGS2(
-	int,		cur,
-	int,		count)
+char *LYGetHiliteStr (
+	int		cur,
+	int		count)
 {
     char *result;
 
@@ -322,9 +322,9 @@ PUBLIC char *LYGetHiliteStr ARGS2(
 /*
  * Get the X-ordinate at which to draw the corresponding highlight-text
  */
-PUBLIC int LYGetHilitePos ARGS2(
-	int,		cur,
-	int,		count)
+int LYGetHilitePos (
+	int		cur,
+	int		count)
 {
     int result;
 
@@ -359,13 +359,13 @@ PUBLIC int LYGetHilitePos ARGS2(
  * with all IsSpecial characters stripped, so we don't need to deal with them
  * here.  -FM
  */
-PRIVATE BOOL show_whereis_targets ARGS6(
-	int,	flag,
-	int,	cur,
-	int,	count,
-	char *,	target,
-	BOOL,	TargetEmphasisON,
-	BOOL,	utf_flag)
+static BOOL show_whereis_targets (
+	int	flag,
+	int	cur,
+	int	count,
+	char *	target,
+	BOOL	TargetEmphasisON,
+	BOOL	utf_flag)
 {
     char *Data = NULL;
     char *cp;
@@ -924,9 +924,9 @@ highlight_search_done:
 #endif /* SHOW_WHEREIS_TARGETS */
 
 #ifdef USE_COLOR_STYLE
-PRIVATE int find_cached_style ARGS2(
-	int,	cur,
-	int,	flag)
+static int find_cached_style (
+	int	cur,
+	int	flag)
 {
     int s = s_alink;
 
@@ -984,10 +984,10 @@ PRIVATE int find_cached_style ARGS2(
 /*
  *  Highlight (or unhighlight) a given link.
  */
-PUBLIC void LYhighlight ARGS3(
-	int,		flag,
-	int,		cur,
-	char *,		target)
+void LYhighlight (
+	int		flag,
+	int		cur,
+	char *		target)
 {
     char buffer[MAX_LINE];
     int i;
@@ -1159,8 +1159,8 @@ PUBLIC void LYhighlight ARGS3(
  *  free_and_clear will free a pointer if it
  *  is non-zero and then set it to zero.
  */
-PUBLIC void free_and_clear ARGS1(
-	char **,	pointer)
+void free_and_clear (
+	char **	pointer)
 {
     if (*pointer) {
 	FREE(*pointer);
@@ -1176,9 +1176,9 @@ PUBLIC void free_and_clear ARGS1(
  *  the condense argument is FALSE, otherwise, condense any serial spaces
  *  or tabs to one space. - FM
  */
-PUBLIC void convert_to_spaces ARGS2(
-	char *,		string,
-	BOOL,		condense)
+void convert_to_spaces (
+	char *		string,
+	BOOL		condense)
 {
     char *s = string;
     char *ns;
@@ -1222,8 +1222,8 @@ PUBLIC void convert_to_spaces ARGS2(
 /*
  *  Strip trailing slashes from directory paths.
  */
-PUBLIC char * strip_trailing_slash ARGS1(
-	char *,		dirname)
+char * strip_trailing_slash (
+	char *		dirname)
 {
     int i;
 
@@ -1238,8 +1238,8 @@ PUBLIC char * strip_trailing_slash ARGS1(
  */
 BOOLEAN mustshow = FALSE;
 
-PUBLIC void statusline ARGS1(
-	CONST char *,	text)
+void statusline (
+	const char *	text)
 {
     char buffer[MAX_LINE];
     unsigned char *temp = NULL;
@@ -1288,13 +1288,13 @@ PUBLIC void statusline ARGS1(
 	if ((temp = typecallocn(unsigned char, strlen(text_buff) + 1)) == NULL)
 	    outofmem(__FILE__, "statusline");
 	if (kanji_code == EUC) {
-	    TO_EUC((CONST unsigned char *)text_buff, temp);
+	    TO_EUC((const unsigned char *)text_buff, temp);
 	} else if (kanji_code == SJIS) {
 #ifdef KANJI_CODE_OVERRIDE
 	    if (!LYRawMode || last_kcode == SJIS)
 		strcpy(temp, text_buff);
 	    else
-		TO_SJIS((CONST unsigned char *)text_buff, temp);
+		TO_SJIS((const unsigned char *)text_buff, temp);
 #else
 	    strcpy((char *) temp, text_buff);
 #endif
@@ -1424,8 +1424,8 @@ PUBLIC void statusline ARGS1(
     return;
 }
 
-PRIVATE char *novice_lines ARGS1(
-	int,		lineno)
+static char *novice_lines (
+	int		lineno)
 {
     switch (lineno) {
     case 0:
@@ -1441,7 +1441,7 @@ PRIVATE char *novice_lines ARGS1(
 
 static int lineno = 0;
 
-PUBLIC void toggle_novice_line NOARGS
+void toggle_novice_line (void)
 {
 	lineno++;
 	if (*novice_lines(lineno) == '\0')
@@ -1449,8 +1449,8 @@ PUBLIC void toggle_novice_line NOARGS
 	return;
 }
 
-PUBLIC void noviceline ARGS1(
-	int,		more_flag GCC_UNUSED)
+void noviceline (
+	int		more_flag GCC_UNUSED)
 {
 
     if (dump_output_immediately)
@@ -1484,8 +1484,8 @@ PUBLIC void noviceline ARGS1(
  *  is possible - actually, currently only checks if fd is connected
  *  to a tty. - kw
  */
-PUBLIC int LYConsoleInputFD ARGS1(
-    BOOLEAN,		need_selectable)
+int LYConsoleInputFD (
+    BOOLEAN		need_selectable)
 {
     int fd = INVSOC;
 #ifdef USE_SLANG
@@ -1513,10 +1513,10 @@ PUBLIC int LYConsoleInputFD ARGS1(
 }
 #endif /* NSL_FORK || MISC_EXP */
 
-PRIVATE int fake_zap = 0;
+static int fake_zap = 0;
 
-PUBLIC void LYFakeZap ARGS1(
-    BOOL,	set)
+void LYFakeZap (
+    BOOL	set)
 {
     if (set && fake_zap < 1) {
 	CTRACE((tfp, "\r *** Set simulated 'Z'"));
@@ -1533,7 +1533,7 @@ PUBLIC void LYFakeZap ARGS1(
 
 }
 
-PRIVATE int DontCheck NOARGS
+static int DontCheck (void)
 {
     static long last;
     long next;
@@ -1570,7 +1570,7 @@ PRIVATE int DontCheck NOARGS
     return FALSE;
 }
 
-PUBLIC int HTCheckForInterrupt NOARGS
+int HTCheckForInterrupt (void)
 {
     int c;
     int cmd;
@@ -1799,8 +1799,8 @@ PUBLIC int HTCheckForInterrupt NOARGS
  * Check if the given filename looks like it's an absolute pathname, i.e.,
  * references a directory.
  */
-PUBLIC BOOLEAN LYisAbsPath ARGS1(
-	CONST char *,	path)
+BOOLEAN LYisAbsPath (
+	const char *	path)
 {
     BOOLEAN result = FALSE;
     if (non_empty(path)) {
@@ -1822,8 +1822,8 @@ PUBLIC BOOLEAN LYisAbsPath ARGS1(
 /*
  * Check if the given filename is the root path, e.g., "/" on Unix.
  */
-PUBLIC BOOLEAN LYisRootPath ARGS1(
-	CONST char *,		path)
+BOOLEAN LYisRootPath (
+	const char *		path)
 {
 #if defined(USE_DOS_DRIVES)
     if (strlen(path) == 3
@@ -1838,8 +1838,8 @@ PUBLIC BOOLEAN LYisRootPath ARGS1(
  *  A file URL for a remote host is an obsolete ftp URL.
  *  Return YES only if we're certain it's a local file. - FM
  */
-PUBLIC BOOLEAN LYisLocalFile ARGS1(
-	CONST char *,		filename)
+BOOLEAN LYisLocalFile (
+	const char *		filename)
 {
     char *host = NULL;
     char *acc_method = NULL;
@@ -1876,8 +1876,8 @@ PUBLIC BOOLEAN LYisLocalFile ARGS1(
  *  Utility for checking URLs with a host field.
  *  Return YES only if we're certain it's the local host. - FM
  */
-PUBLIC BOOLEAN LYisLocalHost ARGS1(
-	CONST char *,		filename)
+BOOLEAN LYisLocalHost (
+	const char *		filename)
 {
     char *host = NULL;
     char *cp;
@@ -1908,7 +1908,7 @@ PUBLIC BOOLEAN LYisLocalHost ARGS1(
 /*
  *  Utility for freeing the list of local host aliases. - FM
  */
-PUBLIC void LYLocalhostAliases_free NOARGS
+void LYLocalhostAliases_free (void)
 {
     char *alias;
     HTList *cur = localhost_aliases;
@@ -1927,8 +1927,8 @@ PUBLIC void LYLocalhostAliases_free NOARGS
 /*
  *  Utility for listing hosts to be treated as local aliases. - FM
  */
-PUBLIC void LYAddLocalhostAlias ARGS1(
-	char *,		alias)
+void LYAddLocalhostAlias (
+	char *		alias)
 {
     char *LocalAlias = NULL;
 
@@ -1952,8 +1952,8 @@ PUBLIC void LYAddLocalhostAlias ARGS1(
  *  Utility for checking URLs with a host field.
  *  Return YES only if we've listed the host as a local alias. - FM
  */
-PUBLIC BOOLEAN LYisLocalAlias ARGS1(
-	CONST char *,		filename)
+BOOLEAN LYisLocalAlias (
+	const char *		filename)
 {
     char *host = NULL;
     char *alias;
@@ -1994,8 +1994,8 @@ PUBLIC BOOLEAN LYisLocalAlias ARGS1(
 **  it returns UNKNOWN_URL_TYPE.  Otherwise, it returns
 **  0 (not a URL). - FM
 */
-PUBLIC int LYCheckForProxyURL ARGS1(
-	char *,		filename)
+int LYCheckForProxyURL (
+	char *		filename)
 {
     char *cp = filename;
     char *cp1;
@@ -2048,10 +2048,10 @@ PUBLIC int LYCheckForProxyURL ARGS1(
  * Compare a "type:" string, replacing it by the comparison-string if it
  * matches (and return true in that case).
  */
-static BOOLEAN compare_type ARGS3(
-	char *,		tst,
-	CONST char *,	cmp,
-	size_t,		len)
+static BOOLEAN compare_type (
+	char *		tst,
+	const char *	cmp,
+	size_t		len)
 {
     if (!strncasecomp(tst, cmp, len)) {
 	if (strncmp(tst, cmp, len)) {
@@ -2082,8 +2082,8 @@ static BOOLEAN compare_type ARGS3(
 **  Chains to LYCheckForProxyURL() if a colon
 **  is present but the type is not recognized.
 */
-PUBLIC int is_url ARGS1(
-	char *,		filename)
+int is_url (
+	char *		filename)
 {
     char *cp = filename;
     char *cp1;
@@ -2422,8 +2422,8 @@ PUBLIC int is_url ARGS1(
  *  dumping immediately.  Calling this will 'fix' it, but may not
  *  always be appropriate. - kw
  */
-PUBLIC void LYFixCursesOn ARGS1(
-    CONST char *,	reason)
+void LYFixCursesOn (
+    const char *	reason)
 {
     if (dump_output_immediately || LYCursesON)
 	return;
@@ -2444,9 +2444,9 @@ PUBLIC void LYFixCursesOn ARGS1(
  *  or rule substitution is not prevented for telnet-like URLs, and
  *  this 'fix' avoids some crashes that can otherwise occur. - kw
  */
-PUBLIC BOOLEAN LYFixCursesOnForAccess ARGS2(
-    CONST char *,	addr,
-    CONST char *,	physical)
+BOOLEAN LYFixCursesOnForAccess (
+    const char *	addr,
+    const char *	physical)
 {
     /*
      *  If curses is off when maybe it shouldn't...
@@ -2484,8 +2484,8 @@ PUBLIC BOOLEAN LYFixCursesOnForAccess ARGS2(
 /*
  *  Determine whether we allow HEAD and related flags for a URL. - kw
  */
-PUBLIC BOOLEAN LYCanDoHEAD ARGS1(
-    CONST char *,	address)
+BOOLEAN LYCanDoHEAD (
+    const char *	address)
 {
     char *temp0 = NULL;
     int isurl;
@@ -2560,8 +2560,8 @@ PUBLIC BOOLEAN LYCanDoHEAD ARGS1(
 /*
  * Close an input file.
  */
-PUBLIC BOOLEAN LYCloseInput ARGS1(
-	FILE *,		fp)
+BOOLEAN LYCloseInput (
+	FILE *		fp)
 {
     if (fp != 0) {
 	int err = ferror(fp);
@@ -2576,8 +2576,8 @@ PUBLIC BOOLEAN LYCloseInput ARGS1(
 /*
  * Close an output file, reporting any problems with writing to it.
  */
-PUBLIC BOOLEAN LYCloseOutput ARGS1(
-	FILE *,		fp)
+BOOLEAN LYCloseOutput (
+	FILE *		fp)
 {
     if (fp != 0) {
 	int err = ferror(fp);
@@ -2593,8 +2593,8 @@ PUBLIC BOOLEAN LYCloseOutput ARGS1(
 /*
  * Test if we'll be able to write a file.  If not, warn the user.
  */
-PUBLIC BOOLEAN LYCanWriteFile ARGS1(
-	CONST char*,	filename)
+BOOLEAN LYCanWriteFile (
+	const char*	filename)
 {
     if (LYCloseOutput(fopen(filename, "w"))) {
 	remove(filename);
@@ -2608,8 +2608,8 @@ PUBLIC BOOLEAN LYCanWriteFile ARGS1(
 /*
  * Test if we'll be able to read a file.
  */
-PUBLIC BOOLEAN LYCanReadFile ARGS1(
-	CONST char*,	filename)
+BOOLEAN LYCanReadFile (
+	const char*	filename)
 {
     FILE *fp;
 
@@ -2622,8 +2622,8 @@ PUBLIC BOOLEAN LYCanReadFile ARGS1(
 /*
  *  Remove backslashes from any string.
  */
-PUBLIC void remove_backslashes ARGS1(
-	char *,		buf)
+void remove_backslashes (
+	char *		buf)
 {
     char *cp;
 
@@ -2647,7 +2647,7 @@ PUBLIC void remove_backslashes ARGS1(
  *  via a terminal in the local domain.
  *
  */
-PUBLIC BOOLEAN inlocaldomain NOARGS
+BOOLEAN inlocaldomain (void)
 {
 #ifdef HAVE_UTMP
     int n;
@@ -2696,9 +2696,9 @@ PUBLIC BOOLEAN inlocaldomain NOARGS
  *  value would currently be ignored anyway.) - kw
  *
  */
-PUBLIC void LYExtSignal ARGS2(
-    int,			sig,
-    LYSigHandlerFunc_t *,	handler)
+void LYExtSignal (
+    int			sig,
+    LYSigHandlerFunc_t *	handler)
 {
 #ifdef SIGWINCH
     /* add more cases to if(condition) if required... */
@@ -2734,10 +2734,10 @@ PUBLIC void LYExtSignal ARGS2(
  *  signal handler from running while lynx is waiting in system() for
  *  an interactive command like an editor. - kw
  */
-PRIVATE BOOLEAN LYToggleSigDfl ARGS3(
-    int,			sig,
-    struct sigaction *,		where,
-    int,			to_dfl)
+static BOOLEAN LYToggleSigDfl (
+    int			sig,
+    struct sigaction *		where,
+    int			to_dfl)
 {
     int rv = -1;
     struct sigaction oact;
@@ -2789,8 +2789,8 @@ PRIVATE BOOLEAN LYToggleSigDfl ARGS3(
 # endif	/* TERMIO_AND_TERMIOS */
 #endif /* TERMIO_AND_CURSES */
 
-PUBLIC void size_change ARGS1(
-	int,		sig GCC_UNUSED)
+void size_change (
+	int		sig GCC_UNUSED)
 {
     int old_lines = LYlines;
     int old_cols = LYcols;
@@ -2888,7 +2888,7 @@ PUBLIC void size_change ARGS1(
 /*
  *  Utility for freeing the list of previous suggested filenames. - FM
  */
-PUBLIC void HTSugFilenames_free NOARGS
+void HTSugFilenames_free (void)
 {
     char *fname;
     HTList *cur = sug_filenames;
@@ -2908,8 +2908,8 @@ PUBLIC void HTSugFilenames_free NOARGS
  *  Utility for listing suggested filenames, making any
  *  repeated filenames the most current in the list. - FM
  */
-PUBLIC void HTAddSugFilename ARGS1(
-	char *,		fname)
+void HTAddSugFilename (
+	char *		fname)
 {
     char *new = NULL;
     char *old;
@@ -2946,10 +2946,10 @@ PUBLIC void HTAddSugFilename ARGS1(
  *  CHANGE_SUG_FILENAME -- Foteos Macrides 29-Dec-1993
  *	Upgraded for use with Lynx2.2 - FM 17-Jan-1994
  */
-PUBLIC void change_sug_filename ARGS1(
-	char *,		fname)
+void change_sug_filename (
+	char *		fname)
 {
-    CONST char *cp2;
+    const char *cp2;
     char *temp = 0, *cp, *cp1, *end;
 #ifdef VMS
     char *dot;
@@ -3247,10 +3247,10 @@ PUBLIC void change_sug_filename ARGS1(
 /*
  * Construct a temporary-filename.  Assumes result is LY_MAXPATH chars long.
  */
-PRIVATE int fmt_tempname ARGS3(
-	char *,		result,
-	CONST char *,	prefix,
-	CONST char *,	suffix)
+static int fmt_tempname (
+	char *		result,
+	const char *	prefix,
+	const char *	suffix)
 {
     int code;
 #ifdef USE_RAND_TEMPNAME
@@ -3319,7 +3319,7 @@ PRIVATE int fmt_tempname ARGS3(
     if (strlen(leaf) > 8)
 	leaf[8] = 0;
     if (strlen(suffix) > 4 || *suffix != '.') {
-	CONST char *tail = strchr(suffix, '.');
+	const char *tail = strchr(suffix, '.');
 	if (tail == 0)
 	    tail = suffix + strlen(suffix);
 	if (8 - (tail - suffix) >= 0)
@@ -3346,8 +3346,8 @@ PRIVATE int fmt_tempname ARGS3(
 /*
  *  Convert 4, 6, 2, 8 to left, right, down, up, etc.
  */
-PUBLIC int number2arrows ARGS1(
-	int,		number)
+int number2arrows (
+	int		number)
 {
     switch(number) {
 	case '1':
@@ -3393,8 +3393,8 @@ PUBLIC int number2arrows ARGS1(
 /* skip the special flags when processing "all" and "default": */
 #define N_SPECIAL_RESTRICT_OPTIONS 2
 
-PRIVATE CONST struct {
-    CONST char *name;
+static const struct {
+    const char *name;
     BOOLEAN *flag;
     BOOLEAN can;
 } restrictions[] = {
@@ -3494,10 +3494,10 @@ PRIVATE CONST struct {
     This function is also used (if macro OPTNAME_ALLOW_DASHES doesn't have
     value of zero) for compare of commandline options -VH
  */
-PUBLIC BOOL strn_dash_equ ARGS3(
-	CONST char*,	p1,
-	CONST char*,	p2,
-	int,		len)
+BOOL strn_dash_equ (
+	const char*	p1,
+	const char*	p2,
+	int		len)
 {
     while (len--) {
 	if (!*p2)
@@ -3537,8 +3537,8 @@ PUBLIC BOOL strn_dash_equ ARGS3(
  * Returns the inx'th name from the restrictions table, or null if inx is
  * out of range.
  */
-PUBLIC CONST char *index_to_restriction ARGS1(
-    int,	inx)
+const char *index_to_restriction (
+    int	inx)
 {
     if (inx >= 0 && inx < (int) TABLESIZE(restrictions))
 	return restrictions[inx].name;
@@ -3549,9 +3549,9 @@ PUBLIC CONST char *index_to_restriction ARGS1(
  * Returns the value TRUE/FALSE of a given restriction, or -1 if it is not
  * one that we recognize.
  */
-PUBLIC int find_restriction ARGS2(
-    CONST char *,	name,
-    int,		len)
+int find_restriction (
+    const char *	name,
+    int		len)
 {
     unsigned i;
     if (len < 0)
@@ -3564,11 +3564,11 @@ PUBLIC int find_restriction ARGS2(
     return -1;
 }
 
-PUBLIC void parse_restrictions ARGS1(
-    CONST char *,	s)
+void parse_restrictions (
+    const char *	s)
 {
-    CONST char *p;
-    CONST char *word;
+    const char *p;
+    const char *word;
     unsigned i;
     BOOLEAN found;
 
@@ -3620,8 +3620,8 @@ PUBLIC void parse_restrictions ARGS1(
     }
 }
 
-PUBLIC void print_restrictions_to_fd ARGS1(
-    FILE *,	fp)
+void print_restrictions_to_fd (
+    FILE *	fp)
 {
     unsigned i, count = 0;
 
@@ -3660,7 +3660,7 @@ typedef struct _VMSMailItemList
   long *return_length_address;
 } VMSMailItemList;
 
-PUBLIC void LYCheckMail NOARGS
+void LYCheckMail (void)
 {
     static BOOL firsttime = TRUE, failure = FALSE;
     static char user[13], dir[252];
@@ -3736,7 +3736,7 @@ PUBLIC void LYCheckMail NOARGS
     return;
 }
 #else
-PUBLIC void LYCheckMail NOARGS
+void LYCheckMail (void)
 {
     static BOOL firsttime = TRUE;
     static char *mf;
@@ -3791,10 +3791,10 @@ PUBLIC void LYCheckMail NOARGS
 **  Such URLs have no `base' reference to which they
 **  could be resolved.  LYLegitimizeHREF could not be used.
 */
-PUBLIC void LYEnsureAbsoluteURL ARGS3(
-	char **,	href,
-	CONST char *,	name,
-	int,		fixit)
+void LYEnsureAbsoluteURL (
+	char **	href,
+	const char *	name,
+	int		fixit)
 {
     char *temp = NULL;
 
@@ -3833,9 +3833,9 @@ PUBLIC void LYEnsureAbsoluteURL ARGS3(
  *  directory on the local system, otherwise as an
  *  http URL. - FM
  */
-PUBLIC void LYConvertToURL ARGS2(
-	char **,	AllocatedString,
-	int,		fixit)
+void LYConvertToURL (
+	char **	AllocatedString,
+	int		fixit)
 {
     char *old_string = *AllocatedString;
     char *temp = NULL;
@@ -4204,7 +4204,7 @@ have_VMS_URL:
 			    temp2 ? temp2 : temp));
 #ifdef WIN_EX  /* 1998/01/13 (Tue) 09:07:37 */
 		{
-		    CONST char *p, *q;
+		    const char *p, *q;
 		    char buff[LY_MAXPATH + 128];
 
 		    p = Home_Dir();
@@ -4314,7 +4314,7 @@ have_VMS_URL:
 
 #if defined(_WINDOWS) /* 1998/06/23 (Tue) 16:45:20 */
 
-PUBLIC int win32_check_interrupt(void)
+int win32_check_interrupt(void)
 {
     int c;
 
@@ -4363,10 +4363,10 @@ void sleep(unsigned sec)
  *  prepend the scheme field (e.g., http://), or pass the string
  *  to LYAddSchemeForURL(), if this function returns TRUE. - FM
  */
-PUBLIC BOOLEAN LYExpandHostForURL ARGS3(
-	char **,	AllocatedString,
-	char *,		prefix_list,
-	char *,		suffix_list)
+BOOLEAN LYExpandHostForURL (
+	char **	AllocatedString,
+	char *		prefix_list,
+	char *		suffix_list)
 {
     char DomainPrefix[80], *StartP, *EndP;
     char DomainSuffix[80], *StartS, *EndS;
@@ -4680,9 +4680,9 @@ PUBLIC BOOLEAN LYExpandHostForURL ARGS3(
  *  default_scheme argument was NULL or zero-length and no guess was
  *  made. - FM
   */
-PUBLIC BOOLEAN LYAddSchemeForURL ARGS2(
-	char **,	AllocatedString,
-	char *,		default_scheme)
+BOOLEAN LYAddSchemeForURL (
+	char **	AllocatedString,
+	char *		default_scheme)
 {
     char *Str = NULL;
     BOOLEAN GotScheme = FALSE;
@@ -4784,8 +4784,8 @@ PUBLIC BOOLEAN LYAddSchemeForURL ARGS2(
  *  a directory, our convention is to exclude "Up to parent"
  *  links when a terminal slash is present. - FM
  */
-PUBLIC void LYTrimRelFromAbsPath ARGS1(
-	char *,		path)
+void LYTrimRelFromAbsPath (
+	char *		path)
 {
     char *cp;
     int i;
@@ -4860,12 +4860,12 @@ PUBLIC void LYTrimRelFromAbsPath ARGS1(
  *  document.  Move this function to a separate module for doing this
  *  kind of thing seriously, someday. - FM
  */
-PUBLIC void LYDoCSI ARGS3(
-	char *,		url,
-	CONST char *,	comment,
-	char **,	csi)
+void LYDoCSI (
+	char *		url,
+	const char *	comment,
+	char **	csi)
 {
-    CONST char *cp = comment;
+    const char *cp = comment;
 
     if (cp == NULL)
 	return;
@@ -4888,9 +4888,9 @@ PUBLIC void LYDoCSI ARGS3(
  *  Define_VMSLogical -- Fote Macrides 04-Apr-1995
  *	Define VMS logicals in the process table.
  */
-PUBLIC void Define_VMSLogical ARGS2(
-	char *,		LogicalName,
-	char *,		LogicalValue)
+void Define_VMSLogical (
+	char *		LogicalName,
+	char *		LogicalValue)
 {
     $DESCRIPTOR(lname, "");
     $DESCRIPTOR(lvalue, "");
@@ -4915,14 +4915,14 @@ PUBLIC void Define_VMSLogical ARGS2(
 #endif /* VMS */
 
 #ifdef LY_FIND_LEAKS
-PRIVATE void LYHomeDir_free NOARGS
+static void LYHomeDir_free (void)
 {
     FREE(HomeDir);
 }
 #endif /* LY_FIND_LEAKS */
 
-PUBLIC char * Current_Dir ARGS1(
-	char *,	pathname)
+char * Current_Dir (
+	char *	pathname)
 {
     char *result;
 #ifdef HAVE_GETCWD
@@ -4939,8 +4939,8 @@ PUBLIC char * Current_Dir ARGS1(
  * Verify that the given path refers to an existing directory, returning the
  * string if the directory exists.  If not, return null.
  */
-PRIVATE char * CheckDir ARGS1(
-    char *,	path)
+static char * CheckDir (
+    char *	path)
 {
     struct stat stat_info;
     if (!LYisAbsPath(path)
@@ -4954,7 +4954,7 @@ PRIVATE char * CheckDir ARGS1(
 /*
  * Lookup various possibilities for $HOME, and check that the directory exists.
  */
-PRIVATE char *HomeEnv NOARGS
+static char *HomeEnv (void)
 {
     char *result = CheckDir(LYGetEnv("HOME"));
 
@@ -4997,9 +4997,9 @@ PRIVATE char *HomeEnv NOARGS
     return result;
 }
 
-PUBLIC CONST char * Home_Dir NOARGS
+const char * Home_Dir (void)
 {
-    static CONST char *homedir = NULL;
+    static const char *homedir = NULL;
     char *cp = NULL;
 
     if (homedir == NULL) {
@@ -5033,7 +5033,7 @@ PUBLIC CONST char * Home_Dir NOARGS
 	} else {
 	    StrAllocCopy(HomeDir, cp);
 	}
-	homedir = (CONST char *)HomeDir;
+	homedir = (const char *)HomeDir;
 #ifdef LY_FIND_LEAKS
 	atexit(LYHomeDir_free);
 #endif
@@ -5050,7 +5050,7 @@ PUBLIC CONST char * Home_Dir NOARGS
  * separators are found, returns the original pathname.  The leaf may be
  * empty.
  */
-PUBLIC char *LYPathLeaf ARGS1(char *, pathname)
+char *LYPathLeaf (char * pathname)
 {
     char *leaf;
 #ifdef UNIX
@@ -5086,9 +5086,9 @@ PUBLIC char *LYPathLeaf ARGS1(char *, pathname)
  *  If a subdirectory is present and the path does not begin
  *  with "./", that is prefixed to make the situation clear. - FM
  */
-PUBLIC BOOLEAN LYPathOffHomeOK ARGS2(
-	char *,		fbuffer,
-	size_t,		fbuffer_size)
+BOOLEAN LYPathOffHomeOK (
+	char *		fbuffer,
+	size_t		fbuffer_size)
 {
     char *file = NULL;
     char *cp, *cp1;
@@ -5262,10 +5262,10 @@ PUBLIC BOOLEAN LYPathOffHomeOK ARGS2(
  *  calling this function.  On VMS, the resultant full path
  *  and filename are converted to VMS syntax. - FM
  */
-PUBLIC void LYAddPathToHome ARGS3(
-	char *,		fbuffer,
-	size_t,		fbuffer_size,
-	char *,		fname)
+void LYAddPathToHome (
+	char *		fbuffer,
+	size_t		fbuffer_size,
+	char *		fname)
 {
     char *home = NULL;
     char *file = fname;
@@ -5362,8 +5362,8 @@ PUBLIC void LYAddPathToHome ARGS3(
  * an absolute pathname.  If there is no save-space defined, use the home
  * directory. Return a new string with the result.
  */
-PUBLIC char * LYAddPathToSave ARGS1(
-	char *,		fname)
+char * LYAddPathToSave (
+	char *		fname)
 {
     char *result = NULL;
 
@@ -5397,9 +5397,9 @@ PUBLIC char * LYAddPathToSave ARGS1(
  *  return the clock format value itself, but if anything goes wrong
  *  when parsing the expected patterns, we still return 0. - FM
  */
-PUBLIC time_t LYmktime ARGS2(
-	char *,		string,
-	BOOL,		absolute)
+time_t LYmktime (
+	char *		string,
+	BOOL		absolute)
 {
     char *s;
     time_t now, clock2;
@@ -5675,8 +5675,8 @@ extern char **environ;
 /*
  *  Put STRING, which is of the form "NAME=VALUE", in  the environment.
  */
-PUBLIC int putenv ARGS1(
-	CONST char *,	string)
+int putenv (
+	const char *	string)
 {
   char *name_end = strchr(string, '=');
   register size_t size;
@@ -5728,7 +5728,7 @@ PUBLIC int putenv ARGS1(
 #endif /* !HAVE_PUTENV */
 
 #ifdef NEED_REMOVE
-int remove ARGS1(char *, name)
+int remove (char * name)
 {
     return unlink(name);
 }
@@ -5750,7 +5750,7 @@ int remove ARGS1(char *, name)
  * special case of its directory being pointed to by a link from a directory
  * owned by root and not writable by other users.
  */
-PRIVATE BOOL IsOurFile ARGS1(char *, name)
+static BOOL IsOurFile (char * name)
 {
     struct stat data;
 
@@ -5812,7 +5812,7 @@ PRIVATE BOOL IsOurFile ARGS1(char *, name)
 /*
  * Open a file that we don't want other users to see.
  */
-PRIVATE FILE *OpenHiddenFile ARGS2(char *, name, char *, mode)
+static FILE *OpenHiddenFile (char * name, char * mode)
 {
     FILE *fp = 0;
     struct stat data;
@@ -5867,7 +5867,7 @@ PRIVATE FILE *OpenHiddenFile ARGS2(char *, name, char *, mode)
 }
 #endif /* MULTI_USER_UNIX */
 
-PUBLIC FILE *LYNewBinFile ARGS1(char *, name)
+FILE *LYNewBinFile (char * name)
 {
 #ifdef VMS
     FILE *fp = fopen (name, BIN_W, "mbc=32");
@@ -5878,7 +5878,7 @@ PUBLIC FILE *LYNewBinFile ARGS1(char *, name)
     return fp;
 }
 
-PUBLIC FILE *LYNewTxtFile ARGS1(char *, name)
+FILE *LYNewTxtFile (char * name)
 {
     FILE *fp;
 
@@ -5896,7 +5896,7 @@ PUBLIC FILE *LYNewTxtFile ARGS1(char *, name)
     return fp;
 }
 
-PUBLIC FILE *LYAppendToTxtFile ARGS1(char *, name)
+FILE *LYAppendToTxtFile (char * name)
 {
     FILE *fp;
 
@@ -5919,7 +5919,7 @@ PUBLIC FILE *LYAppendToTxtFile ARGS1(char *, name)
  *  with temp file restricted permissions.  The normal umask should
  *  apply for user files. - kw
  */
-PUBLIC void LYRelaxFilePermissions ARGS1(CONST char *, name)
+void LYRelaxFilePermissions (const char * name)
 {
     mode_t mode;
     struct stat stat_buf;
@@ -5942,9 +5942,9 @@ PUBLIC void LYRelaxFilePermissions ARGS1(CONST char *, name)
 /*
  * Check if the given anchor has an associated file-cache.
  */
-PUBLIC BOOLEAN LYCachedTemp ARGS2(
-	char *,		result,
-	char **,	cached)
+BOOLEAN LYCachedTemp (
+	char *		result,
+	char **	cached)
 {
     if (*cached) {
 	LYstrncpy(result, *cached, LY_MAXPATH);
@@ -5967,10 +5967,10 @@ PUBLIC BOOLEAN LYCachedTemp ARGS2(
  *
  * The mode can be one of: "w", "a", "wb".
  */
-PUBLIC FILE *LYOpenTemp ARGS3(
-	char *,		result,
-	CONST char *,	suffix,
-	CONST char *,	mode)
+FILE *LYOpenTemp (
+	char *		result,
+	const char *	suffix,
+	const char *	mode)
 {
     FILE *fp = 0;
     BOOL txt = TRUE;
@@ -6077,8 +6077,8 @@ PUBLIC FILE *LYOpenTemp ARGS3(
 /*
  * Reopen a temporary file
  */
-PUBLIC FILE *LYReopenTemp ARGS1(
-	char *,		name)
+FILE *LYReopenTemp (
+	char *		name)
 {
     LY_TEMP *p;
     FILE *fp = 0;
@@ -6105,10 +6105,10 @@ PUBLIC FILE *LYReopenTemp ARGS1(
  * The mode should be "w", others are possible (they may be passed on)
  * but probably don't make sense. - kw
  */
-PUBLIC FILE *LYOpenTempRewrite ARGS3(
-	char *,		fname,
-	CONST char *,	suffix,
-	CONST char *,	mode)
+FILE *LYOpenTempRewrite (
+	char *		fname,
+	const char *	suffix,
+	const char *	mode)
 {
     FILE *fp = 0;
     BOOL txt = TRUE;
@@ -6253,9 +6253,9 @@ PUBLIC FILE *LYOpenTempRewrite ARGS3(
  * Special case of LYOpenTemp, used for manipulating bookmark file, i.e., with
  * renaming.
  */
-PUBLIC FILE *LYOpenScratch ARGS2(
-	char *,		result,
-	CONST char *,	prefix)
+FILE *LYOpenScratch (
+	char *		result,
+	const char *	prefix)
 {
     FILE *fp;
     LY_TEMP *p;
@@ -6277,8 +6277,8 @@ PUBLIC FILE *LYOpenScratch ARGS2(
     return fp;
 }
 
-PRIVATE void LY_close_temp ARGS1(
-	LY_TEMP *,	p)
+static void LY_close_temp (
+	LY_TEMP *	p)
 {
     if (p->file != 0) {
 	if (p->outs) {
@@ -6293,8 +6293,8 @@ PRIVATE void LY_close_temp ARGS1(
 /*
  * Close a temp-file, given its name
  */
-PUBLIC void LYCloseTemp ARGS1(
-	char *, name)
+void LYCloseTemp (
+	char * name)
 {
     LY_TEMP *p;
 
@@ -6309,8 +6309,8 @@ PUBLIC void LYCloseTemp ARGS1(
 /*
  * Close a temp-file, given its file-pointer
  */
-PUBLIC void LYCloseTempFP ARGS1(
-	FILE *, fp)
+void LYCloseTempFP (
+	FILE * fp)
 {
     LY_TEMP *p;
 
@@ -6324,8 +6324,8 @@ PUBLIC void LYCloseTempFP ARGS1(
 /*
  * Close a temp-file, removing it.
  */
-PUBLIC int LYRemoveTemp ARGS1(
-	char *, name)
+int LYRemoveTemp (
+	char * name)
 {
     LY_TEMP *p, *q;
     int code = -1;
@@ -6357,7 +6357,7 @@ PUBLIC int LYRemoveTemp ARGS1(
  * Remove all of the temp-files.  Note that this assumes that they are closed,
  * since some systems will not allow us to remove a file which is open.
  */
-PUBLIC void LYCleanupTemp NOARGS
+void LYCleanupTemp (void)
 {
     while (ly_temp != 0) {
 	LYRemoveTemp(ly_temp->name);
@@ -6377,9 +6377,9 @@ PUBLIC void LYCleanupTemp NOARGS
 /*
  * We renamed a temporary file.  Keep track so we can remove it on exit.
  */
-PUBLIC void LYRenamedTemp ARGS2(
-	char *,		oldname,
-	char *,		newname)
+void LYRenamedTemp (
+	char *		oldname,
+	char *		newname)
 {
     LY_TEMP *p;
 
@@ -6393,7 +6393,7 @@ PUBLIC void LYRenamedTemp ARGS2(
 /*
  *  Check that bibhost defines the BibP icon.
  */
-PUBLIC void LYCheckBibHost NOARGS
+void LYCheckBibHost (void)
 {
     DocAddress bibhostIcon;
     BOOLEAN saveFlag;
@@ -6467,10 +6467,10 @@ static uip_entry ly_uip[] =
 
 /*  Public entry points for User Interface Page management: */
 
-PUBLIC BOOL LYIsUIPage3 ARGS3(
-    CONST char *,	url,
-    UIP_t,		type,
-    int,		flagparam)
+BOOL LYIsUIPage3 (
+    const char *	url,
+    UIP_t		type,
+    int		flagparam)
 {
     unsigned int i;
     size_t l;
@@ -6503,9 +6503,9 @@ PUBLIC BOOL LYIsUIPage3 ARGS3(
     return NO;
 }
 
-PUBLIC void LYRegisterUIPage ARGS2(
-    CONST char *,	url,
-    UIP_t,		type)
+void LYRegisterUIPage (
+    const char *	url,
+    UIP_t		type)
 {
     unsigned int i;
     for (i = 0; i < TABLESIZE(ly_uip); i++) {
@@ -6546,7 +6546,7 @@ PUBLIC void LYRegisterUIPage ARGS2(
     }
 }
 
-PUBLIC void LYUIPages_free NOARGS
+void LYUIPages_free (void)
 {
     unsigned int i;
     char *p;
@@ -6567,10 +6567,10 @@ PUBLIC void LYUIPages_free NOARGS
  *  Convert local pathname to www name
  *  (do not bother about file://localhost prefix at this point).
  */
-PUBLIC  CONST char * wwwName ARGS1(
-	CONST char *,	pathname)
+const char * wwwName (
+	const char *	pathname)
 {
-    CONST char *cp = NULL;
+    const char *cp = NULL;
 
 #if defined(USE_DOS_DRIVES)
     cp = HTDOS_wwwName(pathname);
@@ -6592,12 +6592,12 @@ PUBLIC  CONST char * wwwName ARGS1(
  *
  * Both strings are fixed buffer sizes, LY_MAXPATH.
  */
-PUBLIC BOOLEAN LYValidateFilename ARGS2(
-	char *,		result,
-	char *,		given)
+BOOLEAN LYValidateFilename (
+	char *		result,
+	char *		given)
 {
     char *cp;
-    CONST char *cp2;
+    const char *cp2;
 
     /*
      *  Cancel if the user entered "/dev/null" on Unix,
@@ -6689,8 +6689,8 @@ PUBLIC BOOLEAN LYValidateFilename ARGS2(
  *	'N' (no/retry)
  *	3   (cancel)
  */
-PUBLIC int LYValidateOutput ARGS1(
-	char *,		filename)
+int LYValidateOutput (
+	char *		filename)
 {
     int c;
 
@@ -6731,11 +6731,11 @@ PUBLIC int LYValidateOutput ARGS1(
 /*
  * Convert a local filename to a URL
  */
-PUBLIC void LYLocalFileToURL ARGS2(
-	char **,	target,
-	CONST char *,	source)
+void LYLocalFileToURL (
+	char **	target,
+	const char *	source)
 {
-    CONST char *leaf;
+    const char *leaf;
 
     StrAllocCopy(*target, "file://localhost");
 
@@ -6757,9 +6757,9 @@ PUBLIC void LYLocalFileToURL ARGS2(
  * Open a temporary file for internal-pages, optionally reusing an existing
  * filename.
  */
-PUBLIC FILE *InternalPageFP ARGS2(
-	char *, filename,
-	int,	reuse_flag)
+FILE *InternalPageFP (
+	char * filename,
+	int	reuse_flag)
 {
     FILE *fp;
 
@@ -6775,10 +6775,10 @@ PUBLIC FILE *InternalPageFP ARGS2(
     return fp;
 }
 
-PUBLIC void BeginInternalPage ARGS3(
-	FILE *, fp0,
-	char*, Title,
-	char*, HelpURL)
+void BeginInternalPage (
+	FILE * fp0,
+	char* Title,
+	char* HelpURL)
 {
     fprintf(fp0, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n");
 
@@ -6813,14 +6813,14 @@ PUBLIC void BeginInternalPage ARGS3(
     }
 }
 
-PUBLIC void EndInternalPage ARGS1(
-	FILE *, fp0)
+void EndInternalPage (
+	FILE * fp0)
 {
     fprintf(fp0, "</body>\n</html>");
 }
 
-PUBLIC char *trimPoundSelector ARGS1(
-	char *,		address)
+char *trimPoundSelector (
+	char *		address)
 {
     char *pound = findPoundSelector(address);
     if (pound != 0)
@@ -6832,8 +6832,8 @@ PUBLIC char *trimPoundSelector ARGS1(
  * Trim a trailing path-separator to avoid confusing other programs when we concatenate
  * to it.  This only applies to local filesystems.
  */
-PUBLIC void LYTrimPathSep ARGS1(
-	char *,	path)
+void LYTrimPathSep (
+	char *	path)
 {
     size_t len;
 
@@ -6847,8 +6847,8 @@ PUBLIC void LYTrimPathSep ARGS1(
  * Add a trailing path-separator to avoid confusing other programs when we concatenate
  * to it.  This only applies to local filesystems.
  */
-PUBLIC void LYAddPathSep ARGS1(
-	char **,	path)
+void LYAddPathSep (
+	char **	path)
 {
     size_t len;
     char *temp;
@@ -6865,8 +6865,8 @@ PUBLIC void LYAddPathSep ARGS1(
  * Add a trailing path-separator to avoid confusing other programs when we concatenate
  * to it.  This only applies to local filesystems.
  */
-PUBLIC void LYAddPathSep0 ARGS1(
-	char *,		path)
+void LYAddPathSep0 (
+	char *		path)
 {
     size_t len;
 
@@ -6881,8 +6881,8 @@ PUBLIC void LYAddPathSep0 ARGS1(
 /*
  * Check if a given string contains a path separator
  */
-PUBLIC char * LYLastPathSep ARGS1(
-	CONST char *,	path)
+char * LYLastPathSep (
+	const char *	path)
 {
     char *result;
 #if defined(USE_DOS_DRIVES)
@@ -6898,8 +6898,8 @@ PUBLIC char * LYLastPathSep ARGS1(
  * Trim a trailing path-separator to avoid confusing other programs when we concatenate
  * to it.  This only applies to HTML paths.
  */
-PUBLIC void LYTrimHtmlSep ARGS1(
-	char *,	path)
+void LYTrimHtmlSep (
+	char *	path)
 {
     size_t len;
 
@@ -6913,8 +6913,8 @@ PUBLIC void LYTrimHtmlSep ARGS1(
  * Add a trailing path-separator to avoid confusing other programs when we concatenate
  * to it.  This only applies to HTML paths.
  */
-PUBLIC void LYAddHtmlSep ARGS1(
-	char **,	path)
+void LYAddHtmlSep (
+	char **	path)
 {
     size_t len;
     char *temp;
@@ -6931,8 +6931,8 @@ PUBLIC void LYAddHtmlSep ARGS1(
  * Add a trailing path-separator to avoid confusing other programs when we concatenate
  * to it.  This only applies to HTML paths.
  */
-PUBLIC void LYAddHtmlSep0 ARGS1(
-	char *,		path)
+void LYAddHtmlSep0 (
+	char *		path)
 {
     size_t len;
 
@@ -6947,12 +6947,12 @@ PUBLIC void LYAddHtmlSep0 ARGS1(
 /*
  * Copy a file
  */
-PUBLIC int LYCopyFile ARGS2(
-	char *,		src,
-	char *,		dst)
+int LYCopyFile (
+	char *		src,
+	char *		dst)
 {
     int code;
-    CONST char *program;
+    const char *program;
 
     if ((program = HTGetProgramPath(ppCOPY)) != NULL) {
 	char *the_command = 0;
@@ -6997,7 +6997,7 @@ PUBLIC int LYCopyFile ARGS2(
 }
 
 #ifdef __DJGPP__
-PRIVATE char *escape_backslashes ARGS1(char *, source)
+static char *escape_backslashes (char * source)
 {
     char *result = 0;
     int count = 0;
@@ -7026,8 +7026,8 @@ PRIVATE char *escape_backslashes ARGS1(char *, source)
 /*
  * Invoke a shell command, return nonzero on error.
  */
-PUBLIC int LYSystem ARGS1(
-	char *,	command)
+int LYSystem (
+	char *	command)
 {
     int code;
     int do_free = 0;
@@ -7192,7 +7192,7 @@ PUBLIC int LYSystem ARGS1(
  * Return a string which can be used in LYSystem() for spawning a subshell
  */
 #if defined(__CYGWIN__)	/* 1999/02/26 (Fri) */
-PUBLIC int Cygwin_Shell NOARGS
+int Cygwin_Shell (void)
 {
     char *shell;
     int code;
@@ -7233,7 +7233,7 @@ PUBLIC int Cygwin_Shell NOARGS
 }
 #endif
 
-PUBLIC char *LYSysShell NOARGS
+char *LYSysShell (void)
 {
     char *shell = 0;
 #ifdef DOSPATH
@@ -7285,7 +7285,7 @@ PUBLIC char *LYSysShell NOARGS
 /*
  * Return the X-Window $DISPLAY string if it is nonnull/nonempty
  */
-PUBLIC char *LYgetXDisplay NOARGS
+char *LYgetXDisplay (void)
 {
     return LYGetEnv(DISPLAY);
 }
@@ -7294,8 +7294,8 @@ PUBLIC char *LYgetXDisplay NOARGS
  * Set the value of the X-Window $DISPLAY variable (yes it leaks memory, but
  * that is putenv's fault).
  */
-PUBLIC void LYsetXDisplay ARGS1(
-	char *,	new_display)
+void LYsetXDisplay (
+	char *	new_display)
 {
     if (new_display != 0) {
 #ifdef VMS
@@ -7321,7 +7321,7 @@ static PPIB pib;
 static HAB hab;
 static HMQ hmq;
 
-PRIVATE void morph_PM NOARGS
+static void morph_PM (void)
 {
     PTIB tib;
     int first = 0;
@@ -7340,20 +7340,20 @@ PRIVATE void morph_PM NOARGS
     WinCancelShutdown(hmq, 1);	/* Do not inform us on shutdown */
 }
 
-PRIVATE void unmorph_PM NOARGS
+static void unmorph_PM (void)
 {
     WinDestroyMsgQueue(hmq);
     pib->pib_ultype = proc_type;
 }
 
-PUBLIC int size_clip NOARGS
+int size_clip (void)
 {
     return 8192;
 }
 
 /* Code partially stolen from FED editor. */
 
-PUBLIC int put_clip ARGS1(char *, s)
+int put_clip (char * s)
 {
     int sz = strlen(s) + 1;
     int ret = EOF, nl = 0;
@@ -7400,7 +7400,7 @@ static int clip_open;
 /* get_clip_grab() returns a pointer to the string in the system area.
    get_clip_release() should be called ASAP after this. */
 
-PUBLIC char* get_clip_grab NOARGS
+char* get_clip_grab (void)
 {
     char *ClipData;
     ULONG ulFormat;
@@ -7428,7 +7428,7 @@ PUBLIC char* get_clip_grab NOARGS
     return ClipData;
 }
 
-PUBLIC void get_clip_release NOARGS
+void get_clip_release (void)
 {
     if (!clip_open)
 	return;
@@ -7444,7 +7444,7 @@ PUBLIC void get_clip_release NOARGS
 static FILE* paste_handle = 0;
 static char *paste_buf = NULL;
 
-PUBLIC void get_clip_release NOARGS
+void get_clip_release (void)
 {
     if (paste_handle != 0)
 	pclose(paste_handle);
@@ -7452,7 +7452,7 @@ PUBLIC void get_clip_release NOARGS
 	FREE (paste_buf);
 }
 
-PRIVATE int clip_grab NOARGS
+static int clip_grab (void)
 {
     char *cmd = LYGetEnv("RL_PASTE_CMD");
 
@@ -7470,7 +7470,7 @@ PRIVATE int clip_grab NOARGS
 #define PASTE_BUFFER 1008
 #define CF_TEXT 0			/* Not used */
 
-PUBLIC char* get_clip_grab NOARGS
+char* get_clip_grab (void)
 {
     int len;
     int size = PASTE_BUFFER;
@@ -7497,8 +7497,8 @@ PUBLIC char* get_clip_grab NOARGS
     return paste_buf;
 }
 
-PUBLIC int
-put_clip ARGS1(char *, s)
+int
+put_clip (char * s)
 {
     char *cmd = LYGetEnv("RL_CLCOPY_CMD");
     FILE *fh;
@@ -7522,7 +7522,7 @@ put_clip ARGS1(char *, s)
 
 #if defined(WIN_EX)	/* 1997/10/16 (Thu) 20:13:28 */
 
-PUBLIC int put_clip(char *szBuffer)
+int put_clip(char *szBuffer)
 {
     HANDLE hWnd;
     HANDLE m_hLogData;
@@ -7577,7 +7577,7 @@ static int m_locked;
 /* get_clip_grab() returns a pointer to the string in the system area.
    get_clip_release() should be called ASAP after this. */
 
-PUBLIC char* get_clip_grab()
+char* get_clip_grab()
 {
     HANDLE hWnd;
     LPTSTR pLogData;
@@ -7600,7 +7600,7 @@ PUBLIC char* get_clip_grab()
     return pLogData;
 }
 
-PUBLIC void get_clip_release()
+void get_clip_release()
 {
     if (!m_locked)
 	return;
@@ -7625,7 +7625,7 @@ PUBLIC void get_clip_release()
  * Notes/Dependencies:  I got this from
  *      comp.os.ms-windows.programmer.win32
  */
-PUBLIC char * w32_strerror(DWORD ercode)
+char * w32_strerror(DWORD ercode)
 {
 /*  __declspec(thread) necessary if you will use multiple threads */
 #ifdef __CYGWIN__
@@ -7684,8 +7684,8 @@ PUBLIC char * w32_strerror(DWORD ercode)
 /*
  * syslog() interface
  */
-PUBLIC void LYOpenlog ARGS1(
-	CONST char *, banner)
+void LYOpenlog (
+	const char * banner)
 {
 #if defined(DJGPP)
     openlog("lynx", LOG_PID|LOG_NDELAY, LOG_LOCAL5);
@@ -7700,9 +7700,9 @@ PUBLIC void LYOpenlog ARGS1(
     }
 }
 
-PRIVATE BOOLEAN looks_like_password ARGS2(
-	char *,		first,
-	char *,		last)
+static BOOLEAN looks_like_password (
+	char *		first,
+	char *		last)
 {
     BOOLEAN result = FALSE;
 
@@ -7718,8 +7718,8 @@ PRIVATE BOOLEAN looks_like_password ARGS2(
     return result;
 }
 
-PUBLIC void LYSyslog ARGS1(
-	char *,		arg)
+void LYSyslog (
+	char *		arg)
 {
     char *colon1;
     char *colon2;
@@ -7750,7 +7750,7 @@ PUBLIC void LYSyslog ARGS1(
     syslog (LOG_INFO|LOG_LOCAL5, "%s", NONNULL(arg));
 }
 
-PUBLIC void LYCloselog NOARGS
+void LYCloselog (void)
 {
   syslog(LOG_INFO, "Session over");
   closelog();
diff --git a/src/LYUtils.h b/src/LYUtils.h
index f8d9af0f..0edca470 100644
--- a/src/LYUtils.h
+++ b/src/LYUtils.h
@@ -100,107 +100,107 @@
 #define findPoundSelector(address) strchr(address, '#')
 #define restorePoundSelector(pound) if ((pound) != NULL) *(pound) = '#'
 
-extern BOOL strn_dash_equ PARAMS((CONST char* p1,CONST char* p2,int len));
-extern BOOLEAN LYAddSchemeForURL PARAMS((char **AllocatedString, char *default_scheme));
-extern BOOLEAN LYCachedTemp PARAMS((char *result, char **cached));
-extern BOOLEAN LYCanDoHEAD PARAMS((CONST char *address));
-extern BOOLEAN LYCanReadFile PARAMS((CONST char* name));
-extern BOOLEAN LYCanWriteFile PARAMS((CONST char* name));
-extern BOOLEAN LYCloseInput PARAMS((FILE * fp));
-extern BOOLEAN LYCloseOutput PARAMS((FILE * fp));
-extern BOOLEAN LYExpandHostForURL PARAMS((char **AllocatedString, char *prefix_list, char *suffix_list));
-extern BOOLEAN LYFixCursesOnForAccess PARAMS((CONST char* addr, CONST char* physical));
-extern BOOLEAN LYPathOffHomeOK PARAMS((char *fbuffer, size_t fbuffer_size));
-extern BOOLEAN LYValidateFilename PARAMS((char * result, char * given));
-extern BOOLEAN LYisAbsPath PARAMS((CONST char *path));
-extern BOOLEAN LYisLocalAlias PARAMS((CONST char *filename));
-extern BOOLEAN LYisLocalFile PARAMS((CONST char *filename));
-extern BOOLEAN LYisLocalHost PARAMS((CONST char *filename));
-extern BOOLEAN LYisRootPath PARAMS((CONST char *path));
-extern BOOLEAN inlocaldomain NOPARAMS;
-extern CONST char *Home_Dir NOPARAMS;
-extern CONST char *index_to_restriction PARAMS((int inx));
-extern CONST char *wwwName PARAMS((CONST char *pathname));
-extern FILE *InternalPageFP PARAMS((char * filename, int reuse_flag));
-extern FILE *LYAppendToTxtFile PARAMS((char * name));
-extern FILE *LYNewBinFile PARAMS((char * name));
-extern FILE *LYNewTxtFile PARAMS((char * name));
-extern FILE *LYOpenScratch PARAMS((char *result, CONST char *prefix));
-extern FILE *LYOpenTemp PARAMS((char *result, CONST char *suffix, CONST char *mode));
-extern FILE *LYOpenTempRewrite PARAMS((char *result, CONST char *suffix, CONST char *mode));
-extern FILE *LYReopenTemp PARAMS((char *name));
-extern char *Current_Dir PARAMS((char * pathname));
-extern char *LYAddPathToSave PARAMS((char *fname));
-extern char *LYGetEnv PARAMS((CONST char * name));
-extern char *LYGetHiliteStr PARAMS(( int cur, int count));
-extern char *LYLastPathSep PARAMS((CONST char *path));
-extern char *LYPathLeaf PARAMS((char * pathname));
-extern char *LYSysShell NOPARAMS;
-extern char *LYgetXDisplay NOPARAMS;
-extern char *strip_trailing_slash PARAMS((char * my_dirname));
-extern char *trimPoundSelector PARAMS((char * address));
-extern int HTCheckForInterrupt NOPARAMS;
-extern int LYCheckForProxyURL PARAMS((char *filename));
-extern int LYConsoleInputFD PARAMS((BOOLEAN need_selectable));
-extern int LYCopyFile PARAMS((char *src, char *dst));
-extern int LYGetHilitePos PARAMS(( int cur, int count));
-extern int LYRemoveTemp PARAMS((char *name));
-extern int LYSystem PARAMS((char *command));
-extern int LYValidateOutput PARAMS((char * filename));
-extern int find_restriction PARAMS((CONST char * name, int len));
-extern int is_url PARAMS((char *filename));
-extern int number2arrows PARAMS((int number));
-extern size_t utf8_length PARAMS((BOOL utf_flag, CONST char * data));
-extern time_t LYmktime PARAMS((char *string, BOOL absolute));
-extern void BeginInternalPage PARAMS((FILE *fp0, char *Title, char *HelpURL));
-extern void EndInternalPage PARAMS((FILE *fp0));
-extern void HTAddSugFilename PARAMS((char *fname));
-extern void HTSugFilenames_free NOPARAMS;
-extern void LYAddHilite PARAMS((int cur, char *text, int x));
-extern void LYAddHtmlSep PARAMS((char **path));
-extern void LYAddHtmlSep0 PARAMS((char *path));
-extern void LYAddLocalhostAlias PARAMS((char *alias));
-extern void LYAddPathSep PARAMS((char **path));
-extern void LYAddPathSep0 PARAMS((char *path));
-extern void LYAddPathToHome PARAMS((char *fbuffer, size_t fbuffer_size, char *fname));
-extern void LYCheckBibHost NOPARAMS;
-extern void LYCheckMail NOPARAMS;
-extern void LYCleanupTemp NOPARAMS;
-extern void LYCloseTemp PARAMS((char *name));
-extern void LYCloseTempFP PARAMS((FILE *fp));
-extern void LYConvertToURL PARAMS((char **AllocatedString, int fixit));
-extern void LYDoCSI PARAMS((char *url, CONST char *comment, char **csi));
-extern void LYEnsureAbsoluteURL PARAMS((char **href, CONST char *name, int fixit));
-extern void LYFakeZap PARAMS((BOOL set));
-extern void LYFixCursesOn PARAMS((CONST char* reason));
-extern void LYLocalFileToURL PARAMS((char **target, CONST char *source));
-extern void LYLocalhostAliases_free NOPARAMS;
-extern void LYRenamedTemp PARAMS((char * oldname, char * newname));
-extern void LYSetHilite PARAMS((int cur, char *text));
-extern void LYTrimHtmlSep PARAMS((char *path));
-extern void LYTrimPathSep PARAMS((char *path));
-extern void LYTrimRelFromAbsPath PARAMS((char *path));
-extern void LYhighlight PARAMS((int flag, int cur, char *target));
-extern void LYsetXDisplay PARAMS((char *new_display));
-extern void change_sug_filename PARAMS((char *fname));
-extern void convert_to_spaces PARAMS((char *string, BOOL condense));
-extern void free_and_clear PARAMS((char **obj));
-extern void noviceline PARAMS((int more_flag));
-extern void parse_restrictions PARAMS((CONST char *s));
-extern void print_restrictions_to_fd PARAMS((FILE *fp));
-extern void remove_backslashes PARAMS((char *buf));
-extern void size_change PARAMS((int sig));
-extern void statusline PARAMS((CONST char *text));
-extern void toggle_novice_line NOPARAMS;
+extern BOOL strn_dash_equ (const char* p1,const char* p2,int len);
+extern BOOLEAN LYAddSchemeForURL (char **AllocatedString, char *default_scheme);
+extern BOOLEAN LYCachedTemp (char *result, char **cached);
+extern BOOLEAN LYCanDoHEAD (const char *address);
+extern BOOLEAN LYCanReadFile (const char* name);
+extern BOOLEAN LYCanWriteFile (const char* name);
+extern BOOLEAN LYCloseInput (FILE * fp);
+extern BOOLEAN LYCloseOutput (FILE * fp);
+extern BOOLEAN LYExpandHostForURL (char **AllocatedString, char *prefix_list, char *suffix_list);
+extern BOOLEAN LYFixCursesOnForAccess (const char* addr, const char* physical);
+extern BOOLEAN LYPathOffHomeOK (char *fbuffer, size_t fbuffer_size);
+extern BOOLEAN LYValidateFilename (char * result, char * given);
+extern BOOLEAN LYisAbsPath (const char *path);
+extern BOOLEAN LYisLocalAlias (const char *filename);
+extern BOOLEAN LYisLocalFile (const char *filename);
+extern BOOLEAN LYisLocalHost (const char *filename);
+extern BOOLEAN LYisRootPath (const char *path);
+extern BOOLEAN inlocaldomain (void);
+extern const char *Home_Dir (void);
+extern const char *index_to_restriction (int inx);
+extern const char *wwwName (const char *pathname);
+extern FILE *InternalPageFP (char * filename, int reuse_flag);
+extern FILE *LYAppendToTxtFile (char * name);
+extern FILE *LYNewBinFile (char * name);
+extern FILE *LYNewTxtFile (char * name);
+extern FILE *LYOpenScratch (char *result, const char *prefix);
+extern FILE *LYOpenTemp (char *result, const char *suffix, const char *mode);
+extern FILE *LYOpenTempRewrite (char *result, const char *suffix, const char *mode);
+extern FILE *LYReopenTemp (char *name);
+extern char *Current_Dir (char * pathname);
+extern char *LYAddPathToSave (char *fname);
+extern char *LYGetEnv (const char * name);
+extern char *LYGetHiliteStr ( int cur, int count);
+extern char *LYLastPathSep (const char *path);
+extern char *LYPathLeaf (char * pathname);
+extern char *LYSysShell (void);
+extern char *LYgetXDisplay (void);
+extern char *strip_trailing_slash (char * my_dirname);
+extern char *trimPoundSelector (char * address);
+extern int HTCheckForInterrupt (void);
+extern int LYCheckForProxyURL (char *filename);
+extern int LYConsoleInputFD (BOOLEAN need_selectable);
+extern int LYCopyFile (char *src, char *dst);
+extern int LYGetHilitePos ( int cur, int count);
+extern int LYRemoveTemp (char *name);
+extern int LYSystem (char *command);
+extern int LYValidateOutput (char * filename);
+extern int find_restriction (const char * name, int len);
+extern int is_url (char *filename);
+extern int number2arrows (int number);
+extern size_t utf8_length (BOOL utf_flag, const char * data);
+extern time_t LYmktime (char *string, BOOL absolute);
+extern void BeginInternalPage (FILE *fp0, char *Title, char *HelpURL);
+extern void EndInternalPage (FILE *fp0);
+extern void HTAddSugFilename (char *fname);
+extern void HTSugFilenames_free (void);
+extern void LYAddHilite (int cur, char *text, int x);
+extern void LYAddHtmlSep (char **path);
+extern void LYAddHtmlSep0 (char *path);
+extern void LYAddLocalhostAlias (char *alias);
+extern void LYAddPathSep (char **path);
+extern void LYAddPathSep0 (char *path);
+extern void LYAddPathToHome (char *fbuffer, size_t fbuffer_size, char *fname);
+extern void LYCheckBibHost (void);
+extern void LYCheckMail (void);
+extern void LYCleanupTemp (void);
+extern void LYCloseTemp (char *name);
+extern void LYCloseTempFP (FILE *fp);
+extern void LYConvertToURL (char **AllocatedString, int fixit);
+extern void LYDoCSI (char *url, const char *comment, char **csi);
+extern void LYEnsureAbsoluteURL (char **href, const char *name, int fixit);
+extern void LYFakeZap (BOOL set);
+extern void LYFixCursesOn (const char* reason);
+extern void LYLocalFileToURL (char **target, const char *source);
+extern void LYLocalhostAliases_free (void);
+extern void LYRenamedTemp (char * oldname, char * newname);
+extern void LYSetHilite (int cur, char *text);
+extern void LYTrimHtmlSep (char *path);
+extern void LYTrimPathSep (char *path);
+extern void LYTrimRelFromAbsPath (char *path);
+extern void LYhighlight (int flag, int cur, char *target);
+extern void LYsetXDisplay (char *new_display);
+extern void change_sug_filename (char *fname);
+extern void convert_to_spaces (char *string, BOOL condense);
+extern void free_and_clear (char **obj);
+extern void noviceline (int more_flag);
+extern void parse_restrictions (const char *s);
+extern void print_restrictions_to_fd (FILE *fp);
+extern void remove_backslashes (char *buf);
+extern void size_change (int sig);
+extern void statusline (const char *text);
+extern void toggle_novice_line (void);
 
 #ifdef EXP_ASCII_CTYPES
-extern int ascii_tolower PARAMS((int i));
-extern int ascii_toupper PARAMS((int i));
-extern int ascii_isupper PARAMS((int i));
+extern int ascii_tolower (int i);
+extern int ascii_toupper (int i);
+extern int ascii_isupper (int i);
 #endif
 
 #ifdef __CYGWIN__
-extern int Cygwin_Shell PARAMS((void));
+extern int Cygwin_Shell (void);
 #endif
 
 #ifdef _WIN_CC
@@ -230,22 +230,22 @@ typedef enum {
 
 #define UIP_P_FRAG 0x0001   /* flag: consider "url#frag" as matching "url" */
 
-extern BOOL LYIsUIPage3 PARAMS((CONST char * url, UIP_t type, int flagparam));
+extern BOOL LYIsUIPage3 (const char * url, UIP_t type, int flagparam);
 #define LYIsUIPage(url,type) LYIsUIPage3(url, type, UIP_P_FRAG)
-extern void LYRegisterUIPage PARAMS((CONST char * url, UIP_t type));
+extern void LYRegisterUIPage (const char * url, UIP_t type);
 #define LYUnRegisterUIPage(type) LYRegisterUIPage(NULL, type)
-extern void LYUIPages_free NOPARAMS;
+extern void LYUIPages_free (void);
 
 #ifdef CAN_CUT_AND_PASTE
-extern int put_clip PARAMS((char *szBuffer));
+extern int put_clip (char *szBuffer);
 /* get_clip_grab() returns a pointer to the string in the system area.
    get_clip_release() should be called ASAP after this. */
-extern char* get_clip_grab NOPARAMS;
-extern void  get_clip_release NOPARAMS;
+extern char* get_clip_grab (void);
+extern void  get_clip_release (void);
 #  ifdef WIN_EX
 #    define size_clip()	8192
 #  else
-extern int size_clip NOPARAMS;
+extern int size_clip (void);
 #  endif
 #endif
 
@@ -255,15 +255,15 @@ extern char *w32_strerror(DWORD ercode);
 #endif
 
 #ifdef VMS
-extern void Define_VMSLogical PARAMS((char *LogicalName, char *LogicalValue));
+extern void Define_VMSLogical (char *LogicalName, char *LogicalValue);
 #endif /* VMS */
 
 #if ! HAVE_PUTENV
-extern int putenv PARAMS((CONST char *string));
+extern int putenv (const char *string);
 #endif /* HAVE_PUTENV */
 
 #if defined(MULTI_USER_UNIX)
-extern void LYRelaxFilePermissions PARAMS((CONST char * name));
+extern void LYRelaxFilePermissions (const char * name);
 #else
 #define LYRelaxFilePermissions(name) /* nothing */
 #endif
@@ -470,9 +470,9 @@ extern HTList *sug_filenames;
 #if !defined(VMS) && defined(SYSLOG_REQUESTED_URLS)
 #include <syslog.h>
 
-extern void LYOpenlog  PARAMS((CONST char *banner));
-extern void LYSyslog   PARAMS((char *arg));
-extern void LYCloselog NOPARAMS;
+extern void LYOpenlog  (const char *banner);
+extern void LYSyslog   (char *arg);
+extern void LYCloselog (void);
 
 #endif /* !VMS && SYSLOG_REQUESTED_URLS */
 
diff --git a/src/LYexit.c b/src/LYexit.c
index 87071ffc..1e49ba9c 100644
--- a/src/LYexit.c
+++ b/src/LYexit.c
@@ -16,14 +16,14 @@
 /*
  *  Flag for outofmem macro. - FM
  */
-PUBLIC BOOL LYOutOfMemory = FALSE;
+BOOL LYOutOfMemory = FALSE;
 
 
 /*
  *  Stack of functions to call upon exit.
  */
-PRIVATE void (*callstack[ATEXITSIZE]) NOPARAMS;
-PRIVATE int topOfStack = 0;
+static void (*callstack[ATEXITSIZE]) (void);
+static int topOfStack = 0;
 
 /*
  *  Purpose:		Registers termination function.
@@ -35,12 +35,7 @@ PRIVATE int topOfStack = 0;
  *	06-15-94	created Lynx 2-3-1 Garrett Arch Blythe
  */
 
-#ifdef __STDC__
-PUBLIC int LYatexit(void (*function) NOPARAMS)
-#else /* Not ANSI, ugh! */
-PUBLIC int LYatexit(function)
-void (*function) NOPARAMS;
-#endif /* __STDC__ */
+int LYatexit(void (*function) (void))
 {
     /*
      *  Check for available space.
@@ -66,7 +61,7 @@ void (*function) NOPARAMS;
  *  Revision History:
  *	06-15-94	created Lynx 2-3-1 Garrett Arch Blythe
  */
-PRIVATE void LYCompleteExit NOPARAMS
+static void LYCompleteExit (void)
 {
     /*
      *  Just loop through registered functions.
@@ -86,8 +81,8 @@ PRIVATE void LYCompleteExit NOPARAMS
  *  Revision History:
  *	06-15-94	created Lynx 2-3-1 Garrett Arch Blythe
  */
-PUBLIC void LYexit ARGS1(
-	int,		status)
+void LYexit (
+	int		status)
 {
 #ifndef VMS	/*  On VMS, the VMSexit() handler does these. - FM */
 #ifdef _WINDOWS
@@ -174,9 +169,9 @@ PUBLIC void LYexit ARGS1(
     exit(status);
 }
 
-PUBLIC void outofmem ARGS2(
-	CONST char *,	fname,
-	CONST char *,	func)
+void outofmem (
+	const char *	fname,
+	const char *	func)
 {
     fprintf(stderr, "\n\n\n%s %s: %s\n", fname, func, MEMORY_EXHAUSTED_ABORTING);
     LYOutOfMemory = TRUE;
diff --git a/src/LYrcFile.c b/src/LYrcFile.c
index fca9852c..8672b6df 100644
--- a/src/LYrcFile.c
+++ b/src/LYrcFile.c
@@ -21,7 +21,7 @@
 #define MSG_ENABLE_LYNXRC N_("Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n")
 #define putBool(value) ((value) ? "on" : "off")
 
-PUBLIC Config_Enum tbl_DTD_recovery[] = {
+Config_Enum tbl_DTD_recovery[] = {
     { "true",		TRUE },
     { "false",		FALSE },
     { "on",		TRUE },
@@ -32,14 +32,14 @@ PUBLIC Config_Enum tbl_DTD_recovery[] = {
 };
 
 #ifdef DIRED_SUPPORT
-PRIVATE Config_Enum tbl_dir_list_style[] = {
+static Config_Enum tbl_dir_list_style[] = {
     { "FILES_FIRST",	FILES_FIRST },
     { "DIRECTORIES_FIRST", DIRS_FIRST },
     { "MIXED_STYLE",	MIXED_STYLE },
     { NULL,		MIXED_STYLE },
 };
 #ifdef LONG_LIST
-PRIVATE Config_Enum tbl_dir_list_order[] = {
+static Config_Enum tbl_dir_list_order[] = {
     { "ORDER_BY_NAME",	ORDER_BY_NAME },
     { "ORDER_BY_TYPE",	ORDER_BY_TYPE },
     { "ORDER_BY_SIZE",  ORDER_BY_SIZE },
@@ -54,7 +54,7 @@ PRIVATE Config_Enum tbl_dir_list_order[] = {
 #endif /* LONG_LIST */
 #endif /* DIRED_SUPPORT */
 
-PRIVATE Config_Enum tbl_file_sort[] = {
+static Config_Enum tbl_file_sort[] = {
     { "BY_FILENAME",	FILE_BY_NAME },
     { "BY_TYPE",	FILE_BY_TYPE },
     { "BY_SIZE",	FILE_BY_SIZE },
@@ -62,7 +62,7 @@ PRIVATE Config_Enum tbl_file_sort[] = {
     { NULL,		-1 },
 };
 
-PUBLIC Config_Enum tbl_keypad_mode[] = {
+Config_Enum tbl_keypad_mode[] = {
     { "FIELDS_ARE_NUMBERED", FIELDS_ARE_NUMBERED },
     { "LINKS_AND_FIELDS_ARE_NUMBERED", LINKS_AND_FIELDS_ARE_NUMBERED },
     { "LINKS_ARE_NUMBERED", LINKS_ARE_NUMBERED },
@@ -73,7 +73,7 @@ PUBLIC Config_Enum tbl_keypad_mode[] = {
     { NULL,		DEFAULT_KEYPAD_MODE }
 };
 
-PUBLIC Config_Enum tbl_multi_bookmarks[] = {
+Config_Enum tbl_multi_bookmarks[] = {
     { "OFF",		MBM_OFF },
     { "STANDARD",	MBM_STANDARD },
     { "ON",		MBM_STANDARD },
@@ -81,7 +81,7 @@ PUBLIC Config_Enum tbl_multi_bookmarks[] = {
     { NULL,		-1 }
 };
 
-PRIVATE Config_Enum tbl_show_colors[] = {
+static Config_Enum tbl_show_colors[] = {
     { "default",	SHOW_COLOR_UNKNOWN },
     { "default",	SHOW_COLOR_OFF },
     { "default",	SHOW_COLOR_ON },
@@ -92,7 +92,7 @@ PRIVATE Config_Enum tbl_show_colors[] = {
     { NULL,		SHOW_COLOR_UNKNOWN }
 };
 
-PUBLIC Config_Enum tbl_transfer_rate[] = {
+Config_Enum tbl_transfer_rate[] = {
     { "NONE",		rateOFF },
     { "KB",		rateKB },
     { "TRUE",		rateKB },
@@ -105,14 +105,14 @@ PUBLIC Config_Enum tbl_transfer_rate[] = {
     { NULL,		-1 },
 };
 
-PUBLIC Config_Enum tbl_user_mode[] = {
+Config_Enum tbl_user_mode[] = {
     { "ADVANCED",	ADVANCED_MODE },
     { "INTERMEDIATE",	INTERMEDIATE_MODE },
     { "NOVICE",		NOVICE_MODE },
     { NULL,		NOVICE_MODE }
 };
 
-PRIVATE Config_Enum tbl_visited_links[] = {
+static Config_Enum tbl_visited_links[] = {
     { "FIRST_REVERSED",	VISITED_LINKS_AS_FIRST_V | VISITED_LINKS_REVERSE },
     { "FIRST",		VISITED_LINKS_AS_FIRST_V },
     { "TREE",		VISITED_LINKS_AS_TREE    },
@@ -121,21 +121,21 @@ PRIVATE Config_Enum tbl_visited_links[] = {
     { NULL,		DEFAULT_VISITED_LINKS }
 };
 
-PUBLIC Config_Enum tbl_force_prompt[] = {
+Config_Enum tbl_force_prompt[] = {
     { "prompt",		FORCE_PROMPT_DFT	},
     { "yes",		FORCE_PROMPT_YES	},
     { "no",		FORCE_PROMPT_NO		},
     { NULL,		-1			}
 };
 
-PRIVATE BOOL getBool ARGS1(char *, src)
+static BOOL getBool (char * src)
 {
     return (BOOL) (!strncasecomp(src, "on", 2) || !strncasecomp(src, "true", 4));
 }
 
-PUBLIC CONST char *LYputEnum ARGS2(
-    Config_Enum *,	table,
-    int,		value)
+const char *LYputEnum (
+    Config_Enum *	table,
+    int		value)
 {
     while (table->name != 0) {
 	if (table->value == value) {
@@ -146,10 +146,10 @@ PUBLIC CONST char *LYputEnum ARGS2(
     return "?";
 }
 
-PUBLIC BOOL LYgetEnum ARGS3(
-    Config_Enum *,	table,
-    char *,		name,
-    int *,		result)
+BOOL LYgetEnum (
+    Config_Enum *	table,
+    char *		name,
+    int *		result)
 {
     Config_Enum *found = 0;
     unsigned len = strlen(name);
@@ -209,17 +209,17 @@ typedef enum {
 
 typedef struct config_type
 {
-    CONST char *name;
+    const char *name;
     int enabled;		/* see lynx.cfg ENABLE_LYNXRC "off" lines */
     Conf_Types type;
     ParseData;
     char **strings;
     Config_Enum *table;
-    void (*write_it) PARAMS((FILE * fp, struct config_type *));
+    void (*write_it) (FILE * fp, struct config_type *);
     char *note;
 } Config_Type;
 
-PRIVATE int get_assume_charset ARGS1(char *, value)
+static int get_assume_charset (char * value)
 {
     int i;
 
@@ -232,7 +232,7 @@ PRIVATE int get_assume_charset ARGS1(char *, value)
     return 0;
 }
 
-PRIVATE void put_assume_charset ARGS2(FILE *, fp, struct config_type *, tbl)
+static void put_assume_charset (FILE * fp, struct config_type * tbl)
 {
     int i;
 
@@ -241,7 +241,7 @@ PRIVATE void put_assume_charset ARGS2(FILE *, fp, struct config_type *, tbl)
     fprintf(fp, "%s=%s\n\n", tbl->name, LYCharSet_UC[UCLYhndl_for_unspec].MIMEname);
 }
 
-PRIVATE int get_display_charset ARGS1(char *, value)
+static int get_display_charset (char * value)
 {
     int i = 0;
 
@@ -251,7 +251,7 @@ PRIVATE int get_display_charset ARGS1(char *, value)
     return 0;
 }
 
-PRIVATE void put_display_charset ARGS2(FILE *, fp, struct config_type *, tbl)
+static void put_display_charset (FILE * fp, struct config_type * tbl)
 {
     int i;
 
@@ -260,19 +260,19 @@ PRIVATE void put_display_charset ARGS2(FILE *, fp, struct config_type *, tbl)
     fprintf(fp, "%s=%s\n\n", tbl->name, LYchar_set_names[current_char_set]);
 }
 
-PRIVATE int get_editor ARGS1(char *, value)
+static int get_editor (char * value)
 {
     if (!system_editor)
 	StrAllocCopy(editor, value);
     return 0;
 }
 
-PRIVATE void put_editor ARGS2(FILE *, fp, struct config_type *, tbl)
+static void put_editor (FILE * fp, struct config_type * tbl)
 {
     fprintf(fp, "%s=%s\n\n", tbl->name, NonNull(editor));
 }
 
-PUBLIC int get_tagsoup ARGS1(char *, value)
+int get_tagsoup (char * value)
 {
     int found = Old_DTD;
 
@@ -284,7 +284,7 @@ PUBLIC int get_tagsoup ARGS1(char *, value)
     return 0;
 }
 
-PRIVATE void put_tagsoup ARGS2(FILE *, fp, struct config_type *, tbl)
+static void put_tagsoup (FILE * fp, struct config_type * tbl)
 {
     fprintf(fp, "%s=%s\n\n", tbl->name, LYputEnum(tbl_DTD_recovery, Old_DTD));
 }
@@ -564,8 +564,8 @@ in the Visited Links Page.\n\
     PARSE_NIL
 };
 
-PRIVATE Config_Type *lookup_config ARGS1(
-	char *,		name)
+static Config_Type *lookup_config (
+	char *		name)
 {
     Config_Type *tbl = Config_Table;
     char ch = (char) TOUPPER(*name);
@@ -589,7 +589,7 @@ PRIVATE Config_Type *lookup_config ARGS1(
  *  for reading, otherwise use fp which has to be a file open for
  *  reading. - kw
  */
-PUBLIC void read_rc ARGS1(FILE *, fp)
+void read_rc (FILE * fp)
 {
     char *buffer = NULL;
     char rcfile[LY_MAXPATH];
@@ -749,9 +749,9 @@ PUBLIC void read_rc ARGS1(FILE *, fp)
  * Write a set of comments.  Doing it this way avoids preprocessor problems
  * with the leading '#', makes it simpler to use gettext.
  */
-PRIVATE void write_list ARGS2(
-    	FILE *,		fp,
-	char *,		list)
+static void write_list (
+    	FILE *		fp,
+	char *		list)
 {
     int first = TRUE;
     while (*list != 0) {
@@ -771,7 +771,7 @@ PRIVATE void write_list ARGS2(
 /*
  * This is too long for some compilers.
  */
-PRIVATE void explain_keypad_mode ARGS1(FILE *, fp)
+static void explain_keypad_mode (FILE * fp)
 {
     write_list(fp, gettext("\
 If keypad_mode is set to \"NUMBERS_AS_ARROWS\", then the numbers on\n\
@@ -807,7 +807,7 @@ enabled.\n\
  *  for writing, otherwise use fp which has to be a temp file open for
  *  writing. - kw
  */
-PUBLIC int save_rc ARGS1(FILE *, fp)
+int save_rc (FILE * fp)
 {
     Config_Type *tbl = Config_Table;
     char rcfile[LY_MAXPATH];
@@ -924,14 +924,14 @@ It is not this file.\n\
 /*
  * Returns true if the given name would be saved in .lynxrc
  */
-PUBLIC BOOL will_save_rc ARGS1(char *, name)
+BOOL will_save_rc (char * name)
 {
     Config_Type *tbl = lookup_config(name);
     return tbl->name != 0;
 }
 
-PUBLIC int enable_lynxrc ARGS1(
-	char *,		value)
+int enable_lynxrc (
+	char *		value)
 {
     Config_Type *tbl;
     char *colon = strchr(value, ':');
diff --git a/src/LYrcFile.h b/src/LYrcFile.h
index a60e5f40..80f1f8f1 100644
--- a/src/LYrcFile.h
+++ b/src/LYrcFile.h
@@ -240,12 +240,12 @@ extern Config_Enum tbl_multi_bookmarks[];
 extern Config_Enum tbl_transfer_rate[];
 extern Config_Enum tbl_user_mode[];
 
-extern BOOL LYgetEnum PARAMS((Config_Enum * table, char * name, int * result));
-extern BOOL will_save_rc PARAMS((char * name));
-extern CONST char *LYputEnum PARAMS((Config_Enum * table, int value));
-extern int enable_lynxrc PARAMS((char * value));
-extern int get_tagsoup PARAMS((char * value));
-extern int save_rc PARAMS((FILE *));
-extern void read_rc PARAMS((FILE *));
+extern BOOL LYgetEnum (Config_Enum * table, char * name, int * result);
+extern BOOL will_save_rc (char * name);
+extern const char *LYputEnum (Config_Enum * table, int value);
+extern int enable_lynxrc (char * value);
+extern int get_tagsoup (char * value);
+extern int save_rc (FILE *);
+extern void read_rc (FILE *);
 
 #endif /* LYRCFILE_H */
diff --git a/src/TRSTable.c b/src/TRSTable.c
index 7fbd6631..89ea29fc 100644
--- a/src/TRSTable.c
+++ b/src/TRSTable.c
@@ -199,19 +199,19 @@ struct _STable_info {
 **    Anything that requires handling cell contents as paragraphs (block
 **    elements), like reflowing.  Vertical alignment.
 */
-PRIVATE int Stbl_finishCellInRow PARAMS((
+static int Stbl_finishCellInRow (
     STable_rowinfo *	me,
     STable_states *	s,
     int			end_td,
     int			lineno,
-    int			pos));
-PRIVATE int Stbl_finishRowInTable PARAMS((
-    STable_info *	me));
+    int			pos);
+static int Stbl_finishRowInTable (
+    STable_info *	me);
 
-PRIVATE CONST char * cellstate_s ARGS1(
-	cellstate_t,	state)
+static const char * cellstate_s (
+	cellstate_t	state)
 {
-    CONST char *result = "?";
+    const char *result = "?";
 
     switch (state) {
     case CS_invalid:	result = "CS_invalid";	break;
@@ -231,8 +231,8 @@ PRIVATE CONST char * cellstate_s ARGS1(
     return result;
 }
 
-PUBLIC struct _STable_info * Stbl_startTABLE ARGS1(
-    short,		alignment)
+struct _STable_info * Stbl_startTABLE (
+    short		alignment)
 {
     STable_info *me = typecalloc(STable_info);
 
@@ -252,16 +252,16 @@ PUBLIC struct _STable_info * Stbl_startTABLE ARGS1(
     return me;
 }
 
-PRIVATE void free_rowinfo ARGS1(
-    STable_rowinfo *,	me)
+static void free_rowinfo (
+    STable_rowinfo *	me)
 {
     if (me && me->allocated) {
 	FREE(me->cells);
     }
 }
 
-PUBLIC void Stbl_free ARGS1(
-    STable_info *,	me)
+void Stbl_free (
+    STable_info *	me)
 {
     CTRACE2(TRACE_TRST,
 	    (tfp, "TRST:Stbl_free()\n"));
@@ -280,16 +280,16 @@ PUBLIC void Stbl_free ARGS1(
 /*
  * Returns -1 on error, otherwise index of just-added table cell.
  */
-PRIVATE int Stbl_addCellToRow ARGS9(
-    STable_rowinfo *,	me,
-    STable_cellinfo *,	colinfo,
-    int,		ncolinfo,
-    STable_states *,	s,
-    int,		colspan,
-    int,		alignment,
-    int,		isheader,
-    int,		lineno,
-    int *,		ppos)
+static int Stbl_addCellToRow (
+    STable_rowinfo *	me,
+    STable_cellinfo *	colinfo,
+    int		ncolinfo,
+    STable_states *	s,
+    int		colspan,
+    int		alignment,
+    int		isheader,
+    int		lineno,
+    int *		ppos)
 {
     STable_cellinfo *cells;
     int i;
@@ -513,10 +513,10 @@ PRIVATE int Stbl_addCellToRow ARGS9(
 
 /* returns -1 on error, 0 otherwise */
 /* assumes cells have already been allocated (but may need more) */
-PRIVATE int Stbl_reserveCellsInRow ARGS3(
-    STable_rowinfo *,	me,
-    int,		icell,
-    int,		colspan)
+static int Stbl_reserveCellsInRow (
+    STable_rowinfo *	me,
+    int		icell,
+    int		colspan)
 {
     STable_cellinfo *cells;
     int i;
@@ -551,12 +551,12 @@ PRIVATE int Stbl_reserveCellsInRow ARGS3(
 }
 
 /* Returns -1 on failure. */
-PRIVATE int Stbl_finishCellInRow ARGS5(
-    STable_rowinfo *,	me,
-    STable_states *,	s,
-    int,		end_td,
-    int,		lineno,
-    int,		pos)
+static int Stbl_finishCellInRow (
+    STable_rowinfo *	me,
+    STable_states *	s,
+    int		end_td,
+    int		lineno,
+    int		pos)
 {
     STable_cellinfo *lastcell;
     cellstate_t newstate = CS_invalid;
@@ -942,11 +942,11 @@ PRIVATE int Stbl_finishCellInRow ARGS5(
  *  rowspans2eog to keep track of rowspans that are to remain in effect
  *  until the end of the row group (until next THEAD/TFOOT/TBODY) or table.
  */
-PRIVATE int Stbl_reserveCellsInTable ARGS4(
-    STable_info *,	me,
-    int,		icell,
-    int,		colspan,
-    int,		rowspan)
+static int Stbl_reserveCellsInTable (
+    STable_info *	me,
+    int		icell,
+    int		colspan,
+    int		rowspan)
 {
     STable_rowinfo *rows, *row;
     int growby;
@@ -1016,8 +1016,8 @@ PRIVATE int Stbl_reserveCellsInTable ARGS4(
 
 /* Remove reserved cells in trailing rows that were added for rowspan,
  * to be used when a THEAD/TFOOT/TBODY ends. */
-PRIVATE void Stbl_cancelRowSpans ARGS1(
-    STable_info *,	me)
+static void Stbl_cancelRowSpans (
+    STable_info *	me)
 {
     int i;
 
@@ -1035,10 +1035,10 @@ PRIVATE void Stbl_cancelRowSpans ARGS1(
 /*
  * Returns -1 on error, otherwise index of just-added table row.
  */
-PUBLIC int Stbl_addRowToTable ARGS3(
-    STable_info *,	me,
-    int,		alignment,
-    int,		lineno)
+int Stbl_addRowToTable (
+    STable_info *	me,
+    int		alignment,
+    int		lineno)
 {
     STable_rowinfo *rows, *row;
     STable_states * s = &me->s;
@@ -1124,8 +1124,8 @@ PUBLIC int Stbl_addRowToTable ARGS3(
 /*
  * Returns -1 on error, otherwise current number of rows.
  */
-PRIVATE int Stbl_finishRowInTable ARGS1(
-    STable_info *,	me)
+static int Stbl_finishRowInTable (
+    STable_info *	me)
 {
     STable_rowinfo *lastrow;
     STable_states * s = &me->s;
@@ -1152,14 +1152,14 @@ PRIVATE int Stbl_finishRowInTable ARGS1(
     return (me->nrows);
 }
 
-PRIVATE void update_sumcols0 ARGS7(
-    STable_cellinfo *,	sumcols,
-    STable_rowinfo *,	lastrow,
-    int,		pos,
-    int,		len,
-    int,		icell,
-    int,		ispan,
-    int,		allocated_sumcols)
+static void update_sumcols0 (
+    STable_cellinfo *	sumcols,
+    STable_rowinfo *	lastrow,
+    int		pos,
+    int		len,
+    int		icell,
+    int		ispan,
+    int		allocated_sumcols)
 {
     int i;
     if (len > 0) {
@@ -1197,12 +1197,12 @@ PRIVATE void update_sumcols0 ARGS7(
     }
 }
 
-PRIVATE int get_remaining_colspan ARGS5(
-    STable_rowinfo *,	me,
-    STable_cellinfo *,	colinfo,
-    int,		ncolinfo,
-    int,		colspan,
-    int,		ncols_sofar)
+static int get_remaining_colspan (
+    STable_rowinfo *	me,
+    STable_cellinfo *	colinfo,
+    int		ncolinfo,
+    int		colspan,
+    int		ncols_sofar)
 {
     int i;
     int last_colspan = me->ncells ?
@@ -1222,11 +1222,11 @@ PRIVATE int get_remaining_colspan ARGS5(
 
 #ifdef EXP_NESTED_TABLES
 /* Returns -1 on failure, 1 if faking was performed, 0 if not needed. */
-PRIVATE int Stbl_fakeFinishCellInTable ARGS4(
-    STable_info *,	me,
-    STable_rowinfo *,	lastrow,
-    int,		lineno,
-    int,		finishing)	/* Processing finish or start */
+static int Stbl_fakeFinishCellInTable (
+    STable_info *	me,
+    STable_rowinfo *	lastrow,
+    int		lineno,
+    int		finishing)	/* Processing finish or start */
 {
     STable_states * s = &me->s;
     int fake = 0;
@@ -1393,15 +1393,15 @@ PRIVATE int Stbl_fakeFinishCellInTable ARGS4(
 /*
  * Returns -1 on error, otherwise 0.
  */
-PUBLIC int Stbl_addCellToTable ARGS8(
-    STable_info *,	me,
-    int,		colspan,
-    int,		rowspan,
-    int,		alignment,
-    int,		isheader,
-    int,		lineno,
-    int,		offset_not_used_yet GCC_UNUSED,
-    int,		pos)
+int Stbl_addCellToTable (
+    STable_info *	me,
+    int		colspan,
+    int		rowspan,
+    int		alignment,
+    int		isheader,
+    int		lineno,
+    int		offset_not_used_yet GCC_UNUSED,
+    int		pos)
 {
     STable_states * s = &me->s;
     STable_rowinfo *lastrow;
@@ -1503,12 +1503,12 @@ PUBLIC int Stbl_addCellToTable ARGS8(
 /*
  * Returns -1 on error, otherwise 0.
  */
-PUBLIC int Stbl_finishCellInTable ARGS5(
-    STable_info *,	me,
-    int,		end_td,
-    int,		lineno,
-    int,		offset,
-    int,		pos)
+int Stbl_finishCellInTable (
+    STable_info *	me,
+    int		end_td,
+    int		lineno,
+    int		offset,
+    int		pos)
 {
     STable_states * s = &me->s;
     STable_rowinfo *lastrow;
@@ -1618,11 +1618,11 @@ PUBLIC int Stbl_finishCellInTable ARGS5(
 /*
  * Returns -1 on error, otherwise 0.
  */
-PUBLIC int Stbl_addColInfo ARGS4(
-    STable_info *,	me,
-    int,		colspan,
-    short,		alignment,
-    BOOL,		isgroup)
+int Stbl_addColInfo (
+    STable_info *	me,
+    int		colspan,
+    short		alignment,
+    BOOL		isgroup)
 {
     STable_cellinfo *sumcols, *sumcol;
     int i, icolinfo;
@@ -1686,8 +1686,8 @@ PUBLIC int Stbl_addColInfo ARGS4(
 /*
  * Returns -1 on error, otherwise 0.
  */
-PUBLIC int Stbl_finishColGroup ARGS1(
-    STable_info *,	me)
+int Stbl_finishColGroup (
+    STable_info *	me)
 {
     CTRACE2(TRACE_TRST, (tfp, "TRST:Stbl_finishColGroup()\n"));
     if (me->pending_colgroup_next >= me->ncolinfo) {
@@ -1700,9 +1700,9 @@ PUBLIC int Stbl_finishColGroup ARGS1(
     return 0;
 }
 
-PUBLIC int Stbl_addRowGroup ARGS2(
-    STable_info *,	me,
-    short,		alignment)
+int Stbl_addRowGroup (
+    STable_info *	me,
+    short		alignment)
 {
     CTRACE2(TRACE_TRST, (tfp, "TRST:Stbl_addRowGroup()\n"));
     Stbl_cancelRowSpans(me);
@@ -1710,8 +1710,8 @@ PUBLIC int Stbl_addRowGroup ARGS2(
     return 0;			/* that's all! */
 }
 
-PUBLIC int Stbl_finishTABLE ARGS1(
-    STable_info *,	me)
+int Stbl_finishTABLE (
+    STable_info *	me)
 {
     STable_states * s = &me->s;
     int i;
@@ -1835,17 +1835,17 @@ PUBLIC int Stbl_finishTABLE ARGS1(
     return (curpos > MAX_STBL_POS ? -1 : me->ncols);
 }
 
-PUBLIC short Stbl_getAlignment ARGS1(
-    STable_info *,	me)
+short Stbl_getAlignment (
+    STable_info *	me)
 {
     return (short)(me ? me->alignment : HT_ALIGN_NONE);
 }
 
-PRIVATE int get_fixup_positions ARGS4(
-    STable_rowinfo *,	me,
-    int *,		oldpos,
-    int *,		newpos,
-    STable_cellinfo *,	sumcols)
+static int get_fixup_positions (
+    STable_rowinfo *	me,
+    int *		oldpos,
+    int *		newpos,
+    STable_cellinfo *	sumcols)
 {
     int i = 0, ip = 0;
     int next_i, newlen;
@@ -1896,11 +1896,11 @@ PRIVATE int get_fixup_positions ARGS4(
  *           0 or greater (number of oldpos/newpos pairs) if we have
  *             a table row.
  */
-PUBLIC int Stbl_getFixupPositions ARGS4(
-    STable_info *,	me,
-    int,		lineno,
-    int *,		oldpos,
-    int *,		newpos)
+int Stbl_getFixupPositions (
+    STable_info *	me,
+    int		lineno,
+    int *		oldpos,
+    int *		newpos)
 {
     STable_rowinfo * row;
     int j;
@@ -1918,8 +1918,8 @@ PUBLIC int Stbl_getFixupPositions ARGS4(
     return ninserts;
 }
 
-PUBLIC int Stbl_getStartLine ARGS1(
-    STable_info *,	me)
+int Stbl_getStartLine (
+    STable_info *	me)
 {
     if (!me)
 	return -1;
@@ -1929,8 +1929,8 @@ PUBLIC int Stbl_getStartLine ARGS1(
 
 #ifdef EXP_NESTED_TABLES
 
-PUBLIC int Stbl_getStartLineDeep ARGS1(
-    STable_info *,	me)
+int Stbl_getStartLineDeep (
+    STable_info *	me)
 {
     if (!me)
 	return -1;
@@ -1939,10 +1939,10 @@ PUBLIC int Stbl_getStartLineDeep ARGS1(
     return me->startline;
 }
 
-PUBLIC void Stbl_update_enclosing ARGS3(
-    STable_info *,	me,
-    int,		max_width,
-    int,		last_lineno)
+void Stbl_update_enclosing (
+    STable_info *	me,
+    int		max_width,
+    int		last_lineno)
 {
     int l;
 
@@ -1970,10 +1970,10 @@ PUBLIC void Stbl_update_enclosing ARGS3(
     return;
 }
 
-PUBLIC void Stbl_set_enclosing ARGS3(
-    STable_info *,	me,
-    STable_info *,	enclosing,
-    struct _TextAnchor*,enclosing_last_anchor_before_stbl)
+void Stbl_set_enclosing (
+    STable_info *	me,
+    STable_info *	enclosing,
+    struct _TextAnchor*enclosing_last_anchor_before_stbl)
 {
     if (!me)
 	return;
@@ -1981,16 +1981,16 @@ PUBLIC void Stbl_set_enclosing ARGS3(
     me->enclosing_last_anchor_before_stbl = enclosing_last_anchor_before_stbl;
 }
 
-PUBLIC STable_info * Stbl_get_enclosing ARGS1(
-    STable_info *,	me)
+STable_info * Stbl_get_enclosing (
+    STable_info *	me)
 {
     if (!me)
 	return 0;
     return me->enclosing;
 }
 
-PUBLIC struct _TextAnchor * Stbl_get_last_anchor_before ARGS1(
-    STable_info *,	me)
+struct _TextAnchor * Stbl_get_last_anchor_before (
+    STable_info *	me)
 {
     if (!me)
 	return 0;
diff --git a/src/TRSTable.h b/src/TRSTable.h
index 8512bc2b..8945767e 100644
--- a/src/TRSTable.h
+++ b/src/TRSTable.h
@@ -6,15 +6,15 @@
 /* TRST_MAXCOLSPAN and TRST_MAXCOLSPAN are defined in userdefs.h */
 
 typedef struct _STable_info STable_info;
-extern STable_info * Stbl_startTABLE PARAMS((short));
-extern int Stbl_finishTABLE PARAMS((STable_info *));
-extern void Stbl_free PARAMS((STable_info *));
-extern int Stbl_addRowToTable PARAMS((STable_info *, int, int));
-extern int Stbl_addCellToTable PARAMS((STable_info *, int, int, int, int, int, int, int));
-extern int Stbl_finishCellInTable PARAMS((STable_info *, int, int, int, int));
-extern int Stbl_addColInfo PARAMS((STable_info *, int, short, BOOL));
-extern int Stbl_finishColGroup PARAMS((STable_info *));
-extern int Stbl_addRowGroup PARAMS((STable_info *, short));
+extern STable_info * Stbl_startTABLE (short);
+extern int Stbl_finishTABLE (STable_info *);
+extern void Stbl_free (STable_info *);
+extern int Stbl_addRowToTable (STable_info *, int, int);
+extern int Stbl_addCellToTable (STable_info *, int, int, int, int, int, int, int);
+extern int Stbl_finishCellInTable (STable_info *, int, int, int, int);
+extern int Stbl_addColInfo (STable_info *, int, short, BOOL);
+extern int Stbl_finishColGroup (STable_info *);
+extern int Stbl_addRowGroup (STable_info *, short);
 
 #define TRST_ENDCELL_ENDTD	1
 #define TRST_ENDCELL_LINEBREAK	0
@@ -22,26 +22,26 @@ extern int Stbl_addRowGroup PARAMS((STable_info *, short));
 #define TRST_FAKING_CELLS	2
 #define Stbl_lineBreak(stbl,l,off,pos) Stbl_finishCellInTable(stbl, TRST_ENDCELL_LINEBREAK, l, off, pos)
 
-extern int Stbl_getStartLine PARAMS((STable_info *));
-extern int Stbl_getFixupPositions PARAMS((
+extern int Stbl_getStartLine (STable_info *);
+extern int Stbl_getFixupPositions (
     STable_info *	me,
     int			lineno,
     int *		oldpos,
-    int *		newpos));
-extern short Stbl_getAlignment PARAMS((STable_info *));
+    int *		newpos);
+extern short Stbl_getAlignment (STable_info *);
 
 #ifdef EXP_NESTED_TABLES
-extern void Stbl_update_enclosing PARAMS((
+extern void Stbl_update_enclosing (
     STable_info *	me,
     int			max_width,
-    int			last_lineno));
+    int			last_lineno);
 struct _TextAnchor;
-extern void Stbl_set_enclosing PARAMS(( STable_info *me,
+extern void Stbl_set_enclosing ( STable_info *me,
 					STable_info *encl,
-					struct _TextAnchor *last_anchor));
-extern STable_info * Stbl_get_enclosing PARAMS((STable_info *	me));
-extern struct _TextAnchor * Stbl_get_last_anchor_before PARAMS((STable_info *	me));
-extern int Stbl_getStartLineDeep PARAMS((STable_info *));
+					struct _TextAnchor *last_anchor);
+extern STable_info * Stbl_get_enclosing (STable_info *	me);
+extern struct _TextAnchor * Stbl_get_last_anchor_before (STable_info *	me);
+extern int Stbl_getStartLineDeep (STable_info *);
 #else
 #define Stbl_getStartLineDeep(t) Stbl_getStartLine(t)
 #endif
diff --git a/src/UCAuto.c b/src/UCAuto.c
index 34762e35..26921490 100644
--- a/src/UCAuto.c
+++ b/src/UCAuto.c
@@ -69,10 +69,10 @@ static char *T_umap_fn = NULL;
  *	       -1  error (assume font and umap are not loaded)
  *		1  error with umap (assume font loaded but umap empty)
  */
-PRIVATE int call_setfont ARGS3(
-	CONST char *,	font,
-	CONST char *,	fnsuffix,
-	CONST char *,	umap)
+static int call_setfont (
+	const char *	font,
+	const char *	fnsuffix,
+	const char *	umap)
 {
     char *T_setfont_cmd = NULL;
     int rv;
@@ -124,8 +124,8 @@ PRIVATE int call_setfont ARGS3(
     return 0;
 }
 
-PRIVATE void write_esc ARGS1(
-	CONST char *,	p)
+static void write_esc (
+	const char *	p)
 {
     int fd = open("/dev/tty", O_WRONLY);
 
@@ -135,8 +135,8 @@ PRIVATE void write_esc ARGS1(
     }
 }
 
-PRIVATE int nonempty_file ARGS1(
-	CONST char *,	p)
+static int nonempty_file (
+	const char *	p)
 {
     struct stat sb;
 
@@ -148,12 +148,12 @@ PRIVATE int nonempty_file ARGS1(
 /*
  *  This is the thing that actually gets called from display_page().
  */
-PUBLIC void UCChangeTerminalCodepage ARGS2(
-	int,		newcs,
-	LYUCcharset *,	p)
+void UCChangeTerminalCodepage (
+	int		newcs,
+	LYUCcharset *	p)
 {
     static int lastcs = -1;
-    static CONST char * lastname = NULL;
+    static const char * lastname = NULL;
     static TTransT_t lastTransT = GN_dunno;
     static TGen_state_t lastUtf = Dunno;
     static TGen_state_t lastHasUmap = Dunno;
@@ -161,7 +161,7 @@ PUBLIC void UCChangeTerminalCodepage ARGS2(
     static char *old_font = NULL;
     static char *old_umap = NULL;
 
-    CONST char * name;
+    const char * name;
     TTransT_t TransT = GN_dunno;
     TGen_state_t Utf = Dunno;
     TGen_state_t HasUmap = Dunno;
@@ -442,9 +442,9 @@ PUBLIC void UCChangeTerminalCodepage ARGS2(
 /*
  *  This is the thing that actually gets called from display_page().
  */
-PUBLIC void UCChangeTerminalCodepage ARGS2(
-	int,		newcs,
-	LYUCcharset *,	p)
+void UCChangeTerminalCodepage (
+	int		newcs,
+	LYUCcharset *	p)
 {
 #ifdef __EMX__
     int res = 0;
@@ -461,9 +461,9 @@ PUBLIC void UCChangeTerminalCodepage ARGS2(
 
 #ifdef CAN_SWITCH_DISPLAY_CHARSET
 
-PUBLIC int Find_Best_Display_Charset ARGS1 (int, ord)
+int Find_Best_Display_Charset (int ord)
 {
-    CONST char *name = LYCharSet_UC[ord].MIMEname;
+    const char *name = LYCharSet_UC[ord].MIMEname;
     char *s = charset_switch_rules, *r;
     char buf[160];
     static int lowercase;
@@ -528,9 +528,9 @@ PUBLIC int Find_Best_Display_Charset ARGS1 (int, ord)
    before the actual display.
 
    Returns the charset we switched to.  */
-PRIVATE int _Switch_Display_Charset ARGS2 (int, ord, enum switch_display_charset_t, really)
+static int _Switch_Display_Charset (int ord, enum switch_display_charset_t really)
 {
-    CONST char *name;
+    const char *name;
     unsigned short cp;
     static int font_loaded_for = -1, old_h, old_w;
     int rc, ord1;
@@ -659,7 +659,7 @@ PRIVATE int _Switch_Display_Charset ARGS2 (int, ord, enum switch_display_charset
 }
 #  endif /* __EMX__ */
 
-PUBLIC int Switch_Display_Charset ARGS2 (CONST int, ord, CONST enum switch_display_charset_t, really)
+int Switch_Display_Charset (const int ord, const enum switch_display_charset_t really)
 {
     int prev = current_char_set;
     int res;
@@ -685,9 +685,9 @@ PUBLIC int Switch_Display_Charset ARGS2 (CONST int, ord, CONST enum switch_displ
 /*
  *  This is the thing that actually gets called from display_page().
  */
-PUBLIC void UCChangeTerminalCodepage ARGS2(
-	int,		newcs GCC_UNUSED,
-	LYUCcharset *,	p GCC_UNUSED)
+void UCChangeTerminalCodepage (
+	int		newcs GCC_UNUSED,
+	LYUCcharset *	p GCC_UNUSED)
 {
     CTRACE((tfp, "UCChangeTerminalCodepage: Called, but not implemented!"));
 }
diff --git a/src/UCAuto.h b/src/UCAuto.h
index e9f1681e..c4cf965c 100644
--- a/src/UCAuto.h
+++ b/src/UCAuto.h
@@ -3,6 +3,6 @@
 
 #include <UCDefs.h>
 
-extern void UCChangeTerminalCodepage PARAMS((int newcs, LYUCcharset *p));
+extern void UCChangeTerminalCodepage (int newcs, LYUCcharset *p);
 
 #endif /* UCAUTO_H */
diff --git a/src/UCAux.c b/src/UCAux.c
index ceb14615..29da0ba1 100644
--- a/src/UCAux.c
+++ b/src/UCAux.c
@@ -7,8 +7,8 @@
 #include <UCAux.h>
 #include <LYCharSets.h>
 
-PUBLIC BOOL UCCanUniTranslateFrom ARGS1(
-	int,		from)
+BOOL UCCanUniTranslateFrom (
+	int		from)
 {
     if (from < 0)
 	return NO;
@@ -21,8 +21,8 @@ PUBLIC BOOL UCCanUniTranslateFrom ARGS1(
     return YES;
 }
 
-PUBLIC BOOL UCCanTranslateUniTo ARGS1(
-	int,		to)
+BOOL UCCanTranslateUniTo (
+	int		to)
 {
     if (to < 0)
 	return NO;
@@ -34,9 +34,9 @@ PUBLIC BOOL UCCanTranslateUniTo ARGS1(
     return YES;			/* well at least some characters... */
 }
 
-PUBLIC BOOL UCCanTranslateFromTo ARGS2(
-	int,		from,
-	int,		to)
+BOOL UCCanTranslateFromTo (
+	int		from,
+	int		to)
 {
     if (from == to)
 	return YES;
@@ -47,8 +47,8 @@ PUBLIC BOOL UCCanTranslateFromTo ARGS2(
     if (to == LATIN1 || LYCharSet_UC[to].enc == UCT_ENC_UTF8)
 	return UCCanUniTranslateFrom(from);
     {
-	CONST char * fromname = LYCharSet_UC[from].MIMEname;
-	CONST char * toname = LYCharSet_UC[to].MIMEname;
+	const char * fromname = LYCharSet_UC[from].MIMEname;
+	const char * toname = LYCharSet_UC[to].MIMEname;
 	if (!strcmp(fromname, "x-transparent") ||
 	    !strcmp(toname, "x-transparent")) {
 	    return YES; /* ??? */
@@ -87,12 +87,12 @@ PUBLIC BOOL UCCanTranslateFromTo ARGS2(
 **  Returns YES if no translation necessary (because
 **  charsets are equal, are equivalent, etc.).
 */
-PUBLIC BOOL UCNeedNotTranslate ARGS2(
-	int,		from,
-	int,		to)
+BOOL UCNeedNotTranslate (
+	int		from,
+	int		to)
 {
-    CONST char *fromname;
-    CONST char *toname;
+    const char *fromname;
+    const char *toname;
     if (from == to)
 	return YES;
     if (from < 0)
@@ -148,12 +148,12 @@ PUBLIC BOOL UCNeedNotTranslate ARGS2(
 **  not taken into account here (except for HTCJK, somewhat), it's still
 **  up to the caller to do something about them. - KW
 */
-PUBLIC void UCSetTransParams ARGS5(
-    UCTransParams *,	pT,
-    int,		cs_in,
-    CONST LYUCcharset*,	p_in,
-    int,		cs_out,
-    CONST LYUCcharset*,	p_out)
+void UCSetTransParams (
+    UCTransParams *	pT,
+    int		cs_in,
+    const LYUCcharset*	p_in,
+    int		cs_out,
+    const LYUCcharset*	p_out)
 {
     CTRACE((tfp, "UCSetTransParams: from %s(%d) to %s(%d)\n",
 	   p_in->MIMEname,  UCGetLYhndl_byMIME(p_in->MIMEname),
@@ -301,8 +301,8 @@ PUBLIC void UCSetTransParams ARGS5(
 **  structure by setting all its elements to
 **  FALSE. - KW
 */
-PUBLIC void UCTransParams_clear ARGS1(
-    UCTransParams *,    pT)
+void UCTransParams_clear (
+    UCTransParams *    pT)
 {
     pT->transp = FALSE;
     pT->do_cjk = FALSE;
@@ -326,12 +326,12 @@ PUBLIC void UCTransParams_clear ARGS1(
 **  chars to displayable ASCII chars if '0' was requested.  They'll
 **  stay as they are otherwise. - kw
 */
-PUBLIC void UCSetBoxChars ARGS5(
-    int,	cset,
-    int *,	pvert_out,
-    int *,	phori_out,
-    int,	vert_in,
-    int,	hori_in)
+void UCSetBoxChars (
+    int	cset,
+    int *	pvert_out,
+    int *	phori_out,
+    int	vert_in,
+    int	hori_in)
 {
 #ifndef WIDEC_CURSES
     if (cset >= -1 && LYCharSet_UC[cset].enc == UCT_ENC_UTF8) {
@@ -360,10 +360,10 @@ PUBLIC void UCSetBoxChars ARGS5(
 #define PUTC(ch) ((*myPutc)(target, (char)(ch)))
 #define PUTC2(ch) ((*myPutc)(target,(char)(0x80|(0x3f &(ch)))))
 
-PUBLIC BOOL UCPutUtf8_charstring ARGS3(
-	HTStream *,	target,
-	putc_func_t *,	myPutc,
-	long,		code)
+BOOL UCPutUtf8_charstring (
+	HTStream *	target,
+	putc_func_t *	myPutc,
+	long		code)
 {
     if (code < 128)
 	return NO;		/* indicate to caller we didn't handle it */
@@ -406,9 +406,9 @@ PUBLIC BOOL UCPutUtf8_charstring ARGS3(
 **  to minimize byte alignment problems with some
 **  compilers). - FM
 */
-PUBLIC BOOL UCConvertUniToUtf8 ARGS2(
-	UCode_t,	code,
-	char *,		buffer)
+BOOL UCConvertUniToUtf8 (
+	UCode_t	code,
+	char *		buffer)
 {
     char *ch = buffer;
 
@@ -465,7 +465,7 @@ PUBLIC BOOL UCConvertUniToUtf8 ARGS2(
 ** returns the UCS value
 ** returns negative value on error (invalid UTF-8 sequence)
 */
-PUBLIC UCode_t UCGetUniFromUtf8String ARGS1(char **, ppuni)
+UCode_t UCGetUniFromUtf8String (char ** ppuni)
 {
     UCode_t uc_out = 0;
     char * p = *ppuni;
diff --git a/src/UCdomap.c b/src/UCdomap.c
index 887ee962..5ebb0291 100644
--- a/src/UCdomap.c
+++ b/src/UCdomap.c
@@ -79,7 +79,7 @@
 int auto_display_charset = -1;
 #endif
 
-CONST char *UC_GNsetMIMEnames[4] =
+const char *UC_GNsetMIMEnames[4] =
 	{"iso-8859-1", "x-dec-graphics", "cp437", "x-transparent"};
 
 int UC_GNhandles[4] = {-1, -1, -1, -1};
@@ -93,7 +93,7 @@ int UC_GNhandles[4] = {-1, -1, -1, -1};
  *  for chars < 127...).  - KW
  */
 
-PRIVATE u16 translations[][256] = {
+static u16 translations[][256] = {
   /*
    *  8-bit Latin-1 mapped to Unicode -- trivial mapping.
    */
@@ -243,9 +243,9 @@ PRIVATE u16 translations[][256] = {
     0xf0f8, 0xf0f9, 0xf0fa, 0xf0fb, 0xf0fc, 0xf0fd, 0xf0fe, 0xf0ff
   }
 };
-PRIVATE u16 *UC_translate = NULL;
+static u16 *UC_translate = NULL;
 
-PRIVATE struct UC_charset UCInfo[MAXCHARSETS];
+static struct UC_charset UCInfo[MAXCHARSETS];
 
 /*
  *  The standard kernel character-to-font mappings are not invertible
@@ -253,72 +253,72 @@ PRIVATE struct UC_charset UCInfo[MAXCHARSETS];
  */
 #define MAX_GLYPH 512		/* Max possible glyph value */
 
-PRIVATE unsigned char * inv_translate = NULL;
-PRIVATE unsigned char inv_norm_transl[MAX_GLYPH];
-PRIVATE unsigned char * inverse_translations[4] = { NULL, NULL, NULL, NULL };
-
-PRIVATE void set_inverse_transl PARAMS((
-	int		i));
-PRIVATE u16 *set_translate PARAMS((
-	int		m));
-PRIVATE int UC_valid_UC_charset PARAMS((
-	int		UC_charset_hndl));
-PRIVATE void UC_con_set_trans PARAMS((
+static unsigned char * inv_translate = NULL;
+static unsigned char inv_norm_transl[MAX_GLYPH];
+static unsigned char * inverse_translations[4] = { NULL, NULL, NULL, NULL };
+
+static void set_inverse_transl (
+	int		i);
+static u16 *set_translate (
+	int		m);
+static int UC_valid_UC_charset (
+	int		UC_charset_hndl);
+static void UC_con_set_trans (
 	int		UC_charset_in_hndl,
 	int		Gn,
-	int		update_flag));
-PRIVATE int con_insert_unipair PARAMS((
+	int		update_flag);
+static int con_insert_unipair (
 	u16		unicode,
 	u16		fontpos,
-	int		fordefault));
-PRIVATE int con_insert_unipair_str PARAMS((
+	int		fordefault);
+static int con_insert_unipair_str (
 	u16		unicode,
-	CONST char *	replace_str,
-	int		fordefault));
-PRIVATE void con_clear_unimap PARAMS((
-	int		fordefault));
-PRIVATE void con_clear_unimap_str PARAMS((
-	int		fordefault));
-PRIVATE void con_set_default_unimap NOPARAMS;
-PRIVATE int UC_con_set_unimap PARAMS((
+	const char *	replace_str,
+	int		fordefault);
+static void con_clear_unimap (
+	int		fordefault);
+static void con_clear_unimap_str (
+	int		fordefault);
+static void con_set_default_unimap (void);
+static int UC_con_set_unimap (
 	int		UC_charset_out_hndl,
-	int		update_flag));
-PRIVATE int UC_con_set_unimap_str PARAMS((
+	int		update_flag);
+static int UC_con_set_unimap_str (
 	u16			ct,
 	struct unipair_str *	list,
-	int			fordefault));
-PRIVATE int conv_uni_to_pc PARAMS((
+	int			fordefault);
+static int conv_uni_to_pc (
 	long			ucs,
-	int			usedefault));
-PRIVATE int conv_uni_to_str PARAMS((
+	int			usedefault);
+static int conv_uni_to_str (
 	char*		outbuf,
 	int		buflen,
 	long		ucs,
-	int		usedefault));
-PRIVATE void UCconsole_map_init NOPARAMS;
-PRIVATE int UC_MapGN PARAMS((
+	int		usedefault);
+static void UCconsole_map_init (void);
+static int UC_MapGN (
 	int		UChndl,
-	int		update_flag));
-PRIVATE int UC_FindGN_byMIME PARAMS((
-	CONST char *	UC_MIMEcharset));
-PRIVATE void UCreset_allocated_LYCharSets NOPARAMS;
-PRIVATE CONST char ** UC_setup_LYCharSets_repl PARAMS((
+	int		update_flag);
+static int UC_FindGN_byMIME (
+	const char *	UC_MIMEcharset);
+static void UCreset_allocated_LYCharSets (void);
+static const char ** UC_setup_LYCharSets_repl (
 	int		UC_charset_in_hndl,
-	unsigned	lowest8));
-PRIVATE int UC_Register_with_LYCharSets PARAMS((
+	unsigned	lowest8);
+static int UC_Register_with_LYCharSets (
 	int		s,
-	CONST char *	UC_MIMEcharset,
-	CONST char *	UC_LYNXcharset,
-	int		lowest_eightbit));
+	const char *	UC_MIMEcharset,
+	const char *	UC_LYNXcharset,
+	int		lowest_eightbit);
 #ifdef LY_FIND_LEAKS
-PRIVATE void UCfree_allocated_LYCharSets NOPARAMS;
-PRIVATE void UCcleanup_mem NOPARAMS;
+static void UCfree_allocated_LYCharSets (void);
+static void UCcleanup_mem (void);
 #endif
 
-PRIVATE int default_UChndl = -1;
+static int default_UChndl = -1;
 
-PRIVATE void set_inverse_transl ARGS1(
-	int,		i)
+static void set_inverse_transl (
+	int		i)
 {
     int j, glyph;
     u16 *p = translations[i];
@@ -348,8 +348,8 @@ PRIVATE void set_inverse_transl ARGS1(
     }
 }
 
-PRIVATE u16 *set_translate ARGS1(
-	int,		m)
+static u16 *set_translate (
+	int		m)
 {
 	if (!inverse_translations[m])
 		set_inverse_transl(m);
@@ -357,19 +357,19 @@ PRIVATE u16 *set_translate ARGS1(
 	return translations[m];
 }
 
-PRIVATE int UC_valid_UC_charset ARGS1(
-	int,		UC_charset_hndl)
+static int UC_valid_UC_charset (
+	int		UC_charset_hndl)
 {
   return (UC_charset_hndl >= 0 && UC_charset_hndl < UCNumCharsets);
 }
 
-PRIVATE void UC_con_set_trans ARGS3(
-	int,		UC_charset_in_hndl,
-	int,		Gn,
-	int,		update_flag)
+static void UC_con_set_trans (
+	int		UC_charset_in_hndl,
+	int		Gn,
+	int		update_flag)
 {
     int i, j;
-    CONST u16 *p;
+    const u16 *p;
     u16 *ptrans;
 
     if (!UC_valid_UC_charset(UC_charset_in_hndl)) {
@@ -412,10 +412,10 @@ PRIVATE void UC_con_set_trans ARGS3(
  * "paged table" instead.  Simulation has shown the memory cost of
  * this 3-level paged table scheme to be comparable to a hash table.
  */
-PRIVATE int hashtable_contents_valid = 0; /* Use ASCII-only mode for bootup*/
-PRIVATE int hashtable_str_contents_valid = 0;
+static int hashtable_contents_valid = 0; /* Use ASCII-only mode for bootup*/
+static int hashtable_str_contents_valid = 0;
 
-PRIVATE u16 **uni_pagedir[32] =
+static u16 **uni_pagedir[32] =
 {
   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -423,7 +423,7 @@ PRIVATE u16 **uni_pagedir[32] =
   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 };
 
-PRIVATE char* **uni_pagedir_str[32] =
+static char* **uni_pagedir_str[32] =
 {
   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -431,15 +431,15 @@ PRIVATE char* **uni_pagedir_str[32] =
   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 };
 
-PRIVATE CONST u16 * UC_current_unitable = NULL;
-PRIVATE struct unimapdesc_str *UC_current_unitable_str = NULL;
+static const u16 * UC_current_unitable = NULL;
+static struct unimapdesc_str *UC_current_unitable_str = NULL;
 
 /*
  *  Keep a second set of structures for the translation designated
  *  as "default" - kw
  */
-PRIVATE int unidefault_contents_valid = 0; /* Use ASCII-only mode for bootup*/
-PRIVATE int unidefault_str_contents_valid = 0;
+static int unidefault_contents_valid = 0; /* Use ASCII-only mode for bootup*/
+static int unidefault_str_contents_valid = 0;
 
 static u16 **unidefault_pagedir[32] =
 {
@@ -456,13 +456,13 @@ static char* **unidefault_pagedir_str[32] =
   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 };
 
-PRIVATE CONST u16 * UC_default_unitable = 0;
-PRIVATE CONST struct unimapdesc_str *UC_default_unitable_str = 0;
+static const u16 * UC_default_unitable = 0;
+static const struct unimapdesc_str *UC_default_unitable_str = 0;
 
-PRIVATE int con_insert_unipair ARGS3(
-	u16,		unicode,
-	u16,		fontpos,
-	int,		fordefault)
+static int con_insert_unipair (
+	u16		unicode,
+	u16		fontpos,
+	int		fordefault)
 {
     int i, n;
     u16 **p1, *p2;
@@ -500,14 +500,14 @@ PRIVATE int con_insert_unipair ARGS3(
     return 0;
 }
 
-PRIVATE int con_insert_unipair_str ARGS3(
-	u16,		unicode,
-	CONST char *,	replace_str,
-	int,		fordefault)
+static int con_insert_unipair_str (
+	u16		unicode,
+	const char *	replace_str,
+	int		fordefault)
 {
     int i, n;
     char ***p1;
-    CONST char **p2;
+    const char **p2;
 
     if(fordefault)
 	p1 = unidefault_pagedir_str[n = unicode >> 11];
@@ -533,12 +533,12 @@ PRIVATE int con_insert_unipair_str ARGS3(
 	if (!p1[n])
 	    return -1;
 
-	p2 = (CONST char **)p1[n];
+	p2 = (const char **)p1[n];
 	for (i = 0; i < 64; i++) {
 	    p2[i] = NULL;	/* No replace string this character (yet) */
 	}
     }
-    p2 = (CONST char **)p1[n];
+    p2 = (const char **)p1[n];
 
     p2[unicode & 0x3f] = replace_str;
 
@@ -548,8 +548,8 @@ PRIVATE int con_insert_unipair_str ARGS3(
 /*
  *  ui arg was a leftover, deleted. - KW
  */
-PRIVATE void con_clear_unimap ARGS1(
-	int,		fordefault)
+static void con_clear_unimap (
+	int		fordefault)
 {
     int i, j;
     u16 **p1;
@@ -581,7 +581,7 @@ PRIVATE void con_clear_unimap ARGS1(
     }
 }
 
-PRIVATE void con_clear_unimap_str ARGS1(int, fordefault)
+static void con_clear_unimap_str (int fordefault)
 {
   int i, j;
   char ***p1;
@@ -619,10 +619,10 @@ PRIVATE void con_clear_unimap_str ARGS1(int, fordefault)
  *  with.  This routine is executed at sys_setup time, and when the
  *  PIO_FONTRESET ioctl is called.
  */
-PRIVATE void con_set_default_unimap NOARGS
+static void con_set_default_unimap (void)
 {
     int i, j;
-    CONST u16 *p;
+    const u16 *p;
 
     /*
      *	The default font is always 256 characters.
@@ -643,26 +643,26 @@ PRIVATE void con_set_default_unimap NOARGS
     UC_default_unitable_str = &dfont_replacedesc;
 }
 
-PUBLIC int UCNumCharsets = 0;
+int UCNumCharsets = 0;
 
-PUBLIC int UCLYhndl_HTFile_for_unspec = -1;
-PUBLIC int UCLYhndl_HTFile_for_unrec = -1;
-PUBLIC int UCLYhndl_for_unspec = -1;
-PUBLIC int UCLYhndl_for_unrec = -1;
+int UCLYhndl_HTFile_for_unspec = -1;
+int UCLYhndl_HTFile_for_unrec = -1;
+int UCLYhndl_for_unspec = -1;
+int UCLYhndl_for_unrec = -1;
 
  /* easy to type, will initialize later */
-PUBLIC int LATIN1 = -1;        /* UCGetLYhndl_byMIME("iso-8859-1") */
-PUBLIC int US_ASCII = -1;      /* UCGetLYhndl_byMIME("us-ascii")   */
-PUBLIC int UTF8_handle = -1;   /* UCGetLYhndl_byMIME("utf-8")      */
-PUBLIC int TRANSPARENT = -1;   /* UCGetLYhndl_byMIME("x-transparent")  */
+int LATIN1 = -1;        /* UCGetLYhndl_byMIME("iso-8859-1") */
+int US_ASCII = -1;      /* UCGetLYhndl_byMIME("us-ascii")   */
+int UTF8_handle = -1;   /* UCGetLYhndl_byMIME("utf-8")      */
+int TRANSPARENT = -1;   /* UCGetLYhndl_byMIME("x-transparent")  */
 
 
-PRIVATE int UC_con_set_unimap ARGS2(
-	int,		UC_charset_out_hndl,
-	int,		update_flag)
+static int UC_con_set_unimap (
+	int		UC_charset_out_hndl,
+	int		update_flag)
 {
     int i, j;
-    CONST u16 *p;
+    const u16 *p;
 
     if (!UC_valid_UC_charset(UC_charset_out_hndl)) {
 	CTRACE((tfp, "UC_con_set_unimap: Invalid charset handle %d.\n",
@@ -696,10 +696,10 @@ PRIVATE int UC_con_set_unimap ARGS2(
     return 0;
 }
 
-PRIVATE int UC_con_set_unimap_str ARGS3(
-	u16,		ct,
-	struct unipair_str *, list,
-	int,		fordefault)
+static int UC_con_set_unimap_str (
+	u16		ct,
+	struct unipair_str * list,
+	int		fordefault)
 {
     int err = 0, err1;
 
@@ -725,9 +725,9 @@ PRIVATE int UC_con_set_unimap_str ARGS3(
     return err;
 }
 
-PRIVATE int conv_uni_to_pc ARGS2(
-	long,		ucs,
-	int,		usedefault)
+static int conv_uni_to_pc (
+	long		ucs,
+	int		usedefault)
 {
     int h;
     u16 **p1, *p2;
@@ -785,11 +785,11 @@ PRIVATE int conv_uni_to_pc ARGS2(
 /*
  *  Note: contents of outbuf is not changes for negative return value!
  */
-PRIVATE int conv_uni_to_str ARGS4(
-	char*,		outbuf,
-	int,		buflen,
-	long,		ucs,
-	int,		usedefault)
+static int conv_uni_to_str (
+	char*		outbuf,
+	int		buflen,
+	long		ucs,
+	int		usedefault)
 {
     char *h;
     char ***p1, **p2;
@@ -840,7 +840,7 @@ PRIVATE int conv_uni_to_str ARGS4(
     return -4;
 }
 
-PUBLIC int UCInitialized = 0;
+int UCInitialized = 0;
 
 /*
  *  [ original comment: - KW ]
@@ -848,7 +848,7 @@ PUBLIC int UCInitialized = 0;
  * initialized.  It must be possible to call kmalloc(..., GFP_KERNEL)
  * from this function, hence the call from sys_setup.
  */
-PRIVATE void UCconsole_map_init NOARGS
+static void UCconsole_map_init (void)
 {
     con_set_default_unimap();
     UCInitialized = 1;
@@ -857,14 +857,14 @@ PRIVATE void UCconsole_map_init NOARGS
 /*
  *  OK now, finally, some stuff that is more specifically for Lynx: - KW
  */
-PUBLIC int UCTransUniChar ARGS2(
-	long,		unicode,
-	int,		charset_out)
+int UCTransUniChar (
+	long		unicode,
+	int		charset_out)
 {
     int rc = 0;
     int UChndl_out;
     int isdefault, trydefault = 0;
-    CONST u16 * ut;
+    const u16 * ut;
 
     if ((UChndl_out = LYCharSet_UC[charset_out].UChndl) < 0) {
 	if (LYCharSet_UC[charset_out].codepage < 0)
@@ -906,18 +906,18 @@ PUBLIC int UCTransUniChar ARGS2(
 /*
  *  Returns string length, or negative value for error.
  */
-PUBLIC int UCTransUniCharStr ARGS5(
-	char *,		outbuf,
-	int,		buflen,
-	long,		unicode,
-	int,		charset_out,
-	int,		chk_single_flag)
+int UCTransUniCharStr (
+	char *		outbuf,
+	int		buflen,
+	long		unicode,
+	int		charset_out,
+	int		chk_single_flag)
 {
     int rc = -14, src = 0, ignore_err;
     int UChndl_out;
     int isdefault, trydefault = 0;
     struct unimapdesc_str * repl;
-    CONST u16 * ut;
+    const u16 * ut;
 
     if (buflen < 2)
 	return -13;
@@ -998,11 +998,11 @@ PUBLIC int UCTransUniCharStr ARGS5(
     return -4;
 }
 
-PRIVATE int UC_lastautoGN = 0;
+static int UC_lastautoGN = 0;
 
-PRIVATE int UC_MapGN ARGS2(
-	int,		UChndl,
-	int,		update_flag)
+static int UC_MapGN (
+	int		UChndl,
+	int		update_flag)
 {
     int i, Gn, found, lasthndl;
     found = 0;
@@ -1038,16 +1038,16 @@ PRIVATE int UC_MapGN ARGS2(
     return Gn;
 }
 
-PUBLIC int UCTransChar ARGS3(
-	char,		ch_in,
-	int,		charset_in,
-	int,		charset_out)
+int UCTransChar (
+	char		ch_in,
+	int		charset_in,
+	int		charset_out)
 {
     int unicode, Gn;
     int rc = -4;
     int UChndl_in, UChndl_out;
     int isdefault, trydefault = 0;
-    CONST u16 * ut;
+    const u16 * ut;
     int upd = 0;
 
 #ifndef UC_NO_SHORTCUTS
@@ -1109,9 +1109,9 @@ PUBLIC int UCTransChar ARGS3(
     return rc;
 }
 
-PUBLIC long int UCTransToUni ARGS2(
-	char,		ch_in,
-	int,		charset_in)
+long int UCTransToUni (
+	char		ch_in,
+	int		charset_in)
 {
   int unicode, Gn;
   unsigned char ch_iu;
@@ -1146,17 +1146,17 @@ PUBLIC long int UCTransToUni ARGS2(
   return unicode;
 }
 
-PUBLIC int UCReverseTransChar ARGS3(
-	char,		ch_out,
-	int,		charset_in,
-	int,		charset_out)
+int UCReverseTransChar (
+	char		ch_out,
+	int		charset_in,
+	int		charset_out)
 {
     int Gn;
     int rc = -1;
     int UChndl_in, UChndl_out;
     int isdefault;
     int i_ch = UCH(ch_out);
-    CONST u16 * ut;
+    const u16 * ut;
 
 #ifndef UC_NO_SHORTCUTS
     if (charset_in == charset_out)
@@ -1206,20 +1206,20 @@ PUBLIC int UCReverseTransChar ARGS3(
 /*
  *  Returns string length, or negative value for error.
  */
-PUBLIC int UCTransCharStr ARGS6(
-	char *,		outbuf,
-	int,		buflen,
-	char,		ch_in,
-	int,		charset_in,
-	int,		charset_out,
-	int,		chk_single_flag)
+int UCTransCharStr (
+	char *		outbuf,
+	int		buflen,
+	char		ch_in,
+	int		charset_in,
+	int		charset_out,
+	int		chk_single_flag)
 {
     int unicode, Gn;
     int rc = -14, src = 0, ignore_err;
     int UChndl_in, UChndl_out;
     int isdefault, trydefault = 0;
     struct unimapdesc_str * repl;
-    CONST u16 * ut;
+    const u16 * ut;
     int upd = 0;
 
     if (buflen < 2)
@@ -1327,8 +1327,8 @@ PUBLIC int UCTransCharStr ARGS6(
     return -4;
 }
 
-PRIVATE int UC_FindGN_byMIME ARGS1(
-	CONST char *,	UC_MIMEcharset)
+static int UC_FindGN_byMIME (
+	const char *	UC_MIMEcharset)
 {
   int i;
 
@@ -1340,8 +1340,8 @@ PRIVATE int UC_FindGN_byMIME ARGS1(
   return -1;
 }
 
-PUBLIC int UCGetRawUniMode_byLYhndl ARGS1(
-	int,		i)
+int UCGetRawUniMode_byLYhndl (
+	int		i)
 {
     if (i < 0)
 	return 0;
@@ -1353,9 +1353,9 @@ PUBLIC int UCGetRawUniMode_byLYhndl ARGS1(
  * potentially unchecked recursion into UCGetLYhntl_byMIME if neither the "cp"
  * nor "windows-" prefixes are configured, so we check it here.
  */
-PRIVATE int getLYhndl_byCP ARGS2(
-	CONST char *,	prefix,
-	CONST char *,	codepage)
+static int getLYhndl_byCP (
+	const char *	prefix,
+	const char *	codepage)
 {
     static int nested;
     int result = -1;
@@ -1376,8 +1376,8 @@ PRIVATE int getLYhndl_byCP ARGS2(
  *  return -1 if we got NULL or did not recognize value.
  *  According to RFC, MIME headers should match case-insensitively.
  */
-PUBLIC int UCGetLYhndl_byMIME ARGS1(
-	CONST char *,	value)
+int UCGetLYhndl_byMIME (
+	const char *	value)
 {
     int i;
     int LYhndl = -1;
@@ -1529,9 +1529,9 @@ PUBLIC int UCGetLYhndl_byMIME ARGS1(
 /*
  *  We need to remember which ones were allocated and which are static.
  */
-PRIVATE CONST char ** remember_allocated_LYCharSets[MAXCHARSETS];
+static const char ** remember_allocated_LYCharSets[MAXCHARSETS];
 
-PRIVATE void UCreset_allocated_LYCharSets NOARGS
+static void UCreset_allocated_LYCharSets (void)
 {
     int i = 0;
 
@@ -1541,7 +1541,7 @@ PRIVATE void UCreset_allocated_LYCharSets NOARGS
 }
 
 #ifdef LY_FIND_LEAKS
-PRIVATE void UCfree_allocated_LYCharSets NOARGS
+static void UCfree_allocated_LYCharSets (void)
 {
     int i = 0;
 
@@ -1553,17 +1553,17 @@ PRIVATE void UCfree_allocated_LYCharSets NOARGS
 }
 #endif
 
-PRIVATE CONST char ** UC_setup_LYCharSets_repl ARGS2(
-	int,		UC_charset_in_hndl,
-	unsigned,	lowest8)
+static const char ** UC_setup_LYCharSets_repl (
+	int		UC_charset_in_hndl,
+	unsigned	lowest8)
 {
-    CONST char **ISO_Latin1 = LYCharSets[0];
-    CONST char **p;
+    const char **ISO_Latin1 = LYCharSets[0];
+    const char **p;
     char **prepl;
-    CONST u16 *pp;
+    const u16 *pp;
     char **tp;
-    CONST char *s7;
-    CONST char *s8;
+    const char *s7;
+    const char *s8;
     size_t i;
     int j, changed;
     u16 k;
@@ -1633,7 +1633,7 @@ PRIVATE CONST char ** UC_setup_LYCharSets_repl ARGS2(
 	return 0;
     }
 
-    p = (CONST char **)prepl;
+    p = (const char **)prepl;
     changed = 0;
     for (i = 0; i < HTML_dtd.number_of_entities; i++, p++) {
 	/*
@@ -1689,20 +1689,20 @@ PRIVATE CONST char ** UC_setup_LYCharSets_repl ARGS2(
 	FREE(prepl);
 	return NULL;
     }
-    return (CONST char **)prepl;
+    return (const char **)prepl;
 }
 
 /*
  *  "New method" meets "Old method" ...
  */
-PRIVATE int UC_Register_with_LYCharSets ARGS4(
-	int,		s,
-	CONST char *,	UC_MIMEcharset,
-	CONST char *,	UC_LYNXcharset,
-	int,		lowest_eightbit)
+static int UC_Register_with_LYCharSets (
+	int		s,
+	const char *	UC_MIMEcharset,
+	const char *	UC_LYNXcharset,
+	int		lowest_eightbit)
 {
     int i, LYhndl, found;
-    CONST char **repl;
+    const char **repl;
 
     LYhndl = -1;
     if (LYNumCharsets == 0) {
@@ -1786,16 +1786,16 @@ PRIVATE int UC_Register_with_LYCharSets ARGS4(
  *  This only sets up the structure - no initialization of the tables
  * is done here yet.
  */
-PUBLIC void UC_Charset_Setup ARGS9(
-	CONST char *,		UC_MIMEcharset,
-	CONST char *,		UC_LYNXcharset,
-	CONST u8 *,		unicount,
-	CONST u16 *,		unitable,
-	int,			nnuni,
-	struct unimapdesc_str,	replacedesc,
-	int,			lowest_eight,
-	int,			UC_rawuni,
-	int,			codepage)
+void UC_Charset_Setup (
+	const char *		UC_MIMEcharset,
+	const char *		UC_LYNXcharset,
+	const u8 *		unicount,
+	const u16 *		unitable,
+	int			nnuni,
+	struct unimapdesc_str	replacedesc,
+	int			lowest_eight,
+	int			UC_rawuni,
+	int			codepage)
 {
     int s, Gn;
     int i, status = 0, found;
@@ -1854,12 +1854,12 @@ PUBLIC void UC_Charset_Setup ARGS9(
  *  These are for character sets without any real tables of their own.
  *  We don't keep an entry in UCinfo[] for them.
  */
-PRIVATE int UC_NoUctb_Register_with_LYCharSets ARGS5(
-	CONST char *,	UC_MIMEcharset,
-	CONST char *,	UC_LYNXcharset,
-	int,		lowest_eightbit,
-	int,			UC_rawuni,
-	int,			codepage)
+static int UC_NoUctb_Register_with_LYCharSets (
+	const char *	UC_MIMEcharset,
+	const char *	UC_LYNXcharset,
+	int		lowest_eightbit,
+	int			UC_rawuni,
+	int			codepage)
 {
     int i, LYhndl = -1;
 
@@ -1920,13 +1920,13 @@ PRIVATE int UC_NoUctb_Register_with_LYCharSets ARGS5(
 /*
  *  A wrapper for the previous function.
  */
-PRIVATE void UC_Charset_NoUctb_Setup ARGS6(
-	CONST char *,		UC_MIMEcharset,
-	CONST char *,		UC_LYNXcharset,
-	int,			trydefault,
-	int,			lowest_eight,
-	int,			UC_rawuni,
-	int,			codepage)
+static void UC_Charset_NoUctb_Setup (
+	const char *		UC_MIMEcharset,
+	const char *		UC_LYNXcharset,
+	int			trydefault,
+	int			lowest_eight,
+	int			UC_rawuni,
+	int			codepage)
 {
     int i;
 
@@ -1955,7 +1955,7 @@ PRIVATE void UC_Charset_NoUctb_Setup ARGS6(
 }
 
 #ifdef LY_FIND_LEAKS
-PRIVATE void UCcleanup_mem NOARGS
+static void UCcleanup_mem (void)
 {
     int i;
 
@@ -1972,7 +1972,7 @@ PRIVATE void UCcleanup_mem NOARGS
 
 #ifdef CAN_AUTODETECT_DISPLAY_CHARSET
 #  ifdef __EMX__
-PRIVATE int CpOrdinal ARGS2 (CONST unsigned long, cp, CONST int, other)
+static int CpOrdinal (const unsigned long cp, const int other)
 {
     char lyName[80];
     char myMimeName[80];
@@ -2011,7 +2011,7 @@ PRIVATE int CpOrdinal ARGS2 (CONST unsigned long, cp, CONST int, other)
 #  endif /* __EMX__ */
 #endif /* CAN_AUTODETECT_DISPLAY_CHARSET */
 
-PUBLIC void UCInit NOARGS
+void UCInit (void)
 {
 
     UCreset_allocated_LYCharSets();
@@ -2122,7 +2122,7 @@ PUBLIC void UCInit NOARGS
  *  Safe variant of UCGetLYhndl_byMIME, with blind recovery from typo
  *  in user input: lynx.cfg, userdefs.h, command line switches.
  */
-PUBLIC int safeUCGetLYhndl_byMIME ARGS1 (CONST char *, value)
+int safeUCGetLYhndl_byMIME (const char * value)
 {
     int i = UCGetLYhndl_byMIME(value);
 
@@ -2184,7 +2184,7 @@ typedef int nl_item;
 
 static char buf[16];
 
-PRIVATE char *nl_langinfo(nl_item item)
+static char *nl_langinfo(nl_item item)
 {
   char *l, *p;
 
@@ -2264,7 +2264,7 @@ PRIVATE char *nl_langinfo(nl_item item)
  * Another possible thing to investigate is the locale_charset() function
  * provided in libiconv 1.5.1.
  */
-PUBLIC void LYFindLocaleCharset NOARGS
+void LYFindLocaleCharset (void)
 {
     CTRACE((tfp, "LYFindLocaleCharset(%d)\n", LYLocaleCharset));
     if (LYLocaleCharset) {
diff --git a/src/UCdomap.h b/src/UCdomap.h
index 3a494252..51dfc51b 100644
--- a/src/UCdomap.h
+++ b/src/UCdomap.h
@@ -28,22 +28,22 @@
  *	UC_* to be only known internally.
  *	UC[A-Z]* to be exported to other parts of Lynx. -KW
  */
-extern void UC_Charset_Setup PARAMS((
-	CONST char *		UC_MIMEcharset,
-	CONST char *		UC_LYNXcharset,
-	CONST u8 *		unicount,
-	CONST u16 *		unitable,
+extern void UC_Charset_Setup (
+	const char *		UC_MIMEcharset,
+	const char *		UC_LYNXcharset,
+	const u8 *		unicount,
+	const u16 *		unitable,
 	int			nnuni,
 	struct unimapdesc_str	replacedesc,
 	int			lowest_eight,
 	int			UC_rawuni,
-	int			codepage));
+	int			codepage);
 
 struct UC_charset {
-	CONST char *MIMEname;
-	CONST char *LYNXname;
-	CONST u8* unicount;
-	CONST u16* unitable;
+	const char *MIMEname;
+	const char *LYNXname;
+	const u8* unicount;
+	const u16* unitable;
 	int num_uni;
 	struct unimapdesc_str replacedesc;
 	int uc_status;
@@ -57,7 +57,7 @@ struct UC_charset {
 extern int UCNumCharsets;
 extern int UCInitialized;
 
-extern void UCInit NOARGS;
+extern void UCInit (void);
 
 /*
  *  INSTRUCTIONS for adding new character sets which do not have
diff --git a/src/chrtrans/UCkd.h b/src/chrtrans/UCkd.h
index 4a5a4513..8d92ec8b 100644
--- a/src/chrtrans/UCkd.h
+++ b/src/chrtrans/UCkd.h
@@ -24,7 +24,7 @@ struct unipair {
 };
 struct unipair_str {
 	u16 unicode;
-	CONST char * replace_str;
+	const char * replace_str;
 };
 struct unimapdesc {
 	u16 entry_ct;
diff --git a/src/chrtrans/caselower.h b/src/chrtrans/caselower.h
index ea2011ef..842d6af8 100644
--- a/src/chrtrans/caselower.h
+++ b/src/chrtrans/caselower.h
@@ -28,7 +28,7 @@ typedef struct {
 	u16 lower;
 } unipair;
 
-static CONST unipair unicode_to_lower_case[] =
+static const unipair unicode_to_lower_case[] =
 {
   {0x0041, 0x0061},  /* LATIN CAPITAL LETTER A */
   {0x0042, 0x0062},  /* LATIN CAPITAL LETTER B */
diff --git a/src/chrtrans/entities.h b/src/chrtrans/entities.h
index 8dda4693..715b5a8c 100644
--- a/src/chrtrans/entities.h
+++ b/src/chrtrans/entities.h
@@ -27,7 +27,7 @@ typedef struct {
     u16 code;
 } UC_entity_info;
 
-static CONST UC_entity_info unicode_entities[] =
+static const UC_entity_info unicode_entities[] =
 
 
 #ifdef ENTITIES_HTML40_ONLY
diff --git a/src/chrtrans/makefile.in b/src/chrtrans/makefile.in
index 59bc269f..4852116e 100644
--- a/src/chrtrans/makefile.in
+++ b/src/chrtrans/makefile.in
@@ -14,8 +14,13 @@ VPATH		= $(srcdir)
 
 top_builddir	= ../..
 
-BUILD_LIBS	= @BUILD_LIBS@ #$(SITE_LIBS)
-BUILD_LDFLAGS	= @BUILD_LDFLAGS@
+CC		= @CC@
+CPP		= @CPP@
+CFLAGS		= @CFLAGS@
+CPPFLAGS	= @CPPFLAGS@
+
+LIBS		= @LIBS@
+LDFLAGS		= @LDFLAGS@
 
 INTLLIB		= @INTLDIR_MAKE@@INTLLIBS@
 
@@ -29,6 +34,9 @@ BUILD_CPP	= @BUILD_CPP@
 BUILD_CFLAGS	= @BUILD_CFLAGS@
 BUILD_CPPFLAGS	= @BUILD_CPPFLAGS@ @DEFS@
 
+BUILD_LIBS	= @BUILD_LIBS@ #$(SITE_LIBS)
+BUILD_LDFLAGS	= @BUILD_LDFLAGS@
+
 x		= @EXEEXT@
 o		= .@BUILD_OBJEXT@
 BUILD_EXEEXT	= @BUILD_EXEEXT@
diff --git a/src/chrtrans/makeuctb.c b/src/chrtrans/makeuctb.c
index 7448c554..ce218d26 100644
--- a/src/chrtrans/makeuctb.c
+++ b/src/chrtrans/makeuctb.c
@@ -47,8 +47,8 @@ static FILE *chdr = 0;
  * everything before leaving, since some old (and a few not-so-old) platforms
  * do not properly implement POSIX 'exit()'.
  */
-PRIVATE void done PARAMS((int code)) GCC_NORETURN;
-PRIVATE void done ARGS1(int, code)
+static void done (int code) GCC_NORETURN;
+static void done (int code)
 {
     if (chdr != 0) {
 	fflush(chdr);
@@ -58,9 +58,9 @@ PRIVATE void done ARGS1(int, code)
     exit(code);
 }
 
-PRIVATE void usage NOARGS
+static void usage (void)
 {
-    static CONST char *tbl[] = {
+    static const char *tbl[] = {
 	"Usage: makeuctb [parameters]",
 	"",
 	"Utility to convert .tbl into .h files for Lynx compilation.",
@@ -79,7 +79,7 @@ PRIVATE void usage NOARGS
 }
 
 #ifdef EXP_ASCII_CTYPES
-PUBLIC int ascii_tolower ARGS1(int, i)
+int ascii_tolower (int i)
 {
     if ( 91 > i && i > 64 )
 	return (i+32);
@@ -89,13 +89,13 @@ PUBLIC int ascii_tolower ARGS1(int, i)
 #endif
 
 /* copied from HTString.c, not everybody has strncasecmp */
-PUBLIC int strncasecomp ARGS3(
-	CONST char*,	a,
-	CONST char *,	b,
-	int,		n)
+int strncasecomp (
+	const char*	a,
+	const char *	b,
+	int		n)
 {
-    CONST char *p = a;
-    CONST char *q = b;
+    const char *p = a;
+    const char *q = b;
 
     for (p = a, q = b; ; p++, q++) {
 	int diff;
@@ -110,8 +110,8 @@ PUBLIC int strncasecomp ARGS3(
     /*NOTREACHED*/
 }
 
-PRIVATE int getunicode ARGS1(
-	char **,	p0)
+static int getunicode (
+	char **	p0)
 {
     char *p = *p0;
 
@@ -140,19 +140,19 @@ int unicount[MAX_FONTLEN];
 
 struct unimapdesc_str themap_str = {0, NULL, 0, 0};
 
-PRIVATE char *tblname;
-PRIVATE char *hdrname;
+static char *tblname;
+static char *hdrname;
 
-PRIVATE int RawOrEnc = 0;
-PRIVATE int Raw_found = 0;		/* whether explicit R directive found */
-PRIVATE int CodePage = 0;
-PRIVATE int CodePage_found = 0;		/* whether explicit C directive found */
+static int RawOrEnc = 0;
+static int Raw_found = 0;		/* whether explicit R directive found */
+static int CodePage = 0;
+static int CodePage_found = 0;		/* whether explicit C directive found */
 
 #define MAX_UNIPAIRS 2500
 
-PRIVATE void addpair_str ARGS2(
-	char *,		str,
-	int,		un)
+static void addpair_str (
+	char *		str,
+	int		un)
 {
    int i = 0;
 
@@ -196,9 +196,9 @@ PRIVATE void addpair_str ARGS2(
     /* otherwise: ignore */
 }
 
-PRIVATE void addpair ARGS2(
-	int,	fp,
-	int,	un)
+static void addpair (
+	int	fp,
+	int	un)
 {
     int i;
 
@@ -248,9 +248,9 @@ int this_isDefaultMap = -1;
 int useDefaultMap = 1;
 int lowest_eight = 999;
 
-PUBLIC int main ARGS2(
-	int,		argc,
-	char **,	argv)
+int main (
+	int	argc,
+	char **	argv)
 {
     static char *first_ifdefs[] = {
 	"/*",
@@ -779,7 +779,7 @@ PUBLIC int main ARGS2(
  *\n\
  */\n\
 \n\
-static CONST u8 dfont_unicount%s[%d] = \n\
+static const u8 dfont_unicount%s[%d] = \n\
 {\n\t", argv[0], argv[1], id_append, fontlen);
 
     for (i = 0; i < fontlen; i++) {
@@ -805,10 +805,10 @@ static CONST u8 dfont_unicount%s[%d] = \n\
     }
 
     if (nuni) {
-	fprintf(chdr, "\nstatic CONST u16 dfont_unitable%s[%d] = \n{\n\t",
+	fprintf(chdr, "\nstatic const u16 dfont_unitable%s[%d] = \n{\n\t",
 		id_append, nuni);
     } else {
-	fprintf(chdr, "\nstatic CONST u16 dfont_unitable%s[1]; /* dummy */\n", id_append);
+	fprintf(chdr, "\nstatic const u16 dfont_unitable%s[1]; /* dummy */\n", id_append);
     }
 
     fp0 = 0;
@@ -851,11 +851,11 @@ static struct unipair_str repl_map%s[%d] = \n\
     }
     if (themap_str.entry_ct) {
 	fprintf(chdr, "\n\
-static CONST struct unimapdesc_str dfont_replacedesc%s = {%d,repl_map%s,",
+static const struct unimapdesc_str dfont_replacedesc%s = {%d,repl_map%s,",
 id_append, themap_str.entry_ct, id_append);
     } else {
 	fprintf(chdr, "\n\
-static CONST struct unimapdesc_str dfont_replacedesc%s = {0,NULL,",id_append);
+static const struct unimapdesc_str dfont_replacedesc%s = {0,NULL,",id_append);
     }
     fprintf(chdr, "%d,%d};\n",
 	    this_isDefaultMap ? 1 : 0,
diff --git a/src/makefile.in b/src/makefile.in
index f361d287..d25e74b4 100644
--- a/src/makefile.in
+++ b/src/makefile.in
@@ -108,6 +108,8 @@ do_chartrans_stuff:
 		SITE_DEFS="$(SITE_DEFS)" \
 		BUILD_CFLAGS="$(BUILD_CFLAGS)" \
 		BUILD_CPPFLAGS="$(BUILD_CPPFLAGS)" \
+		BUILD_LDFLAGS="$(BUILD_LDFLAGS)" \
+		BUILD_LIBS="$(BUILD_LIBS)" \
 		BUILD_CC="$(BUILD_CC)" tables
 
 lint:
diff --git a/userdefs.h b/userdefs.h
index f6dcbeeb..b02dcf2a 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1360,11 +1360,11 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.6dev.1"
+#define LYNX_VERSION "2.8.6dev.2"
 #define LYNX_WWW_HOME "http://lynx.isc.org/"
 #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Tue, 20 Apr 2004 03:36:55 -0700"
+#define LYNX_DATE "Tue, 27 Apr 2004 13:06:18 -0700"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */