diff --git a/MakefileParser/MakefileImporter.project b/MakefileParser/MakefileImporter.project
index e20b8355ef..04d72caabe 100644
--- a/MakefileParser/MakefileImporter.project
+++ b/MakefileParser/MakefileImporter.project
@@ -53,11 +53,11 @@
       <PreBuild/>
       <PostBuild/>
       <CustomBuild Enabled="no">
-        <CleanCommand></CleanCommand>
-        <BuildCommand></BuildCommand>
+        <CleanCommand/>
+        <BuildCommand/>
       </CustomBuild>
       <AdditionalRules>
-        <CustomPostBuild></CustomPostBuild>
+        <CustomPostBuild/>
         <CustomPreBuild>makefile_parser.cpp makefile_lexer.cpp
 makefile_parser.cpp: makefile_parser.y
 	yacc -dl  -t -v makefile_parser.y
@@ -96,14 +96,12 @@ makefile_lexer.cpp: makefile_parser.l
       <PreBuild/>
       <PostBuild/>
       <CustomBuild Enabled="no">
-        <CleanCommand></CleanCommand>
-        <BuildCommand></BuildCommand>
+        <CleanCommand/>
+        <BuildCommand/>
       </CustomBuild>
       <AdditionalRules>
-        <CustomPostBuild></CustomPostBuild>
-        <CustomPreBuild>
-
-</CustomPreBuild>
+        <CustomPostBuild/>
+        <CustomPreBuild/>
       </AdditionalRules>
     </Configuration>
     <Configuration Name="WinDebugUnicode" CompilerType="gnu g++" DebuggerType="GNU gdb debugger">
@@ -135,11 +133,11 @@ makefile_lexer.cpp: makefile_parser.l
       <PreBuild/>
       <PostBuild/>
       <CustomBuild Enabled="no">
-        <CleanCommand></CleanCommand>
-        <BuildCommand></BuildCommand>
+        <CleanCommand/>
+        <BuildCommand/>
       </CustomBuild>
       <AdditionalRules>
-        <CustomPostBuild></CustomPostBuild>
+        <CustomPostBuild/>
         <CustomPreBuild>makefile_parser.cpp makefile_lexer.cpp
 makefile_parser.cpp: makefile_parser.y
 	yacc -dl  -t -v makefile_parser.y
@@ -180,12 +178,12 @@ makefile_lexer.cpp: makefile_parser.l
       <PreBuild/>
       <PostBuild/>
       <CustomBuild Enabled="no">
-        <CleanCommand></CleanCommand>
-        <BuildCommand></BuildCommand>
+        <CleanCommand/>
+        <BuildCommand/>
       </CustomBuild>
       <AdditionalRules>
-        <CustomPostBuild></CustomPostBuild>
-        <CustomPreBuild></CustomPreBuild>
+        <CustomPostBuild/>
+        <CustomPreBuild/>
       </AdditionalRules>
     </Configuration>
   </Settings>
diff --git a/MakefileParser/makefile_lexer.cpp b/MakefileParser/makefile_lexer.cpp
index 337aa933c9..dea4517510 100644
--- a/MakefileParser/makefile_lexer.cpp
+++ b/MakefileParser/makefile_lexer.cpp
@@ -1567,18 +1567,10 @@ int main()
 
 
 
-void initLexer(const char *fileName)
+void initLexer(const char *data)
 {
-        FILE *file = fopen(fileName, "r");
-        if(!file)
-        {
-                printf("failed loading file 'test.h'\n");
-                exit(-1);
-        }
-
-        //set the file to be our buffer
-        YY_BUFFER_STATE buffState = yy_create_buffer(file, YY_BUF_SIZE);
-        yy_switch_to_buffer(buffState);
+	BEGIN INITIAL;
+	yy_scan_string(data);
 }
 
 int yywrap()