diff --git a/applications/utilities/mesh/conversion/ensightToFoam/Make/options b/applications/utilities/mesh/conversion/ensightToFoam/Make/options
index b5a412d068..85cfbb962f 100644
--- a/applications/utilities/mesh/conversion/ensightToFoam/Make/options
+++ b/applications/utilities/mesh/conversion/ensightToFoam/Make/options
@@ -1,7 +1,11 @@
 EXE_INC = \
-    -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/conversion/lnInclude
 
 EXE_LIBS = \
+    -lfileFormats \
+    -lsurfMesh \
+    -lmeshTools \
     -lconversion
diff --git a/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.C b/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.C
index 54bb7a56cd..ab672e5721 100644
--- a/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.C
+++ b/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.C
@@ -207,7 +207,7 @@ bool Foam::fileFormats::ensightMeshReader::readGoldPart
 
 
     // Work
-    DynamicList<label> verts; 
+    DynamicList<label> verts;
 
     string line;
     while (is.good())
diff --git a/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.H b/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.H
index 5e3d4cc716..e69b3d6dc9 100644
--- a/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.H
+++ b/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef ensightMeshReader_H
-#define ensightMeshReader_H
+#ifndef Foam_ensightMeshReader_H
+#define Foam_ensightMeshReader_H
 
 #include "meshReader.H"
 //#include "ensightReadFile.H"
@@ -46,6 +46,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class ensightReadFile;
 
 namespace fileFormats
@@ -59,7 +60,7 @@ class ensightMeshReader
 :
     public meshReader
 {
-    // Private data
+    // Private Data
 
         //- Merge distance
         const scalar mergeTol_;
@@ -168,13 +169,13 @@ public:
     // Access
 
         //- Original node id (if supplied) or -1
-        inline const labelList& nodeIds() const
+        const labelList& nodeIds() const noexcept
         {
             return nodeIds_;
         }
 
         //- Original element id (if supplied) or -1
-        inline const labelList& elementIds() const
+        const labelList& elementIds() const noexcept
         {
             return elementIds_;
         }