diff --git a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs
index 0095a0ff..c7114c7e 100644
--- a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs
+++ b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs
@@ -10,7 +10,13 @@ namespace Cxxi.Generators.CLI
 
         private CLIForwardRefeferencePrinter forwardRefsPrinter;
 
-        protected override void Generate()
+        public CLIHeadersTemplate(Driver driver, TranslationUnit unit)
+            : base(driver, unit)
+        {
+            
+        }
+
+        public override void Generate()
         {
             GenerateStart();
 
diff --git a/src/Generator/Generators/CLI/CLISourcesTemplate.cs b/src/Generator/Generators/CLI/CLISourcesTemplate.cs
index ab9b90d1..448265a9 100644
--- a/src/Generator/Generators/CLI/CLISourcesTemplate.cs
+++ b/src/Generator/Generators/CLI/CLISourcesTemplate.cs
@@ -8,7 +8,13 @@ namespace Cxxi.Generators.CLI
 {
     public class CLISourcesTemplate : CLITextTemplate
     {
-        protected override void Generate()
+        public CLISourcesTemplate(Driver driver, TranslationUnit unit)
+            : base(driver, unit)
+        {
+            
+        }
+
+        public override void Generate()
         {
             GenerateStart();
 
diff --git a/src/Generator/Generators/CLI/CLITextTemplate.cs b/src/Generator/Generators/CLI/CLITextTemplate.cs
index 2d539e61..217311f3 100644
--- a/src/Generator/Generators/CLI/CLITextTemplate.cs
+++ b/src/Generator/Generators/CLI/CLITextTemplate.cs
@@ -10,6 +10,12 @@ namespace Cxxi.Generators.CLI
 
         public ITypePrinter TypePrinter { get; set; }
 
+        protected CLITextTemplate(Driver driver, TranslationUnit unit)
+            : base(driver, unit)
+        {
+            TypePrinter = new CLITypePrinter(driver.TypeDatabase, driver.Library);
+        }
+
         public static string SafeIdentifier(string proposedName)
         {
             return proposedName;
@@ -46,7 +52,7 @@ namespace Cxxi.Generators.CLI
 
         public void GenerateSummary(string comment)
         {
-            if (String.IsNullOrWhiteSpace(comment))
+            if (string.IsNullOrWhiteSpace(comment))
                 return;
 
             // Wrap the comment to the line width.
@@ -118,6 +124,6 @@ namespace Cxxi.Generators.CLI
 
         public abstract override string FileExtension { get; }
 
-        protected abstract override void Generate();
+        public abstract override void Generate();
     }
 }
\ No newline at end of file