diff --git a/src/map/if/acd/ac_decomposition.hpp b/src/map/if/acd/ac_decomposition.hpp
index d8a44b1d5..803f9ce59 100644
--- a/src/map/if/acd/ac_decomposition.hpp
+++ b/src/map/if/acd/ac_decomposition.hpp
@@ -459,7 +459,7 @@ private:
     if ( free_set_size == offset )
     {
       best_cost = fn( tt );
-      return { tt, permutations, best_cost };
+      return std::make_tuple( tt, permutations, best_cost );
     }
 
     /* works up to 16 input truth tables */
diff --git a/src/map/if/acd/kitty_operations.hpp b/src/map/if/acd/kitty_operations.hpp
index e0292bc05..f1893144c 100644
--- a/src/map/if/acd/kitty_operations.hpp
+++ b/src/map/if/acd/kitty_operations.hpp
@@ -6,7 +6,6 @@
 #include <cassert>
 #include <functional>
 #include <iterator>
-#include <optional>
 #include <iostream>
 
 #include "kitty_algorithm.hpp"
diff --git a/src/map/if/acd/kitty_operators.hpp b/src/map/if/acd/kitty_operators.hpp
index 7ccab7ca1..ded73b002 100644
--- a/src/map/if/acd/kitty_operators.hpp
+++ b/src/map/if/acd/kitty_operators.hpp
@@ -6,7 +6,6 @@
 #include <cassert>
 #include <functional>
 #include <iterator>
-#include <optional>
 
 #include "kitty_constants.hpp"
 #include "kitty_dynamic_tt.hpp"