diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index 0497c75e8d..0c70cdc82e 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.H
@@ -435,8 +435,7 @@ Ostream& operator<<(Ostream&, const token::compound&);
 
 
 #define defineCompoundTypeName(Type, Name)                                    \
-    typedef token::Compound<Type> tokenCompound##Name##_;                     \
-    defineTemplateTypeNameAndDebugWithName(tokenCompound##Name##_, #Type, 0);
+    defineTemplateTypeNameAndDebugWithName(token::Compound<Type>, #Type, 0);
 
 #define addCompoundToRunTimeSelectionTable(Type, Name)                        \
     token::compound::addIstreamConstructorToTable<token::Compound<Type> >     \
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index 352a826cab..51f0887b5e 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -573,8 +573,10 @@ Foam::label Foam::cyclicPolyPatch::getConsistentRotationFace
 {
     // Determine a face furthest away from the axis
 
-    const scalarField magRadSqr =
-        magSqr((faceCentres - rotationCentre_) ^ rotationAxis_);
+    const scalarField magRadSqr
+    (
+        magSqr((faceCentres - rotationCentre_) ^ rotationAxis_)
+    );
 
     label rotFace = findMax(magRadSqr);
 
diff --git a/src/triSurface/triSurfaceFields/triSurfaceFields.C b/src/triSurface/triSurfaceFields/triSurfaceFields.C
index 71ad3d24bd..9ef99d19b8 100644
--- a/src/triSurface/triSurfaceFields/triSurfaceFields.C
+++ b/src/triSurface/triSurfaceFields/triSurfaceFields.C
@@ -32,24 +32,36 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+#ifndef __clang__
 template<>
+#endif
 const word triSurfaceLabelField::typeName("triSurfaceLabelField");
 
+#ifndef __clang__
 template<>
+#endif
 const word triSurfaceScalarField::typeName("triSurfaceScalarField");
 
+#ifndef __clang__
 template<>
+#endif
 const word triSurfaceVectorField::typeName("triSurfaceVectorField");
 
+#ifndef __clang__
 template<>
+#endif
 const word triSurfaceSphericalTensorField::typeName
 ("triSurfaceSphericalTensorField");
 
+#ifndef __clang__
 template<>
+#endif
 const word triSurfaceSymmTensorField::typeName
 ("triSurfaceSymmTensorField");
 
+#ifndef __clang__
 template<>
+#endif
 const word triSurfaceTensorField::typeName("triSurfaceTensorField");
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //