diff --git a/pintool/addrtrace.cpp b/pintool/addrtrace.cpp
index 28043705..507983bd 100644
--- a/pintool/addrtrace.cpp
+++ b/pintool/addrtrace.cpp
@@ -177,6 +177,29 @@ std::vector<entry_t> trace; /* Contains all traced instructions */
 ofstream imgfile;           /* Holds memory layout with function symbols */
 ofstream vdsofile;          /* Holds vdso shared library */
 
+/***********************************************************************/
+/* Image tracking*/
+typedef struct {
+    string name;
+    uint64_t baseaddr;
+    uint64_t endaddr;
+    string hash;
+} imgobj_t;
+
+typedef std::vector<imgobj_t> IMGVEC;
+IMGVEC imgvec;
+
+/* Image to function mapping*/
+typedef struct {
+    string name;
+    uint64_t baseaddr;
+    uint64_t endaddr;
+    string funcname;
+} funcobj_t;
+
+typedef std::vector<funcobj_t> FUNCVEC;
+FUNCVEC funcvec;
+
 /***********************************************************************/
 /* Heap tracking */