diff --git a/llvm/lib/Fuzzer/FuzzerInternal.h b/llvm/lib/Fuzzer/FuzzerInternal.h
index 61f4866..db1e505 100644
--- a/llvm/lib/Fuzzer/FuzzerInternal.h
+++ b/llvm/lib/Fuzzer/FuzzerInternal.h
@@ -28,7 +28,7 @@
 
 #include "FuzzerExtFunctions.h"
 #include "FuzzerInterface.h"
-#include "FuzzerTracePC.h"
+#include "FuzzerValueBitMap.h"
 
 // Platform detection.
 #ifdef __linux__
@@ -131,6 +131,9 @@
 int GetPid();
 void SleepSeconds(int Seconds);
 
+// See FuzzerTracePC.cpp
+size_t PCMapMergeFromCurrent(ValueBitMap &M);
+
 class Random {
  public:
   Random(unsigned int seed) : R(seed) {}
@@ -349,10 +352,10 @@
     void Reset() {
       BlockCoverage = 0;
       CallerCalleeCoverage = 0;
-      PcMapBits = 0;
       CounterBitmapBits = 0;
       CounterBitmap.clear();
       PCMap.Reset();
+      PCMapBits = 0;
       PcBufferPos = 0;
     }
 
@@ -364,9 +367,8 @@
     // Precalculated number of bits in CounterBitmap.
     size_t CounterBitmapBits;
     std::vector<uint8_t> CounterBitmap;
-    // Precalculated number of bits in PCMap.
-    size_t PcMapBits;
-    PcCoverageMap PCMap;
+    ValueBitMap PCMap;
+    size_t PCMapBits;
   };
 
   Fuzzer(UserCallback CB, MutationDispatcher &MD, FuzzingOptions Options);