diff --git a/core/lib/instrument.c b/core/lib/instrument.c
index 3b3590b42d3..17b7ce86f2e 100644
--- a/core/lib/instrument.c
+++ b/core/lib/instrument.c
@@ -48,6 +48,7 @@
 #include "instrlist.h"
 #include "decode.h"
 #include "disassemble.h"
+#include "dr_tools.h"
 #include "ir_utils.h"
 #include "../fragment.h"
 #include "../fcache.h"
diff --git a/core/unix/coredump.c b/core/unix/coredump.c
index f77f0fa9849..9d5fa02acbc 100644
--- a/core/unix/coredump.c
+++ b/core/unix/coredump.c
@@ -27,13 +27,16 @@
  */
 
 #include <elf.h>
+#include <stddef.h>
 #include <sys/mman.h>
 #include "../globals.h"
 
 #include "../hashtable.h"
 #include "../os_shared.h"
 #include "../synch.h"
-#include "dr_tools.h"
+#include "../utils.h"
+#include "../lib/globals_api.h"
+#include "../lib/globals_shared.h"
 #include "elf_defines.h"
 #include "memquery.h"