diff --git a/src/CppParser/Bindings/CLI/AST.h b/src/CppParser/Bindings/CLI/AST.h
index a34e6477..4329fa55 100644
--- a/src/CppParser/Bindings/CLI/AST.h
+++ b/src/CppParser/Bindings/CLI/AST.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CppSharp.h"
-#include <C:/Development/CppSharp/src/CppParser/AST.h>
+#include <AST.h>
 
 namespace CppSharp
 {
diff --git a/src/CppParser/Bindings/CLI/CppParser.cpp b/src/CppParser/Bindings/CLI/CppParser.cpp
index 92a4b704..ea60f590 100644
--- a/src/CppParser/Bindings/CLI/CppParser.cpp
+++ b/src/CppParser/Bindings/CLI/CppParser.cpp
@@ -30,6 +30,16 @@ void CppSharp::Parser::ParserOptions::Instance::set(System::IntPtr object)
     NativePtr = (::CppSharp::CppParser::ParserOptions*)object.ToPointer();
 }
 
+System::String^ CppSharp::Parser::ParserOptions::FileName::get()
+{
+    return clix::marshalString<clix::E_UTF8>(((::CppSharp::CppParser::ParserOptions*)NativePtr)->FileName);
+}
+
+void CppSharp::Parser::ParserOptions::FileName::set(System::String^ value)
+{
+    ((::CppSharp::CppParser::ParserOptions*)NativePtr)->FileName = clix::marshalString<clix::E_UTF8>(value);
+}
+
 System::Collections::Generic::List<System::String^>^ CppSharp::Parser::ParserOptions::IncludeDirs::get()
 {
     auto _tmpIncludeDirs = gcnew System::Collections::Generic::List<System::String^>();
@@ -118,16 +128,6 @@ void CppSharp::Parser::ParserOptions::LibraryDirs::set(System::Collections::Gene
     ((::CppSharp::CppParser::ParserOptions*)NativePtr)->LibraryDirs = _tmpvalue;
 }
 
-System::String^ CppSharp::Parser::ParserOptions::FileName::get()
-{
-    return clix::marshalString<clix::E_UTF8>(((::CppSharp::CppParser::ParserOptions*)NativePtr)->FileName);
-}
-
-void CppSharp::Parser::ParserOptions::FileName::set(System::String^ value)
-{
-    ((::CppSharp::CppParser::ParserOptions*)NativePtr)->FileName = clix::marshalString<clix::E_UTF8>(value);
-}
-
 CppSharp::Parser::AST::ASTContext^ CppSharp::Parser::ParserOptions::ASTContext::get()
 {
     return gcnew CppSharp::Parser::AST::ASTContext((::CppSharp::CppParser::AST::ASTContext*)((::CppSharp::CppParser::ParserOptions*)NativePtr)->ASTContext);
@@ -158,6 +158,16 @@ void CppSharp::Parser::ParserOptions::TargetTriple::set(System::String^ value)
     ((::CppSharp::CppParser::ParserOptions*)NativePtr)->TargetTriple = clix::marshalString<clix::E_UTF8>(value);
 }
 
+CppSharp::Parser::AST::CppAbi CppSharp::Parser::ParserOptions::Abi::get()
+{
+    return (CppSharp::Parser::AST::CppAbi)((::CppSharp::CppParser::ParserOptions*)NativePtr)->Abi;
+}
+
+void CppSharp::Parser::ParserOptions::Abi::set(CppSharp::Parser::AST::CppAbi value)
+{
+    ((::CppSharp::CppParser::ParserOptions*)NativePtr)->Abi = (::CppSharp::CppParser::AST::CppAbi)value;
+}
+
 bool CppSharp::Parser::ParserOptions::NoStandardIncludes::get()
 {
     return ((::CppSharp::CppParser::ParserOptions*)NativePtr)->NoStandardIncludes;
@@ -188,16 +198,6 @@ void CppSharp::Parser::ParserOptions::MicrosoftMode::set(bool value)
     ((::CppSharp::CppParser::ParserOptions*)NativePtr)->MicrosoftMode = value;
 }
 
-CppSharp::Parser::AST::CppAbi CppSharp::Parser::ParserOptions::Abi::get()
-{
-    return (CppSharp::Parser::AST::CppAbi)((::CppSharp::CppParser::ParserOptions*)NativePtr)->Abi;
-}
-
-void CppSharp::Parser::ParserOptions::Abi::set(CppSharp::Parser::AST::CppAbi value)
-{
-    ((::CppSharp::CppParser::ParserOptions*)NativePtr)->Abi = (::CppSharp::CppParser::AST::CppAbi)value;
-}
-
 bool CppSharp::Parser::ParserOptions::Verbose::get()
 {
     return ((::CppSharp::CppParser::ParserOptions*)NativePtr)->Verbose;
diff --git a/src/CppParser/Bindings/CLI/CppParser.h b/src/CppParser/Bindings/CLI/CppParser.h
index 5e168d4a..b00f6f3e 100644
--- a/src/CppParser/Bindings/CLI/CppParser.h
+++ b/src/CppParser/Bindings/CLI/CppParser.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CppSharp.h"
-#include <C:/Development/CppSharp/src/CppParser/CppParser.h>
+#include <CppParser.h>
 
 namespace CppSharp
 {
@@ -67,6 +67,11 @@ namespace CppSharp
             ParserOptions(System::IntPtr native);
             ParserOptions();
 
+            property System::String^ FileName
+            {
+                System::String^ get();
+                void set(System::String^);
+            }
             property System::Collections::Generic::List<System::String^>^ IncludeDirs
             {
                 System::Collections::Generic::List<System::String^>^ get();
@@ -87,11 +92,6 @@ namespace CppSharp
                 System::Collections::Generic::List<System::String^>^ get();
                 void set(System::Collections::Generic::List<System::String^>^);
             }
-            property System::String^ FileName
-            {
-                System::String^ get();
-                void set(System::String^);
-            }
             property CppSharp::Parser::AST::ASTContext^ ASTContext
             {
                 CppSharp::Parser::AST::ASTContext^ get();
@@ -107,6 +107,11 @@ namespace CppSharp
                 System::String^ get();
                 void set(System::String^);
             }
+            property CppSharp::Parser::AST::CppAbi Abi
+            {
+                CppSharp::Parser::AST::CppAbi get();
+                void set(CppSharp::Parser::AST::CppAbi);
+            }
             property bool NoStandardIncludes
             {
                 bool get();
@@ -122,11 +127,6 @@ namespace CppSharp
                 bool get();
                 void set(bool);
             }
-            property CppSharp::Parser::AST::CppAbi Abi
-            {
-                CppSharp::Parser::AST::CppAbi get();
-                void set(CppSharp::Parser::AST::CppAbi);
-            }
             property bool Verbose
             {
                 bool get();