diff --git a/applications/test/dictionary/blockMeshDict1.calc b/applications/test/dictionary/blockMeshDict1.calc
index 91dbbd10a6..1045cedb48 100644
--- a/applications/test/dictionary/blockMeshDict1.calc
+++ b/applications/test/dictionary/blockMeshDict1.calc
@@ -32,7 +32,7 @@ vertices
 (
     (0.0    0.0 0)      //0
     (10     0.0 0)
-    (10     0.0 0)      //2
+    #calc #{ vector(10, 0, 0) #} //2
     (0.0    0.0 0)
 
     (0.0    $minY $z)   //4
diff --git a/applications/test/dictionary/blockMeshDict1.eval b/applications/test/dictionary/blockMeshDict1.eval
index 6dd94e3cd9..048389c2c3 100644
--- a/applications/test/dictionary/blockMeshDict1.eval
+++ b/applications/test/dictionary/blockMeshDict1.eval
@@ -32,7 +32,7 @@ vertices
 (
     (0.0    0.0 0)      //0
     (10     0.0 0)
-    (10     0.0 0)      //2
+    #eval{ vector(10, 0, 0) } //2
     (0.0    0.0 0)
 
     (0.0    $minY $z)   //4
diff --git a/etc/codeTemplates/dynamicCode/codeStreamTemplate.C b/etc/codeTemplates/dynamicCode/codeStreamTemplate.C
index bedf07b8a6..f88eda7a15 100644
--- a/etc/codeTemplates/dynamicCode/codeStreamTemplate.C
+++ b/etc/codeTemplates/dynamicCode/codeStreamTemplate.C
@@ -31,6 +31,8 @@ Description
 #include "dictionary.H"
 #include "Ostream.H"
 #include "Pstream.H"
+#include "pointField.H"
+#include "tensor.H"
 #include "unitConversion.H"
 
 //{{{ begin codeInclude
@@ -51,7 +53,7 @@ ${localCode}
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-extern "C" void ${typeName}(Ostream& os, const dictionary& dict)
+extern "C" void ${typeName}(Foam::Ostream& os, const Foam::dictionary& dict)
 {
 //{{{ begin code
     ${code}