diff --git a/include/hpp/centroidal-dynamics/solver_LP_clp.hh b/include/hpp/centroidal-dynamics/solver_LP_clp.hh
index f0e63822f688cfb03b68868d2ddc6138e6f8aa58..bdc5973ada1133f38cf0c3d179ce7f8a1ade9b8d 100644
--- a/include/hpp/centroidal-dynamics/solver_LP_clp.hh
+++ b/include/hpp/centroidal-dynamics/solver_LP_clp.hh
@@ -12,7 +12,7 @@
 #include <hpp/centroidal-dynamics/solver_LP_abstract.hh>
 #include <hpp/centroidal-dynamics/util.hh>
 
-#include "ClpSimplex.hpp"
+#include "coin/ClpSimplex.hpp"
 
 namespace centroidal_dynamics {
 
diff --git a/include/hpp/centroidal-dynamics/util.hh b/include/hpp/centroidal-dynamics/util.hh
index ec14d2a5535843ec7ec9347ac48be44f427e973f..bde796b95d411245edd13306277a2ecb41127666 100644
--- a/include/hpp/centroidal-dynamics/util.hh
+++ b/include/hpp/centroidal-dynamics/util.hh
@@ -13,10 +13,9 @@
 #include <fstream>
 #include <iostream>
 
-#include "cdd.h"
-#include "cddmp.h"
-#include "cddtypes.h"
 #include "setoper.h"
+// cdd.h needs to be included after setoper.h
+#include "cdd.h"
 
 namespace centroidal_dynamics {
 
diff --git a/src/solver_LP_clp.cpp b/src/solver_LP_clp.cpp
index c8a35c163b58ec7381f6f00f51148e08fc623a31..4495e7af42cb7a1e33e73b9ae49f5c782545793e 100644
--- a/src/solver_LP_clp.cpp
+++ b/src/solver_LP_clp.cpp
@@ -7,7 +7,7 @@
 
 #include <hpp/centroidal-dynamics/solver_LP_clp.hh>
 
-#include "CoinBuild.hpp"
+#include "coin/CoinBuild.hpp"
 
 namespace centroidal_dynamics {
 
diff --git a/test/test_LP_solvers.cpp b/test/test_LP_solvers.cpp
index 43aafc25ca734d421674db4bc0cab6491eb4998f..df86d1cf5185e6d5b1695211fecc43e10e961df6 100644
--- a/test/test_LP_solvers.cpp
+++ b/test/test_LP_solvers.cpp
@@ -6,10 +6,10 @@
 #ifdef CLP_FOUND
 #include <hpp/centroidal-dynamics/solver_LP_clp.hh>
 
-#include "ClpSimplex.hpp"
-#include "CoinBuild.hpp"
-#include "CoinModel.hpp"
-#include "CoinTime.hpp"
+#include "coin/ClpSimplex.hpp"
+#include "coin/CoinBuild.hpp"
+#include "coin/CoinModel.hpp"
+#include "coin/CoinTime.hpp"
 #endif
 
 #include <hpp/centroidal-dynamics/logger.hh>
@@ -348,7 +348,7 @@ void test_small_LP() {
   double row2Value[] = {1.0, -5.0, 1.0};
   model.addRow(3, row2Index, row2Value, 1.0, 1.0);
 
-  int n = model.getdimVarXs();
+  int n = model.getNumCols();
   int m = model.getNumRows();
   cout << "Problem has " << n << " variables and " << m << " constraints.\n";