am 22d9450d: am a82875c6: am 5188d556: Merge "Include what we use."

* commit '22d9450d870d6c484a7c542649206bc8616957d4':
  Include what we use.
diff --git a/base/logging.cpp b/base/logging.cpp
index 8bfb204..38ee2af 100644
--- a/base/logging.cpp
+++ b/base/logging.cpp
@@ -18,6 +18,7 @@
 
 #include <iostream>
 #include <limits>
+#include <mutex>
 #include <sstream>
 #include <string>
 #include <vector>
diff --git a/base/strings.cpp b/base/strings.cpp
index 5f7eccc..6f698d9 100644
--- a/base/strings.cpp
+++ b/base/strings.cpp
@@ -17,6 +17,7 @@
 #include "base/strings.h"
 
 #include <stdlib.h>
+#include <string.h>
 
 #include <string>
 #include <vector>