diff --git a/binder/Generators/Java/JavaSources.cs b/binder/Generators/Java/JavaSources.cs
index f74517c..9874c29 100644
--- a/binder/Generators/Java/JavaSources.cs
+++ b/binder/Generators/Java/JavaSources.cs
@@ -2,14 +2,17 @@ using System.Collections.Generic;
 using CppSharp;
 using CppSharp.AST;
 using CppSharp.Generators;
+using CppSharp.Generators.CSharp;
 
 namespace MonoEmbeddinator4000.Generators
 {
     public class JavaSources : CppSharp.Generators.CSharp.CSharpSources
     {
         public JavaSources(BindingContext context, TranslationUnit unit)
-            : base(context, new List<TranslationUnit> { unit }, null, null)
+            : base(context, new List<TranslationUnit> { unit })
         {
+            TypePrinter = new CSharpTypePrinter(context);
+            ExpressionPrinter = new CSharpExpressionPrinter(TypePrinter);
         }
 
         public override string FileExtension => "java";
diff --git a/external/CppSharp b/external/CppSharp
index 2595e24..f68dc31 160000
--- a/external/CppSharp
+++ b/external/CppSharp
@@ -1 +1 @@
-Subproject commit 2595e2426ea341b34da80396f083588203e76d2f
+Subproject commit f68dc310f05416ae271b1a0a26323789a9aca0cc