diff --git a/lang/basic/src/Makefile b/lang/basic/src/Makefile
index 61052c553..f1d61a490 100644
--- a/lang/basic/src/Makefile
+++ b/lang/basic/src/Makefile
@@ -5,7 +5,7 @@ h=$(EMHOME)/h
 m=$(EMHOME)/modules/h
 LIBDIR= $(EMHOME)/modules/lib
 LIBDIR2= $(EMHOME)/lib
-CFLAGS = -I$h -I$m
+CFLAGS = -I$h -I$m -O
 
 FILES= bem.o symbols.o initialize.o compile.o \
 	parsepar.o gencode.o util.o graph.o \
@@ -17,15 +17,15 @@ CSRCFILES= bem.c symbols.c initialize.c compile.c \
 CGENFILES= basic.c Lpars.c
 CFILES=$(CSRCFILES) $(CGENFILES)
 
-LIBFILES= $(LIBDIR)/libem_mes.a $(LIBDIR)/libeme.a \
+LIBFILES= $(LIBDIR)/libem_mes.a $(LIBDIR)/libemk.a \
 	  $(LIBDIR2)/em_data.a $(LIBDIR)/libprint.a \
 	  $(LIBDIR)/liballoc.a \
 	  $(LIBDIR)/libsystem.a $(LIBDIR)/libstring.a
 
-LINTLIBFILES= $(LIBDIR)/llib-lem_mes.a $(LIBDIR)/llib-leme.a \
-	  $(LIBDIR)/llib-lprint.a \
-	  $(LIBDIR)/llib-lalloc.a \
-	  $(LIBDIR)/llib-lsystem.a $(LIBDIR)/llib-lstring.a
+LINTLIBFILES= $(LIBDIR)/llib-lem_mes.ln $(LIBDIR)/llib-lemk.ln \
+	  $(LIBDIR)/llib-lprint.ln \
+	  $(LIBDIR)/llib-lalloc.ln \
+	  $(LIBDIR)/llib-lsystem.ln $(LIBDIR)/llib-lstring.ln
 
 all:		dummy bem
 
@@ -56,7 +56,7 @@ $(FILES): 	bem.h symbols.h graph.h
 tokentab.h:	Lpars.h
 		maketokentab
 
-lint:		$(CFILES)
+lint:		dummy $(CFILES) tokentab.h	
 		lint -b $(CFLAGS) $(CFILES) $(LINTLIBFILES)
 
 clean:
diff --git a/lang/basic/src/bem.h b/lang/basic/src/bem.h
index 124a42053..fdcccae91 100644
--- a/lang/basic/src/bem.h
+++ b/lang/basic/src/bem.h
@@ -73,7 +73,7 @@ extern Linerecord *currline;
 extern char *itoa();
 extern char *salloc();
 
-extern char *sprintf();
+extern char *sprint();
 extern char *strcpy();
 extern char *strcat();
 extern char *malloc();
diff --git a/lang/basic/src/gencode.c b/lang/basic/src/gencode.c
index 6dfc2ef06..da3c443bd 100644
--- a/lang/basic/src/gencode.c
+++ b/lang/basic/src/gencode.c
@@ -59,6 +59,7 @@ List	*datalist=0;
 datastmt()
 {
 	List *l,*l1;
+	extern long sys_filesize();
 
 	/* NOSTRICT */ l= (List *) salloc(sizeof(List));
 	l->linenr= currline->linenr;