diff --git a/common/include/verify_policy.h b/common/include/verify_policy.h
index 9eb5f93..5b08be7 100644
--- a/common/include/verify_policy.h
+++ b/common/include/verify_policy.h
@@ -132,9 +132,9 @@ void * pangu_http_ctx_new(unsigned int thread_id);
 
 void pangu_http_ctx_free(void * pme);
 
-size_t http_scan(enum verify_policy_type policy_type, struct verify_policy_query_obj *query_obj, cJSON *data_obj, void *pme);
+size_t http_policy_scan(enum verify_policy_type policy_type, struct verify_policy_query_obj *query_obj, cJSON *data_obj, void *pme);
 
-void get_scan_status(struct verify_policy_query_obj *query_obj, cJSON *attributes, cJSON  *data_obj, void *pme);
+void http_get_scan_status(struct verify_policy_query_obj *query_obj, cJSON *attributes, cJSON  *data_obj, void *pme);
 
 int security_policy_init(struct verify_policy * verify, const char* profile_path);
 
diff --git a/common/src/verify_policy_logging.cpp b/common/src/verify_policy_logging.cpp
index 44d1495..8d41225 100644
--- a/common/src/verify_policy_logging.cpp
+++ b/common/src/verify_policy_logging.cpp
@@ -16,8 +16,9 @@
 #include <ctype.h>
 
 #include "verify_policy_logging.h"
-#include "MESA_prof_load.h"
-#include "MESA_handle_logger.h"
+#include <MESA/MESA_prof_load.h>
+#include <MESA/MESA_handle_logger.h>
+
 
 RTLogInit2Data logging_sc_lid;
 
diff --git a/platform/src/verify_policy.cpp b/platform/src/verify_policy.cpp
index 5a33ef7..2942569 100644
--- a/platform/src/verify_policy.cpp
+++ b/platform/src/verify_policy.cpp
@@ -23,8 +23,8 @@
 #include <MESA/stream.h>
 
 #include "verify_policy.h"
-#include "MESA_prof_load.h"
-#include "MESA_handle_logger.h"
+#include <MESA/MESA_prof_load.h>
+#include <MESA/MESA_handle_logger.h>
 #include "verify_policy_utils.h"
 #include "verify_policy_logging.h"
 
@@ -310,7 +310,7 @@ cJSON *get_query_from_request(const char *data, int thread_id)
 					{
 						goto free;
 					}
-					hit_cnt = http_scan(verify_policy->type, &verify_policy->verify_object[i], data_obj, ctx);
+					hit_cnt = http_policy_scan(verify_policy->type, &verify_policy->verify_object[i], data_obj, ctx);
 					if(0 == strcasecmp(verify_policy->verify_object[i].attri_name, "ip"))
 					{
 						ipaddr_free(verify_policy->verify_object[i].ip_addr);
@@ -324,7 +324,7 @@ cJSON *get_query_from_request(const char *data, int thread_id)
 				cJSON_AddItemToObject(verfifySession, "attributes", attributes);
 				for (item = 0; item < i; item++)
 				{
-					get_scan_status(&verify_policy->verify_object[item], attributes,data_obj, ctx);
+					http_get_scan_status(&verify_policy->verify_object[item], attributes,data_obj, ctx);
 				}
 				pangu_http_ctx_free(ctx);
 			}
diff --git a/scan/src/pangu_http.cpp b/scan/src/pangu_http.cpp
index e664f0f..05aa4a5 100644
--- a/scan/src/pangu_http.cpp
+++ b/scan/src/pangu_http.cpp
@@ -171,7 +171,7 @@ static enum pangu_action decide_ctrl_action(const struct Maat_rule_t * hit_rules
 	return prior_action;
 }
 
-void get_scan_status(struct verify_policy_query_obj *query_obj, cJSON *attributes, cJSON  *data_obj, void *pme)
+void http_get_scan_status(struct verify_policy_query_obj *query_obj, cJSON *attributes, cJSON  *data_obj, void *pme)
 {
 	int i=0;
 	cJSON *attributeObj=NULL,*hitPaths=NULL;
@@ -255,7 +255,7 @@ static int http_hit_policy_list(Maat_feather_t maat, size_t hit_cnt, cJSON *data
 	return 0;
 }
 
-size_t http_scan(enum verify_policy_type policy_type, struct verify_policy_query_obj *query_obj, cJSON *data_obj, void *pme)
+size_t http_policy_scan(enum verify_policy_type policy_type, struct verify_policy_query_obj *query_obj, cJSON *data_obj, void *pme)
 {
 	int scan_ret=0, n_read;
 	size_t hit_cnt=0;