diff --git a/gtsam/nonlinear/lago.cpp b/gtsam/nonlinear/lago.cpp
index e2f13fded..08fa8175f 100644
--- a/gtsam/nonlinear/lago.cpp
+++ b/gtsam/nonlinear/lago.cpp
@@ -17,7 +17,10 @@
  */
 
 #include <gtsam/nonlinear/lago.h>
-#include <gtsam/slam/dataset.h>
+#include <gtsam/slam/PriorFactor.h>
+#include <gtsam/slam/BetweenFactor.h>
+#include <gtsam/geometry/Pose2.h>
+
 #include <boost/math/special_functions.hpp>
 
 namespace gtsam {
diff --git a/gtsam/nonlinear/lago.h b/gtsam/nonlinear/lago.h
index 91f6ecd97..4450e1108 100644
--- a/gtsam/nonlinear/lago.h
+++ b/gtsam/nonlinear/lago.h
@@ -34,15 +34,11 @@
 
 #pragma once
 
-#include <gtsam/geometry/Pose2.h>
-#include <gtsam/inference/Symbol.h>
+#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/linear/VectorValues.h>
 #include <gtsam/inference/graph.h>
-#include <gtsam/nonlinear/NonlinearFactorGraph.h>
-#include <gtsam/nonlinear/GaussNewtonOptimizer.h>
-#include <gtsam/slam/PriorFactor.h>
-#include <gtsam/slam/BetweenFactor.h>
 
 namespace gtsam {