header cleanups

This commit fixed several places (but not all) where wrong include
directory is specified and prevent the clean up in the chidren changes.

Signed-off-by: Nan Zhou <nanzhoumails@gmail.com>
Change-Id: Ibbba62e2c0cfe3583a65f1befa1b233bd3eebf19
diff --git a/include/ibm/locks.hpp b/include/ibm/locks.hpp
index 7cd8037..e713f97 100644
--- a/include/ibm/locks.hpp
+++ b/include/ibm/locks.hpp
@@ -1,9 +1,10 @@
 #pragma once
 
+#include "ibm/utils.hpp"
+
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/endian/conversion.hpp>
-#include <include/ibm/utils.hpp>
 #include <logging.hpp>
 #include <nlohmann/json.hpp>