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 {