diff --git a/src/sixDoFRigidBodyState/Make/options b/src/sixDoFRigidBodyState/Make/options
index 2d77c5dda4..4e92d1eec1 100644
--- a/src/sixDoFRigidBodyState/Make/options
+++ b/src/sixDoFRigidBodyState/Make/options
@@ -2,10 +2,8 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-    -I$(LIB_SRC)/sixDoFRigidBodyMotion/lnInclude \
-    -I$(LIB_SRC)/OpenFOAM/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I$(LIB_SRC)/sixDoFRigidBodyMotion/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
-    -lmeshTools
+    -ldynamicFvMesh
diff --git a/src/sixDoFRigidBodyState/sixDoFRigidBodyState/sixDoFRigidBodyState.H b/src/sixDoFRigidBodyState/sixDoFRigidBodyState/sixDoFRigidBodyState.H
index 42267b32da..3a6c77a189 100644
--- a/src/sixDoFRigidBodyState/sixDoFRigidBodyState/sixDoFRigidBodyState.H
+++ b/src/sixDoFRigidBodyState/sixDoFRigidBodyState/sixDoFRigidBodyState.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,9 +125,11 @@ public:
 
     // Member Functions
 
-    vector velocity() const;
+        //- Return the current body velocity
+        vector velocity() const;
 
-    vector angularVelocity() const;
+        //- Return the current body angular velocity
+        vector angularVelocity() const;
 
         //- Read the sixDoFRigidBodyState data
         virtual bool read(const dictionary&);