diff --git a/bootstrap/build.conf b/bootstrap/build.conf
index 0c145caf..5eca2052 100644
--- a/bootstrap/build.conf
+++ b/bootstrap/build.conf
@@ -5,11 +5,8 @@
 
 projectdir = 'coriolis-2.x'
 
-projects = [ { 'name'      :   "importeds"
-             , 'tools'     : [ "Coloquinte" ]
-             , 'repository': 'https://github.com/alnurn/Coloquinte' }
-
-           , { 'name'      :   "coriolis"
+projects = [ 
+             { 'name'      :   "coriolis"
              , 'tools'     : [ "bootstrap"
                              , "vlsisapd"
                              , "hurricane"
@@ -17,6 +14,7 @@ projects = [ { 'name'      :   "importeds"
                             #, "nimbus"
                             #, "metis"
                             #, "mauka"
+                             , "coloquinte"
                              , "etesian"
                              , "knik"
                              , "katabatic"
diff --git a/coloquinte/src/cell_swapping.cxx b/coloquinte/src/cell_swapping.cxx
index c9582160..3bb46592 100644
--- a/coloquinte/src/cell_swapping.cxx
+++ b/coloquinte/src/cell_swapping.cxx
@@ -2,6 +2,8 @@
 #include "coloquinte/detailed.hxx"
 #include "coloquinte/circuit_helper.hxx"
 
+#include <functional>
+
 namespace coloquinte{
 namespace dp{
 
diff --git a/coloquinte/src/coloquinte/topologies.hxx b/coloquinte/src/coloquinte/topologies.hxx
index 3af6fb07..3670a23c 100644
--- a/coloquinte/src/coloquinte/topologies.hxx
+++ b/coloquinte/src/coloquinte/topologies.hxx
@@ -1,6 +1,8 @@
 
 #include "common.hxx"
 
+#include <array>
+
 #ifndef COLOQUINTE_TOPOLOGIES
 #define COLOQUINTE_TOPOLOGIES
 
diff --git a/coloquinte/src/optimization_subproblems.cxx b/coloquinte/src/optimization_subproblems.cxx
index cdb99b13..76417f67 100644
--- a/coloquinte/src/optimization_subproblems.cxx
+++ b/coloquinte/src/optimization_subproblems.cxx
@@ -1,6 +1,8 @@
 
 #include "coloquinte/optimization_subproblems.hxx"
 
+#include <stdexcept>
+
 namespace coloquinte{
 
 std::vector<capacity_t>  transport_1D(std::vector<t1D_elt> sources, std::vector<t1D_elt> sinks){
diff --git a/coloquinte/src/solvers.cxx b/coloquinte/src/solvers.cxx
index 24033ec0..6838d85e 100644
--- a/coloquinte/src/solvers.cxx
+++ b/coloquinte/src/solvers.cxx
@@ -2,6 +2,7 @@
 #include "coloquinte/solvers.hxx"
 
 #include <cassert>
+#include <stdexcept>
 
 namespace coloquinte{
 namespace gp{
diff --git a/coloquinte/src/topologies.cxx b/coloquinte/src/topologies.cxx
index 863363e2..3a2d67b8 100644
--- a/coloquinte/src/topologies.cxx
+++ b/coloquinte/src/topologies.cxx
@@ -3,10 +3,10 @@
 #include "coloquinte/circuit_helper.hxx"
 #include "coloquinte/union_find.hxx"
 
-#include <array>
 #include <algorithm>
 #include <cassert>
 #include <set>
+#include <functional>
 
 namespace coloquinte{
 using edge_t = std::pair<index_t, index_t>;