Consolidate all util.hpp
This deletes all lower level util.hpp and cats them
into the top level util.hpp to avoid name conflicts.
Change-Id: Ia11e4a08053a3970b0aadf21d1156ab26def36bd
Signed-off-by: James Feist <james.feist@linux.intel.com>
diff --git a/test/dbushelper_mock.hpp b/test/dbushelper_mock.hpp
index e373f8a..62e88f1 100644
--- a/test/dbushelper_mock.hpp
+++ b/test/dbushelper_mock.hpp
@@ -1,6 +1,6 @@
#pragma once
-#include "dbus/util.hpp"
+#include "util.hpp"
#include <sdbusplus/bus.hpp>
#include <string>