diff --git a/src/scan.l b/src/scan.l
index b52256b8..39e8870f 100644
--- a/src/scan.l
+++ b/src/scan.l
@@ -23,13 +23,16 @@
 #define YY_EXIT_FAILURE ( (void)yyscanner, 2 )
 %}
 
+%option reentrant
+
 %option noyyalloc
 %option noyyrealloc
 %option noyyfree
-%option reentrant
 %option noinput
 %option nounput
 %option extra-type="struct parser_control *"
+%option noyywrap
+
 %option header-file="lex.yy.h"
 %option never-interactive
 
@@ -190,13 +193,3 @@ yyfree(void * ptr, yyscan_t yyscanner)
 {
   return pic_free(yyextra->pic, ptr);
 }
-
-#define UNUSED(v) ((void)(v))
-
-int
-yywrap(yyscan_t yyscanner)
-{
-  UNUSED(yyscanner);
-
-  return 1;
-}