diff --git a/src/Generator/Generators/CLI/CLIHeaders.cs b/src/Generator/Generators/CLI/CLIHeaders.cs
index 1b4cd21c..d4e60e42 100644
--- a/src/Generator/Generators/CLI/CLIHeaders.cs
+++ b/src/Generator/Generators/CLI/CLIHeaders.cs
@@ -218,7 +218,7 @@ namespace CppSharp.Generators.CLI
 
         public void GenerateFunctions(DeclarationContext decl)
         {
-            PushBlock(BlockKind.FunctionsClass);
+            PushBlock(BlockKind.FunctionsClass, decl);
 
             WriteLine("public ref class {0}", TranslationUnit.FileNameWithoutExtension);
             WriteLine("{");
diff --git a/src/Generator/Generators/CLI/CLISources.cs b/src/Generator/Generators/CLI/CLISources.cs
index 89666e7d..5b7541cd 100644
--- a/src/Generator/Generators/CLI/CLISources.cs
+++ b/src/Generator/Generators/CLI/CLISources.cs
@@ -95,12 +95,14 @@ namespace CppSharp.Generators.CLI
                 GenerateClass(@class);
             }
 
+            PushBlock(BlockKind.FunctionsClass, @namespace);
             // Generate all the function declarations for the module.
             foreach (var function in @namespace.Functions.Where(f => f.IsGenerated))
             {
                 GenerateFunction(function, @namespace);
                 NewLine();
             }
+            PopBlock();
 
             if (Options.GenerateFunctionTemplates)
             {