diff --git a/applications/solvers/combustion/fireFoam/createFields.H b/applications/solvers/combustion/fireFoam/createFields.H
index a399df8536723747cd9f2a32b379e6c5bc9dd996..95bda056065ba96ea419070c6a751a3c6d1ad101 100644
--- a/applications/solvers/combustion/fireFoam/createFields.H
+++ b/applications/solvers/combustion/fireFoam/createFields.H
@@ -71,9 +71,9 @@ IOdictionary combustionProperties
 );
 
 Info<< "Creating combustion model\n" << endl;
-autoPtr<combustionModel::combustionModel> combustion
+autoPtr<combustionModel> combustion
 (
-    combustionModel::combustionModel::New
+    combustionModel::New
     (
         combustionProperties,
         thermo,
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculatorI.H b/applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculatorI.H
index ae147cd102d825f5c6ec7e43b96de23e551d4a8a..78feb859a9310f68df6ba261a4833315b0384d75 100644
--- a/applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculatorI.H
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/patchPointEdgeCirculatorI.H
@@ -233,7 +233,7 @@ void Foam::patchPointEdgeCirculator::setCanonical()
 
 
 //- Step to next edge.
-Foam::patchPointEdgeCirculator::patchPointEdgeCirculator&
+Foam::patchPointEdgeCirculator&
 Foam::patchPointEdgeCirculator::operator++()
 {
     if (index_ == -1)
diff --git a/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C b/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
index a9f3472ea1f2f97845273492495070aa7d648dc6..2cb7ef6c5bcb38ccd676a6542480588e0ab04361 100644
--- a/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
+++ b/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
@@ -113,7 +113,7 @@ int main(int argc, char *argv[])
     argList::validArgs.clear();
     argList::validArgs.append("OBJ file");
     argList::validArgs.append("output VTK file");
-    argList::argList args(argc, argv);
+    argList args(argc, argv);
 
     const fileName objName = args[1];
     const fileName outName = args[2];
diff --git a/applications/utilities/surface/surfaceClean/surfaceClean.C b/applications/utilities/surface/surfaceClean/surfaceClean.C
index b5bf012549acc1fd9e93eeb6ddb1af516f723683..46d9bb90dad282b908f87cfb9c9718d486acf91c 100644
--- a/applications/utilities/surface/surfaceClean/surfaceClean.C
+++ b/applications/utilities/surface/surfaceClean/surfaceClean.C
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
     argList::validArgs.append("surface file");
     argList::validArgs.append("min length");
     argList::validArgs.append("output surface file");
-    argList::argList args(argc, argv);
+    argList args(argc, argv);
 
     const fileName inFileName = args[1];
     const scalar minLen = args.argRead<scalar>(2);
diff --git a/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C b/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C
index 424e06a67a7b3306c3079de04e32bfae838044a3..d7e84e1303c59312b14433819b61f6edcf5f5e9c 100644
--- a/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C
+++ b/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
     argList::validArgs.clear();
     argList::validArgs.append("surface file");
     argList::validArgs.append("output surface file");
-    argList::argList args(argc, argv);
+    argList args(argc, argv);
 
     const fileName surfFileName = args[1];
     const fileName outFileName  = args[2];
diff --git a/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C b/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C
index 87d27ed1e5469727852afce9ebb6f98e76d9a4bb..50502faebeabb48799371b6534b909e0135cb89d 100644
--- a/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C
+++ b/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
     argList::noParallel();
     argList::validArgs.clear();
     argList::validArgs.append("input file");
-    argList::argList args(argc, argv);
+    argList args(argc, argv);
 
     const fileName surfName = args[1];
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTests.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTests.C
index c4c8774098e3836a770b489f98662f969b804a4f..6ec7861bc815d4bfadb2318b7d17b11b5dbef4be 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTests.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTests.C
@@ -118,7 +118,7 @@ void Foam::lduMatrix::solverPerformance::print() const
 }
 
 
-Foam::lduMatrix::solverPerformance::solverPerformance Foam::max
+Foam::lduMatrix::solverPerformance Foam::max
 (
     const lduMatrix::solverPerformance& sp1,
     const lduMatrix::solverPerformance& sp2
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index f1a91c869d5e96a7c3b6a0fa95dac8a823fc4f9f..0fc8dbf70c3fb01ebe2dccb752d356959605024a 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -187,7 +187,9 @@ $(interpolation)/interpolationCellPointWallModified/cellPointWeightWallModified/
 $(interpolation)/interpolationCellPointWallModified/makeInterpolationCellPointWallModified.C
 
 volPointInterpolation = interpolation/volPointInterpolation
-/* $(volPointInterpolation)/pointPatchInterpolation/pointPatchInterpolation.C */
+/*
+$(volPointInterpolation)/pointPatchInterpolation/pointPatchInterpolation.C
+*/
 $(volPointInterpolation)/volPointInterpolation.C
 
 surfaceInterpolation = interpolation/surfaceInterpolation
@@ -305,8 +307,10 @@ $(snGradSchemes)/snGradScheme/snGradSchemes.C
 $(snGradSchemes)/correctedSnGrad/correctedSnGrads.C
 $(snGradSchemes)/limitedSnGrad/limitedSnGrads.C
 $(snGradSchemes)/uncorrectedSnGrad/uncorrectedSnGrads.C
-//$(snGradSchemes)/quadraticFitSnGrad/quadraticFitSnGradData.C
-//$(snGradSchemes)/quadraticFitSnGrad/quadraticFitSnGrads.C
+/*
+$(snGradSchemes)/quadraticFitSnGrad/quadraticFitSnGradData.C
+$(snGradSchemes)/quadraticFitSnGrad/quadraticFitSnGrads.C
+*/
 
 convectionSchemes = finiteVolume/convectionSchemes
 $(convectionSchemes)/convectionScheme/convectionSchemes.C
diff --git a/src/meshTools/edgeFaceCirculator/edgeFaceCirculatorI.H b/src/meshTools/edgeFaceCirculator/edgeFaceCirculatorI.H
index ecf331fcfb21246bdcc46fb75a369684b0919106..8c04f926a98dd0553368c6128c057d716619b8be 100644
--- a/src/meshTools/edgeFaceCirculator/edgeFaceCirculatorI.H
+++ b/src/meshTools/edgeFaceCirculator/edgeFaceCirculatorI.H
@@ -352,8 +352,8 @@ bool Foam::edgeFaceCirculator::operator!=(const edgeFaceCirculator& circ) const
 
 
 //- Step to next face.
-Foam::edgeFaceCirculator::edgeFaceCirculator&
- Foam::edgeFaceCirculator::operator++()
+Foam::edgeFaceCirculator&
+Foam::edgeFaceCirculator::operator++()
 {
     if (faceLabel_ == -1)
     {