diff --git a/gtsam/navigation/ConstantVelocityFactor.h b/gtsam/navigation/ConstantVelocityFactor.h
index f5a35947f..028026f7d 100644
--- a/gtsam/navigation/ConstantVelocityFactor.h
+++ b/gtsam/navigation/ConstantVelocityFactor.h
@@ -1,6 +1,20 @@
-#include <gtsam/base/numericalDerivative.h>
-#include <gtsam/geometry/Pose3.h>
-#include <gtsam/inference/Symbol.h>
+/* ----------------------------------------------------------------------------
+
+ * GTSAM Copyright 2010, Georgia Tech Research Corporation,
+ * Atlanta, Georgia 30332-0415
+ * All Rights Reserved
+ * Authors: Frank Dellaert, et al. (see THANKS for the full author list)
+
+ * See LICENSE for the license information
+
+ * -------------------------------------------------------------------------- */
+
+/**
+ * @file    NonlinearFactor.h
+ * @brief   Non-linear factor base classes
+ * @author  Asa Hammond
+ */
+
 #include <gtsam/navigation/NavState.h>
 #include <gtsam/nonlinear/NonlinearFactor.h>
 
diff --git a/gtsam/navigation/tests/testConstantVelocityFactor.cpp b/gtsam/navigation/tests/testConstantVelocityFactor.cpp
index 5bc2599c3..5c32fe738 100644
--- a/gtsam/navigation/tests/testConstantVelocityFactor.cpp
+++ b/gtsam/navigation/tests/testConstantVelocityFactor.cpp
@@ -12,20 +12,15 @@
 /**
  * @file    testConstantVelocityFactor.cpp
  * @brief   Unit test for ConstantVelocityFactor
- * @author  Alex Cunningham
  * @author  Asa Hammond
  */
 
 #include <gtsam/base/TestableAssertions.h>
-#include <gtsam/base/numericalDerivative.h>
 #include <gtsam/geometry/Pose3.h>
 #include <gtsam/inference/Symbol.h>
 #include <gtsam/navigation/ConstantVelocityFactor.h>
-#include <gtsam/nonlinear/Values.h>
 
 #include <CppUnitLite/TestHarness.h>
-
-#include <boost/bind.hpp>
 #include <list>
 
 /* ************************************************************************* */