diff --git a/src/CppParser/Bindings/CLI/CppParser.cpp b/src/CppParser/Bindings/CLI/CppParser.cpp
index ac4d2fa3..7220ac36 100644
--- a/src/CppParser/Bindings/CLI/CppParser.cpp
+++ b/src/CppParser/Bindings/CLI/CppParser.cpp
@@ -166,6 +166,25 @@ void CppSharp::Parser::CppParserOptions::ClearLibraryDirs()
     ((::CppSharp::CppParser::CppParserOptions*)NativePtr)->clearLibraryDirs();
 }
 
+System::String^ CppSharp::Parser::CppParserOptions::GetSupportedStdTypes(unsigned int i)
+{
+    auto __ret = ((::CppSharp::CppParser::CppParserOptions*)NativePtr)->getSupportedStdTypes(i);
+    if (__ret == nullptr) return nullptr;
+    return (__ret == 0 ? nullptr : clix::marshalString<clix::E_UTF8>(__ret));
+}
+
+void CppSharp::Parser::CppParserOptions::AddSupportedStdTypes(System::String^ s)
+{
+    auto ___arg0 = clix::marshalString<clix::E_UTF8>(s);
+    auto __arg0 = ___arg0.c_str();
+    ((::CppSharp::CppParser::CppParserOptions*)NativePtr)->addSupportedStdTypes(__arg0);
+}
+
+void CppSharp::Parser::CppParserOptions::ClearSupportedStdTypes()
+{
+    ((::CppSharp::CppParser::CppParserOptions*)NativePtr)->clearSupportedStdTypes();
+}
+
 CppSharp::Parser::CppParserOptions::CppParserOptions(CppSharp::Parser::CppParserOptions^ _0)
 {
     __ownsNativeInstance = true;
@@ -349,6 +368,28 @@ void CppSharp::Parser::CppParserOptions::LibraryDirs::set(System::Collections::G
     ((::CppSharp::CppParser::CppParserOptions*)NativePtr)->LibraryDirs = _tmpvalue;
 }
 
+System::Collections::Generic::List<System::String^>^ CppSharp::Parser::CppParserOptions::SupportedStdTypes::get()
+{
+    auto _tmp__SupportedStdTypes = gcnew System::Collections::Generic::List<System::String^>();
+    for(auto _element : ((::CppSharp::CppParser::CppParserOptions*)NativePtr)->SupportedStdTypes)
+    {
+        auto _marshalElement = clix::marshalString<clix::E_UTF8>(_element);
+        _tmp__SupportedStdTypes->Add(_marshalElement);
+    }
+    return _tmp__SupportedStdTypes;
+}
+
+void CppSharp::Parser::CppParserOptions::SupportedStdTypes::set(System::Collections::Generic::List<System::String^>^ value)
+{
+    auto _tmpvalue = std::vector<::std::string>();
+    for each(System::String^ _element in value)
+    {
+        auto _marshalElement = clix::marshalString<clix::E_UTF8>(_element);
+        _tmpvalue.push_back(_marshalElement);
+    }
+    ((::CppSharp::CppParser::CppParserOptions*)NativePtr)->SupportedStdTypes = _tmpvalue;
+}
+
 CppSharp::Parser::AST::ASTContext^ CppSharp::Parser::CppParserOptions::ASTContext::get()
 {
     return (((::CppSharp::CppParser::CppParserOptions*)NativePtr)->ASTContext == nullptr) ? nullptr : gcnew CppSharp::Parser::AST::ASTContext((::CppSharp::CppParser::AST::ASTContext*)((::CppSharp::CppParser::CppParserOptions*)NativePtr)->ASTContext);
@@ -491,6 +532,12 @@ unsigned int CppSharp::Parser::CppParserOptions::LibraryDirsCount::get()
     return __ret;
 }
 
+unsigned int CppSharp::Parser::CppParserOptions::SupportedStdTypesCount::get()
+{
+    auto __ret = ((::CppSharp::CppParser::CppParserOptions*)NativePtr)->getSupportedStdTypesCount();
+    return __ret;
+}
+
 CppSharp::Parser::ParserDiagnostic::ParserDiagnostic(::CppSharp::CppParser::ParserDiagnostic* native)
     : __ownsNativeInstance(false)
 {
diff --git a/src/CppParser/Bindings/CLI/CppParser.h b/src/CppParser/Bindings/CLI/CppParser.h
index 7d42fffa..5f1be90b 100644
--- a/src/CppParser/Bindings/CLI/CppParser.h
+++ b/src/CppParser/Bindings/CLI/CppParser.h
@@ -127,6 +127,12 @@ namespace CppSharp
                 void set(System::Collections::Generic::List<System::String^>^);
             }
 
+            property System::Collections::Generic::List<System::String^>^ SupportedStdTypes
+            {
+                System::Collections::Generic::List<System::String^>^ get();
+                void set(System::Collections::Generic::List<System::String^>^);
+            }
+
             property CppSharp::Parser::AST::ASTContext^ ASTContext
             {
                 CppSharp::Parser::AST::ASTContext^ get();
@@ -222,6 +228,11 @@ namespace CppSharp
                 unsigned int get();
             }
 
+            property unsigned int SupportedStdTypesCount
+            {
+                unsigned int get();
+            }
+
             System::String^ GetArguments(unsigned int i);
 
             void AddArguments(System::String^ s);
@@ -264,6 +275,12 @@ namespace CppSharp
 
             void ClearLibraryDirs();
 
+            System::String^ GetSupportedStdTypes(unsigned int i);
+
+            void AddSupportedStdTypes(System::String^ s);
+
+            void ClearSupportedStdTypes();
+
             protected:
             bool __ownsNativeInstance;
         };
diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs
index 8aaf9742..049912cd 100644
--- a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs
@@ -17948,7 +17948,7 @@ namespace CppSharp
 
         public unsafe partial class CppParserOptions : IDisposable
         {
-            [StructLayout(LayoutKind.Explicit, Size = 140)]
+            [StructLayout(LayoutKind.Explicit, Size = 152)]
             public partial struct __Internal
             {
                 [FieldOffset(0)]
@@ -17976,33 +17976,36 @@ namespace CppSharp
                 internal global::Std.Vector.__Internal LibraryDirs;
 
                 [FieldOffset(96)]
+                internal global::Std.Vector.__Internal SupportedStdTypes;
+
+                [FieldOffset(108)]
                 internal global::System.IntPtr ASTContext;
 
-                [FieldOffset(100)]
+                [FieldOffset(112)]
                 internal int toolSetToUse;
 
-                [FieldOffset(104)]
+                [FieldOffset(116)]
                 internal global::Std.BasicString.__Internal targetTriple;
 
-                [FieldOffset(116)]
+                [FieldOffset(128)]
                 internal global::Std.BasicString.__Internal currentDir;
 
-                [FieldOffset(128)]
+                [FieldOffset(140)]
                 internal global::CppSharp.Parser.AST.CppAbi abi;
 
-                [FieldOffset(132)]
+                [FieldOffset(144)]
                 internal byte noStandardIncludes;
 
-                [FieldOffset(133)]
+                [FieldOffset(145)]
                 internal byte noBuiltinIncludes;
 
-                [FieldOffset(134)]
+                [FieldOffset(146)]
                 internal byte microsoftMode;
 
-                [FieldOffset(135)]
+                [FieldOffset(147)]
                 internal byte verbose;
 
-                [FieldOffset(136)]
+                [FieldOffset(148)]
                 internal global::System.IntPtr targetInfo;
 
                 [SuppressUnmanagedCodeSecurity]
@@ -18125,6 +18128,21 @@ namespace CppSharp
                     EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions16clearLibraryDirsEv")]
                 internal static extern void ClearLibraryDirs(global::System.IntPtr instance);
 
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                    EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions20getSupportedStdTypesEj")]
+                internal static extern global::System.IntPtr GetSupportedStdTypes(global::System.IntPtr instance, uint i);
+
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                    EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions20addSupportedStdTypesEPKc")]
+                internal static extern void AddSupportedStdTypes(global::System.IntPtr instance, [MarshalAs(UnmanagedType.LPStr)] string s);
+
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                    EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions22clearSupportedStdTypesEv")]
+                internal static extern void ClearSupportedStdTypes(global::System.IntPtr instance);
+
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions17getArgumentsCountEv")]
@@ -18159,6 +18177,11 @@ namespace CppSharp
                 [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions19getLibraryDirsCountEv")]
                 internal static extern uint GetLibraryDirsCount(global::System.IntPtr instance);
+
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                    EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions25getSupportedStdTypesCountEv")]
+                internal static extern uint GetSupportedStdTypesCount(global::System.IntPtr instance);
             }
 
             public global::System.IntPtr __Instance { get; protected set; }
@@ -18349,6 +18372,22 @@ namespace CppSharp
                 __Internal.ClearLibraryDirs((__Instance + __PointerAdjustment));
             }
 
+            public string GetSupportedStdTypes(uint i)
+            {
+                var __ret = __Internal.GetSupportedStdTypes((__Instance + __PointerAdjustment), i);
+                return Marshal.PtrToStringAnsi(__ret);
+            }
+
+            public void AddSupportedStdTypes(string s)
+            {
+                __Internal.AddSupportedStdTypes((__Instance + __PointerAdjustment), s);
+            }
+
+            public void ClearSupportedStdTypes()
+            {
+                __Internal.ClearSupportedStdTypes((__Instance + __PointerAdjustment));
+            }
+
             public string LibraryFile
             {
                 get
@@ -18579,6 +18618,15 @@ namespace CppSharp
                     return __ret;
                 }
             }
+
+            public uint SupportedStdTypesCount
+            {
+                get
+                {
+                    var __ret = __Internal.GetSupportedStdTypesCount((__Instance + __PointerAdjustment));
+                    return __ret;
+                }
+            }
         }
 
         public unsafe partial class ParserDiagnostic : IDisposable
diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs
index 0967a12c..6f634dd3 100644
--- a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs
+++ b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs
@@ -248,15 +248,6 @@ namespace Std
             [FieldOffset(0)]
             internal global::Std.Tree.__Internal __tree_;
         }
-
-
-        public unsafe partial class ValueCompare
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 0)]
-            public partial struct __Internal
-            {
-            }
-        }
     }
 
     public unsafe partial class Map<_Key, _Tp, _Compare, _Allocator>
diff --git a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs
index d1f4b764..ab001466 100644
--- a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs
@@ -17948,7 +17948,7 @@ namespace CppSharp
 
         public unsafe partial class CppParserOptions : IDisposable
         {
-            [StructLayout(LayoutKind.Explicit, Size = 176)]
+            [StructLayout(LayoutKind.Explicit, Size = 188)]
             public partial struct __Internal
             {
                 [FieldOffset(0)]
@@ -17976,33 +17976,36 @@ namespace CppSharp
                 internal global::Std.Vector.__Internal LibraryDirs;
 
                 [FieldOffset(108)]
+                internal global::Std.Vector.__Internal SupportedStdTypes;
+
+                [FieldOffset(120)]
                 internal global::System.IntPtr ASTContext;
 
-                [FieldOffset(112)]
+                [FieldOffset(124)]
                 internal int toolSetToUse;
 
-                [FieldOffset(116)]
+                [FieldOffset(128)]
                 internal global::Std.BasicString.__Internal targetTriple;
 
-                [FieldOffset(140)]
+                [FieldOffset(152)]
                 internal global::Std.BasicString.__Internal currentDir;
 
-                [FieldOffset(164)]
+                [FieldOffset(176)]
                 internal global::CppSharp.Parser.AST.CppAbi abi;
 
-                [FieldOffset(168)]
+                [FieldOffset(180)]
                 internal byte noStandardIncludes;
 
-                [FieldOffset(169)]
+                [FieldOffset(181)]
                 internal byte noBuiltinIncludes;
 
-                [FieldOffset(170)]
+                [FieldOffset(182)]
                 internal byte microsoftMode;
 
-                [FieldOffset(171)]
+                [FieldOffset(183)]
                 internal byte verbose;
 
-                [FieldOffset(172)]
+                [FieldOffset(184)]
                 internal global::System.IntPtr targetInfo;
 
                 [SuppressUnmanagedCodeSecurity]
@@ -18125,6 +18128,21 @@ namespace CppSharp
                     EntryPoint="?clearLibraryDirs@CppParserOptions@CppParser@CppSharp@@QAEXXZ")]
                 internal static extern void ClearLibraryDirs(global::System.IntPtr instance);
 
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                    EntryPoint="?getSupportedStdTypes@CppParserOptions@CppParser@CppSharp@@QAEPBDI@Z")]
+                internal static extern global::System.IntPtr GetSupportedStdTypes(global::System.IntPtr instance, uint i);
+
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                    EntryPoint="?addSupportedStdTypes@CppParserOptions@CppParser@CppSharp@@QAEXPBD@Z")]
+                internal static extern void AddSupportedStdTypes(global::System.IntPtr instance, [MarshalAs(UnmanagedType.LPStr)] string s);
+
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                    EntryPoint="?clearSupportedStdTypes@CppParserOptions@CppParser@CppSharp@@QAEXXZ")]
+                internal static extern void ClearSupportedStdTypes(global::System.IntPtr instance);
+
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                     EntryPoint="?getArgumentsCount@CppParserOptions@CppParser@CppSharp@@QAEIXZ")]
@@ -18159,6 +18177,11 @@ namespace CppSharp
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                     EntryPoint="?getLibraryDirsCount@CppParserOptions@CppParser@CppSharp@@QAEIXZ")]
                 internal static extern uint GetLibraryDirsCount(global::System.IntPtr instance);
+
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
+                    EntryPoint="?getSupportedStdTypesCount@CppParserOptions@CppParser@CppSharp@@QAEIXZ")]
+                internal static extern uint GetSupportedStdTypesCount(global::System.IntPtr instance);
             }
 
             public global::System.IntPtr __Instance { get; protected set; }
@@ -18349,6 +18372,22 @@ namespace CppSharp
                 __Internal.ClearLibraryDirs((__Instance + __PointerAdjustment));
             }
 
+            public string GetSupportedStdTypes(uint i)
+            {
+                var __ret = __Internal.GetSupportedStdTypes((__Instance + __PointerAdjustment), i);
+                return Marshal.PtrToStringAnsi(__ret);
+            }
+
+            public void AddSupportedStdTypes(string s)
+            {
+                __Internal.AddSupportedStdTypes((__Instance + __PointerAdjustment), s);
+            }
+
+            public void ClearSupportedStdTypes()
+            {
+                __Internal.ClearSupportedStdTypes((__Instance + __PointerAdjustment));
+            }
+
             public string LibraryFile
             {
                 get
@@ -18579,6 +18618,15 @@ namespace CppSharp
                     return __ret;
                 }
             }
+
+            public uint SupportedStdTypesCount
+            {
+                get
+                {
+                    var __ret = __Internal.GetSupportedStdTypesCount((__Instance + __PointerAdjustment));
+                    return __ret;
+                }
+            }
         }
 
         public unsafe partial class ParserDiagnostic : IDisposable
diff --git a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs
index e4197962..37ad4887 100644
--- a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs
+++ b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs
@@ -477,6 +477,43 @@ namespace Std
 
 namespace Std
 {
+    namespace StringVal
+    {
+        [StructLayout(LayoutKind.Explicit, Size = 24)]
+        public unsafe partial struct __Internal
+        {
+            [FieldOffset(0)]
+            internal global::Std.StringVal.Bxty.__Internal _Bx;
+
+            [FieldOffset(16)]
+            internal uint _Mysize;
+
+            [FieldOffset(20)]
+            internal uint _Myres;
+        }
+
+
+        public unsafe partial struct Bxty
+        {
+            [StructLayout(LayoutKind.Explicit, Size = 16)]
+            public partial struct __Internal
+            {
+                [FieldOffset(0)]
+                internal fixed sbyte _Buf[16];
+
+                [FieldOffset(0)]
+                internal global::System.IntPtr _Ptr;
+
+                [FieldOffset(0)]
+                internal fixed sbyte _Alias[16];
+            }
+        }
+    }
+
+    public unsafe partial class StringVal<_Val_types>
+    {
+    }
+
     public unsafe static partial class BasicStringExtensions
     {
         [StructLayout(LayoutKind.Explicit, Size = 0)]
@@ -605,43 +642,6 @@ namespace Std
             __Instance = IntPtr.Zero;
         }
     }
-
-    namespace StringVal
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 24)]
-        public unsafe partial struct __Internal
-        {
-            [FieldOffset(0)]
-            internal global::Std.StringVal.Bxty.__Internal _Bx;
-
-            [FieldOffset(16)]
-            internal uint _Mysize;
-
-            [FieldOffset(20)]
-            internal uint _Myres;
-        }
-
-
-        public unsafe partial struct Bxty
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 16)]
-            public partial struct __Internal
-            {
-                [FieldOffset(0)]
-                internal fixed sbyte _Buf[16];
-
-                [FieldOffset(0)]
-                internal global::System.IntPtr _Ptr;
-
-                [FieldOffset(0)]
-                internal fixed sbyte _Alias[16];
-            }
-        }
-    }
-
-    public unsafe partial class StringVal<_Val_types>
-    {
-    }
 }
 
 namespace Std
diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs
index 738f1dbb..954c112e 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs
@@ -17947,7 +17947,7 @@ namespace CppSharp
 
         public unsafe partial class CppParserOptions : IDisposable
         {
-            [StructLayout(LayoutKind.Explicit, Size = 272)]
+            [StructLayout(LayoutKind.Explicit, Size = 296)]
             public partial struct __Internal
             {
                 [FieldOffset(0)]
@@ -17975,33 +17975,36 @@ namespace CppSharp
                 internal global::Std.Vector.__Internal LibraryDirs;
 
                 [FieldOffset(192)]
+                internal global::Std.Vector.__Internal SupportedStdTypes;
+
+                [FieldOffset(216)]
                 internal global::System.IntPtr ASTContext;
 
-                [FieldOffset(200)]
+                [FieldOffset(224)]
                 internal int toolSetToUse;
 
-                [FieldOffset(208)]
+                [FieldOffset(232)]
                 internal global::Std.BasicString.__Internal targetTriple;
 
-                [FieldOffset(232)]
+                [FieldOffset(256)]
                 internal global::Std.BasicString.__Internal currentDir;
 
-                [FieldOffset(256)]
+                [FieldOffset(280)]
                 internal global::CppSharp.Parser.AST.CppAbi abi;
 
-                [FieldOffset(260)]
+                [FieldOffset(284)]
                 internal byte noStandardIncludes;
 
-                [FieldOffset(261)]
+                [FieldOffset(285)]
                 internal byte noBuiltinIncludes;
 
-                [FieldOffset(262)]
+                [FieldOffset(286)]
                 internal byte microsoftMode;
 
-                [FieldOffset(263)]
+                [FieldOffset(287)]
                 internal byte verbose;
 
-                [FieldOffset(264)]
+                [FieldOffset(288)]
                 internal global::System.IntPtr targetInfo;
 
                 [SuppressUnmanagedCodeSecurity]
@@ -18124,6 +18127,21 @@ namespace CppSharp
                     EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions16clearLibraryDirsEv")]
                 internal static extern void ClearLibraryDirs(global::System.IntPtr instance);
 
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                    EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions20getSupportedStdTypesEj")]
+                internal static extern global::System.IntPtr GetSupportedStdTypes(global::System.IntPtr instance, uint i);
+
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                    EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions20addSupportedStdTypesEPKc")]
+                internal static extern void AddSupportedStdTypes(global::System.IntPtr instance, [MarshalAs(UnmanagedType.LPStr)] string s);
+
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                    EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions22clearSupportedStdTypesEv")]
+                internal static extern void ClearSupportedStdTypes(global::System.IntPtr instance);
+
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions17getArgumentsCountEv")]
@@ -18158,6 +18176,11 @@ namespace CppSharp
                 [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions19getLibraryDirsCountEv")]
                 internal static extern uint GetLibraryDirsCount(global::System.IntPtr instance);
+
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                    EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions25getSupportedStdTypesCountEv")]
+                internal static extern uint GetSupportedStdTypesCount(global::System.IntPtr instance);
             }
 
             public global::System.IntPtr __Instance { get; protected set; }
@@ -18348,6 +18371,22 @@ namespace CppSharp
                 __Internal.ClearLibraryDirs((__Instance + __PointerAdjustment));
             }
 
+            public string GetSupportedStdTypes(uint i)
+            {
+                var __ret = __Internal.GetSupportedStdTypes((__Instance + __PointerAdjustment), i);
+                return Marshal.PtrToStringAnsi(__ret);
+            }
+
+            public void AddSupportedStdTypes(string s)
+            {
+                __Internal.AddSupportedStdTypes((__Instance + __PointerAdjustment), s);
+            }
+
+            public void ClearSupportedStdTypes()
+            {
+                __Internal.ClearSupportedStdTypes((__Instance + __PointerAdjustment));
+            }
+
             public string LibraryFile
             {
                 get
@@ -18578,6 +18617,15 @@ namespace CppSharp
                     return __ret;
                 }
             }
+
+            public uint SupportedStdTypesCount
+            {
+                get
+                {
+                    var __ret = __Internal.GetSupportedStdTypesCount((__Instance + __PointerAdjustment));
+                    return __ret;
+                }
+            }
         }
 
         public unsafe partial class ParserDiagnostic : IDisposable
diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs
index 023f303b..010451ce 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs
@@ -248,15 +248,6 @@ namespace Std
             [FieldOffset(0)]
             internal global::Std.Tree.__Internal __tree_;
         }
-
-
-        public unsafe partial class ValueCompare
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 0)]
-            public partial struct __Internal
-            {
-            }
-        }
     }
 
     public unsafe partial class Map<_Key, _Tp, _Compare, _Allocator>
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs
index 6f7f958a..f25666af 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs
@@ -17947,7 +17947,7 @@ namespace CppSharp
 
         public unsafe partial class CppParserOptions : IDisposable
         {
-            [StructLayout(LayoutKind.Explicit, Size = 296)]
+            [StructLayout(LayoutKind.Explicit, Size = 320)]
             public partial struct __Internal
             {
                 [FieldOffset(0)]
@@ -17975,33 +17975,36 @@ namespace CppSharp
                 internal global::Std.Vector.__Internal LibraryDirs;
 
                 [FieldOffset(200)]
+                internal global::Std.Vector.__Internal SupportedStdTypes;
+
+                [FieldOffset(224)]
                 internal global::System.IntPtr ASTContext;
 
-                [FieldOffset(208)]
+                [FieldOffset(232)]
                 internal int toolSetToUse;
 
-                [FieldOffset(216)]
+                [FieldOffset(240)]
                 internal global::Std.BasicString.__Internal targetTriple;
 
-                [FieldOffset(248)]
+                [FieldOffset(272)]
                 internal global::Std.BasicString.__Internal currentDir;
 
-                [FieldOffset(280)]
+                [FieldOffset(304)]
                 internal global::CppSharp.Parser.AST.CppAbi abi;
 
-                [FieldOffset(284)]
+                [FieldOffset(308)]
                 internal byte noStandardIncludes;
 
-                [FieldOffset(285)]
+                [FieldOffset(309)]
                 internal byte noBuiltinIncludes;
 
-                [FieldOffset(286)]
+                [FieldOffset(310)]
                 internal byte microsoftMode;
 
-                [FieldOffset(287)]
+                [FieldOffset(311)]
                 internal byte verbose;
 
-                [FieldOffset(288)]
+                [FieldOffset(312)]
                 internal global::System.IntPtr targetInfo;
 
                 [SuppressUnmanagedCodeSecurity]
@@ -18124,6 +18127,21 @@ namespace CppSharp
                     EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions16clearLibraryDirsEv")]
                 internal static extern void ClearLibraryDirs(global::System.IntPtr instance);
 
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                    EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions20getSupportedStdTypesEj")]
+                internal static extern global::System.IntPtr GetSupportedStdTypes(global::System.IntPtr instance, uint i);
+
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                    EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions20addSupportedStdTypesEPKc")]
+                internal static extern void AddSupportedStdTypes(global::System.IntPtr instance, [MarshalAs(UnmanagedType.LPStr)] string s);
+
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                    EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions22clearSupportedStdTypesEv")]
+                internal static extern void ClearSupportedStdTypes(global::System.IntPtr instance);
+
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions17getArgumentsCountEv")]
@@ -18158,6 +18176,11 @@ namespace CppSharp
                 [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions19getLibraryDirsCountEv")]
                 internal static extern uint GetLibraryDirsCount(global::System.IntPtr instance);
+
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                    EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions25getSupportedStdTypesCountEv")]
+                internal static extern uint GetSupportedStdTypesCount(global::System.IntPtr instance);
             }
 
             public global::System.IntPtr __Instance { get; protected set; }
@@ -18348,6 +18371,22 @@ namespace CppSharp
                 __Internal.ClearLibraryDirs((__Instance + __PointerAdjustment));
             }
 
+            public string GetSupportedStdTypes(uint i)
+            {
+                var __ret = __Internal.GetSupportedStdTypes((__Instance + __PointerAdjustment), i);
+                return Marshal.PtrToStringAnsi(__ret);
+            }
+
+            public void AddSupportedStdTypes(string s)
+            {
+                __Internal.AddSupportedStdTypes((__Instance + __PointerAdjustment), s);
+            }
+
+            public void ClearSupportedStdTypes()
+            {
+                __Internal.ClearSupportedStdTypes((__Instance + __PointerAdjustment));
+            }
+
             public string LibraryFile
             {
                 get
@@ -18578,6 +18617,15 @@ namespace CppSharp
                     return __ret;
                 }
             }
+
+            public uint SupportedStdTypesCount
+            {
+                get
+                {
+                    var __ret = __Internal.GetSupportedStdTypesCount((__Instance + __PointerAdjustment));
+                    return __ret;
+                }
+            }
         }
 
         public unsafe partial class ParserDiagnostic : IDisposable
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs
index 26e1c080..e9e354ac 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs
@@ -13,10 +13,6 @@ using System.Runtime.CompilerServices;
 
 [assembly:InternalsVisibleTo("CppSharp.CppParser")]
 
-namespace Std
-{
-}
-
 namespace GnuCxx
 {
 }
@@ -288,15 +284,6 @@ namespace Std
             [FieldOffset(0)]
             internal global::Std.RbTree.__Internal _M_t;
         }
-
-
-        public unsafe partial class ValueCompare
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 0)]
-            public partial struct __Internal
-            {
-            }
-        }
     }
 
     public unsafe partial class Map<_Key, _Tp, _Compare, _Alloc>
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs
index f021d275..61286cef 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs
@@ -17947,7 +17947,7 @@ namespace CppSharp
 
         public unsafe partial class CppParserOptions : IDisposable
         {
-            [StructLayout(LayoutKind.Explicit, Size = 224)]
+            [StructLayout(LayoutKind.Explicit, Size = 248)]
             public partial struct __Internal
             {
                 [FieldOffset(0)]
@@ -17975,33 +17975,36 @@ namespace CppSharp
                 internal global::Std.Vector.__Internal LibraryDirs;
 
                 [FieldOffset(176)]
+                internal global::Std.Vector.__Internal SupportedStdTypes;
+
+                [FieldOffset(200)]
                 internal global::System.IntPtr ASTContext;
 
-                [FieldOffset(184)]
+                [FieldOffset(208)]
                 internal int toolSetToUse;
 
-                [FieldOffset(192)]
+                [FieldOffset(216)]
                 internal global::Std.BasicString.__Internal targetTriple;
 
-                [FieldOffset(200)]
+                [FieldOffset(224)]
                 internal global::Std.BasicString.__Internal currentDir;
 
-                [FieldOffset(208)]
+                [FieldOffset(232)]
                 internal global::CppSharp.Parser.AST.CppAbi abi;
 
-                [FieldOffset(212)]
+                [FieldOffset(236)]
                 internal byte noStandardIncludes;
 
-                [FieldOffset(213)]
+                [FieldOffset(237)]
                 internal byte noBuiltinIncludes;
 
-                [FieldOffset(214)]
+                [FieldOffset(238)]
                 internal byte microsoftMode;
 
-                [FieldOffset(215)]
+                [FieldOffset(239)]
                 internal byte verbose;
 
-                [FieldOffset(216)]
+                [FieldOffset(240)]
                 internal global::System.IntPtr targetInfo;
 
                 [SuppressUnmanagedCodeSecurity]
@@ -18124,6 +18127,21 @@ namespace CppSharp
                     EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions16clearLibraryDirsEv")]
                 internal static extern void ClearLibraryDirs(global::System.IntPtr instance);
 
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                    EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions20getSupportedStdTypesEj")]
+                internal static extern global::System.IntPtr GetSupportedStdTypes(global::System.IntPtr instance, uint i);
+
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                    EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions20addSupportedStdTypesEPKc")]
+                internal static extern void AddSupportedStdTypes(global::System.IntPtr instance, [MarshalAs(UnmanagedType.LPStr)] string s);
+
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                    EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions22clearSupportedStdTypesEv")]
+                internal static extern void ClearSupportedStdTypes(global::System.IntPtr instance);
+
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions17getArgumentsCountEv")]
@@ -18158,6 +18176,11 @@ namespace CppSharp
                 [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions19getLibraryDirsCountEv")]
                 internal static extern uint GetLibraryDirsCount(global::System.IntPtr instance);
+
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                    EntryPoint="_ZN8CppSharp9CppParser16CppParserOptions25getSupportedStdTypesCountEv")]
+                internal static extern uint GetSupportedStdTypesCount(global::System.IntPtr instance);
             }
 
             public global::System.IntPtr __Instance { get; protected set; }
@@ -18348,6 +18371,22 @@ namespace CppSharp
                 __Internal.ClearLibraryDirs((__Instance + __PointerAdjustment));
             }
 
+            public string GetSupportedStdTypes(uint i)
+            {
+                var __ret = __Internal.GetSupportedStdTypes((__Instance + __PointerAdjustment), i);
+                return Marshal.PtrToStringAnsi(__ret);
+            }
+
+            public void AddSupportedStdTypes(string s)
+            {
+                __Internal.AddSupportedStdTypes((__Instance + __PointerAdjustment), s);
+            }
+
+            public void ClearSupportedStdTypes()
+            {
+                __Internal.ClearSupportedStdTypes((__Instance + __PointerAdjustment));
+            }
+
             public string LibraryFile
             {
                 get
@@ -18578,6 +18617,15 @@ namespace CppSharp
                     return __ret;
                 }
             }
+
+            public uint SupportedStdTypesCount
+            {
+                get
+                {
+                    var __ret = __Internal.GetSupportedStdTypesCount((__Instance + __PointerAdjustment));
+                    return __ret;
+                }
+            }
         }
 
         public unsafe partial class ParserDiagnostic : IDisposable
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs
index cab30ec0..92992db1 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs
@@ -13,10 +13,6 @@ using System.Runtime.CompilerServices;
 
 [assembly:InternalsVisibleTo("CppSharp.CppParser")]
 
-namespace Std
-{
-}
-
 namespace GnuCxx
 {
 }
@@ -45,15 +41,6 @@ namespace Std
                 EntryPoint="_ZNSaIcED2Ev")]
             internal static extern void dtorc__N_std_S_allocator__C(global::System.IntPtr instance);
         }
-
-
-        public unsafe partial class Rebind
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 0)]
-            public unsafe partial struct __Internal
-            {
-            }
-        }
     }
 
     public unsafe partial class Allocator<_Tp> : IDisposable
@@ -297,15 +284,6 @@ namespace Std
             [FieldOffset(0)]
             internal global::Std.RbTree.__Internal _M_t;
         }
-
-
-        public unsafe partial class ValueCompare
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 0)]
-            public partial struct __Internal
-            {
-            }
-        }
     }
 
     public unsafe partial class Map<_Key, _Tp, _Compare, _Alloc>
diff --git a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs
index 06e7a07d..0b8d1f30 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs
@@ -17948,7 +17948,7 @@ namespace CppSharp
 
         public unsafe partial class CppParserOptions : IDisposable
         {
-            [StructLayout(LayoutKind.Explicit, Size = 296)]
+            [StructLayout(LayoutKind.Explicit, Size = 320)]
             public partial struct __Internal
             {
                 [FieldOffset(0)]
@@ -17976,33 +17976,36 @@ namespace CppSharp
                 internal global::Std.Vector.__Internal LibraryDirs;
 
                 [FieldOffset(200)]
+                internal global::Std.Vector.__Internal SupportedStdTypes;
+
+                [FieldOffset(224)]
                 internal global::System.IntPtr ASTContext;
 
-                [FieldOffset(208)]
+                [FieldOffset(232)]
                 internal int toolSetToUse;
 
-                [FieldOffset(216)]
+                [FieldOffset(240)]
                 internal global::Std.BasicString.__Internal targetTriple;
 
-                [FieldOffset(248)]
+                [FieldOffset(272)]
                 internal global::Std.BasicString.__Internal currentDir;
 
-                [FieldOffset(280)]
+                [FieldOffset(304)]
                 internal global::CppSharp.Parser.AST.CppAbi abi;
 
-                [FieldOffset(284)]
+                [FieldOffset(308)]
                 internal byte noStandardIncludes;
 
-                [FieldOffset(285)]
+                [FieldOffset(309)]
                 internal byte noBuiltinIncludes;
 
-                [FieldOffset(286)]
+                [FieldOffset(310)]
                 internal byte microsoftMode;
 
-                [FieldOffset(287)]
+                [FieldOffset(311)]
                 internal byte verbose;
 
-                [FieldOffset(288)]
+                [FieldOffset(312)]
                 internal global::System.IntPtr targetInfo;
 
                 [SuppressUnmanagedCodeSecurity]
@@ -18125,6 +18128,21 @@ namespace CppSharp
                     EntryPoint="?clearLibraryDirs@CppParserOptions@CppParser@CppSharp@@QEAAXXZ")]
                 internal static extern void ClearLibraryDirs(global::System.IntPtr instance);
 
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                    EntryPoint="?getSupportedStdTypes@CppParserOptions@CppParser@CppSharp@@QEAAPEBDI@Z")]
+                internal static extern global::System.IntPtr GetSupportedStdTypes(global::System.IntPtr instance, uint i);
+
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                    EntryPoint="?addSupportedStdTypes@CppParserOptions@CppParser@CppSharp@@QEAAXPEBD@Z")]
+                internal static extern void AddSupportedStdTypes(global::System.IntPtr instance, [MarshalAs(UnmanagedType.LPStr)] string s);
+
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                    EntryPoint="?clearSupportedStdTypes@CppParserOptions@CppParser@CppSharp@@QEAAXXZ")]
+                internal static extern void ClearSupportedStdTypes(global::System.IntPtr instance);
+
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="?getArgumentsCount@CppParserOptions@CppParser@CppSharp@@QEAAIXZ")]
@@ -18159,6 +18177,11 @@ namespace CppSharp
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="?getLibraryDirsCount@CppParserOptions@CppParser@CppSharp@@QEAAIXZ")]
                 internal static extern uint GetLibraryDirsCount(global::System.IntPtr instance);
+
+                [SuppressUnmanagedCodeSecurity]
+                [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                    EntryPoint="?getSupportedStdTypesCount@CppParserOptions@CppParser@CppSharp@@QEAAIXZ")]
+                internal static extern uint GetSupportedStdTypesCount(global::System.IntPtr instance);
             }
 
             public global::System.IntPtr __Instance { get; protected set; }
@@ -18349,6 +18372,22 @@ namespace CppSharp
                 __Internal.ClearLibraryDirs((__Instance + __PointerAdjustment));
             }
 
+            public string GetSupportedStdTypes(uint i)
+            {
+                var __ret = __Internal.GetSupportedStdTypes((__Instance + __PointerAdjustment), i);
+                return Marshal.PtrToStringAnsi(__ret);
+            }
+
+            public void AddSupportedStdTypes(string s)
+            {
+                __Internal.AddSupportedStdTypes((__Instance + __PointerAdjustment), s);
+            }
+
+            public void ClearSupportedStdTypes()
+            {
+                __Internal.ClearSupportedStdTypes((__Instance + __PointerAdjustment));
+            }
+
             public string LibraryFile
             {
                 get
@@ -18579,6 +18618,15 @@ namespace CppSharp
                     return __ret;
                 }
             }
+
+            public uint SupportedStdTypesCount
+            {
+                get
+                {
+                    var __ret = __Internal.GetSupportedStdTypesCount((__Instance + __PointerAdjustment));
+                    return __ret;
+                }
+            }
         }
 
         public unsafe partial class ParserDiagnostic : IDisposable
diff --git a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs
index 4b4cf128..82429d77 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs
@@ -477,6 +477,43 @@ namespace Std
 
 namespace Std
 {
+    namespace StringVal
+    {
+        [StructLayout(LayoutKind.Explicit, Size = 32)]
+        public unsafe partial struct __Internal
+        {
+            [FieldOffset(0)]
+            internal global::Std.StringVal.Bxty.__Internal _Bx;
+
+            [FieldOffset(16)]
+            internal ulong _Mysize;
+
+            [FieldOffset(24)]
+            internal ulong _Myres;
+        }
+
+
+        public unsafe partial struct Bxty
+        {
+            [StructLayout(LayoutKind.Explicit, Size = 16)]
+            public partial struct __Internal
+            {
+                [FieldOffset(0)]
+                internal fixed sbyte _Buf[16];
+
+                [FieldOffset(0)]
+                internal global::System.IntPtr _Ptr;
+
+                [FieldOffset(0)]
+                internal fixed sbyte _Alias[16];
+            }
+        }
+    }
+
+    public unsafe partial class StringVal<_Val_types>
+    {
+    }
+
     public unsafe static partial class BasicStringExtensions
     {
         [StructLayout(LayoutKind.Explicit, Size = 0)]
@@ -605,43 +642,6 @@ namespace Std
             __Instance = IntPtr.Zero;
         }
     }
-
-    namespace StringVal
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 32)]
-        public unsafe partial struct __Internal
-        {
-            [FieldOffset(0)]
-            internal global::Std.StringVal.Bxty.__Internal _Bx;
-
-            [FieldOffset(16)]
-            internal ulong _Mysize;
-
-            [FieldOffset(24)]
-            internal ulong _Myres;
-        }
-
-
-        public unsafe partial struct Bxty
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 16)]
-            public partial struct __Internal
-            {
-                [FieldOffset(0)]
-                internal fixed sbyte _Buf[16];
-
-                [FieldOffset(0)]
-                internal global::System.IntPtr _Ptr;
-
-                [FieldOffset(0)]
-                internal fixed sbyte _Alias[16];
-            }
-        }
-    }
-
-    public unsafe partial class StringVal<_Val_types>
-    {
-    }
 }
 
 namespace Std
diff --git a/src/CppParser/CppParser.cpp b/src/CppParser/CppParser.cpp
index 1307c500..d4ab7263 100644
--- a/src/CppParser/CppParser.cpp
+++ b/src/CppParser/CppParser.cpp
@@ -31,6 +31,7 @@ DEF_VECTOR_STRING(CppParserOptions, SystemIncludeDirs)
 DEF_VECTOR_STRING(CppParserOptions, Defines)
 DEF_VECTOR_STRING(CppParserOptions, Undefines)
 DEF_VECTOR_STRING(CppParserOptions, LibraryDirs)
+DEF_VECTOR_STRING(CppParserOptions, SupportedStdTypes)
 
 ParserResult::ParserResult()
     : ASTContext(0)
diff --git a/src/CppParser/CppParser.h b/src/CppParser/CppParser.h
index 8c99234e..549aedac 100644
--- a/src/CppParser/CppParser.h
+++ b/src/CppParser/CppParser.h
@@ -31,6 +31,7 @@ struct CS_API CppParserOptions
     VECTOR_STRING(Defines)
     VECTOR_STRING(Undefines)
     VECTOR_STRING(LibraryDirs)
+    VECTOR_STRING(SupportedStdTypes)
 
     CppSharp::CppParser::AST::ASTContext* ASTContext;
 
diff --git a/src/CppParser/Parser.cpp b/src/CppParser/Parser.cpp
index 53b06e3b..96dba492 100644
--- a/src/CppParser/Parser.cpp
+++ b/src/CppParser/Parser.cpp
@@ -70,6 +70,8 @@ void* IgnorePtr = reinterpret_cast<void*>(0x1);
 
 Parser::Parser(CppParserOptions* Opts) : lib(Opts->ASTContext), opts(Opts), index(0)
 {
+    for (const auto& SupportedStdType : Opts->SupportedStdTypes)
+        supportedStdTypes.insert(SupportedStdType);
     supportedStdTypes.insert("allocator");
     supportedStdTypes.insert("basic_string");
 }