Made all fields of C# marshalling structures internal.

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
8 years ago · 51fe04b666
13 changed files with 5961 additions and 5964 deletions
--- 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
--- a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs
+++ b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs
@ -47,7 +47,7 @@ namespace Std
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public global::System.IntPtr __ptr_;
+            internal global::System.IntPtr __ptr_;
        }
    }
 }
@ -62,10 +62,10 @@ public unsafe partial class Sbuf
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public global::System.IntPtr _base;
+        internal global::System.IntPtr _base;
        [FieldOffset(4)]
-        public int _size;
+        internal int _size;
    }
 }
@ -75,13 +75,13 @@ public unsafe partial class DarwinSigaltstack
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public global::System.IntPtr ss_sp;
+        internal global::System.IntPtr ss_sp;
        [FieldOffset(4)]
-        public uint ss_size;
+        internal uint ss_size;
        [FieldOffset(8)]
-        public int ss_flags;
+        internal int ss_flags;
    }
 }
@ -91,10 +91,10 @@ public unsafe partial class Timeval
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public int tv_sec;
+        internal int tv_sec;
        [FieldOffset(4)]
-        public int tv_usec;
+        internal int tv_usec;
    }
 }
@ -104,10 +104,10 @@ public unsafe partial class RuneRange
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public int __nranges;
+        internal int __nranges;
        [FieldOffset(4)]
-        public global::System.IntPtr __ranges;
+        internal global::System.IntPtr __ranges;
    }
 }
@ -266,10 +266,10 @@ public unsafe partial struct Sigval
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public int sival_int;
+        internal int sival_int;
        [FieldOffset(0)]
-        public global::System.IntPtr sival_ptr;
+        internal global::System.IntPtr sival_ptr;
    }
 }
@ -279,10 +279,10 @@ public unsafe partial struct SigactionU
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public global::System.IntPtr __sa_handler;
+        internal global::System.IntPtr __sa_handler;
        [FieldOffset(0)]
-        public global::System.IntPtr __sa_sigaction;
+        internal global::System.IntPtr __sa_sigaction;
    }
 }
@ -292,52 +292,52 @@ public unsafe partial class DarwinI386ThreadState
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public uint __eax;
+        internal uint __eax;
        [FieldOffset(4)]
-        public uint __ebx;
+        internal uint __ebx;
        [FieldOffset(8)]
-        public uint __ecx;
+        internal uint __ecx;
        [FieldOffset(12)]
-        public uint __edx;
+        internal uint __edx;
        [FieldOffset(16)]
-        public uint __edi;
+        internal uint __edi;
        [FieldOffset(20)]
-        public uint __esi;
+        internal uint __esi;
        [FieldOffset(24)]
-        public uint __ebp;
+        internal uint __ebp;
        [FieldOffset(28)]
-        public uint __esp;
+        internal uint __esp;
        [FieldOffset(32)]
-        public uint __ss;
+        internal uint __ss;
        [FieldOffset(36)]
-        public uint __eflags;
+        internal uint __eflags;
        [FieldOffset(40)]
-        public uint __eip;
+        internal uint __eip;
        [FieldOffset(44)]
-        public uint __cs;
+        internal uint __cs;
        [FieldOffset(48)]
-        public uint __ds;
+        internal uint __ds;
        [FieldOffset(52)]
-        public uint __es;
+        internal uint __es;
        [FieldOffset(56)]
-        public uint __fs;
+        internal uint __fs;
        [FieldOffset(60)]
-        public uint __gs;
+        internal uint __gs;
    }
 }
@ -347,37 +347,37 @@ public unsafe partial class DarwinFpControl
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public ushort __invalid;
+        internal ushort __invalid;
        [FieldOffset(0)]
-        public ushort __denorm;
+        internal ushort __denorm;
        [FieldOffset(0)]
-        public ushort __zdiv;
+        internal ushort __zdiv;
        [FieldOffset(0)]
-        public ushort __ovrfl;
+        internal ushort __ovrfl;
        [FieldOffset(0)]
-        public ushort __undfl;
+        internal ushort __undfl;
        [FieldOffset(0)]
-        public ushort __precis;
+        internal ushort __precis;
        [FieldOffset(0)]
-        public ushort _;
+        internal ushort _;
        [FieldOffset(1)]
-        public ushort __pc;
+        internal ushort __pc;
        [FieldOffset(1)]
-        public ushort __rc;
+        internal ushort __rc;
        [FieldOffset(1)]
-        public ushort _1;
+        internal ushort _1;
        [FieldOffset(1)]
-        public ushort _2;
+        internal ushort _2;
    }
 }
@ -387,46 +387,46 @@ public unsafe partial class DarwinFpStatus
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public ushort __invalid;
+        internal ushort __invalid;
        [FieldOffset(0)]
-        public ushort __denorm;
+        internal ushort __denorm;
        [FieldOffset(0)]
-        public ushort __zdiv;
+        internal ushort __zdiv;
        [FieldOffset(0)]
-        public ushort __ovrfl;
+        internal ushort __ovrfl;
        [FieldOffset(0)]
-        public ushort __undfl;
+        internal ushort __undfl;
        [FieldOffset(0)]
-        public ushort __precis;
+        internal ushort __precis;
        [FieldOffset(0)]
-        public ushort __stkflt;
+        internal ushort __stkflt;
        [FieldOffset(0)]
-        public ushort __errsumm;
+        internal ushort __errsumm;
        [FieldOffset(1)]
-        public ushort __c0;
+        internal ushort __c0;
        [FieldOffset(1)]
-        public ushort __c1;
+        internal ushort __c1;
        [FieldOffset(1)]
-        public ushort __c2;
+        internal ushort __c2;
        [FieldOffset(1)]
-        public ushort __tos;
+        internal ushort __tos;
        [FieldOffset(1)]
-        public ushort __c3;
+        internal ushort __c3;
        [FieldOffset(1)]
-        public ushort __busy;
+        internal ushort __busy;
    }
 }
@ -436,10 +436,10 @@ public unsafe partial class DarwinMmstReg
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public fixed sbyte __mmst_reg[10];
+        internal fixed sbyte __mmst_reg[10];
        [FieldOffset(10)]
-        public fixed sbyte __mmst_rsrv[6];
+        internal fixed sbyte __mmst_rsrv[6];
    }
 }
@ -449,7 +449,7 @@ public unsafe partial class DarwinXmmReg
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public fixed sbyte __xmm_reg[16];
+        internal fixed sbyte __xmm_reg[16];
    }
 }
@ -459,7 +459,7 @@ public unsafe partial class DarwinI386FloatState
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public fixed int __fpu_reserved[2];
+        internal fixed int __fpu_reserved[2];
        [FieldOffset(8)]
        internal global::DarwinFpControl.__Internal __fpu_fcw;
@ -468,37 +468,37 @@ public unsafe partial class DarwinI386FloatState
        internal global::DarwinFpStatus.__Internal __fpu_fsw;
        [FieldOffset(12)]
-        public byte __fpu_ftw;
+        internal byte __fpu_ftw;
        [FieldOffset(13)]
-        public byte __fpu_rsrv1;
+        internal byte __fpu_rsrv1;
        [FieldOffset(14)]
-        public ushort __fpu_fop;
+        internal ushort __fpu_fop;
        [FieldOffset(16)]
-        public uint __fpu_ip;
+        internal uint __fpu_ip;
        [FieldOffset(20)]
-        public ushort __fpu_cs;
+        internal ushort __fpu_cs;
        [FieldOffset(22)]
-        public ushort __fpu_rsrv2;
+        internal ushort __fpu_rsrv2;
        [FieldOffset(24)]
-        public uint __fpu_dp;
+        internal uint __fpu_dp;
        [FieldOffset(28)]
-        public ushort __fpu_ds;
+        internal ushort __fpu_ds;
        [FieldOffset(30)]
-        public ushort __fpu_rsrv3;
+        internal ushort __fpu_rsrv3;
        [FieldOffset(32)]
-        public uint __fpu_mxcsr;
+        internal uint __fpu_mxcsr;
        [FieldOffset(36)]
-        public uint __fpu_mxcsrmask;
+        internal uint __fpu_mxcsrmask;
        [FieldOffset(40)]
        internal global::DarwinMmstReg.__Internal __fpu_stmm0;
@ -549,10 +549,10 @@ public unsafe partial class DarwinI386FloatState
        internal global::DarwinXmmReg.__Internal __fpu_xmm7;
        [FieldOffset(296)]
-        public fixed sbyte __fpu_rsrv4[224];
+        internal fixed sbyte __fpu_rsrv4[224];
        [FieldOffset(520)]
-        public int __fpu_reserved1;
+        internal int __fpu_reserved1;
    }
 }
@ -562,7 +562,7 @@ public unsafe partial class DarwinI386AvxState
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public fixed int __fpu_reserved[2];
+        internal fixed int __fpu_reserved[2];
        [FieldOffset(8)]
        internal global::DarwinFpControl.__Internal __fpu_fcw;
@ -571,37 +571,37 @@ public unsafe partial class DarwinI386AvxState
        internal global::DarwinFpStatus.__Internal __fpu_fsw;
        [FieldOffset(12)]
-        public byte __fpu_ftw;
+        internal byte __fpu_ftw;
        [FieldOffset(13)]
-        public byte __fpu_rsrv1;
+        internal byte __fpu_rsrv1;
        [FieldOffset(14)]
-        public ushort __fpu_fop;
+        internal ushort __fpu_fop;
        [FieldOffset(16)]
-        public uint __fpu_ip;
+        internal uint __fpu_ip;
        [FieldOffset(20)]
-        public ushort __fpu_cs;
+        internal ushort __fpu_cs;
        [FieldOffset(22)]
-        public ushort __fpu_rsrv2;
+        internal ushort __fpu_rsrv2;
        [FieldOffset(24)]
-        public uint __fpu_dp;
+        internal uint __fpu_dp;
        [FieldOffset(28)]
-        public ushort __fpu_ds;
+        internal ushort __fpu_ds;
        [FieldOffset(30)]
-        public ushort __fpu_rsrv3;
+        internal ushort __fpu_rsrv3;
        [FieldOffset(32)]
-        public uint __fpu_mxcsr;
+        internal uint __fpu_mxcsr;
        [FieldOffset(36)]
-        public uint __fpu_mxcsrmask;
+        internal uint __fpu_mxcsrmask;
        [FieldOffset(40)]
        internal global::DarwinMmstReg.__Internal __fpu_stmm0;
@ -652,13 +652,13 @@ public unsafe partial class DarwinI386AvxState
        internal global::DarwinXmmReg.__Internal __fpu_xmm7;
        [FieldOffset(296)]
-        public fixed sbyte __fpu_rsrv4[224];
+        internal fixed sbyte __fpu_rsrv4[224];
        [FieldOffset(520)]
-        public int __fpu_reserved1;
+        internal int __fpu_reserved1;
        [FieldOffset(524)]
-        public fixed sbyte __avx_reserved1[64];
+        internal fixed sbyte __avx_reserved1[64];
        [FieldOffset(588)]
        internal global::DarwinXmmReg.__Internal __fpu_ymmh0;
@ -692,16 +692,16 @@ public unsafe partial class DarwinI386ExceptionState
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public ushort __trapno;
+        internal ushort __trapno;
        [FieldOffset(2)]
-        public ushort __cpu;
+        internal ushort __cpu;
        [FieldOffset(4)]
-        public uint __err;
+        internal uint __err;
        [FieldOffset(8)]
-        public uint __faultvaddr;
+        internal uint __faultvaddr;
    }
 }
@ -711,67 +711,67 @@ public unsafe partial class DarwinX86ThreadState64
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public ulong __rax;
+        internal ulong __rax;
        [FieldOffset(8)]
-        public ulong __rbx;
+        internal ulong __rbx;
        [FieldOffset(16)]
-        public ulong __rcx;
+        internal ulong __rcx;
        [FieldOffset(24)]
-        public ulong __rdx;
+        internal ulong __rdx;
        [FieldOffset(32)]
-        public ulong __rdi;
+        internal ulong __rdi;
        [FieldOffset(40)]
-        public ulong __rsi;
+        internal ulong __rsi;
        [FieldOffset(48)]
-        public ulong __rbp;
+        internal ulong __rbp;
        [FieldOffset(56)]
-        public ulong __rsp;
+        internal ulong __rsp;
        [FieldOffset(64)]
-        public ulong __r8;
+        internal ulong __r8;
        [FieldOffset(72)]
-        public ulong __r9;
+        internal ulong __r9;
        [FieldOffset(80)]
-        public ulong __r10;
+        internal ulong __r10;
        [FieldOffset(88)]
-        public ulong __r11;
+        internal ulong __r11;
        [FieldOffset(96)]
-        public ulong __r12;
+        internal ulong __r12;
        [FieldOffset(104)]
-        public ulong __r13;
+        internal ulong __r13;
        [FieldOffset(112)]
-        public ulong __r14;
+        internal ulong __r14;
        [FieldOffset(120)]
-        public ulong __r15;
+        internal ulong __r15;
        [FieldOffset(128)]
-        public ulong __rip;
+        internal ulong __rip;
        [FieldOffset(136)]
-        public ulong __rflags;
+        internal ulong __rflags;
        [FieldOffset(144)]
-        public ulong __cs;
+        internal ulong __cs;
        [FieldOffset(152)]
-        public ulong __fs;
+        internal ulong __fs;
        [FieldOffset(160)]
-        public ulong __gs;
+        internal ulong __gs;
    }
 }
@ -781,7 +781,7 @@ public unsafe partial class DarwinX86FloatState64
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public fixed int __fpu_reserved[2];
+        internal fixed int __fpu_reserved[2];
        [FieldOffset(8)]
        internal global::DarwinFpControl.__Internal __fpu_fcw;
@ -790,37 +790,37 @@ public unsafe partial class DarwinX86FloatState64
        internal global::DarwinFpStatus.__Internal __fpu_fsw;
        [FieldOffset(12)]
-        public byte __fpu_ftw;
+        internal byte __fpu_ftw;
        [FieldOffset(13)]
-        public byte __fpu_rsrv1;
+        internal byte __fpu_rsrv1;
        [FieldOffset(14)]
-        public ushort __fpu_fop;
+        internal ushort __fpu_fop;
        [FieldOffset(16)]
-        public uint __fpu_ip;
+        internal uint __fpu_ip;
        [FieldOffset(20)]
-        public ushort __fpu_cs;
+        internal ushort __fpu_cs;
        [FieldOffset(22)]
-        public ushort __fpu_rsrv2;
+        internal ushort __fpu_rsrv2;
        [FieldOffset(24)]
-        public uint __fpu_dp;
+        internal uint __fpu_dp;
        [FieldOffset(28)]
-        public ushort __fpu_ds;
+        internal ushort __fpu_ds;
        [FieldOffset(30)]
-        public ushort __fpu_rsrv3;
+        internal ushort __fpu_rsrv3;
        [FieldOffset(32)]
-        public uint __fpu_mxcsr;
+        internal uint __fpu_mxcsr;
        [FieldOffset(36)]
-        public uint __fpu_mxcsrmask;
+        internal uint __fpu_mxcsrmask;
        [FieldOffset(40)]
        internal global::DarwinMmstReg.__Internal __fpu_stmm0;
@ -895,10 +895,10 @@ public unsafe partial class DarwinX86FloatState64
        internal global::DarwinXmmReg.__Internal __fpu_xmm15;
        [FieldOffset(424)]
-        public fixed sbyte __fpu_rsrv4[96];
+        internal fixed sbyte __fpu_rsrv4[96];
        [FieldOffset(520)]
-        public int __fpu_reserved1;
+        internal int __fpu_reserved1;
    }
 }
@ -908,7 +908,7 @@ public unsafe partial class DarwinX86AvxState64
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public fixed int __fpu_reserved[2];
+        internal fixed int __fpu_reserved[2];
        [FieldOffset(8)]
        internal global::DarwinFpControl.__Internal __fpu_fcw;
@ -917,37 +917,37 @@ public unsafe partial class DarwinX86AvxState64
        internal global::DarwinFpStatus.__Internal __fpu_fsw;
        [FieldOffset(12)]
-        public byte __fpu_ftw;
+        internal byte __fpu_ftw;
        [FieldOffset(13)]
-        public byte __fpu_rsrv1;
+        internal byte __fpu_rsrv1;
        [FieldOffset(14)]
-        public ushort __fpu_fop;
+        internal ushort __fpu_fop;
        [FieldOffset(16)]
-        public uint __fpu_ip;
+        internal uint __fpu_ip;
        [FieldOffset(20)]
-        public ushort __fpu_cs;
+        internal ushort __fpu_cs;
        [FieldOffset(22)]
-        public ushort __fpu_rsrv2;
+        internal ushort __fpu_rsrv2;
        [FieldOffset(24)]
-        public uint __fpu_dp;
+        internal uint __fpu_dp;
        [FieldOffset(28)]
-        public ushort __fpu_ds;
+        internal ushort __fpu_ds;
        [FieldOffset(30)]
-        public ushort __fpu_rsrv3;
+        internal ushort __fpu_rsrv3;
        [FieldOffset(32)]
-        public uint __fpu_mxcsr;
+        internal uint __fpu_mxcsr;
        [FieldOffset(36)]
-        public uint __fpu_mxcsrmask;
+        internal uint __fpu_mxcsrmask;
        [FieldOffset(40)]
        internal global::DarwinMmstReg.__Internal __fpu_stmm0;
@ -1022,13 +1022,13 @@ public unsafe partial class DarwinX86AvxState64
        internal global::DarwinXmmReg.__Internal __fpu_xmm15;
        [FieldOffset(424)]
-        public fixed sbyte __fpu_rsrv4[96];
+        internal fixed sbyte __fpu_rsrv4[96];
        [FieldOffset(520)]
-        public int __fpu_reserved1;
+        internal int __fpu_reserved1;
        [FieldOffset(524)]
-        public fixed sbyte __avx_reserved1[64];
+        internal fixed sbyte __avx_reserved1[64];
        [FieldOffset(588)]
        internal global::DarwinXmmReg.__Internal __fpu_ymmh0;
@ -1086,16 +1086,16 @@ public unsafe partial class DarwinX86ExceptionState64
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public ushort __trapno;
+        internal ushort __trapno;
        [FieldOffset(2)]
-        public ushort __cpu;
+        internal ushort __cpu;
        [FieldOffset(4)]
-        public uint __err;
+        internal uint __err;
        [FieldOffset(8)]
-        public ulong __faultvaddr;
+        internal ulong __faultvaddr;
    }
 }
@ -1105,7 +1105,7 @@ public unsafe partial struct Wait
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public int w_status;
+        internal int w_status;
        [FieldOffset(0)]
        internal global::Wait._.__Internal w_T;
@ -1120,16 +1120,16 @@ public unsafe partial struct Wait
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public uint w_Termsig;
+            internal uint w_Termsig;
            [FieldOffset(0)]
-            public uint w_Coredump;
+            internal uint w_Coredump;
            [FieldOffset(1)]
-            public uint w_Retcode;
+            internal uint w_Retcode;
            [FieldOffset(2)]
-            public uint w_Filler;
+            internal uint w_Filler;
        }
    }
@ -1139,13 +1139,13 @@ public unsafe partial struct Wait
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public uint w_Stopval;
+            internal uint w_Stopval;
            [FieldOffset(1)]
-            public uint w_Stopsig;
+            internal uint w_Stopsig;
            [FieldOffset(2)]
-            public uint w_Filler;
+            internal uint w_Filler;
        }
    }
 }
@ -1179,10 +1179,10 @@ namespace Std
            public unsafe partial struct __Internal
            {
                [FieldOffset(0)]
-                public global::System.IntPtr __begin_;
+                internal global::System.IntPtr __begin_;
                [FieldOffset(4)]
-                public global::System.IntPtr __end_;
+                internal global::System.IntPtr __end_;
                [FieldOffset(8)]
                internal global::Std.__1.CompressedPair.__Internal __end_cap_;
@ -1201,7 +1201,7 @@ namespace Std
            public unsafe partial struct __Internal
            {
                [FieldOffset(0)]
-                public global::System.IntPtr __begin_node_;
+                internal global::System.IntPtr __begin_node_;
                [FieldOffset(4)]
                internal global::Std.__1.CompressedPair.__Internal __pair1_;
@ -1217,7 +1217,7 @@ namespace Std
            public unsafe partial struct __Internal_Ptr
            {
                [FieldOffset(0)]
-                public global::System.IntPtr __left_;
+                internal global::System.IntPtr __left_;
            }
        }
    }
@ -1420,13 +1420,13 @@ namespace Std
                public partial struct __Internal
                {
                    [FieldOffset(0)]
-                    public uint __cap_;
+                    internal uint __cap_;
                    [FieldOffset(4)]
-                    public uint __size_;
+                    internal uint __size_;
                    [FieldOffset(8)]
-                    public global::System.IntPtr __data_;
+                    internal global::System.IntPtr __data_;
                }
            }
@ -1439,7 +1439,7 @@ namespace Std
                    internal global::Std.__1.BasicString.Short._.__Internal _;
                    [FieldOffset(1)]
-                    public fixed sbyte __data_[11];
+                    internal fixed sbyte __data_[11];
                }
                public unsafe partial struct _
@ -1448,10 +1448,10 @@ namespace Std
                    public partial struct __Internal
                    {
                        [FieldOffset(0)]
-                        public byte __size_;
+                        internal byte __size_;
                        [FieldOffset(0)]
-                        public sbyte __lx;
+                        internal sbyte __lx;
                    }
                }
            }
@ -1462,7 +1462,7 @@ namespace Std
                public partial struct __Internal
                {
                    [FieldOffset(0)]
-                    public fixed uint __words[3];
+                    internal fixed uint __words[3];
                }
            }
--- a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs
--- a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs
+++ b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs
@ -21,7 +21,7 @@ namespace Std
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public int _Locktype;
+            internal int _Locktype;
        }
    }
 }
@ -34,10 +34,10 @@ namespace Std
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public global::System.IntPtr _Data1;
+            internal global::System.IntPtr _Data1;
            [FieldOffset(4)]
-            public global::System.IntPtr _Data2;
+            internal global::System.IntPtr _Data2;
        }
    }
 }
@ -48,10 +48,10 @@ public unsafe partial class StdExceptionData
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public global::System.IntPtr _What;
+        internal global::System.IntPtr _What;
        [FieldOffset(4)]
-        public byte _DoFree;
+        internal byte _DoFree;
    }
 }
@ -150,20 +150,20 @@ namespace Std
        public unsafe partial struct __Internalc__N_std_S__Yarn__C
        {
            [FieldOffset(0)]
-            public global::System.IntPtr _Myptr;
+            internal global::System.IntPtr _Myptr;
            [FieldOffset(4)]
-            public sbyte _Nul;
+            internal sbyte _Nul;
        }
        [StructLayout(LayoutKind.Explicit, Size = 8)]
        public unsafe partial struct __Internalc__N_std_S__Yarn__W
        {
            [FieldOffset(0)]
-            public global::System.IntPtr _Myptr;
+            internal global::System.IntPtr _Myptr;
            [FieldOffset(4)]
-            public char _Nul;
+            internal char _Nul;
        }
    }
@ -657,10 +657,10 @@ namespace Std
            internal global::Std.StringVal.Bxty.__Internal _Bx;
            [FieldOffset(16)]
-            public uint _Mysize;
+            internal uint _Mysize;
            [FieldOffset(20)]
-            public uint _Myres;
+            internal uint _Myres;
        }
@ -682,13 +682,13 @@ namespace Std
        public unsafe partial struct __Internal
        {
            [FieldOffset(0)]
-            public global::System.IntPtr _Myfirst;
+            internal global::System.IntPtr _Myfirst;
            [FieldOffset(4)]
-            public global::System.IntPtr _Mylast;
+            internal global::System.IntPtr _Mylast;
            [FieldOffset(8)]
-            public global::System.IntPtr _Myend;
+            internal global::System.IntPtr _Myend;
        }
    }
@ -715,10 +715,10 @@ namespace Std
        public unsafe partial struct __Internal
        {
            [FieldOffset(0)]
-            public global::System.IntPtr _Myhead;
+            internal global::System.IntPtr _Myhead;
            [FieldOffset(4)]
-            public uint _Mysize;
+            internal uint _Mysize;
        }
    }
 }
@ -742,10 +742,10 @@ public unsafe partial class StdTypeInfoData
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public global::System.IntPtr _UndecoratedName;
+        internal global::System.IntPtr _UndecoratedName;
        [FieldOffset(4)]
-        public fixed sbyte _DecoratedName[1];
+        internal fixed sbyte _DecoratedName[1];
    }
 }
@ -755,16 +755,16 @@ public unsafe partial class Ctypevec
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public uint _Page;
+        internal uint _Page;
        [FieldOffset(4)]
-        public global::System.IntPtr _Table;
+        internal global::System.IntPtr _Table;
        [FieldOffset(8)]
-        public int _Delfl;
+        internal int _Delfl;
        [FieldOffset(12)]
-        public global::System.IntPtr _LocaleName;
+        internal global::System.IntPtr _LocaleName;
    }
 }
@ -774,16 +774,16 @@ public unsafe partial class Cvtvec
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public uint _Page;
+        internal uint _Page;
        [FieldOffset(4)]
-        public uint _Mbcurmax;
+        internal uint _Mbcurmax;
        [FieldOffset(8)]
-        public int _Isclocale;
+        internal int _Isclocale;
        [FieldOffset(12)]
-        public fixed byte _Isleadbyte[32];
+        internal fixed byte _Isleadbyte[32];
    }
 }
@ -805,10 +805,10 @@ namespace Std
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public int _Myval;
+            internal int _Myval;
            [FieldOffset(4)]
-            public global::System.IntPtr _Mycat;
+            internal global::System.IntPtr _Mycat;
        }
    }
 }
--- 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
--- 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
@ -47,7 +47,7 @@ namespace Std
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public global::System.IntPtr __ptr_;
+            internal global::System.IntPtr __ptr_;
        }
    }
 }
@ -62,10 +62,10 @@ public unsafe partial class Sbuf
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public global::System.IntPtr _base;
+        internal global::System.IntPtr _base;
        [FieldOffset(8)]
-        public int _size;
+        internal int _size;
    }
 }
@ -75,13 +75,13 @@ public unsafe partial class DarwinSigaltstack
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public global::System.IntPtr ss_sp;
+        internal global::System.IntPtr ss_sp;
        [FieldOffset(8)]
-        public ulong ss_size;
+        internal ulong ss_size;
        [FieldOffset(16)]
-        public int ss_flags;
+        internal int ss_flags;
    }
 }
@ -91,10 +91,10 @@ public unsafe partial class Timeval
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public long tv_sec;
+        internal long tv_sec;
        [FieldOffset(8)]
-        public int tv_usec;
+        internal int tv_usec;
    }
 }
@ -104,10 +104,10 @@ public unsafe partial class RuneRange
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public int __nranges;
+        internal int __nranges;
        [FieldOffset(8)]
-        public global::System.IntPtr __ranges;
+        internal global::System.IntPtr __ranges;
    }
 }
@ -266,10 +266,10 @@ public unsafe partial struct Sigval
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public int sival_int;
+        internal int sival_int;
        [FieldOffset(0)]
-        public global::System.IntPtr sival_ptr;
+        internal global::System.IntPtr sival_ptr;
    }
 }
@ -279,10 +279,10 @@ public unsafe partial struct SigactionU
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public global::System.IntPtr __sa_handler;
+        internal global::System.IntPtr __sa_handler;
        [FieldOffset(0)]
-        public global::System.IntPtr __sa_sigaction;
+        internal global::System.IntPtr __sa_sigaction;
    }
 }
@ -292,52 +292,52 @@ public unsafe partial class DarwinI386ThreadState
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public uint __eax;
+        internal uint __eax;
        [FieldOffset(4)]
-        public uint __ebx;
+        internal uint __ebx;
        [FieldOffset(8)]
-        public uint __ecx;
+        internal uint __ecx;
        [FieldOffset(12)]
-        public uint __edx;
+        internal uint __edx;
        [FieldOffset(16)]
-        public uint __edi;
+        internal uint __edi;
        [FieldOffset(20)]
-        public uint __esi;
+        internal uint __esi;
        [FieldOffset(24)]
-        public uint __ebp;
+        internal uint __ebp;
        [FieldOffset(28)]
-        public uint __esp;
+        internal uint __esp;
        [FieldOffset(32)]
-        public uint __ss;
+        internal uint __ss;
        [FieldOffset(36)]
-        public uint __eflags;
+        internal uint __eflags;
        [FieldOffset(40)]
-        public uint __eip;
+        internal uint __eip;
        [FieldOffset(44)]
-        public uint __cs;
+        internal uint __cs;
        [FieldOffset(48)]
-        public uint __ds;
+        internal uint __ds;
        [FieldOffset(52)]
-        public uint __es;
+        internal uint __es;
        [FieldOffset(56)]
-        public uint __fs;
+        internal uint __fs;
        [FieldOffset(60)]
-        public uint __gs;
+        internal uint __gs;
    }
 }
@ -347,37 +347,37 @@ public unsafe partial class DarwinFpControl
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public ushort __invalid;
+        internal ushort __invalid;
        [FieldOffset(0)]
-        public ushort __denorm;
+        internal ushort __denorm;
        [FieldOffset(0)]
-        public ushort __zdiv;
+        internal ushort __zdiv;
        [FieldOffset(0)]
-        public ushort __ovrfl;
+        internal ushort __ovrfl;
        [FieldOffset(0)]
-        public ushort __undfl;
+        internal ushort __undfl;
        [FieldOffset(0)]
-        public ushort __precis;
+        internal ushort __precis;
        [FieldOffset(0)]
-        public ushort _;
+        internal ushort _;
        [FieldOffset(1)]
-        public ushort __pc;
+        internal ushort __pc;
        [FieldOffset(1)]
-        public ushort __rc;
+        internal ushort __rc;
        [FieldOffset(1)]
-        public ushort _1;
+        internal ushort _1;
        [FieldOffset(1)]
-        public ushort _2;
+        internal ushort _2;
    }
 }
@ -387,46 +387,46 @@ public unsafe partial class DarwinFpStatus
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public ushort __invalid;
+        internal ushort __invalid;
        [FieldOffset(0)]
-        public ushort __denorm;
+        internal ushort __denorm;
        [FieldOffset(0)]
-        public ushort __zdiv;
+        internal ushort __zdiv;
        [FieldOffset(0)]
-        public ushort __ovrfl;
+        internal ushort __ovrfl;
        [FieldOffset(0)]
-        public ushort __undfl;
+        internal ushort __undfl;
        [FieldOffset(0)]
-        public ushort __precis;
+        internal ushort __precis;
        [FieldOffset(0)]
-        public ushort __stkflt;
+        internal ushort __stkflt;
        [FieldOffset(0)]
-        public ushort __errsumm;
+        internal ushort __errsumm;
        [FieldOffset(1)]
-        public ushort __c0;
+        internal ushort __c0;
        [FieldOffset(1)]
-        public ushort __c1;
+        internal ushort __c1;
        [FieldOffset(1)]
-        public ushort __c2;
+        internal ushort __c2;
        [FieldOffset(1)]
-        public ushort __tos;
+        internal ushort __tos;
        [FieldOffset(1)]
-        public ushort __c3;
+        internal ushort __c3;
        [FieldOffset(1)]
-        public ushort __busy;
+        internal ushort __busy;
    }
 }
@ -436,10 +436,10 @@ public unsafe partial class DarwinMmstReg
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public fixed sbyte __mmst_reg[10];
+        internal fixed sbyte __mmst_reg[10];
        [FieldOffset(10)]
-        public fixed sbyte __mmst_rsrv[6];
+        internal fixed sbyte __mmst_rsrv[6];
    }
 }
@ -449,7 +449,7 @@ public unsafe partial class DarwinXmmReg
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public fixed sbyte __xmm_reg[16];
+        internal fixed sbyte __xmm_reg[16];
    }
 }
@ -459,7 +459,7 @@ public unsafe partial class DarwinI386FloatState
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public fixed int __fpu_reserved[2];
+        internal fixed int __fpu_reserved[2];
        [FieldOffset(8)]
        internal global::DarwinFpControl.__Internal __fpu_fcw;
@ -468,37 +468,37 @@ public unsafe partial class DarwinI386FloatState
        internal global::DarwinFpStatus.__Internal __fpu_fsw;
        [FieldOffset(12)]
-        public byte __fpu_ftw;
+        internal byte __fpu_ftw;
        [FieldOffset(13)]
-        public byte __fpu_rsrv1;
+        internal byte __fpu_rsrv1;
        [FieldOffset(14)]
-        public ushort __fpu_fop;
+        internal ushort __fpu_fop;
        [FieldOffset(16)]
-        public uint __fpu_ip;
+        internal uint __fpu_ip;
        [FieldOffset(20)]
-        public ushort __fpu_cs;
+        internal ushort __fpu_cs;
        [FieldOffset(22)]
-        public ushort __fpu_rsrv2;
+        internal ushort __fpu_rsrv2;
        [FieldOffset(24)]
-        public uint __fpu_dp;
+        internal uint __fpu_dp;
        [FieldOffset(28)]
-        public ushort __fpu_ds;
+        internal ushort __fpu_ds;
        [FieldOffset(30)]
-        public ushort __fpu_rsrv3;
+        internal ushort __fpu_rsrv3;
        [FieldOffset(32)]
-        public uint __fpu_mxcsr;
+        internal uint __fpu_mxcsr;
        [FieldOffset(36)]
-        public uint __fpu_mxcsrmask;
+        internal uint __fpu_mxcsrmask;
        [FieldOffset(40)]
        internal global::DarwinMmstReg.__Internal __fpu_stmm0;
@ -549,10 +549,10 @@ public unsafe partial class DarwinI386FloatState
        internal global::DarwinXmmReg.__Internal __fpu_xmm7;
        [FieldOffset(296)]
-        public fixed sbyte __fpu_rsrv4[224];
+        internal fixed sbyte __fpu_rsrv4[224];
        [FieldOffset(520)]
-        public int __fpu_reserved1;
+        internal int __fpu_reserved1;
    }
 }
@ -562,7 +562,7 @@ public unsafe partial class DarwinI386AvxState
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public fixed int __fpu_reserved[2];
+        internal fixed int __fpu_reserved[2];
        [FieldOffset(8)]
        internal global::DarwinFpControl.__Internal __fpu_fcw;
@ -571,37 +571,37 @@ public unsafe partial class DarwinI386AvxState
        internal global::DarwinFpStatus.__Internal __fpu_fsw;
        [FieldOffset(12)]
-        public byte __fpu_ftw;
+        internal byte __fpu_ftw;
        [FieldOffset(13)]
-        public byte __fpu_rsrv1;
+        internal byte __fpu_rsrv1;
        [FieldOffset(14)]
-        public ushort __fpu_fop;
+        internal ushort __fpu_fop;
        [FieldOffset(16)]
-        public uint __fpu_ip;
+        internal uint __fpu_ip;
        [FieldOffset(20)]
-        public ushort __fpu_cs;
+        internal ushort __fpu_cs;
        [FieldOffset(22)]
-        public ushort __fpu_rsrv2;
+        internal ushort __fpu_rsrv2;
        [FieldOffset(24)]
-        public uint __fpu_dp;
+        internal uint __fpu_dp;
        [FieldOffset(28)]
-        public ushort __fpu_ds;
+        internal ushort __fpu_ds;
        [FieldOffset(30)]
-        public ushort __fpu_rsrv3;
+        internal ushort __fpu_rsrv3;
        [FieldOffset(32)]
-        public uint __fpu_mxcsr;
+        internal uint __fpu_mxcsr;
        [FieldOffset(36)]
-        public uint __fpu_mxcsrmask;
+        internal uint __fpu_mxcsrmask;
        [FieldOffset(40)]
        internal global::DarwinMmstReg.__Internal __fpu_stmm0;
@ -652,13 +652,13 @@ public unsafe partial class DarwinI386AvxState
        internal global::DarwinXmmReg.__Internal __fpu_xmm7;
        [FieldOffset(296)]
-        public fixed sbyte __fpu_rsrv4[224];
+        internal fixed sbyte __fpu_rsrv4[224];
        [FieldOffset(520)]
-        public int __fpu_reserved1;
+        internal int __fpu_reserved1;
        [FieldOffset(524)]
-        public fixed sbyte __avx_reserved1[64];
+        internal fixed sbyte __avx_reserved1[64];
        [FieldOffset(588)]
        internal global::DarwinXmmReg.__Internal __fpu_ymmh0;
@ -692,16 +692,16 @@ public unsafe partial class DarwinI386ExceptionState
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public ushort __trapno;
+        internal ushort __trapno;
        [FieldOffset(2)]
-        public ushort __cpu;
+        internal ushort __cpu;
        [FieldOffset(4)]
-        public uint __err;
+        internal uint __err;
        [FieldOffset(8)]
-        public uint __faultvaddr;
+        internal uint __faultvaddr;
    }
 }
@ -711,67 +711,67 @@ public unsafe partial class DarwinX86ThreadState64
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public ulong __rax;
+        internal ulong __rax;
        [FieldOffset(8)]
-        public ulong __rbx;
+        internal ulong __rbx;
        [FieldOffset(16)]
-        public ulong __rcx;
+        internal ulong __rcx;
        [FieldOffset(24)]
-        public ulong __rdx;
+        internal ulong __rdx;
        [FieldOffset(32)]
-        public ulong __rdi;
+        internal ulong __rdi;
        [FieldOffset(40)]
-        public ulong __rsi;
+        internal ulong __rsi;
        [FieldOffset(48)]
-        public ulong __rbp;
+        internal ulong __rbp;
        [FieldOffset(56)]
-        public ulong __rsp;
+        internal ulong __rsp;
        [FieldOffset(64)]
-        public ulong __r8;
+        internal ulong __r8;
        [FieldOffset(72)]
-        public ulong __r9;
+        internal ulong __r9;
        [FieldOffset(80)]
-        public ulong __r10;
+        internal ulong __r10;
        [FieldOffset(88)]
-        public ulong __r11;
+        internal ulong __r11;
        [FieldOffset(96)]
-        public ulong __r12;
+        internal ulong __r12;
        [FieldOffset(104)]
-        public ulong __r13;
+        internal ulong __r13;
        [FieldOffset(112)]
-        public ulong __r14;
+        internal ulong __r14;
        [FieldOffset(120)]
-        public ulong __r15;
+        internal ulong __r15;
        [FieldOffset(128)]
-        public ulong __rip;
+        internal ulong __rip;
        [FieldOffset(136)]
-        public ulong __rflags;
+        internal ulong __rflags;
        [FieldOffset(144)]
-        public ulong __cs;
+        internal ulong __cs;
        [FieldOffset(152)]
-        public ulong __fs;
+        internal ulong __fs;
        [FieldOffset(160)]
-        public ulong __gs;
+        internal ulong __gs;
    }
 }
@ -781,7 +781,7 @@ public unsafe partial class DarwinX86FloatState64
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public fixed int __fpu_reserved[2];
+        internal fixed int __fpu_reserved[2];
        [FieldOffset(8)]
        internal global::DarwinFpControl.__Internal __fpu_fcw;
@ -790,37 +790,37 @@ public unsafe partial class DarwinX86FloatState64
        internal global::DarwinFpStatus.__Internal __fpu_fsw;
        [FieldOffset(12)]
-        public byte __fpu_ftw;
+        internal byte __fpu_ftw;
        [FieldOffset(13)]
-        public byte __fpu_rsrv1;
+        internal byte __fpu_rsrv1;
        [FieldOffset(14)]
-        public ushort __fpu_fop;
+        internal ushort __fpu_fop;
        [FieldOffset(16)]
-        public uint __fpu_ip;
+        internal uint __fpu_ip;
        [FieldOffset(20)]
-        public ushort __fpu_cs;
+        internal ushort __fpu_cs;
        [FieldOffset(22)]
-        public ushort __fpu_rsrv2;
+        internal ushort __fpu_rsrv2;
        [FieldOffset(24)]
-        public uint __fpu_dp;
+        internal uint __fpu_dp;
        [FieldOffset(28)]
-        public ushort __fpu_ds;
+        internal ushort __fpu_ds;
        [FieldOffset(30)]
-        public ushort __fpu_rsrv3;
+        internal ushort __fpu_rsrv3;
        [FieldOffset(32)]
-        public uint __fpu_mxcsr;
+        internal uint __fpu_mxcsr;
        [FieldOffset(36)]
-        public uint __fpu_mxcsrmask;
+        internal uint __fpu_mxcsrmask;
        [FieldOffset(40)]
        internal global::DarwinMmstReg.__Internal __fpu_stmm0;
@ -895,10 +895,10 @@ public unsafe partial class DarwinX86FloatState64
        internal global::DarwinXmmReg.__Internal __fpu_xmm15;
        [FieldOffset(424)]
-        public fixed sbyte __fpu_rsrv4[96];
+        internal fixed sbyte __fpu_rsrv4[96];
        [FieldOffset(520)]
-        public int __fpu_reserved1;
+        internal int __fpu_reserved1;
    }
 }
@ -908,7 +908,7 @@ public unsafe partial class DarwinX86AvxState64
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public fixed int __fpu_reserved[2];
+        internal fixed int __fpu_reserved[2];
        [FieldOffset(8)]
        internal global::DarwinFpControl.__Internal __fpu_fcw;
@ -917,37 +917,37 @@ public unsafe partial class DarwinX86AvxState64
        internal global::DarwinFpStatus.__Internal __fpu_fsw;
        [FieldOffset(12)]
-        public byte __fpu_ftw;
+        internal byte __fpu_ftw;
        [FieldOffset(13)]
-        public byte __fpu_rsrv1;
+        internal byte __fpu_rsrv1;
        [FieldOffset(14)]
-        public ushort __fpu_fop;
+        internal ushort __fpu_fop;
        [FieldOffset(16)]
-        public uint __fpu_ip;
+        internal uint __fpu_ip;
        [FieldOffset(20)]
-        public ushort __fpu_cs;
+        internal ushort __fpu_cs;
        [FieldOffset(22)]
-        public ushort __fpu_rsrv2;
+        internal ushort __fpu_rsrv2;
        [FieldOffset(24)]
-        public uint __fpu_dp;
+        internal uint __fpu_dp;
        [FieldOffset(28)]
-        public ushort __fpu_ds;
+        internal ushort __fpu_ds;
        [FieldOffset(30)]
-        public ushort __fpu_rsrv3;
+        internal ushort __fpu_rsrv3;
        [FieldOffset(32)]
-        public uint __fpu_mxcsr;
+        internal uint __fpu_mxcsr;
        [FieldOffset(36)]
-        public uint __fpu_mxcsrmask;
+        internal uint __fpu_mxcsrmask;
        [FieldOffset(40)]
        internal global::DarwinMmstReg.__Internal __fpu_stmm0;
@ -1022,13 +1022,13 @@ public unsafe partial class DarwinX86AvxState64
        internal global::DarwinXmmReg.__Internal __fpu_xmm15;
        [FieldOffset(424)]
-        public fixed sbyte __fpu_rsrv4[96];
+        internal fixed sbyte __fpu_rsrv4[96];
        [FieldOffset(520)]
-        public int __fpu_reserved1;
+        internal int __fpu_reserved1;
        [FieldOffset(524)]
-        public fixed sbyte __avx_reserved1[64];
+        internal fixed sbyte __avx_reserved1[64];
        [FieldOffset(588)]
        internal global::DarwinXmmReg.__Internal __fpu_ymmh0;
@ -1086,16 +1086,16 @@ public unsafe partial class DarwinX86ExceptionState64
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public ushort __trapno;
+        internal ushort __trapno;
        [FieldOffset(2)]
-        public ushort __cpu;
+        internal ushort __cpu;
        [FieldOffset(4)]
-        public uint __err;
+        internal uint __err;
        [FieldOffset(8)]
-        public ulong __faultvaddr;
+        internal ulong __faultvaddr;
    }
 }
@ -1105,7 +1105,7 @@ public unsafe partial struct Wait
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public int w_status;
+        internal int w_status;
        [FieldOffset(0)]
        internal global::Wait._.__Internal w_T;
@ -1120,16 +1120,16 @@ public unsafe partial struct Wait
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public uint w_Termsig;
+            internal uint w_Termsig;
            [FieldOffset(0)]
-            public uint w_Coredump;
+            internal uint w_Coredump;
            [FieldOffset(1)]
-            public uint w_Retcode;
+            internal uint w_Retcode;
            [FieldOffset(2)]
-            public uint w_Filler;
+            internal uint w_Filler;
        }
    }
@ -1139,13 +1139,13 @@ public unsafe partial struct Wait
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public uint w_Stopval;
+            internal uint w_Stopval;
            [FieldOffset(1)]
-            public uint w_Stopsig;
+            internal uint w_Stopsig;
            [FieldOffset(2)]
-            public uint w_Filler;
+            internal uint w_Filler;
        }
    }
 }
@ -1179,10 +1179,10 @@ namespace Std
            public unsafe partial struct __Internal
            {
                [FieldOffset(0)]
-                public global::System.IntPtr __begin_;
+                internal global::System.IntPtr __begin_;
                [FieldOffset(8)]
-                public global::System.IntPtr __end_;
+                internal global::System.IntPtr __end_;
                [FieldOffset(16)]
                internal global::Std.__1.CompressedPair.__Internal __end_cap_;
@ -1201,7 +1201,7 @@ namespace Std
            public unsafe partial struct __Internal
            {
                [FieldOffset(0)]
-                public global::System.IntPtr __begin_node_;
+                internal global::System.IntPtr __begin_node_;
                [FieldOffset(8)]
                internal global::Std.__1.CompressedPair.__Internal __pair1_;
@ -1217,7 +1217,7 @@ namespace Std
            public unsafe partial struct __Internal_Ptr
            {
                [FieldOffset(0)]
-                public global::System.IntPtr __left_;
+                internal global::System.IntPtr __left_;
            }
        }
    }
@ -1420,13 +1420,13 @@ namespace Std
                public partial struct __Internal
                {
                    [FieldOffset(0)]
-                    public ulong __cap_;
+                    internal ulong __cap_;
                    [FieldOffset(8)]
-                    public ulong __size_;
+                    internal ulong __size_;
                    [FieldOffset(16)]
-                    public global::System.IntPtr __data_;
+                    internal global::System.IntPtr __data_;
                }
            }
@ -1439,7 +1439,7 @@ namespace Std
                    internal global::Std.__1.BasicString.Short._.__Internal _;
                    [FieldOffset(1)]
-                    public fixed sbyte __data_[23];
+                    internal fixed sbyte __data_[23];
                }
                public unsafe partial struct _
@ -1448,10 +1448,10 @@ namespace Std
                    public partial struct __Internal
                    {
                        [FieldOffset(0)]
-                        public byte __size_;
+                        internal byte __size_;
                        [FieldOffset(0)]
-                        public sbyte __lx;
+                        internal sbyte __lx;
                    }
                }
            }
@ -1462,7 +1462,7 @@ namespace Std
                public partial struct __Internal
                {
                    [FieldOffset(0)]
-                    public fixed ulong __words[3];
+                    internal fixed ulong __words[3];
                }
            }
--- 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
--- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs
@ -31,7 +31,7 @@ namespace Std
            public partial struct __Internal
            {
                [FieldOffset(0)]
-                public global::System.IntPtr _M_exception_object;
+                internal global::System.IntPtr _M_exception_object;
            }
        }
    }
@ -171,10 +171,10 @@ namespace Std
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public global::System.IntPtr _M_p;
+            internal global::System.IntPtr _M_p;
            [FieldOffset(8)]
-            public uint _M_offset;
+            internal uint _M_offset;
        }
    }
@ -184,10 +184,10 @@ namespace Std
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public global::System.IntPtr _M_p;
+            internal global::System.IntPtr _M_p;
            [FieldOffset(8)]
-            public uint _M_offset;
+            internal uint _M_offset;
        }
    }
 }
@ -254,16 +254,16 @@ namespace Std
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public global::Std.RbTreeColor _M_color;
+            internal global::Std.RbTreeColor _M_color;
            [FieldOffset(8)]
-            public global::System.IntPtr _M_parent;
+            internal global::System.IntPtr _M_parent;
            [FieldOffset(16)]
-            public global::System.IntPtr _M_left;
+            internal global::System.IntPtr _M_left;
            [FieldOffset(24)]
-            public global::System.IntPtr _M_right;
+            internal global::System.IntPtr _M_right;
        }
    }
 }
@ -315,7 +315,7 @@ public unsafe partial class MbstateT
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public int __count;
+        internal int __count;
        [FieldOffset(4)]
        internal global::MbstateT._.__Internal __value;
@ -327,10 +327,10 @@ public unsafe partial class MbstateT
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public uint __wch;
+            internal uint __wch;
            [FieldOffset(0)]
-            public fixed sbyte __wchb[4];
+            internal fixed sbyte __wchb[4];
        }
    }
 }
@ -432,10 +432,10 @@ public unsafe partial class Timespec
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public long tv_sec;
+        internal long tv_sec;
        [FieldOffset(8)]
-        public long tv_nsec;
+        internal long tv_nsec;
    }
 }
@ -445,10 +445,10 @@ public unsafe partial class Timeval
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public long tv_sec;
+        internal long tv_sec;
        [FieldOffset(8)]
-        public long tv_usec;
+        internal long tv_usec;
    }
 }
@ -458,10 +458,10 @@ public unsafe partial class PthreadInternalList
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public global::System.IntPtr __prev;
+        internal global::System.IntPtr __prev;
        [FieldOffset(8)]
-        public global::System.IntPtr __next;
+        internal global::System.IntPtr __next;
    }
 }
@ -474,10 +474,10 @@ public unsafe partial struct PthreadMutexT
        internal global::PthreadMutexT.PthreadMutexS.__Internal __data;
        [FieldOffset(0)]
-        public fixed sbyte __size[40];
+        internal fixed sbyte __size[40];
        [FieldOffset(0)]
-        public long __align;
+        internal long __align;
    }
    public unsafe partial class PthreadMutexS
@ -486,25 +486,25 @@ public unsafe partial struct PthreadMutexT
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public int __lock;
+            internal int __lock;
            [FieldOffset(4)]
-            public uint __count;
+            internal uint __count;
            [FieldOffset(8)]
-            public int __owner;
+            internal int __owner;
            [FieldOffset(12)]
-            public uint __nusers;
+            internal uint __nusers;
            [FieldOffset(16)]
-            public int __kind;
+            internal int __kind;
            [FieldOffset(20)]
-            public short __spins;
+            internal short __spins;
            [FieldOffset(22)]
-            public short __elision;
+            internal short __elision;
            [FieldOffset(24)]
            internal global::PthreadInternalList.__Internal __list;
@ -521,10 +521,10 @@ public unsafe partial struct PthreadCondT
        internal global::PthreadCondT._.__Internal __data;
        [FieldOffset(0)]
-        public fixed sbyte __size[48];
+        internal fixed sbyte __size[48];
        [FieldOffset(0)]
-        public long __align;
+        internal long __align;
    }
    public unsafe partial class _
@ -533,28 +533,28 @@ public unsafe partial struct PthreadCondT
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public int __lock;
+            internal int __lock;
            [FieldOffset(4)]
-            public uint __futex;
+            internal uint __futex;
            [FieldOffset(8)]
-            public ulong __total_seq;
+            internal ulong __total_seq;
            [FieldOffset(16)]
-            public ulong __wakeup_seq;
+            internal ulong __wakeup_seq;
            [FieldOffset(24)]
-            public ulong __woken_seq;
+            internal ulong __woken_seq;
            [FieldOffset(32)]
-            public global::System.IntPtr __mutex;
+            internal global::System.IntPtr __mutex;
            [FieldOffset(40)]
-            public uint __nwaiters;
+            internal uint __nwaiters;
            [FieldOffset(44)]
-            public uint __broadcast_seq;
+            internal uint __broadcast_seq;
        }
    }
 }
@ -568,10 +568,10 @@ public unsafe partial struct PthreadRwlockT
        internal global::PthreadRwlockT._.__Internal __data;
        [FieldOffset(0)]
-        public fixed sbyte __size[56];
+        internal fixed sbyte __size[56];
        [FieldOffset(0)]
-        public long __align;
+        internal long __align;
    }
    public unsafe partial class _
@ -580,40 +580,40 @@ public unsafe partial struct PthreadRwlockT
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public int __lock;
+            internal int __lock;
            [FieldOffset(4)]
-            public uint __nr_readers;
+            internal uint __nr_readers;
            [FieldOffset(8)]
-            public uint __readers_wakeup;
+            internal uint __readers_wakeup;
            [FieldOffset(12)]
-            public uint __writer_wakeup;
+            internal uint __writer_wakeup;
            [FieldOffset(16)]
-            public uint __nr_readers_queued;
+            internal uint __nr_readers_queued;
            [FieldOffset(20)]
-            public uint __nr_writers_queued;
+            internal uint __nr_writers_queued;
            [FieldOffset(24)]
-            public int __writer;
+            internal int __writer;
            [FieldOffset(28)]
-            public int __shared;
+            internal int __shared;
            [FieldOffset(32)]
-            public sbyte __rwelision;
+            internal sbyte __rwelision;
            [FieldOffset(33)]
-            public fixed byte __pad1[7];
+            internal fixed byte __pad1[7];
            [FieldOffset(40)]
-            public ulong __pad2;
+            internal ulong __pad2;
            [FieldOffset(48)]
-            public uint __flags;
+            internal uint __flags;
        }
    }
 }
@ -624,10 +624,10 @@ public unsafe partial class PthreadUnwindBufT
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public fixed byte __cancel_jmp_buf[72];
+        internal fixed byte __cancel_jmp_buf[72];
        [FieldOffset(72)]
-        public void* __pad;
+        internal void* __pad;
    }
    public unsafe partial class _
@ -636,10 +636,10 @@ public unsafe partial class PthreadUnwindBufT
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public fixed long __cancel_jmp_buf[8];
+            internal fixed long __cancel_jmp_buf[8];
            [FieldOffset(64)]
-            public int __mask_was_saved;
+            internal int __mask_was_saved;
        }
    }
 }
@ -657,7 +657,7 @@ namespace Std
                internal global::Std.Cxx11.BasicString.AllocHider.__Internal _M_dataplus;
                [FieldOffset(8)]
-                public ulong _M_string_length;
+                internal ulong _M_string_length;
                [FieldOffset(16)]
                internal global::Std.Cxx11.BasicString._.__Internal _;
@ -684,7 +684,7 @@ namespace Std
                public partial struct __Internal
                {
                    [FieldOffset(0)]
-                    public global::System.IntPtr _M_p;
+                    internal global::System.IntPtr _M_p;
                }
            }
@ -694,10 +694,10 @@ namespace Std
                public partial struct __Internal
                {
                    [FieldOffset(0)]
-                    public fixed sbyte _M_local_buf[16];
+                    internal fixed sbyte _M_local_buf[16];
                    [FieldOffset(0)]
-                    public ulong _M_allocated_capacity;
+                    internal ulong _M_allocated_capacity;
                }
            }
@ -794,7 +794,7 @@ public unsafe partial struct Wait
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public int w_status;
+        internal int w_status;
        [FieldOffset(0)]
        internal global::Wait._.__Internal __wait_terminated;
@ -809,16 +809,16 @@ public unsafe partial struct Wait
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public uint __w_termsig;
+            internal uint __w_termsig;
            [FieldOffset(0)]
-            public uint __w_coredump;
+            internal uint __w_coredump;
            [FieldOffset(1)]
-            public uint __w_retcode;
+            internal uint __w_retcode;
            [FieldOffset(2)]
-            public uint __;
+            internal uint __;
        }
    }
@ -828,13 +828,13 @@ public unsafe partial struct Wait
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public uint __w_stopval;
+            internal uint __w_stopval;
            [FieldOffset(1)]
-            public uint __w_stopsig;
+            internal uint __w_stopsig;
            [FieldOffset(2)]
-            public uint __;
+            internal uint __;
        }
    }
 }
@ -867,10 +867,10 @@ namespace Std
            public partial struct __Internal
            {
                [FieldOffset(0)]
-                public global::System.IntPtr _M_p;
+                internal global::System.IntPtr _M_p;
                [FieldOffset(0)]
-                public fixed sbyte _M_bytes[8];
+                internal fixed sbyte _M_bytes[8];
            }
        }
    }
--- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs
--- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs
@ -31,7 +31,7 @@ namespace Std
            public partial struct __Internal
            {
                [FieldOffset(0)]
-                public global::System.IntPtr _M_exception_object;
+                internal global::System.IntPtr _M_exception_object;
            }
        }
    }
@ -171,10 +171,10 @@ namespace Std
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public global::System.IntPtr _M_p;
+            internal global::System.IntPtr _M_p;
            [FieldOffset(8)]
-            public uint _M_offset;
+            internal uint _M_offset;
        }
    }
@ -184,10 +184,10 @@ namespace Std
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public global::System.IntPtr _M_p;
+            internal global::System.IntPtr _M_p;
            [FieldOffset(8)]
-            public uint _M_offset;
+            internal uint _M_offset;
        }
    }
 }
@ -254,16 +254,16 @@ namespace Std
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public global::Std.RbTreeColor _M_color;
+            internal global::Std.RbTreeColor _M_color;
            [FieldOffset(8)]
-            public global::System.IntPtr _M_parent;
+            internal global::System.IntPtr _M_parent;
            [FieldOffset(16)]
-            public global::System.IntPtr _M_left;
+            internal global::System.IntPtr _M_left;
            [FieldOffset(24)]
-            public global::System.IntPtr _M_right;
+            internal global::System.IntPtr _M_right;
        }
    }
 }
@ -308,7 +308,7 @@ public unsafe partial class MbstateT
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public int __count;
+        internal int __count;
        [FieldOffset(4)]
        internal global::MbstateT._.__Internal __value;
@ -320,10 +320,10 @@ public unsafe partial class MbstateT
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public uint __wch;
+            internal uint __wch;
            [FieldOffset(0)]
-            public fixed sbyte __wchb[4];
+            internal fixed sbyte __wchb[4];
        }
    }
 }
@ -417,10 +417,10 @@ public unsafe partial class Timespec
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public long tv_sec;
+        internal long tv_sec;
        [FieldOffset(8)]
-        public long tv_nsec;
+        internal long tv_nsec;
    }
 }
@ -430,10 +430,10 @@ public unsafe partial class Timeval
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public long tv_sec;
+        internal long tv_sec;
        [FieldOffset(8)]
-        public long tv_usec;
+        internal long tv_usec;
    }
 }
@ -443,10 +443,10 @@ public unsafe partial class PthreadInternalList
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public global::System.IntPtr __prev;
+        internal global::System.IntPtr __prev;
        [FieldOffset(8)]
-        public global::System.IntPtr __next;
+        internal global::System.IntPtr __next;
    }
 }
@ -459,10 +459,10 @@ public unsafe partial struct PthreadMutexT
        internal global::PthreadMutexT.PthreadMutexS.__Internal __data;
        [FieldOffset(0)]
-        public fixed sbyte __size[40];
+        internal fixed sbyte __size[40];
        [FieldOffset(0)]
-        public long __align;
+        internal long __align;
    }
    public unsafe partial class PthreadMutexS
@ -471,25 +471,25 @@ public unsafe partial struct PthreadMutexT
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public int __lock;
+            internal int __lock;
            [FieldOffset(4)]
-            public uint __count;
+            internal uint __count;
            [FieldOffset(8)]
-            public int __owner;
+            internal int __owner;
            [FieldOffset(12)]
-            public uint __nusers;
+            internal uint __nusers;
            [FieldOffset(16)]
-            public int __kind;
+            internal int __kind;
            [FieldOffset(20)]
-            public short __spins;
+            internal short __spins;
            [FieldOffset(22)]
-            public short __elision;
+            internal short __elision;
            [FieldOffset(24)]
            internal global::PthreadInternalList.__Internal __list;
@ -506,10 +506,10 @@ public unsafe partial struct PthreadCondT
        internal global::PthreadCondT._.__Internal __data;
        [FieldOffset(0)]
-        public fixed sbyte __size[48];
+        internal fixed sbyte __size[48];
        [FieldOffset(0)]
-        public long __align;
+        internal long __align;
    }
    public unsafe partial class _
@ -518,28 +518,28 @@ public unsafe partial struct PthreadCondT
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public int __lock;
+            internal int __lock;
            [FieldOffset(4)]
-            public uint __futex;
+            internal uint __futex;
            [FieldOffset(8)]
-            public ulong __total_seq;
+            internal ulong __total_seq;
            [FieldOffset(16)]
-            public ulong __wakeup_seq;
+            internal ulong __wakeup_seq;
            [FieldOffset(24)]
-            public ulong __woken_seq;
+            internal ulong __woken_seq;
            [FieldOffset(32)]
-            public global::System.IntPtr __mutex;
+            internal global::System.IntPtr __mutex;
            [FieldOffset(40)]
-            public uint __nwaiters;
+            internal uint __nwaiters;
            [FieldOffset(44)]
-            public uint __broadcast_seq;
+            internal uint __broadcast_seq;
        }
    }
 }
@ -553,10 +553,10 @@ public unsafe partial struct PthreadRwlockT
        internal global::PthreadRwlockT._.__Internal __data;
        [FieldOffset(0)]
-        public fixed sbyte __size[56];
+        internal fixed sbyte __size[56];
        [FieldOffset(0)]
-        public long __align;
+        internal long __align;
    }
    public unsafe partial class _
@ -565,40 +565,40 @@ public unsafe partial struct PthreadRwlockT
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public int __lock;
+            internal int __lock;
            [FieldOffset(4)]
-            public uint __nr_readers;
+            internal uint __nr_readers;
            [FieldOffset(8)]
-            public uint __readers_wakeup;
+            internal uint __readers_wakeup;
            [FieldOffset(12)]
-            public uint __writer_wakeup;
+            internal uint __writer_wakeup;
            [FieldOffset(16)]
-            public uint __nr_readers_queued;
+            internal uint __nr_readers_queued;
            [FieldOffset(20)]
-            public uint __nr_writers_queued;
+            internal uint __nr_writers_queued;
            [FieldOffset(24)]
-            public int __writer;
+            internal int __writer;
            [FieldOffset(28)]
-            public int __shared;
+            internal int __shared;
            [FieldOffset(32)]
-            public sbyte __rwelision;
+            internal sbyte __rwelision;
            [FieldOffset(33)]
-            public fixed byte __pad1[7];
+            internal fixed byte __pad1[7];
            [FieldOffset(40)]
-            public ulong __pad2;
+            internal ulong __pad2;
            [FieldOffset(48)]
-            public uint __flags;
+            internal uint __flags;
        }
    }
 }
@ -609,10 +609,10 @@ public unsafe partial class PthreadUnwindBufT
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public fixed byte __cancel_jmp_buf[72];
+        internal fixed byte __cancel_jmp_buf[72];
        [FieldOffset(72)]
-        public void* __pad;
+        internal void* __pad;
    }
    public unsafe partial class _
@ -621,10 +621,10 @@ public unsafe partial class PthreadUnwindBufT
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public fixed long __cancel_jmp_buf[8];
+            internal fixed long __cancel_jmp_buf[8];
            [FieldOffset(64)]
-            public int __mask_was_saved;
+            internal int __mask_was_saved;
        }
    }
 }
@ -656,7 +656,7 @@ namespace Std
            public partial struct __Internal
            {
                [FieldOffset(0)]
-                public global::System.IntPtr _M_p;
+                internal global::System.IntPtr _M_p;
            }
        }
@ -666,13 +666,13 @@ namespace Std
            public partial struct __Internal
            {
                [FieldOffset(0)]
-                public ulong _M_length;
+                internal ulong _M_length;
                [FieldOffset(8)]
-                public ulong _M_capacity;
+                internal ulong _M_capacity;
                [FieldOffset(16)]
-                public int _M_refcount;
+                internal int _M_refcount;
            }
        }
@ -682,13 +682,13 @@ namespace Std
            public partial struct __Internal
            {
                [FieldOffset(0)]
-                public ulong _M_length;
+                internal ulong _M_length;
                [FieldOffset(8)]
-                public ulong _M_capacity;
+                internal ulong _M_capacity;
                [FieldOffset(16)]
-                public int _M_refcount;
+                internal int _M_refcount;
            }
        }
@ -793,7 +793,7 @@ public unsafe partial struct Wait
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public int w_status;
+        internal int w_status;
        [FieldOffset(0)]
        internal global::Wait._.__Internal __wait_terminated;
@ -808,16 +808,16 @@ public unsafe partial struct Wait
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public uint __w_termsig;
+            internal uint __w_termsig;
            [FieldOffset(0)]
-            public uint __w_coredump;
+            internal uint __w_coredump;
            [FieldOffset(1)]
-            public uint __w_retcode;
+            internal uint __w_retcode;
            [FieldOffset(2)]
-            public uint __;
+            internal uint __;
        }
    }
@ -827,13 +827,13 @@ public unsafe partial struct Wait
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public uint __w_stopval;
+            internal uint __w_stopval;
            [FieldOffset(1)]
-            public uint __w_stopsig;
+            internal uint __w_stopsig;
            [FieldOffset(2)]
-            public uint __;
+            internal uint __;
        }
    }
 }
@ -862,7 +862,7 @@ namespace Std
                internal global::Std.SsoString.Str.__Internal _M_s;
                [FieldOffset(0)]
-                public fixed sbyte _M_bytes[32];
+                internal fixed sbyte _M_bytes[32];
            }
        }
@ -872,13 +872,13 @@ namespace Std
            public partial struct __Internal
            {
                [FieldOffset(0)]
-                public global::System.IntPtr _M_p;
+                internal global::System.IntPtr _M_p;
                [FieldOffset(8)]
-                public ulong _M_string_length;
+                internal ulong _M_string_length;
                [FieldOffset(16)]
-                public fixed sbyte _M_local_buf[16];
+                internal fixed sbyte _M_local_buf[16];
            }
        }
    }
--- 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
--- a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs
@ -21,7 +21,7 @@ namespace Std
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public int _Locktype;
+            internal int _Locktype;
        }
    }
 }
@ -34,10 +34,10 @@ namespace Std
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public global::System.IntPtr _Data1;
+            internal global::System.IntPtr _Data1;
            [FieldOffset(8)]
-            public global::System.IntPtr _Data2;
+            internal global::System.IntPtr _Data2;
        }
    }
 }
@ -48,10 +48,10 @@ public unsafe partial class StdExceptionData
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public global::System.IntPtr _What;
+        internal global::System.IntPtr _What;
        [FieldOffset(8)]
-        public byte _DoFree;
+        internal byte _DoFree;
    }
 }
@ -150,20 +150,20 @@ namespace Std
        public unsafe partial struct __Internalc__N_std_S__Yarn__C
        {
            [FieldOffset(0)]
-            public global::System.IntPtr _Myptr;
+            internal global::System.IntPtr _Myptr;
            [FieldOffset(8)]
-            public sbyte _Nul;
+            internal sbyte _Nul;
        }
        [StructLayout(LayoutKind.Explicit, Size = 16)]
        public unsafe partial struct __Internalc__N_std_S__Yarn__W
        {
            [FieldOffset(0)]
-            public global::System.IntPtr _Myptr;
+            internal global::System.IntPtr _Myptr;
            [FieldOffset(8)]
-            public char _Nul;
+            internal char _Nul;
        }
    }
@ -565,7 +565,7 @@ public unsafe partial class SETJMP_FLOAT128
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public fixed ulong Part[2];
+        internal fixed ulong Part[2];
    }
 }
@ -667,10 +667,10 @@ namespace Std
            internal global::Std.StringVal.Bxty.__Internal _Bx;
            [FieldOffset(16)]
-            public ulong _Mysize;
+            internal ulong _Mysize;
            [FieldOffset(24)]
-            public ulong _Myres;
+            internal ulong _Myres;
        }
@ -692,13 +692,13 @@ namespace Std
        public unsafe partial struct __Internal
        {
            [FieldOffset(0)]
-            public global::System.IntPtr _Myfirst;
+            internal global::System.IntPtr _Myfirst;
            [FieldOffset(8)]
-            public global::System.IntPtr _Mylast;
+            internal global::System.IntPtr _Mylast;
            [FieldOffset(16)]
-            public global::System.IntPtr _Myend;
+            internal global::System.IntPtr _Myend;
        }
    }
@ -725,10 +725,10 @@ namespace Std
        public unsafe partial struct __Internal
        {
            [FieldOffset(0)]
-            public global::System.IntPtr _Myhead;
+            internal global::System.IntPtr _Myhead;
            [FieldOffset(8)]
-            public ulong _Mysize;
+            internal ulong _Mysize;
        }
    }
 }
@ -752,10 +752,10 @@ public unsafe partial class StdTypeInfoData
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public global::System.IntPtr _UndecoratedName;
+        internal global::System.IntPtr _UndecoratedName;
        [FieldOffset(8)]
-        public fixed sbyte _DecoratedName[1];
+        internal fixed sbyte _DecoratedName[1];
    }
 }
@ -765,16 +765,16 @@ public unsafe partial class Ctypevec
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public uint _Page;
+        internal uint _Page;
        [FieldOffset(8)]
-        public global::System.IntPtr _Table;
+        internal global::System.IntPtr _Table;
        [FieldOffset(16)]
-        public int _Delfl;
+        internal int _Delfl;
        [FieldOffset(24)]
-        public global::System.IntPtr _LocaleName;
+        internal global::System.IntPtr _LocaleName;
    }
 }
@ -784,16 +784,16 @@ public unsafe partial class Cvtvec
    public partial struct __Internal
    {
        [FieldOffset(0)]
-        public uint _Page;
+        internal uint _Page;
        [FieldOffset(4)]
-        public uint _Mbcurmax;
+        internal uint _Mbcurmax;
        [FieldOffset(8)]
-        public int _Isclocale;
+        internal int _Isclocale;
        [FieldOffset(12)]
-        public fixed byte _Isleadbyte[32];
+        internal fixed byte _Isleadbyte[32];
    }
 }
@ -815,10 +815,10 @@ namespace Std
        public partial struct __Internal
        {
            [FieldOffset(0)]
-            public int _Myval;
+            internal int _Myval;
            [FieldOffset(8)]
-            public global::System.IntPtr _Mycat;
+            internal global::System.IntPtr _Mycat;
        }
    }
 }
--- a/src/Generator/Generators/CSharp/CSharpSources.cs
+++ b/src/Generator/Generators/CSharp/CSharpSources.cs
@ -649,16 +649,13 @@ namespace CppSharp.Generators.CSharp
            if (!Options.GenerateSequentialLayout || @class.IsUnion)
                WriteLine($"[FieldOffset({field.Offset})]");
-            var access = decl != null && !decl.IsGenerated ? "internal" : "public";
+            Write($"internal {retType}{retType.NameSuffix}");
            if (field.Expression != null)
            {
                var fieldValuePrinted = field.Expression.CSharpValue(ExpressionPrinter);
-                Write($"{access} {retType}{retType.NameSuffix} = {fieldValuePrinted};");
+                Write($" = {fieldValuePrinted}");
            }
            else
            {
                Write($"{access} {retType}{retType.NameSuffix};");
            }
            Write(";");
            PopBlock(NewLineKind.BeforeNextBlock);
        }