diff --git a/binarystore.cpp b/binarystore.cpp
index 764b9fb..1e8475c 100644
--- a/binarystore.cpp
+++ b/binarystore.cpp
@@ -1,7 +1,21 @@
 #include "binarystore.hpp"
 
+#include <unistd.h>
+
 #include <algorithm>
 #include <blobs-ipmid/blobs.hpp>
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "binaryblob.pb.h"
+
+using std::size_t;
+using std::uint16_t;
+using std::uint32_t;
+using std::uint64_t;
+using std::uint8_t;
 
 namespace binstore
 {
diff --git a/handler.cpp b/handler.cpp
index 80790ed..e0a343a 100644
--- a/handler.cpp
+++ b/handler.cpp
@@ -1,6 +1,16 @@
 #include "handler.hpp"
 
 #include <algorithm>
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <vector>
+
+using std::size_t;
+using std::uint16_t;
+using std::uint32_t;
+using std::uint64_t;
+using std::uint8_t;
 
 namespace blobs
 {