diff --git a/rhubarb/CMakeLists.txt b/rhubarb/CMakeLists.txt
index 5e078ca..41507c3 100644
--- a/rhubarb/CMakeLists.txt
+++ b/rhubarb/CMakeLists.txt
@@ -102,9 +102,13 @@ include_directories(SYSTEM "lib/tclap-1.2.1/include")
 
 # ... Google Test
 add_subdirectory("lib/googletest")
+target_compile_options(gmock PRIVATE ${disableWarningsFlags})
 set_target_properties(gmock PROPERTIES FOLDER lib)
+target_compile_options(gmock_main PRIVATE ${disableWarningsFlags})
 set_target_properties(gmock_main PROPERTIES FOLDER lib)
+target_compile_options(gtest PRIVATE ${disableWarningsFlags})
 set_target_properties(gtest PROPERTIES FOLDER lib)
+target_compile_options(gtest_main PRIVATE ${disableWarningsFlags})
 set_target_properties(gtest_main PROPERTIES FOLDER lib)
 
 # ... GSL
diff --git a/rhubarb/src/tools/Lazy.h b/rhubarb/src/tools/Lazy.h
index e34f91b..0084a14 100644
--- a/rhubarb/src/tools/Lazy.h
+++ b/rhubarb/src/tools/Lazy.h
@@ -2,6 +2,7 @@
 
 #include <memory>
 #include <mutex>
+#include <functional>
 
 // Class template for lazy initialization.
 // Copies use reference semantics.
diff --git a/rhubarb/src/tools/tools.h b/rhubarb/src/tools/tools.h
index 52d8d29..124eb2a 100644
--- a/rhubarb/src/tools/tools.h
+++ b/rhubarb/src/tools/tools.h
@@ -4,6 +4,7 @@
 #include <memory>
 #include <chrono>
 #include <deque>
+#include <string>
 
 #define UNUSED(x) ((void)(x))