6 files changed, 20 insertions, 10 deletions
diff --git a/src/lib/utils/boost/info.txt b/src/lib/utils/boost/info.txt
index 8748c0bf1..c12b99a28 100644
--- a/src/lib/utils/boost/info.txt
+++ b/src/lib/utils/boost/info.txt
@@ -1,11 +1,11 @@
-define BOOST_FILESYSTEM 20131228
-define BOOST_ASIO 20131228
-define BOOST_DATETIME 20150720
+<defines>
+BOOST_FILESYSTEM -> 20131228
+BOOST_ASIO -> 20131228
+BOOST_DATETIME -> 20150720
+</defines>
 
 load_on vendor
 
 <libs>
 all -> boost_system,boost_filesystem
 </libs>
-
-
diff --git a/src/lib/utils/dyn_load/info.txt b/src/lib/utils/dyn_load/info.txt
index 22a79be43..2caeac728 100644
--- a/src/lib/utils/dyn_load/info.txt
+++ b/src/lib/utils/dyn_load/info.txt
@@ -1,4 +1,6 @@
-define DYNAMIC_LOADER 20160310
+<defines>
+DYNAMIC_LOADER -> 20160310
+</defines>
 
 load_on dep
 
diff --git a/src/lib/utils/http_util/info.txt b/src/lib/utils/http_util/info.txt
index a23a43a3d..fe9fc3ea7 100644
--- a/src/lib/utils/http_util/info.txt
+++ b/src/lib/utils/http_util/info.txt
@@ -1 +1,3 @@
-define HTTP_UTIL 20131128
+<defines>
+HTTP_UTIL -> 20131128
+</defines>
diff --git a/src/lib/utils/info.txt b/src/lib/utils/info.txt
index 306e6e9ad..da84b64b4 100644
--- a/src/lib/utils/info.txt
+++ b/src/lib/utils/info.txt
@@ -1,4 +1,6 @@
-define UTIL_FUNCTIONS 20161127
+<defines>
+UTIL_FUNCTIONS -> 20161127
+</defines>
 
 load_on always
 
diff --git a/src/lib/utils/locking_allocator/info.txt b/src/lib/utils/locking_allocator/info.txt
index 0831fddb6..5f848f62d 100644
--- a/src/lib/utils/locking_allocator/info.txt
+++ b/src/lib/utils/locking_allocator/info.txt
@@ -1,4 +1,6 @@
-define LOCKING_ALLOCATOR 20131128
+<defines>
+LOCKING_ALLOCATOR -> 20131128
+</defines>
 
 <os>
 linux
diff --git a/src/lib/utils/simd/info.txt b/src/lib/utils/simd/info.txt
index 6b9e381fa..7784902a6 100644
--- a/src/lib/utils/simd/info.txt
+++ b/src/lib/utils/simd/info.txt
@@ -1,4 +1,6 @@
-define SIMD_32 20131128
+<defines>
+SIMD_32 -> 20131128
+</defines>
 
 <header:internal>
 simd_32.h