diff --git a/lexer/theme-lexer.l b/lexer/theme-lexer.l
index 3d16c127..3f1a00ab 100644
--- a/lexer/theme-lexer.l
+++ b/lexer/theme-lexer.l
@@ -1,4 +1,6 @@
-%option noyywrap nounput never-interactive
+%option noyywrap
+%option nounput
+%option never-interactive
 %option bison-locations
 
 %{
@@ -35,7 +37,7 @@ typedef struct _ParseObject {
     char *filename;
 
     /** Length of string  */
-    size_t str_len;
+    ssize_t str_len;
     /** String */
     const char *input_str;
     /** Position in file */
diff --git a/lexer/theme-parser.y b/lexer/theme-parser.y
index f571d231..30cc987f 100644
--- a/lexer/theme-parser.y
+++ b/lexer/theme-parser.y
@@ -7,6 +7,7 @@
 %parse-param {const char *what}
 %code requires {
 #include "theme.h"
+#include "xrmoptions.h"
 
 typedef struct YYLTYPE {
   int first_line;