diff --git a/core/data-items/common/ClientIndex.h b/utils/LocListMap.h
similarity index 100%
rename from core/data-items/common/ClientIndex.h
rename to utils/LocListMap.h
diff --git a/core/data-items/common/DataItemIndex.h b/utils/LocUnorderedSetMap.h
similarity index 100%
rename from core/data-items/common/DataItemIndex.h
rename to utils/LocUnorderedSetMap.h
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 3801fdd4..33afc1be 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -28,7 +28,8 @@ libgps_utils_la_h_sources = \
         gps_extended_c.h \
         gps_extended.h \
         loc_gps.h \
-        log_util.h
+        log_util.h \
+        LocUnorderedSetMap.h
 
 libgps_utils_la_c_sources = \
         linked_list.c \