diff --git a/src/internet-stack/sgi-hashmap.h b/src/common/sgi-hashmap.h
similarity index 100%
rename from src/internet-stack/sgi-hashmap.h
rename to src/common/sgi-hashmap.h
diff --git a/src/common/wscript b/src/common/wscript
index d6f0d8d09..2ca057376 100644
--- a/src/common/wscript
+++ b/src/common/wscript
@@ -37,4 +37,5 @@ def build(bld):
         'tag-buffer.h',
         'packet-tag-list.h',
         'ascii-writer.h',
+        'sgi-hashmap.h',
         ]
diff --git a/src/internet-stack/arp-cache.h b/src/internet-stack/arp-cache.h
index d9deb4bb4..dfbf80a78 100644
--- a/src/internet-stack/arp-cache.h
+++ b/src/internet-stack/arp-cache.h
@@ -32,7 +32,7 @@
 #include "ns3/ptr.h"
 #include "ns3/object.h"
 #include "ns3/traced-callback.h"
-#include "sgi-hashmap.h"
+#include "ns3/sgi-hashmap.h"
 
 namespace ns3 {
 
diff --git a/src/internet-stack/ndisc-cache.h b/src/internet-stack/ndisc-cache.h
index 20016b5c4..5c7c049dd 100644
--- a/src/internet-stack/ndisc-cache.h
+++ b/src/internet-stack/ndisc-cache.h
@@ -31,8 +31,8 @@
 #include "ns3/ipv6-address.h"
 #include "ns3/ptr.h"
 #include "ns3/timer.h"
+#include "ns3/sgi-hashmap.h"
 
-#include "sgi-hashmap.h"
 #include "ipv6-interface.h"
 
 namespace ns3