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/test/include/multipart_test.cpp b/test/include/multipart_test.cpp
index f29bcfe..38ac53d 100644
--- a/test/include/multipart_test.cpp
+++ b/test/include/multipart_test.cpp
@@ -1,4 +1,4 @@
-#include "http/http_request.hpp"
+#include "http_request.hpp"
 #include "multipart_parser.hpp"
 
 #include <boost/beast/http/fields.hpp>
diff --git a/test/redfish-core/lib/log_services_dump_test.cpp b/test/redfish-core/lib/log_services_dump_test.cpp
index 192b79d..5258309 100644
--- a/test/redfish-core/lib/log_services_dump_test.cpp
+++ b/test/redfish-core/lib/log_services_dump_test.cpp
@@ -1,8 +1,8 @@
 #include "app.hpp"
+#include "async_resp.hpp"
 #include "event_service_manager.hpp"
-#include "include/async_resp.hpp"
-#include "redfish-core/lib/health.hpp"
-#include "redfish-core/lib/log_services.hpp"
+#include "health.hpp"
+#include "log_services.hpp"
 
 #include <nlohmann/json.hpp>
 
diff --git a/test/redfish-core/lib/service_root_test.cpp b/test/redfish-core/lib/service_root_test.cpp
index 661f157..1f50100 100644
--- a/test/redfish-core/lib/service_root_test.cpp
+++ b/test/redfish-core/lib/service_root_test.cpp
@@ -1,7 +1,7 @@
 #include "bmcweb_config.h"
 
+#include "async_resp.hpp"
 #include "http_response.hpp"
-#include "include/async_resp.hpp"
 #include "nlohmann/json.hpp"
 #include "service_root.hpp"
 
diff --git a/test/redfish-core/lib/thermal_subsystem_test.cpp b/test/redfish-core/lib/thermal_subsystem_test.cpp
index c688023..88747a2 100644
--- a/test/redfish-core/lib/thermal_subsystem_test.cpp
+++ b/test/redfish-core/lib/thermal_subsystem_test.cpp
@@ -1,4 +1,4 @@
-#include "include/async_resp.hpp"
+#include "async_resp.hpp"
 #include "thermal_subsystem.hpp"
 
 #include <nlohmann/json.hpp>