diff --git a/cmdopt.cpp b/cmdopt.cpp
index 05c693c8..277808b8 100644
--- a/cmdopt.cpp
+++ b/cmdopt.cpp
@@ -20,6 +20,7 @@
 
 #include <algorithm>
 #include <cstring>
+#include <iostream>
 #include <iomanip>
 
 using util::cmdopt::option::base;
diff --git a/debug.hpp b/debug.hpp
index 240a9e90..de1492a9 100644
--- a/debug.hpp
+++ b/debug.hpp
@@ -18,8 +18,6 @@
 #define __DEBUG_HPP
 
 //#include "maths.hpp" // XXX: See notes at the end of file for maths.hpp inclusion
-#include <iostream>
-#include <sstream>
 #include <stdexcept>
 #include <string>
 
diff --git a/tap.ipp b/tap.ipp
index 7cce5cbd..94503739 100644
--- a/tap.ipp
+++ b/tap.ipp
@@ -21,8 +21,9 @@
 
 #include "maths.hpp"
 
-#include <cstdlib>
 #include <algorithm>
+#include <cstdlib>
+#include <iostream>
 
 #include "format.hpp"