diff --git a/exp-drd/drd_thread.h b/exp-drd/drd_thread.h
index ddbd086..d122978 100644
--- a/exp-drd/drd_thread.h
+++ b/exp-drd/drd_thread.h
@@ -30,6 +30,7 @@
 // Includes.
 
 #include "drd_segment.h"
+#include "pub_drd_bitmap.h"
 #include "pub_tool_libcassert.h"  // tl_assert()
 #include "pub_tool_stacktrace.h"  // StackTrace
 #include "pub_tool_threadstate.h" // VG_N_THREADS
@@ -122,17 +123,6 @@
 void thread_combine_vc(const DrdThreadId joiner, const DrdThreadId joinee);
 void thread_combine_vc2(const DrdThreadId tid, const VectorClock* const vc);
 
-Bool bm_access_load_1_triggers_conflict(const Addr a1);
-Bool bm_access_load_2_triggers_conflict(const Addr a1);
-Bool bm_access_load_4_triggers_conflict(const Addr a1);
-Bool bm_access_load_8_triggers_conflict(const Addr a1);
-Bool bm_access_load_triggers_conflict(const Addr a1, const Addr a2);
-Bool bm_access_store_1_triggers_conflict(const Addr a1);
-Bool bm_access_store_2_triggers_conflict(const Addr a1);
-Bool bm_access_store_4_triggers_conflict(const Addr a1);
-Bool bm_access_store_8_triggers_conflict(const Addr a1);
-Bool bm_access_store_triggers_conflict(const Addr a1, const Addr a2);
-
 void thread_stop_using_mem(const Addr a1, const Addr a2);
 void thread_start_recording(const DrdThreadId tid);
 void thread_stop_recording(const DrdThreadId tid);