diff --git a/codeCoverage/code_coverage.C b/codeCoverage/code_coverage.C
index 5dea727..7dd61ab 100644
--- a/codeCoverage/code_coverage.C
+++ b/codeCoverage/code_coverage.C
@@ -149,8 +149,8 @@ bool insertBBEntry(BPatch_binaryEdit* appBin, BPatch_function* curFunc, char con
                    char const* moduleName, BPatch_function* instBBIncFunc, BPatch_function* registerBB,
                    int* bbIndex, BPatch_Vector<BPatch_snippet*>* registerCalls) {
   BPatch_flowGraph* appCFG = curFunc->getCFG();
-  BPatch_Set<BPatch_basicBlock*> allBlocks;
-  BPatch_Set<BPatch_basicBlock*>::iterator iter;
+  std::set<BPatch_basicBlock*> allBlocks;
+  std::set<BPatch_basicBlock*>::iterator iter;
   if(!appCFG) {
     cerr << "Failed to find CFG for function " << funcName << endl;
     return EXIT_FAILURE;
diff --git a/instrumentMemoryAccess/instrumenting_memory_access.cpp b/instrumentMemoryAccess/instrumenting_memory_access.cpp
index 1844095..52bf777 100644
--- a/instrumentMemoryAccess/instrumenting_memory_access.cpp
+++ b/instrumentMemoryAccess/instrumenting_memory_access.cpp
@@ -51,7 +51,7 @@ bool instrumentMemoryAccesses(BPatch_addressSpace* app) {
   BPatch_image* appImage = app->getImage();
 
   // We're interested in loads and stores
-  BPatch_Set<BPatch_opCode> axs;
+  std::set<BPatch_opCode> axs;
   axs.insert(BPatch_opLoad);
   axs.insert(BPatch_opStore);
 
diff --git a/symbolicEvalInstructions/symbolic_instruction_evaluation.cpp b/symbolicEvalInstructions/symbolic_instruction_evaluation.cpp
index dafe635..55d724d 100644
--- a/symbolicEvalInstructions/symbolic_instruction_evaluation.cpp
+++ b/symbolicEvalInstructions/symbolic_instruction_evaluation.cpp
@@ -35,7 +35,7 @@ int main(int argc, char* argv[]) {
   }();
 
   BPatch_flowGraph* cfg = function->getCFG();
-  BPatch_Set<BPatch_basicBlock*> blocks;
+  std::set<BPatch_basicBlock*> blocks;
   cfg->getAllBasicBlocks(blocks);
 
   Dyninst::AssignmentConverter converter(true, false);