diff --git a/src/.gitignore b/src/.gitignore
index c226dec3cbcac241cba9c29310ff03489c9f9821..763306ec4b50eaa317465d6429ca9ce98eca6b31 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -6,3 +6,4 @@ depcomp
 install-sh
 missing
 ylwrap
+*.o
diff --git a/src/code.h b/src/code.h
index 86c4c01d66b4707ff2a6321ff7cf8f6031cf2f1d..10bff7ca78f534d53931e361847ed381b5a04f15 100755
--- a/src/code.h
+++ b/src/code.h
@@ -186,6 +186,9 @@ extern void (*FunctionPrototipe)( int f, ... );
 extern void (*FunctionBegin)( int f, ... );
 extern void (*FunctionEnd)( int f );
 
+void MATLAB_Inline( char *fmt, ... );
+void F90_Inline( char *fmt, ... );
+
 void WriteDelim();
 
 #endif
diff --git a/src/configure.ac b/src/configure.ac
index c39c204c568086e36eb0a63714708e1a9f8699d1..6e9aa45237d6933f3df780ab018e7563bd527e60 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -7,6 +7,6 @@ dnl we use the build type foreign here instead of gnu because I do not have a NE
 AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_FILES([Makefile])
 AC_PROG_CC
-AC_PROG_LEX(yywrap)
+AC_PROG_LEX(noyywrap)
 AC_PROG_YACC
 AC_OUTPUT
diff --git a/src/gen.c b/src/gen.c
index a086edcf7b59ca0bc340ff9a31f7ea19e982e0e5..488deed00ca976603bb125b89cceb2a3203efd4a 100755
--- a/src/gen.c
+++ b/src/gen.c
@@ -35,8 +35,6 @@
 #include "gdata.h"
 #include "code.h"
 #include "scan.h"
-#include "code_matlab.c"
-#include "code_f90.c"
 
 #define MAX_MONITOR 8
 enum strutypes { PLAIN, LU };
diff --git a/src/scan.h b/src/scan.h
index f5ba14f9efdacd0067b32d8956cf271d61d48f97..350fb42b7cdce07512c7731fcdfbf46ca40bf204 100755
--- a/src/scan.h
+++ b/src/scan.h
@@ -72,6 +72,8 @@ extern int nError;
 extern int nWarning;
 extern int crt_section;
 
+int EqNoCase( char *s1, char *s2 );
+
 int ParseEquationFile( char * filename );
 
 int Parser( char * filename );  
diff --git a/src/scanner.c b/src/scanner.c
index c21454e101bdfda78fcc3a958ca207e45f85a231..7f96ff96f127d28d25e23ee7641c707478a3da53 100755
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -36,7 +36,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <ctype.h>
 
 int AtomNr    = 0;
 int SpeciesNr = 0;
@@ -172,14 +171,6 @@ int n;
     ScanError("Bad Z grid number <%s>", cmd);
 }
 
-int EqNoCase( char *s1, char *s2 )
-{
-  while( *s1 ) {
-    if ( toupper(*s1++) != toupper(*s2++) ) return 0;
-  }
-  return *s1 == *s2;
-}
-
 void CmdFunction( char *cmd )
 {
   if( EqNoCase( cmd, "AGGREGATE" ) ) {
diff --git a/src/yacc.l b/src/yacc.l
index 53fddce79abce3b0796a48c74f19acbfdcb438bc..7b11d96276937addbc0d5baf586cc1156d892083 100755
--- a/src/yacc.l
+++ b/src/yacc.l
@@ -41,6 +41,8 @@
 %s COMMENT COMMENT2 EQN_ID
 %x INL_CODE
 
+%option noyywrap
+
 %{
   #include <string.h> /* strcpy, strlen */
   #include "gdata.h"