diff --git a/src/as/asLib.h b/src/as/asLib.h
index 08b9057cd..bd8d5ca83 100644
--- a/src/as/asLib.h
+++ b/src/as/asLib.h
@@ -14,6 +14,8 @@
 #define INCasLibh
 
 #include "shareLib.h"
+#include "ellLib.h"
+#include "errlog.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/as/asLib.y b/src/as/asLib.y
index db8ae115e..7e2803158 100644
--- a/src/as/asLib.y
+++ b/src/as/asLib.y
@@ -8,9 +8,8 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 %{
-static int yyerror();
+static int yyerror(char *);
 static int yy_start;
-static int myParse();
 #include "asLibRoutines.c"
 static int yyFailed = FALSE;
 static int line_num=1;
@@ -207,8 +206,7 @@ rule_hag_list_name:	tokenSTRING
  
 #include "asLib_lex.c"
  
-static int yyerror(str)
-char  *str;
+static int yyerror(char *str)
 {
     if (strlen(str)) epicsPrintf("%s\n", str);
     epicsPrintf("Access Security file error at line %d\n",
diff --git a/src/as/asLibRoutines.c b/src/as/asLibRoutines.c
index 183db7451..2fd39802d 100644
--- a/src/as/asLibRoutines.c
+++ b/src/as/asLibRoutines.c
@@ -19,7 +19,6 @@
 #include "epicsStdioRedirect.h"
 #include "dbDefs.h"
 #include "epicsThread.h"
-#include "ellLib.h"
 #include "cantProceed.h"
 #include "epicsMutex.h"
 #include "epicsPrint.h"
@@ -27,8 +26,6 @@
 #include "freeList.h"
 #include "macLib.h"
 #include "postfix.h"
-#include "errlog.h"
-#include "ellLib.h"
  
 static epicsMutexId asLock;
 #define LOCK epicsMutexMustLock(asLock)
@@ -45,9 +42,10 @@ epicsShareDef int   asActive = FALSE;
 static void         *freeListPvt = NULL;
 
 
-#define RPCL_LEN 184
 #define DEFAULT "DEFAULT"
 
+/* Defined in asLib.y */
+static int myParse(ASINPUTFUNCPTR inputfunction);
 
 /*private routines */
 static long asAddMemberPvt(ASMEMBERPVT *pasMemberPvt,const char *asgName);
@@ -239,7 +237,7 @@ long epicsShareAPI asInitFP(FILE *fp,const char *substitutions)
 	    errMessage(status,"asInitFP: macCreateHandle error");
 	    return(status);
 	}
-	macParseDefns(macHandle,(char *)substitutions,&macPairs);
+	macParseDefns(macHandle,substitutions,&macPairs);
 	if(macPairs ==NULL) {
 	    macDeleteHandle(macHandle);
 	    macHandle = NULL;
diff --git a/src/as/asLib_lex.l b/src/as/asLib_lex.l
index 8e9216045..90e1b55bb 100644
--- a/src/as/asLib_lex.l
+++ b/src/as/asLib_lex.l
@@ -21,7 +21,7 @@ static ASINPUTFUNCPTR *my_yyinput;
 #undef YY_INPUT
 #define YY_INPUT(b,r,ms) (r=(*my_yyinput)((char *)b,ms))
 
-static int yyreset()
+static int yyreset(void)
 {
 	line_num=1;
 	BEGIN INITIAL;
diff --git a/src/as/ascheck.c b/src/as/ascheck.c
index 6a05a675f..4cd2eb375 100644
--- a/src/as/ascheck.c
+++ b/src/as/ascheck.c
@@ -16,7 +16,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "dbDefs.h"
 #include "errlog.h"
 #include "asLib.h"
 #include "dbStaticLib.h"