diff --git a/dart/dynamics/Marker.cpp b/dart/dynamics/Marker.cpp
index ef9b5ac17a5b6..d59345d6e0233 100644
--- a/dart/dynamics/Marker.cpp
+++ b/dart/dynamics/Marker.cpp
@@ -36,8 +36,6 @@
 
 #include "dart/dynamics/Marker.h"
 
-#include <string>
-
 #include "dart/dynamics/BodyNode.h"
 
 namespace dart {
diff --git a/dart/dynamics/Marker.h b/dart/dynamics/Marker.h
index 97ebc6950cefe..752565741453a 100644
--- a/dart/dynamics/Marker.h
+++ b/dart/dynamics/Marker.h
@@ -37,7 +37,6 @@
 #ifndef DART_DYNAMICS_MARKER_H_
 #define DART_DYNAMICS_MARKER_H_
 
-#include <string>
 #include <Eigen/Dense>
 #include "dart/common/Deprecated.h"
 #include "dart/dynamics/detail/MarkerAspect.h"
@@ -131,11 +130,8 @@ class Marker final :
   EIGEN_MAKE_ALIGNED_OPERATOR_NEW
 
 };
-// TODO: Marker class should be refactored into a Node once pull request #531 is
-// finished.
 
 }  // namespace dynamics
 }  // namespace dart
 
 #endif  // DART_DYNAMICS_MARKER_H_
-
diff --git a/dart/dynamics/detail/MarkerAspect.h b/dart/dynamics/detail/MarkerAspect.h
index afd8a99f99737..f7d7e40f69e6d 100644
--- a/dart/dynamics/detail/MarkerAspect.h
+++ b/dart/dynamics/detail/MarkerAspect.h
@@ -34,8 +34,8 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DART_DYNAMICS_DETAIL_MARKER_H_
-#define DART_DYNAMICS_DETAIL_MARKER_H_
+#ifndef DART_DYNAMICS_DETAIL_MARKERASPECT_H_
+#define DART_DYNAMICS_DETAIL_MARKERASPECT_H_
 
 #include <Eigen/Core>
 #include "dart/math/Helpers.h"
@@ -64,9 +64,8 @@ struct MarkerProperties
   EIGEN_MAKE_ALIGNED_OPERATOR_NEW
 };
 
-
 } // namespace detail
 } // namespace dynamics
 } // namespace dart
 
-#endif // DART_DYNAMICS_DETAIL_MARKER_H_
+#endif // DART_DYNAMICS_DETAIL_MARKERASPECT_H_
diff --git a/dart/utils/VskParser.h b/dart/utils/VskParser.h
index 0d89b8d7d3d31..cbd04152838c1 100644
--- a/dart/utils/VskParser.h
+++ b/dart/utils/VskParser.h
@@ -40,8 +40,8 @@
 
 #include "dart/common/ResourceRetriever.h"
 #include "dart/common/Uri.h"
+#include "dart/math/Constants.h"
 #include "dart/dynamics/Skeleton.h"
-#include "dart/math/Helpers.h"
 
 namespace dart {
 namespace utils {