diff --git a/include/dollop_man.h b/include/dollop_man.h
index fd4572235ee28263abe567a82ae129ef8c17dd48..e143e428dcb6861f49b4d73173680bb4124e9f6d 100644
--- a/include/dollop_man.h
+++ b/include/dollop_man.h
@@ -32,8 +32,20 @@
 #define dollop_man_h 
 
 #include <dollop.h>
+#include <set>
+#include <map>
+#include <list>
+
 
 namespace Zipr_SDK {
+
+
+typedef         std::set<Dollop_t*> DollopList_t;
+typedef         std::map<libIRDB::Instruction_t*,Dollop_t*>  InsnToDollopMap_t;
+typedef         std::list<DollopPatch_t*>  DollopPatchList_t;
+typedef         std::map<Dollop_t*, DollopPatchList_t > DollopToDollopPatchListMap_t;
+
+
 class DollopManager_t {
 	public:
 		DollopManager_t() {};
@@ -85,8 +97,8 @@ class DollopManager_t {
 		 * Return beginning and ending iterators for all the
 		 * dollops under management.
 		 */
-		virtual std::list<Zipr_SDK::Dollop_t*>::const_iterator dollops_begin() = 0;
-		virtual std::list<Zipr_SDK::Dollop_t*>::const_iterator dollops_end() = 0;
+		virtual DollopList_t::iterator dollops_begin() = 0;
+		virtual DollopList_t::iterator dollops_end() = 0;
 
 		/*
 		 * Print (for debugging) all the dollop patches