diff --git a/pointer/unique_ref_boost_optional_gtest_workaround.h b/pointer/unique_ref_boost_optional_gtest_workaround.h
index 736e82ce..62442452 100644
--- a/pointer/unique_ref_boost_optional_gtest_workaround.h
+++ b/pointer/unique_ref_boost_optional_gtest_workaround.h
@@ -10,14 +10,14 @@
 //TODO Test that this solves the problem (add test unit file that doesn't compile without)
 
 #include "unique_ref.h"
-#include <boost/optional/optional_io.hpp>
 //gtest/boost::optional workaround for working with optional<unique_ref<T>>
-namespace boost {
+namespace cpputils {
     template<typename T>
     inline std::ostream& operator<<(std::ostream& out, const cpputils::unique_ref<T> &ref) {
       out << ref.get();
       return out;
     }
 }
+#include <boost/optional/optional_io.hpp>
 
 #endif
diff --git a/process/subprocess.cpp b/process/subprocess.cpp
index 334d56ad..fcf740b0 100644
--- a/process/subprocess.cpp
+++ b/process/subprocess.cpp
@@ -1,6 +1,7 @@
 #include "subprocess.h"
 #include <cstdio>
 #include <stdexcept>
+#include <sys/wait.h>
 
 using std::string;