diff --git a/call_graph.h b/call_graph.h
index daa5ac50..2f6222d8 100644
--- a/call_graph.h
+++ b/call_graph.h
@@ -15,7 +15,11 @@
 #ifndef CALLGRAPH_H_
 #define CALLGRAPH_H_
 
+#include <cstddef>
 #include <iosfwd>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "third_party/absl/container/btree_set.h"
 #include "third_party/absl/container/node_hash_map.h"
diff --git a/function.h b/function.h
index 52f7b2fa..c5f73257 100644
--- a/function.h
+++ b/function.h
@@ -17,10 +17,12 @@
 
 #include <cstdint>
 #include <ostream>
+#include <string>
 #include <vector>
 
 #include "third_party/absl/container/btree_map.h"
 #include "third_party/absl/container/node_hash_set.h"
+#include "third_party/absl/log/check.h"
 #include "third_party/zynamics/binexport/basic_block.h"
 #include "third_party/zynamics/binexport/edge.h"
 #include "third_party/zynamics/binexport/util/types.h"
diff --git a/instruction.h b/instruction.h
index 03bddd17..9750c1d0 100644
--- a/instruction.h
+++ b/instruction.h
@@ -15,6 +15,8 @@
 #ifndef INSTRUCTION_H_
 #define INSTRUCTION_H_
 
+#include <cstdint>
+#include <functional>
 #include <ostream>
 #include <string>
 #include <vector>
@@ -22,6 +24,7 @@
 #include "third_party/absl/container/node_hash_set.h"
 #include "third_party/zynamics/binexport/operand.h"
 #include "third_party/zynamics/binexport/util/range.h"
+#include "third_party/zynamics/binexport/util/types.h"
 
 class FlowGraph;
 class AddressSpace;
@@ -120,6 +123,7 @@ class Instruction {
   bool HasFlag(uint8_t flag) const;
 
  private:
+
   static thread_local int instance_count_;
   static thread_local StringCache string_cache_;
   static thread_local Operands operands_;