diff --git a/demo-serving/op/classify_op.h b/demo-serving/op/classify_op.h
index c381f032d0e3a7e19e1a711b1ebe1747ee3145d8..a4b115642025f244c181846b9ae0402431ad3df5 100644
--- a/demo-serving/op/classify_op.h
+++ b/demo-serving/op/classify_op.h
@@ -14,15 +14,7 @@
 
 #pragma once
 #include <vector>
-#ifdef BCLOUD
-#ifdef WITH_GPU
-#include "paddle/paddle_inference_api.h"
-#else
-#include "paddle/fluid/inference/api/paddle_inference_api.h"
-#endif
-#else
 #include "paddle_inference_api.h"  // NOLINT
-#endif
 #include "demo-serving/image_class.pb.h"
 
 namespace baidu {
diff --git a/demo-serving/op/ctr_prediction_op.h b/demo-serving/op/ctr_prediction_op.h
index ee648151b4ecf4611502798308c2cd81db923bb3..c135de3842d7b299c998e143fbccf200a780d451 100644
--- a/demo-serving/op/ctr_prediction_op.h
+++ b/demo-serving/op/ctr_prediction_op.h
@@ -14,15 +14,7 @@
 
 #pragma once
 #include <vector>
-#ifdef BCLOUD
-#ifdef WITH_GPU
-#include "paddle/paddle_inference_api.h"
-#else
-#include "paddle/fluid/inference/api/paddle_inference_api.h"
-#endif
-#else
 #include "paddle_inference_api.h"  // NOLINT
-#endif
 #include "demo-serving/ctr_prediction.pb.h"
 
 namespace baidu {
diff --git a/demo-serving/op/reader_op.h b/demo-serving/op/reader_op.h
index 546ca19667af0161ddb62f354e32791d15d8ae4b..e3a63fcdc7b461c1f8a2925bfe22727ffade7f8c 100644
--- a/demo-serving/op/reader_op.h
+++ b/demo-serving/op/reader_op.h
@@ -27,16 +27,7 @@
 #include "opencv/cv.hpp"
 #include "opencv/cxcore.h"
 #include "opencv/highgui.h"
-
-#ifdef BCLOUD
-#ifdef WITH_GPU
-#include "paddle/paddle_inference_api.h"
-#else
-#include "paddle/fluid/inference/api/paddle_inference_api.h"
-#endif
-#else
 #include "paddle_inference_api.h"  // NOLINT
-#endif
 
 namespace baidu {
 namespace paddle_serving {
diff --git a/demo-serving/op/text_classification_op.h b/demo-serving/op/text_classification_op.h
index 21ac6991be1b47654618c52c4123a5f99f4bc185..44c25931ed6c3e0c3d2b5b0dc75d8461e8a55bc9 100644
--- a/demo-serving/op/text_classification_op.h
+++ b/demo-serving/op/text_classification_op.h
@@ -14,15 +14,7 @@
 
 #pragma once
 #include <vector>
-#ifdef BCLOUD
-#ifdef WITH_GPU
-#include "paddle/paddle_inference_api.h"
-#else
-#include "paddle/fluid/inference/api/paddle_inference_api.h"
-#endif
-#else
 #include "paddle_inference_api.h"  // NOLINT
-#endif
 #include "demo-serving/text_classification.pb.h"
 
 namespace baidu {
diff --git a/inferencer-fluid-cpu/include/fluid_cpu_engine.h b/inferencer-fluid-cpu/include/fluid_cpu_engine.h
index a7ba3ae13bfa040f3a6f4b05d8d5cd6b93ae36b5..114710e3db73ff6be31a81e266179ba942971093 100644
--- a/inferencer-fluid-cpu/include/fluid_cpu_engine.h
+++ b/inferencer-fluid-cpu/include/fluid_cpu_engine.h
@@ -21,15 +21,7 @@
 #include <vector>
 #include "configure/include/configure_parser.h"
 #include "configure/inferencer_configure.pb.h"
-#ifdef BCLOUD
-#ifdef WITH_GPU
-#include "paddle/paddle_inference_api.h"
-#else
-#include "paddle/fluid/inference/api/paddle_inference_api.h"
-#endif
-#else
 #include "paddle_inference_api.h"  // NOLINT
-#endif
 #include "predictor/framework/infer.h"
 
 namespace baidu {
diff --git a/inferencer-fluid-gpu/include/fluid_gpu_engine.h b/inferencer-fluid-gpu/include/fluid_gpu_engine.h
index 433f19128fb605dfa0cffbc2dce1f7ccd39f1d78..2b61c89d1bace63abbad2c299b9f97ba40e6a93d 100644
--- a/inferencer-fluid-gpu/include/fluid_gpu_engine.h
+++ b/inferencer-fluid-gpu/include/fluid_gpu_engine.h
@@ -23,15 +23,7 @@
 #include <vector>
 #include "configure/include/configure_parser.h"
 #include "configure/inferencer_configure.pb.h"
-#ifdef BCLOUD
-#ifdef WITH_GPU
-#include "paddle/paddle_inference_api.h"
-#else
-#include "paddle/fluid/inference/api/paddle_inference_api.h"
-#endif
-#else
 #include "paddle_inference_api.h"  // NOLINT
-#endif
 #include "predictor/framework/infer.h"
 
 DECLARE_int32(gpuid);
diff --git a/kvdb/include/kvdb/kvdb_impl.h b/kvdb/include/kvdb/kvdb_impl.h
index 8dde028b6bddd8a32b9d2d4fd36eae90508a4e3c..cab06cad12b8740977c5681e2594905dbf5f476b 100644
--- a/kvdb/include/kvdb/kvdb_impl.h
+++ b/kvdb/include/kvdb/kvdb_impl.h
@@ -31,6 +31,7 @@
 #include <memory>
 #include <unordered_map>
 #include <vector>
+#include <functional>
 class AbstractKVDB;
 class FileReader;
 class ParamDict;