headers: add xcam_std.h as xcam cplusplus first header

 * new xcam_std.h as first header instead of xcam_utils.h
 * all export headers with #include <> instead of #include ""

Signed-off-by: Wind Yuan <feng.yuan@intel.com>

167 files changed, 597 insertions, 657 deletions

diff --git a/capi/context_priv.cpp b/capi/context_priv.cpp
index 17c196d..ecbffa6 100644
--- a/capi/context_priv.cpp
+++ b/capi/context_priv.cpp
@@ -30,6 +30,7 @@
 #include <ocl/cl_image_warp_handler.h>
 #include <ocl/cl_fisheye_handler.h>
 #include <ocl/cl_image_360_stitch.h>
+#include <ocl/cl_utils.h>
 
 using namespace XCam;
 
diff --git a/modules/isp/aiq3a_utils.cpp b/modules/isp/aiq3a_utils.cpp
index 1278a95..d78c115 100644
--- a/modules/isp/aiq3a_utils.cpp
+++ b/modules/isp/aiq3a_utils.cpp
@@ -89,7 +89,7 @@ translate_atomisp_parameters (
         XCAM_ASSERT (wb);
         wb->head.type = XCAM_3A_RESULT_WHITE_BALANCE;
         wb->head.process_type = XCAM_IMAGE_PROCESS_ALWAYS;
-        wb->head.version = XCAM_VERSION;
+        wb->head.version = xcam_version ();
         coefficient = pow (2, (16 - atomisp_params.wb_config->integer_bits));
         wb->r_gain = atomisp_params.wb_config->r / coefficient;
         wb->gr_gain = atomisp_params.wb_config->gr / coefficient;
@@ -105,7 +105,7 @@ translate_atomisp_parameters (
         XCAM_ASSERT (blc);
         blc->head.type =    XCAM_3A_RESULT_BLACK_LEVEL;
         blc->head.process_type = XCAM_IMAGE_PROCESS_ALWAYS;
-        blc->head.version = XCAM_VERSION;
+        blc->head.version = xcam_version ();
         if (atomisp_params.ob_config->mode == atomisp_ob_mode_fixed) {
             blc->r_level = atomisp_params.ob_config->level_r / (double)65536;
             blc->gr_level = atomisp_params.ob_config->level_gr / (double)65536;
@@ -135,7 +135,7 @@ translate_atomisp_parameters (
         XCAM_ASSERT (cm);
         cm->head.type = XCAM_3A_RESULT_RGB2YUV_MATRIX;
         cm->head.process_type = XCAM_IMAGE_PROCESS_ALWAYS;
-        cm->head.version = XCAM_VERSION;
+        cm->head.version = xcam_version ();
         coefficient = pow (2, atomisp_params.yuv2rgb_cc_config->fraction_bits);
         for (int i = 0; i < XCAM_COLOR_MATRIX_SIZE; i++) {
             tmp_matrix [i] = atomisp_params.yuv2rgb_cc_config->matrix [i] / coefficient;
@@ -153,7 +153,7 @@ translate_atomisp_parameters (
         XCAM_ASSERT (gt);
         gt->head.type = XCAM_3A_RESULT_G_GAMMA;
         gt->head.process_type = XCAM_IMAGE_PROCESS_ALWAYS;
-        gt->head.version = XCAM_VERSION;
+        gt->head.version = xcam_version ();
         for (int i = 0; i < XCAM_GAMMA_TABLE_SIZE; i++) {
             gt->table[i] = (double)atomisp_params.g_gamma_table->data.vamem_2[i] / 16;
         }
@@ -167,7 +167,7 @@ translate_atomisp_parameters (
         XCAM_ASSERT (macc);
         macc->head.type = XCAM_3A_RESULT_MACC;
         macc->head.process_type = XCAM_IMAGE_PROCESS_ALWAYS;
-        macc->head.version = XCAM_VERSION;
+        macc->head.version = xcam_version ();
         coefficient = pow (2, (13 - atomisp_params.macc_config->color_effect));
         for (int i = 0; i < XCAM_CHROMA_AXIS_SIZE * XCAM_CHROMA_MATRIX_SIZE; i++) {
             macc->table[i] = (double)atomisp_params.macc_table->data[i] / coefficient;
@@ -182,7 +182,7 @@ translate_atomisp_parameters (
         XCAM_ASSERT (dpc);
         dpc->head.type = XCAM_3A_RESULT_DEFECT_PIXEL_CORRECTION;
         dpc->head.process_type = XCAM_IMAGE_PROCESS_ALWAYS;
-        dpc->head.version = XCAM_VERSION;
+        dpc->head.version = xcam_version ();
         coefficient = pow (2, 16);
         dpc->gr_threshold = atomisp_params.dp_config->threshold / coefficient;
         dpc->r_threshold = atomisp_params.dp_config->threshold / coefficient;
@@ -200,7 +200,7 @@ translate_atomisp_parameters (
         XCAM_ASSERT (bnr);
         bnr->head.type = XCAM_3A_RESULT_BAYER_NOISE_REDUCTION;
         bnr->head.process_type = XCAM_IMAGE_PROCESS_ALWAYS;
-        bnr->head.version = XCAM_VERSION;
+        bnr->head.version = xcam_version ();
         bnr->bnr_gain = (double)atomisp_params.nr_config->bnr_gain / pow(2, 16);
         bnr->direction = (double)atomisp_params.nr_config->direction / pow(2, 16);
         results[result_count++] = (XCam3aResultHead*)bnr;
@@ -229,7 +229,7 @@ translate_3a_results_to_xcam (X3aResultList &list,
             *new_exposure = exposure;
             new_exposure->head.type = XCAM_3A_RESULT_EXPOSURE;
             new_exposure->head.process_type = XCAM_IMAGE_PROCESS_ALWAYS;
-            new_exposure->head.version = XCAM_VERSION;
+            new_exposure->head.version = xcam_version ();
             results[result_count++] = (XCam3aResultHead*)new_exposure;
             break;
         }
diff --git a/modules/isp/aiq3a_utils.h b/modules/isp/aiq3a_utils.h
index 21d23a2..41d4bc0 100644
--- a/modules/isp/aiq3a_utils.h
+++ b/modules/isp/aiq3a_utils.h
@@ -23,7 +23,7 @@
 #define XCAM_AIQ_UTILS_H
 
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "x3a_result.h"
 
 #include <base/xcam_3a_stats.h>
diff --git a/modules/isp/aiq_handler.h b/modules/isp/aiq_handler.h
index 910c805..222c311 100644
--- a/modules/isp/aiq_handler.h
+++ b/modules/isp/aiq_handler.h
@@ -21,7 +21,7 @@
 #ifndef XCAM_AIQ_HANDLER_H
 #define XCAM_AIQ_HANDLER_H
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "handler_interface.h"
 #include "x3a_statistics_queue.h"
 #include "ia_types.h"
diff --git a/modules/isp/atomisp_device.h b/modules/isp/atomisp_device.h
index 000e991..ac9ddf8 100644
--- a/modules/isp/atomisp_device.h
+++ b/modules/isp/atomisp_device.h
@@ -21,7 +21,7 @@
 #ifndef XCAM_ATOMISP_DEVICE_H
 #define XCAM_ATOMISP_DEVICE_H
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "v4l2_device.h"
 #if HAVE_LIBDRM
 #include "drm_display.h"
diff --git a/modules/isp/hybrid_analyzer_loader.cpp b/modules/isp/hybrid_analyzer_loader.cpp
index ad7af74..4d0f4b8 100644
--- a/modules/isp/hybrid_analyzer_loader.cpp
+++ b/modules/isp/hybrid_analyzer_loader.cpp
@@ -85,9 +85,9 @@ HybridAnalyzerLoader::load_symbol (void* handle)
         XCAM_LOG_DEBUG ("get symbol failed from lib");
         return NULL;
     }
-    if (desc->version < XCAM_VERSION) {
+    if (desc->version < xcam_version ()) {
         XCAM_LOG_DEBUG ("get symbolfailed. version is:0x%04x, but expect:0x%04x",
-                        desc->version, XCAM_VERSION);
+                        desc->version, xcam_version ());
         return NULL;
     }
     if (desc->size < sizeof (XCam3ADescription)) {
diff --git a/modules/isp/hybrid_analyzer_loader.h b/modules/isp/hybrid_analyzer_loader.h
index 9d0e0e2..e683b10 100644
--- a/modules/isp/hybrid_analyzer_loader.h
+++ b/modules/isp/hybrid_analyzer_loader.h
@@ -22,11 +22,10 @@
 #ifndef XCAM_HYBRID_ANALYZER_LOADER_H
 #define XCAM_HYBRID_ANALYZER_LOADER_H
 
-#include <base/xcam_common.h>
+#include <xcam_std.h>
 #include <base/xcam_3a_description.h>
 #include "dynamic_analyzer_loader.h"
 #include "isp_controller.h"
-#include "smartptr.h"
 
 namespace XCam {
 class IspController;
diff --git a/modules/isp/isp_config_translator.h b/modules/isp/isp_config_translator.h
index 85c4bf8..02cc10a 100644
--- a/modules/isp/isp_config_translator.h
+++ b/modules/isp/isp_config_translator.h
@@ -21,12 +21,10 @@
 #ifndef XCAM_ISP_CONFIG_TRANSLATOR_H
 #define XCAM_ISP_CONFIG_TRANSLATOR_H
 
-#include <base/xcam_common.h>
+#include <xcam_std.h>
 #include <linux/atomisp.h>
-#include "xcam_utils.h"
 #include "x3a_result.h"
 #include "sensor_descriptor.h"
-#include "smartptr.h"
 
 namespace XCam {
 
diff --git a/modules/isp/isp_controller.h b/modules/isp/isp_controller.h
index 1858af0..7e8d083 100644
--- a/modules/isp/isp_controller.h
+++ b/modules/isp/isp_controller.h
@@ -20,7 +20,7 @@
 #ifndef XCAM_ISP_CONTROLLER_H
 #define XCAM_ISP_CONTROLLER_H
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "x3a_isp_config.h"
 
 namespace XCam {
diff --git a/modules/isp/isp_image_processor.h b/modules/isp/isp_image_processor.h
index 1675056..4997502 100644
--- a/modules/isp/isp_image_processor.h
+++ b/modules/isp/isp_image_processor.h
@@ -21,7 +21,7 @@
 #ifndef XCAM_ISP_IMAGE_PROCESSOR_H
 #define XCAM_ISP_IMAGE_PROCESSOR_H
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "image_processor.h"
 
 namespace XCam {
diff --git a/modules/isp/sensor_descriptor.h b/modules/isp/sensor_descriptor.h
index 82dcf88..a49ab67 100644
--- a/modules/isp/sensor_descriptor.h
+++ b/modules/isp/sensor_descriptor.h
@@ -21,7 +21,7 @@
 #ifndef XCAM_SENSOR_DESCRIPTOR_H
 #define XCAM_SENSOR_DESCRIPTOR_H
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include <linux/atomisp.h>
 
 namespace XCam {
diff --git a/modules/isp/x3a_analyzer_aiq.h b/modules/isp/x3a_analyzer_aiq.h
index 5e6c20c..0478230 100644
--- a/modules/isp/x3a_analyzer_aiq.h
+++ b/modules/isp/x3a_analyzer_aiq.h
@@ -21,7 +21,7 @@
 #ifndef XCAM_3A_ANALYZER_AIQ_H
 #define XCAM_3A_ANALYZER_AIQ_H
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "x3a_analyzer.h"
 #include <linux/atomisp.h>
 
diff --git a/modules/isp/x3a_isp_config.h b/modules/isp/x3a_isp_config.h
index f489981..e2ac024 100644
--- a/modules/isp/x3a_isp_config.h
+++ b/modules/isp/x3a_isp_config.h
@@ -21,8 +21,8 @@
 #ifndef XCAM_3A_ISP_CONFIG_H
 #define XCAM_3A_ISP_CONFIG_H
 
-#include "xcam_utils.h"
-#include "x3a_result.h"
+#include <xcam_std.h>
+#include <x3a_result.h>
 #include <linux/atomisp.h>
 #include <base/xcam_3a_result.h>
 
@@ -149,7 +149,7 @@ private:
 /* special X3aAtomIspParametersResult type */
 template <>
 class X3aIspResultT<struct atomisp_parameters, X3aIspConfig::X3aIspResultDummy, X3aIspConfig::IspAllParameters>
-            : public X3aStandardResultT<X3aIspConfig::X3aIspResultDummy>
+        : public X3aStandardResultT<X3aIspConfig::X3aIspResultDummy>
     {
 public:
         X3aIspResultT (
diff --git a/modules/isp/x3a_statistics_queue.h b/modules/isp/x3a_statistics_queue.h
index 0c5a711..9f94dc7 100644
--- a/modules/isp/x3a_statistics_queue.h
+++ b/modules/isp/x3a_statistics_queue.h
@@ -21,10 +21,9 @@
 #ifndef XCAM_3A_STATISTIC_QUEUE_H
 #define XCAM_3A_STATISTIC_QUEUE_H
 
-#include "xcam_utils.h"
-#include "xcam_mutex.h"
-#include "smartptr.h"
-#include "x3a_stats_pool.h"
+#include <xcam_std.h>
+#include <xcam_mutex.h>
+#include <x3a_stats_pool.h>
 #include <linux/atomisp.h>
 
 namespace XCam {
diff --git a/modules/ocl/Makefile.am b/modules/ocl/Makefile.am
index 2faa841..8661d35 100644
--- a/modules/ocl/Makefile.am
+++ b/modules/ocl/Makefile.am
@@ -140,7 +140,6 @@ nobase_libxcam_oclinclude_HEADERS = \
     cl_image_warp_handler.h         \
     cl_image_360_stitch.h           \
     cl_blender.h                    \
-    cl_pyramid_blender.h            \
     cl_retinex_handler.h            \
     cl_wavelet_denoise_handler.h    \
     cl_newwavelet_denoise_handler.h \
@@ -164,4 +163,9 @@ if HAVE_LIBDRM
 nobase_libxcam_oclinclude_HEADERS += cl_image_bo_buffer.h
 endif
 
+noinst_HEADERS =                    \
+    cl_pyramid_blender.h            \
+    $(NULL)
+
+
 libxcam_ocl_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/modules/ocl/cl_3a_image_processor.h b/modules/ocl/cl_3a_image_processor.h
index f0600d6..a501157 100644
--- a/modules/ocl/cl_3a_image_processor.h
+++ b/modules/ocl/cl_3a_image_processor.h
@@ -21,10 +21,10 @@
 #ifndef XCAM_CL_3A_IMAGE_PROCESSOR_H
 #define XCAM_CL_3A_IMAGE_PROCESSOR_H
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include <base/xcam_3a_types.h>
-#include "ocl/cl_image_processor.h"
-#include "stats_callback_interface.h"
+#include <ocl/cl_image_processor.h>
+#include <stats_callback_interface.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_3a_stats_context.cpp b/modules/ocl/cl_3a_stats_context.cpp
index 413cad0..4d43e6a 100644
--- a/modules/ocl/cl_3a_stats_context.cpp
+++ b/modules/ocl/cl_3a_stats_context.cpp
@@ -19,7 +19,7 @@
  * Author: Jia Meng <jia.meng@intel.com>
  */
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "cl_3a_stats_context.h"
 
 namespace XCam {
diff --git a/modules/ocl/cl_3a_stats_context.h b/modules/ocl/cl_3a_stats_context.h
index aa50f5b..e0f5110 100644
--- a/modules/ocl/cl_3a_stats_context.h
+++ b/modules/ocl/cl_3a_stats_context.h
@@ -21,10 +21,10 @@
 #ifndef XCAM_CL_3A_STATS_CONTEXT_H
 #define XCAM_CL_3A_STATS_CONTEXT_H
 
-#include "xcam_utils.h"
-#include "x3a_stats_pool.h"
-#include "ocl/cl_memory.h"
-#include "ocl/cl_context.h"
+#include <xcam_std.h>
+#include <x3a_stats_pool.h>
+#include <ocl/cl_memory.h>
+#include <ocl/cl_context.h>
 
 #define XCAM_CL_3A_STATS_BUFFER_COUNT 6
 
diff --git a/modules/ocl/cl_3d_denoise_handler.h b/modules/ocl/cl_3d_denoise_handler.h
index 63121cc..f1fa712 100644
--- a/modules/ocl/cl_3d_denoise_handler.h
+++ b/modules/ocl/cl_3d_denoise_handler.h
@@ -21,10 +21,10 @@
 #ifndef XCAM_CL_3D_DENOISE_HANLDER_H
 #define XCAM_CL_3D_DENOISE_HANLDER_H
 
-#include "xcam_utils.h"
-#include "base/xcam_3a_result.h"
-#include "x3a_stats_pool.h"
-#include "ocl/cl_image_handler.h"
+#include <xcam_std.h>
+#include <base/xcam_3a_result.h>
+#include <x3a_stats_pool.h>
+#include <ocl/cl_image_handler.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_argument.cpp b/modules/ocl/cl_argument.cpp
index 446d668..4650aec 100644
--- a/modules/ocl/cl_argument.cpp
+++ b/modules/ocl/cl_argument.cpp
@@ -18,7 +18,6 @@
  * Author: Wind Yuan <feng.yuan@intel.com>
  */
 
-#include "xcam_utils.h"
 #include "cl_argument.h"
 
 namespace XCam {
diff --git a/modules/ocl/cl_argument.h b/modules/ocl/cl_argument.h
index 8985f15..09eafbb 100644
--- a/modules/ocl/cl_argument.h
+++ b/modules/ocl/cl_argument.h
@@ -21,8 +21,8 @@
 #ifndef XCAM_CL_KERNEL_ARGUMENT_H
 #define XCAM_CL_KERNEL_ARGUMENT_H
 
-#include "xcam_utils.h"
-#include "ocl/cl_memory.h"
+#include <xcam_std.h>
+#include <ocl/cl_memory.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_bayer_basic_handler.h b/modules/ocl/cl_bayer_basic_handler.h
index e594172..61a31f5 100644
--- a/modules/ocl/cl_bayer_basic_handler.h
+++ b/modules/ocl/cl_bayer_basic_handler.h
@@ -21,11 +21,11 @@
 #ifndef XCAM_CL_BAYER_BASIC_HANLDER_H
 #define XCAM_CL_BAYER_BASIC_HANLDER_H
 
-#include "xcam_utils.h"
-#include "ocl/cl_image_handler.h"
-#include "ocl/cl_memory.h"
-#include "ocl/cl_3a_stats_context.h"
-#include "stats_callback_interface.h"
+#include <xcam_std.h>
+#include <ocl/cl_image_handler.h>
+#include <ocl/cl_memory.h>
+#include <ocl/cl_3a_stats_context.h>
+#include <stats_callback_interface.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_bayer_pipe_handler.h b/modules/ocl/cl_bayer_pipe_handler.h
index a53804f..8549e30 100644
--- a/modules/ocl/cl_bayer_pipe_handler.h
+++ b/modules/ocl/cl_bayer_pipe_handler.h
@@ -23,12 +23,12 @@
 #ifndef XCAM_CL_BAYER_PIPE_HANDLER_H
 #define XCAM_CL_BAYER_PIPE_HANDLER_H
 
-#include "xcam_utils.h"
-#include "ocl/cl_image_handler.h"
-#include "stats_callback_interface.h"
-#include "x3a_stats_pool.h"
-#include "ocl/cl_context.h"
-#include "ocl/cl_3a_stats_context.h"
+#include <xcam_std.h>
+#include <stats_callback_interface.h>
+#include <x3a_stats_pool.h>
+#include <ocl/cl_context.h>
+#include <ocl/cl_image_handler.h>
+#include <ocl/cl_3a_stats_context.h>
 
 #define XCAM_BNR_TABLE_SIZE 64
 
diff --git a/modules/ocl/cl_blender.h b/modules/ocl/cl_blender.h
index 1d44cb5..c31bc44 100644
--- a/modules/ocl/cl_blender.h
+++ b/modules/ocl/cl_blender.h
@@ -21,10 +21,10 @@
 #ifndef XCAM_CL_BLENDER_H
 #define XCAM_CL_BLENDER_H
 
-#include "xcam_utils.h"
-#include "interface/data_types.h"
-#include "interface/blender.h"
-#include "ocl/cl_image_handler.h"
+#include <xcam_std.h>
+#include <interface/data_types.h>
+#include <interface/blender.h>
+#include <ocl/cl_image_handler.h>
 
 #define XCAM_CL_BLENDER_ALIGNMENT_X 8
 #define XCAM_CL_BLENDER_ALIGNMENT_Y 1
diff --git a/modules/ocl/cl_context.h b/modules/ocl/cl_context.h
index 280fd69..b234e2c 100644
--- a/modules/ocl/cl_context.h
+++ b/modules/ocl/cl_context.h
@@ -21,13 +21,12 @@
 #ifndef XCAM_CL_CONTEXT_H
 #define XCAM_CL_CONTEXT_H
 
-#include "xcam_utils.h"
-#include "smartptr.h"
-#include "ocl/cl_event.h"
+#include <xcam_std.h>
 #include <map>
 #include <list>
 #include <CL/cl.h>
 #include <CL/cl_intel.h>
+#include <ocl/cl_event.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_csc_handler.h b/modules/ocl/cl_csc_handler.h
index 130db41..e812eed 100644
--- a/modules/ocl/cl_csc_handler.h
+++ b/modules/ocl/cl_csc_handler.h
@@ -21,9 +21,9 @@
 #ifndef XCAM_CL_CSC_HANLDER_H
 #define XCAM_CL_CSC_HANLDER_H
 
-#include "xcam_utils.h"
-#include "ocl/cl_image_handler.h"
-#include "base/xcam_3a_result.h"
+#include <xcam_std.h>
+#include <base/xcam_3a_result.h>
+#include <ocl/cl_image_handler.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_csc_image_processor.h b/modules/ocl/cl_csc_image_processor.h
index b29a3bb..76639d3 100644
--- a/modules/ocl/cl_csc_image_processor.h
+++ b/modules/ocl/cl_csc_image_processor.h
@@ -21,9 +21,9 @@
 #ifndef XCAM_CL_CSC_IMAGE_PROCESSOR_H
 #define XCAM_CL_CSC_IMAGE_PROCESSOR_H
 
-#include "xcam_utils.h"
-#include "ocl/cl_image_processor.h"
-#include "stats_callback_interface.h"
+#include <xcam_std.h>
+#include <stats_callback_interface.h>
+#include <ocl/cl_image_processor.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_defog_dcp_handler.h b/modules/ocl/cl_defog_dcp_handler.h
index 14e8ed8..1560bf5 100644
--- a/modules/ocl/cl_defog_dcp_handler.h
+++ b/modules/ocl/cl_defog_dcp_handler.h
@@ -21,10 +21,10 @@
 #ifndef XCAM_CL_DEFOG_DCP_HANLDER_H
 #define XCAM_CL_DEFOG_DCP_HANLDER_H
 
-#include "xcam_utils.h"
-#include "ocl/cl_image_handler.h"
-#include "base/xcam_3a_result.h"
-#include "x3a_stats_pool.h"
+#include <xcam_std.h>
+#include <base/xcam_3a_result.h>
+#include <x3a_stats_pool.h>
+#include <ocl/cl_image_handler.h>
 
 #define XCAM_DEFOG_DC_ORIGINAL      0
 #define XCAM_DEFOG_DC_MIN_FILTER_V  1
diff --git a/modules/ocl/cl_demo_handler.h b/modules/ocl/cl_demo_handler.h
index bd1846d..c5f3203 100644
--- a/modules/ocl/cl_demo_handler.h
+++ b/modules/ocl/cl_demo_handler.h
@@ -21,8 +21,8 @@
 #ifndef XCAM_CL_DEMO_HANLDER_H
 #define XCAM_CL_DEMO_HANLDER_H
 
-#include "xcam_utils.h"
-#include "ocl/cl_image_handler.h"
+#include <xcam_std.h>
+#include <ocl/cl_image_handler.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_device.h b/modules/ocl/cl_device.h
index 06a8121..f688e53 100644
--- a/modules/ocl/cl_device.h
+++ b/modules/ocl/cl_device.h
@@ -21,9 +21,8 @@
 #ifndef XCAM_CL_DEVICE_H
 #define XCAM_CL_DEVICE_H
 
-#include "xcam_utils.h"
-#include "smartptr.h"
-#include "xcam_mutex.h"
+#include <xcam_std.h>
+#include <xcam_mutex.h>
 #include <CL/cl.h>
 
 namespace XCam {
diff --git a/modules/ocl/cl_event.h b/modules/ocl/cl_event.h
index 1b91f16..226aca0 100644
--- a/modules/ocl/cl_event.h
+++ b/modules/ocl/cl_event.h
@@ -21,8 +21,7 @@
 #ifndef XCAM_CL_EVENT_H
 #define XCAM_CL_EVENT_H
 
-#include "xcam_utils.h"
-#include "smartptr.h"
+#include <xcam_std.h>
 #include <list>
 #include <CL/cl.h>
 
diff --git a/modules/ocl/cl_fisheye_handler.cpp b/modules/ocl/cl_fisheye_handler.cpp
index a16632d..93b62a5 100644
--- a/modules/ocl/cl_fisheye_handler.cpp
+++ b/modules/ocl/cl_fisheye_handler.cpp
@@ -77,10 +77,10 @@ CLFisheye2GPSKernel::CLFisheye2GPSKernel (
 XCamReturn
 CLFisheye2GPSKernel::prepare_arguments (CLArgList &args, CLWorkSize &work_size)
 {
-    SmartPtr<CLImage> input_y = _handler->get_input_image (CLNV12PlaneY);
-    SmartPtr<CLImage> input_uv = _handler->get_input_image (CLNV12PlaneUV);
-    SmartPtr<CLImage> output_y = _handler->get_output_image (CLNV12PlaneY);
-    SmartPtr<CLImage> output_uv = _handler->get_output_image (CLNV12PlaneUV);
+    SmartPtr<CLImage> input_y = _handler->get_input_image (NV12PlaneYIdx);
+    SmartPtr<CLImage> input_uv = _handler->get_input_image (NV12PlaneUVIdx);
+    SmartPtr<CLImage> output_y = _handler->get_output_image (NV12PlaneYIdx);
+    SmartPtr<CLImage> output_uv = _handler->get_output_image (NV12PlaneUVIdx);
     const CLImageDesc &input_y_desc = input_y->get_image_desc ();
     const CLImageDesc &outuv_desc = output_uv->get_image_desc ();
     FisheyeInfo fisheye_info;
@@ -245,43 +245,43 @@ CLFisheyeHandler::prepare_parameters (SmartPtr<VideoBuffer> &input, SmartPtr<Vid
     cl_desc.format.image_channel_order = CL_R;
     cl_desc.width = input_image_w;
     cl_desc.height = input_image_h;
-    cl_desc.row_pitch = in_info.strides[CLNV12PlaneY];
-    _input[CLNV12PlaneY] = convert_to_climage (context, input, cl_desc, in_info.offsets[CLNV12PlaneY]);
+    cl_desc.row_pitch = in_info.strides[NV12PlaneYIdx];
+    _input[NV12PlaneYIdx] = convert_to_climage (context, input, cl_desc, in_info.offsets[NV12PlaneYIdx]);
 
     cl_desc.format.image_channel_data_type = CL_UNORM_INT8;
     cl_desc.format.image_channel_order = CL_RG;
     cl_desc.width = input_image_w / 2;
     cl_desc.height = input_image_h / 2;
-    cl_desc.row_pitch = in_info.strides[CLNV12PlaneUV];
-    _input[CLNV12PlaneUV] = convert_to_climage (context, input, cl_desc, in_info.offsets[CLNV12PlaneUV]);
+    cl_desc.row_pitch = in_info.strides[NV12PlaneUVIdx];
+    _input[NV12PlaneUVIdx] = convert_to_climage (context, input, cl_desc, in_info.offsets[NV12PlaneUVIdx]);
 
     if (_use_map) {
         cl_desc.format.image_channel_data_type = CL_UNSIGNED_INT16;
         cl_desc.format.image_channel_order = CL_RGBA;
         cl_desc.width = XCAM_ALIGN_DOWN (out_info.width, 8) / 8; //CL_RGBA * CL_UNSIGNED_INT16 = 8
         cl_desc.height = XCAM_ALIGN_DOWN (out_info.height, 2);
-        cl_desc.row_pitch = out_info.strides[CLNV12PlaneY];
-        _output[CLNV12PlaneY] = convert_to_climage (context, output, cl_desc, out_info.offsets[CLNV12PlaneY]);
+        cl_desc.row_pitch = out_info.strides[NV12PlaneYIdx];
+        _output[NV12PlaneYIdx] = convert_to_climage (context, output, cl_desc, out_info.offsets[NV12PlaneYIdx]);
         cl_desc.height /= 2;
-        cl_desc.row_pitch = out_info.strides[CLNV12PlaneUV];
-        _output[CLNV12PlaneUV] = convert_to_climage (context, output, cl_desc, out_info.offsets[CLNV12PlaneUV]);
+        cl_desc.row_pitch = out_info.strides[NV12PlaneUVIdx];
+        _output[NV12PlaneUVIdx] = convert_to_climage (context, output, cl_desc, out_info.offsets[NV12PlaneUVIdx]);
     } else {
         cl_desc.format.image_channel_data_type = CL_UNSIGNED_INT8;
         cl_desc.format.image_channel_order = CL_RGBA;
         cl_desc.width = XCAM_ALIGN_DOWN (out_info.width, 4) / 4; //CL_RGBA * CL_UNSIGNED_INT8 = 4
         cl_desc.height = XCAM_ALIGN_DOWN (out_info.height, 2);
-        cl_desc.row_pitch = out_info.strides[CLNV12PlaneY];
-        _output[CLNV12PlaneY] = convert_to_climage (context, output, cl_desc, out_info.offsets[CLNV12PlaneY]);
+        cl_desc.row_pitch = out_info.strides[NV12PlaneYIdx];
+        _output[NV12PlaneYIdx] = convert_to_climage (context, output, cl_desc, out_info.offsets[NV12PlaneYIdx]);
         cl_desc.height /= 2;
-        cl_desc.row_pitch = out_info.strides[CLNV12PlaneUV];
-        _output[CLNV12PlaneUV] = convert_to_climage (context, output, cl_desc, out_info.offsets[CLNV12PlaneUV]);
+        cl_desc.row_pitch = out_info.strides[NV12PlaneUVIdx];
+        _output[NV12PlaneUVIdx] = convert_to_climage (context, output, cl_desc, out_info.offsets[NV12PlaneUVIdx]);
     }
 
     XCAM_ASSERT (
-        _input[CLNV12PlaneY].ptr () && _input[CLNV12PlaneY]->is_valid () &&
-        _input[CLNV12PlaneUV].ptr () && _input[CLNV12PlaneUV]->is_valid () &&
-        _output[CLNV12PlaneY].ptr () && _output[CLNV12PlaneY]->is_valid () &&
-        _output[CLNV12PlaneUV].ptr () && _output[CLNV12PlaneUV]->is_valid ());
+        _input[NV12PlaneYIdx].ptr () && _input[NV12PlaneYIdx]->is_valid () &&
+        _input[NV12PlaneUVIdx].ptr () && _input[NV12PlaneUVIdx]->is_valid () &&
+        _output[NV12PlaneYIdx].ptr () && _output[NV12PlaneYIdx]->is_valid () &&
+        _output[NV12PlaneUVIdx].ptr () && _output[NV12PlaneUVIdx]->is_valid ());
 
     if (_use_map && !_geo_table.ptr ()) {
         generate_fisheye_table (input_image_w, input_image_h, _fisheye_info);
@@ -530,7 +530,7 @@ CLFisheyeHandler::execute_done (SmartPtr<VideoBuffer> &output)
 {
     XCAM_UNUSED (output);
 
-    for (int i = 0; i < CLNV12PlaneMax; ++i) {
+    for (int i = 0; i < NV12PlaneMax; ++i) {
         _input[i].release ();
         _output[i].release ();
     }
@@ -539,12 +539,12 @@ CLFisheyeHandler::execute_done (SmartPtr<VideoBuffer> &output)
 }
 
 SmartPtr<CLImage>
-CLFisheyeHandler::get_geo_input_image (CLNV12PlaneIdx index) {
+CLFisheyeHandler::get_geo_input_image (NV12PlaneIdx index) {
     return get_input_image(index);
 }
 
 SmartPtr<CLImage>
-CLFisheyeHandler::get_geo_output_image (CLNV12PlaneIdx index) {
+CLFisheyeHandler::get_geo_output_image (NV12PlaneIdx index) {
     return get_output_image (index);
 }
 
diff --git a/modules/ocl/cl_fisheye_handler.h b/modules/ocl/cl_fisheye_handler.h
index f9f4a42..be7452f 100644
--- a/modules/ocl/cl_fisheye_handler.h
+++ b/modules/ocl/cl_fisheye_handler.h
@@ -21,12 +21,11 @@
 #ifndef XCAM_CL_FISHEYE_HANDLER_H
 #define XCAM_CL_FISHEYE_HANDLER_H
 
-#include "xcam_utils.h"
-#include "interface/data_types.h"
-#include "ocl/cl_image_handler.h"
-#include "ocl/cl_geo_map_handler.h"
-#include "calibration_parser.h"
-#include "surview_fisheye_dewarp.h"
+#include <xcam_std.h>
+#include <interface/data_types.h>
+#include <ocl/cl_image_handler.h>
+#include <ocl/cl_geo_map_handler.h>
+#include <surview_fisheye_dewarp.h>
 
 namespace XCam {
 
@@ -96,8 +95,8 @@ protected:
     virtual XCamReturn execute_done (SmartPtr<VideoBuffer> &output);
 
     // derived from GeoKernelParamCallback
-    virtual SmartPtr<CLImage> get_geo_input_image (CLNV12PlaneIdx index);
-    virtual SmartPtr<CLImage> get_geo_output_image (CLNV12PlaneIdx index);
+    virtual SmartPtr<CLImage> get_geo_input_image (NV12PlaneIdx index);
+    virtual SmartPtr<CLImage> get_geo_output_image (NV12PlaneIdx index);
     virtual SmartPtr<CLImage> get_geo_map_table () {
         return _geo_table;
     }
@@ -108,12 +107,12 @@ protected:
     virtual float* get_lsc_gray_threshold ();
 
 private:
-    SmartPtr<CLImage> &get_input_image (CLNV12PlaneIdx index) {
-        XCAM_ASSERT (index < CLNV12PlaneMax);
+    SmartPtr<CLImage> &get_input_image (NV12PlaneIdx index) {
+        XCAM_ASSERT (index < NV12PlaneMax);
         return _input [index];
     }
-    SmartPtr<CLImage> &get_output_image (CLNV12PlaneIdx index) {
-        XCAM_ASSERT (index < CLNV12PlaneMax);
+    SmartPtr<CLImage> &get_output_image (NV12PlaneIdx index) {
+        XCAM_ASSERT (index < NV12PlaneMax);
         return _output [index];
     }
 
@@ -151,8 +150,8 @@ private:
 
     SmartPtr<CLImage>                _geo_table;
     SmartPtr<CLImage>                _lsc_table;
-    SmartPtr<CLImage>                _input[CLNV12PlaneMax];
-    SmartPtr<CLImage>                _output[CLNV12PlaneMax];
+    SmartPtr<CLImage>                _input[NV12PlaneMax];
+    SmartPtr<CLImage>                _output[NV12PlaneMax];
 };
 
 SmartPtr<CLImageHandler>
diff --git a/modules/ocl/cl_gauss_handler.h b/modules/ocl/cl_gauss_handler.h
index 7825034..261c89a 100644
--- a/modules/ocl/cl_gauss_handler.h
+++ b/modules/ocl/cl_gauss_handler.h
@@ -21,10 +21,10 @@
 #ifndef XCAM_CL_GAUSS_HANLDER_H
 #define XCAM_CL_GAUSS_HANLDER_H
 
-#include "xcam_utils.h"
-#include "ocl/cl_image_handler.h"
-#include "base/xcam_3a_result.h"
-#include "x3a_stats_pool.h"
+#include <xcam_std.h>
+#include <base/xcam_3a_result.h>
+#include <x3a_stats_pool.h>
+#include <ocl/cl_image_handler.h>
 
 #define XCAM_GAUSS_DEFAULT_RADIUS 2
 #define XCAM_GAUSS_DEFAULT_SIGMA 2.0f
diff --git a/modules/ocl/cl_geo_map_handler.cpp b/modules/ocl/cl_geo_map_handler.cpp
index de70553..8151425 100644
--- a/modules/ocl/cl_geo_map_handler.cpp
+++ b/modules/ocl/cl_geo_map_handler.cpp
@@ -45,10 +45,10 @@ CLGeoMapKernel::CLGeoMapKernel (
 XCamReturn
 CLGeoMapKernel::prepare_arguments (CLArgList &args, CLWorkSize &work_size)
 {
-    SmartPtr<CLImage> input_y = _handler->get_geo_input_image (CLNV12PlaneY);
-    SmartPtr<CLImage> input_uv = _handler->get_geo_input_image (CLNV12PlaneUV);
-    SmartPtr<CLImage> output_y = _handler->get_geo_output_image (CLNV12PlaneY);
-    SmartPtr<CLImage> output_uv = _handler->get_geo_output_image (CLNV12PlaneUV);
+    SmartPtr<CLImage> input_y = _handler->get_geo_input_image (NV12PlaneYIdx);
+    SmartPtr<CLImage> input_uv = _handler->get_geo_input_image (NV12PlaneUVIdx);
+    SmartPtr<CLImage> output_y = _handler->get_geo_output_image (NV12PlaneYIdx);
+    SmartPtr<CLImage> output_uv = _handler->get_geo_output_image (NV12PlaneUVIdx);
     const CLImageDesc &outuv_desc = output_uv->get_image_desc ();
     SmartPtr<CLImage> geo_image = _handler->get_geo_map_table ();
 
@@ -255,31 +255,31 @@ CLGeoMapHandler::prepare_parameters (SmartPtr<VideoBuffer> &input, SmartPtr<Vide
     cl_desc.format.image_channel_order = CL_R;
     cl_desc.width = input_image_w;
     cl_desc.height = input_image_h;
-    cl_desc.row_pitch = in_info.strides[CLNV12PlaneY];
-    _input[CLNV12PlaneY] = convert_to_climage (context, input, cl_desc, in_info.offsets[CLNV12PlaneY]);
+    cl_desc.row_pitch = in_info.strides[NV12PlaneYIdx];
+    _input[NV12PlaneYIdx] = convert_to_climage (context, input, cl_desc, in_info.offsets[NV12PlaneYIdx]);
 
     cl_desc.format.image_channel_data_type = CL_UNORM_INT8;
     cl_desc.format.image_channel_order = CL_RG;
     cl_desc.width = input_image_w / 2;
     cl_desc.height = input_image_h / 2;
-    cl_desc.row_pitch = in_info.strides[CLNV12PlaneUV];
-    _input[CLNV12PlaneUV] = convert_to_climage (context, input, cl_desc, in_info.offsets[CLNV12PlaneUV]);
+    cl_desc.row_pitch = in_info.strides[NV12PlaneUVIdx];
+    _input[NV12PlaneUVIdx] = convert_to_climage (context, input, cl_desc, in_info.offsets[NV12PlaneUVIdx]);
 
     cl_desc.format.image_channel_data_type = CL_UNSIGNED_INT16;
     cl_desc.format.image_channel_order = CL_RGBA;
     cl_desc.width = XCAM_ALIGN_DOWN (out_info.width, 4) / 8; //CL_RGBA * CL_UNSIGNED_INT16 = 8
     cl_desc.height = XCAM_ALIGN_DOWN (out_info.height, 2);
-    cl_desc.row_pitch = out_info.strides[CLNV12PlaneY];
-    _output[CLNV12PlaneY] = convert_to_climage (context, output, cl_desc, out_info.offsets[CLNV12PlaneY]);
+    cl_desc.row_pitch = out_info.strides[NV12PlaneYIdx];
+    _output[NV12PlaneYIdx] = convert_to_climage (context, output, cl_desc, out_info.offsets[NV12PlaneYIdx]);
     cl_desc.height /= 2;
-    cl_desc.row_pitch = out_info.strides[CLNV12PlaneUV];
-    _output[CLNV12PlaneUV] = convert_to_climage (context, output, cl_desc, out_info.offsets[CLNV12PlaneUV]);
+    cl_desc.row_pitch = out_info.strides[NV12PlaneUVIdx];
+    _output[NV12PlaneUVIdx] = convert_to_climage (context, output, cl_desc, out_info.offsets[NV12PlaneUVIdx]);
 
     XCAM_ASSERT (
-        _input[CLNV12PlaneY].ptr () && _input[CLNV12PlaneY]->is_valid () &&
-        _input[CLNV12PlaneUV].ptr () && _input[CLNV12PlaneUV]->is_valid () &&
-        _output[CLNV12PlaneY].ptr () && _output[CLNV12PlaneY]->is_valid () &&
-        _output[CLNV12PlaneUV].ptr () && _output[CLNV12PlaneUV]->is_valid ());
+        _input[NV12PlaneYIdx].ptr () && _input[NV12PlaneYIdx]->is_valid () &&
+        _input[NV12PlaneUVIdx].ptr () && _input[NV12PlaneUVIdx]->is_valid () &&
+        _output[NV12PlaneYIdx].ptr () && _output[NV12PlaneYIdx]->is_valid () &&
+        _output[NV12PlaneUVIdx].ptr () && _output[NV12PlaneUVIdx]->is_valid ());
 
     XCAM_FAIL_RETURN (
         ERROR, _geo_map.ptr () && _geo_map->is_valid (),
@@ -309,7 +309,7 @@ CLGeoMapHandler::execute_done (SmartPtr<VideoBuffer> &output)
 {
     XCAM_UNUSED (output);
 
-    for (int i = 0; i < CLNV12PlaneMax; ++i) {
+    for (int i = 0; i < NV12PlaneMax; ++i) {
         _input[i].release ();
         _output[i].release ();
     }
diff --git a/modules/ocl/cl_geo_map_handler.h b/modules/ocl/cl_geo_map_handler.h
index c592da7..a41ad27 100644
--- a/modules/ocl/cl_geo_map_handler.h
+++ b/modules/ocl/cl_geo_map_handler.h
@@ -21,8 +21,8 @@
 #ifndef XCAM_CL_GEO_MAP_HANDLER_H
 #define XCAM_CL_GEO_MAP_HANDLER_H
 
-#include "xcam_utils.h"
-#include "ocl/cl_image_handler.h"
+#include <xcam_std.h>
+#include <ocl/cl_image_handler.h>
 
 namespace XCam {
 
@@ -43,8 +43,8 @@ public:
     virtual ~GeoKernelParamCallback () {}
 
 protected:
-    virtual SmartPtr<CLImage> get_geo_input_image (CLNV12PlaneIdx index) = 0;
-    virtual SmartPtr<CLImage> get_geo_output_image (CLNV12PlaneIdx index) = 0;
+    virtual SmartPtr<CLImage> get_geo_input_image (NV12PlaneIdx index) = 0;
+    virtual SmartPtr<CLImage> get_geo_output_image (NV12PlaneIdx index) = 0;
     virtual SmartPtr<CLImage> get_geo_map_table () = 0;
     virtual void get_geo_equivalent_out_size (float &width, float &height) = 0;
     virtual void get_geo_pixel_out_size (float &width, float &height) = 0;
@@ -98,12 +98,12 @@ public:
 
 protected:
     // derived from GeoKernelParamCallback
-    virtual SmartPtr<CLImage> get_geo_input_image (CLNV12PlaneIdx index) {
-        XCAM_ASSERT (index < CLNV12PlaneMax);
+    virtual SmartPtr<CLImage> get_geo_input_image (NV12PlaneIdx index) {
+        XCAM_ASSERT (index < NV12PlaneMax);
         return _input [index];
     }
-    virtual SmartPtr<CLImage> get_geo_output_image (CLNV12PlaneIdx index) {
-        XCAM_ASSERT (index < CLNV12PlaneMax);
+    virtual SmartPtr<CLImage> get_geo_output_image (NV12PlaneIdx index) {
+        XCAM_ASSERT (index < NV12PlaneMax);
         return _output [index];
     }
     virtual SmartPtr<CLImage> get_geo_map_table () {
@@ -141,8 +141,8 @@ private:
     uint32_t                         _map_width, _map_height;
     uint32_t                         _map_aligned_width;
     float                            _uint_x, _uint_y;
-    SmartPtr<CLImage>                _input[CLNV12PlaneMax];
-    SmartPtr<CLImage>                _output[CLNV12PlaneMax];
+    SmartPtr<CLImage>                _input[NV12PlaneMax];
+    SmartPtr<CLImage>                _output[NV12PlaneMax];
     SmartPtr<CLBuffer>               _geo_map;
     SmartPtr<CLImage>                _geo_image;
     bool                             _geo_map_normalized;
diff --git a/modules/ocl/cl_image_360_stitch.cpp b/modules/ocl/cl_image_360_stitch.cpp
index 1dd6355..bf1d1ec 100644
--- a/modules/ocl/cl_image_360_stitch.cpp
+++ b/modules/ocl/cl_image_360_stitch.cpp
@@ -20,6 +20,9 @@
 
 #include "cl_utils.h"
 #include "cl_image_360_stitch.h"
+#if HAVE_OPENCV
+#include "cv_feature_match.h"
+#endif
 
 #define XCAM_BLENDER_GLOBAL_SCALE_EXT_WIDTH 64
 
diff --git a/modules/ocl/cl_image_360_stitch.h b/modules/ocl/cl_image_360_stitch.h
index 2d47d73..2c6babf 100644
--- a/modules/ocl/cl_image_360_stitch.h
+++ b/modules/ocl/cl_image_360_stitch.h
@@ -21,14 +21,12 @@
 #ifndef XCAM_CL_IMAGE_360_STITCH_H
 #define XCAM_CL_IMAGE_360_STITCH_H
 
-#include "xcam_utils.h"
-#include "interface/stitcher.h"
-#include "ocl/cl_multi_image_handler.h"
-#include "ocl/cl_fisheye_handler.h"
-#include "ocl/cl_blender.h"
-#if HAVE_OPENCV
-#include "ocl/cv_feature_match.h"
-#endif
+#include <xcam_std.h>
+#include <interface/stitcher.h>
+#include <interface/feature_match.h>
+#include <ocl/cl_multi_image_handler.h>
+#include <ocl/cl_fisheye_handler.h>
+#include <ocl/cl_blender.h>
 
 namespace XCam {
 
@@ -129,9 +127,7 @@ private:
     SmartPtr<CLContext>         _context;
     CLFisheyeParams             _fisheye[XCAM_STITCH_FISHEYE_MAX_NUM];
     SmartPtr<CLBlender>         _blender[XCAM_STITCH_FISHEYE_MAX_NUM];
-#if HAVE_OPENCV
     SmartPtr<FeatureMatch>      _feature_match[XCAM_STITCH_FISHEYE_MAX_NUM];
-#endif
 
     uint32_t                    _output_width;
     uint32_t                    _output_height;
diff --git a/modules/ocl/cl_image_bo_buffer.h b/modules/ocl/cl_image_bo_buffer.h
index 48c2ec9..42a32ed 100644
--- a/modules/ocl/cl_image_bo_buffer.h
+++ b/modules/ocl/cl_image_bo_buffer.h
@@ -21,10 +21,10 @@
 #ifndef XCAM_CL_IMAGE_BO_BUFFER_H
 #define XCAM_CL_IMAGE_BO_BUFFER_H
 
-#include "xcam_utils.h"
-#include "drm_bo_buffer.h"
-#include "ocl/cl_memory.h"
-#include "ocl/cl_context.h"
+#include <xcam_std.h>
+#include <drm_bo_buffer.h>
+#include <ocl/cl_memory.h>
+#include <ocl/cl_context.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_image_handler.cpp b/modules/ocl/cl_image_handler.cpp
index 5e5cba2..c359bcd 100644
--- a/modules/ocl/cl_image_handler.cpp
+++ b/modules/ocl/cl_image_handler.cpp
@@ -22,6 +22,7 @@
 #if HAVE_LIBDRM
 #include "drm_display.h"
 #include "cl_image_bo_buffer.h"
+#include "drm_bo_buffer.h"
 #endif
 #include "cl_device.h"
 #include "swapped_buffer.h"
diff --git a/modules/ocl/cl_image_handler.h b/modules/ocl/cl_image_handler.h
index 0ed00c7..45c1b31 100644
--- a/modules/ocl/cl_image_handler.h
+++ b/modules/ocl/cl_image_handler.h
@@ -21,16 +21,13 @@
 #ifndef XCAM_CL_IMAGE_HANDLER_H
 #define XCAM_CL_IMAGE_HANDLER_H
 
-#include "xcam_utils.h"
-#include "swapped_buffer.h"
-#if HAVE_LIBDRM
-#include "drm_bo_buffer.h"
-#endif
-#include "ocl/cl_kernel.h"
-#include "ocl/cl_argument.h"
-#include "ocl/cl_memory.h"
-#include "ocl/cl_video_buffer.h"
-#include "x3a_result.h"
+#include <xcam_std.h>
+#include <swapped_buffer.h>
+#include <x3a_result.h>
+#include <ocl/cl_kernel.h>
+#include <ocl/cl_argument.h>
+#include <ocl/cl_memory.h>
+#include <ocl/cl_video_buffer.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_image_processor.h b/modules/ocl/cl_image_processor.h
index 7be88aa..b955b1a 100644
--- a/modules/ocl/cl_image_processor.h
+++ b/modules/ocl/cl_image_processor.h
@@ -21,9 +21,9 @@
 #ifndef XCAM_CL_IMAGE_PROCESSOR_H
 #define XCAM_CL_IMAGE_PROCESSOR_H
 
-#include "xcam_utils.h"
-#include "image_processor.h"
-#include "priority_buffer_queue.h"
+#include <xcam_std.h>
+#include <image_processor.h>
+#include <ocl/priority_buffer_queue.h>
 #include <list>
 
 namespace XCam {
diff --git a/modules/ocl/cl_image_scaler.h b/modules/ocl/cl_image_scaler.h
index 8186bad..bb4edf6 100644
--- a/modules/ocl/cl_image_scaler.h
+++ b/modules/ocl/cl_image_scaler.h
@@ -21,10 +21,10 @@
 #ifndef XCAM_CL_IMAGE_SCALER_H
 #define XCAM_CL_IMAGE_SCALER_H
 
-#include "xcam_utils.h"
-#include "ocl/cl_image_handler.h"
-#include "ocl/cl_memory.h"
-#include "stats_callback_interface.h"
+#include <xcam_std.h>
+#include <ocl/cl_image_handler.h>
+#include <ocl/cl_memory.h>
+#include <stats_callback_interface.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_image_warp_handler.h b/modules/ocl/cl_image_warp_handler.h
index 4fca852..6354bed 100644
--- a/modules/ocl/cl_image_warp_handler.h
+++ b/modules/ocl/cl_image_warp_handler.h
@@ -21,9 +21,9 @@
 #ifndef XCAM_CL_IMAGE_WARP_H
 #define XCAM_CL_IMAGE_WARP_H
 
-#include "xcam_utils.h"
-#include "ocl/cl_image_handler.h"
-#include "ocl/cl_memory.h"
+#include <xcam_std.h>
+#include <ocl/cl_image_handler.h>
+#include <ocl/cl_memory.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_kernel.h b/modules/ocl/cl_kernel.h
index 8061de0..1acc896 100644
--- a/modules/ocl/cl_kernel.h
+++ b/modules/ocl/cl_kernel.h
@@ -21,11 +21,10 @@
 #ifndef XCAM_CL_KERNEL_H
 #define XCAM_CL_KERNEL_H
 
-#include "xcam_utils.h"
-#include "smartptr.h"
-#include "xcam_mutex.h"
-#include "ocl/cl_event.h"
-#include "ocl/cl_argument.h"
+#include <xcam_std.h>
+#include <xcam_mutex.h>
+#include <ocl/cl_event.h>
+#include <ocl/cl_argument.h>
 
 #include <CL/cl.h>
 #include <string>
diff --git a/modules/ocl/cl_multi_image_handler.h b/modules/ocl/cl_multi_image_handler.h
index e7056fb..7b44818 100644
--- a/modules/ocl/cl_multi_image_handler.h
+++ b/modules/ocl/cl_multi_image_handler.h
@@ -21,8 +21,8 @@
 #ifndef XCAM_CL_MULTI_IMAGE_HANDLER_H
 #define XCAM_CL_MULTI_IMAGE_HANDLER_H
 
-#include "xcam_utils.h"
-#include "ocl/cl_image_handler.h"
+#include <xcam_std.h>
+#include <ocl/cl_image_handler.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_newtonemapping_handler.h b/modules/ocl/cl_newtonemapping_handler.h
index bfab50a..aaf2163 100644
--- a/modules/ocl/cl_newtonemapping_handler.h
+++ b/modules/ocl/cl_newtonemapping_handler.h
@@ -21,9 +21,9 @@
 #ifndef XCAM_CL_NEWTONEMAPPING_HANLDER_H
 #define XCAM_CL_NEWTONEMAPPING_HANLDER_H
 
-#include "xcam_utils.h"
-#include "ocl/cl_image_handler.h"
-#include "x3a_stats_pool.h"
+#include <xcam_std.h>
+#include <ocl/cl_image_handler.h>
+#include <x3a_stats_pool.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_newwavelet_denoise_handler.h b/modules/ocl/cl_newwavelet_denoise_handler.h
index 04ee9b9..d09e6e2 100644
--- a/modules/ocl/cl_newwavelet_denoise_handler.h
+++ b/modules/ocl/cl_newwavelet_denoise_handler.h
@@ -21,9 +21,9 @@
 #ifndef XCAM_CL_NEWWAVELET_DENOISE_HANLDER_H
 #define XCAM_CL_NEWWAVELET_DENOISE_HANLDER_H
 
-#include "xcam_utils.h"
-#include "ocl/cl_image_handler.h"
-#include "base/xcam_3a_result.h"
+#include <xcam_std.h>
+#include <ocl/cl_image_handler.h>
+#include <base/xcam_3a_result.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_post_image_processor.h b/modules/ocl/cl_post_image_processor.h
index 6c3b6ba..a06e007 100644
--- a/modules/ocl/cl_post_image_processor.h
+++ b/modules/ocl/cl_post_image_processor.h
@@ -22,11 +22,12 @@
 #ifndef XCAM_CL_POST_IMAGE_PROCESSOR_H
 #define XCAM_CL_POST_IMAGE_PROCESSOR_H
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include <base/xcam_3a_types.h>
-#include "ocl/cl_image_processor.h"
-#include "stats_callback_interface.h"
-#include "ocl/cl_blender.h"
+#include <ocl/cl_image_processor.h>
+#include <stats_callback_interface.h>
+#include <ocl/cl_blender.h>
+#include <ocl/cl_utils.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_pyramid_blender.h b/modules/ocl/cl_pyramid_blender.h
index c6e1eb8..a89f107 100644
--- a/modules/ocl/cl_pyramid_blender.h
+++ b/modules/ocl/cl_pyramid_blender.h
@@ -21,8 +21,8 @@
 #ifndef XCAM_CL_PYRAMID_BLENDER_H
 #define XCAM_CL_PYRAMID_BLENDER_H
 
-#include "xcam_utils.h"
-#include "ocl/cl_blender.h"
+#include <xcam_std.h>
+#include <ocl/cl_blender.h>
 
 #define CL_PYRAMID_ENABLE_DUMP 0
 
diff --git a/modules/ocl/cl_retinex_handler.h b/modules/ocl/cl_retinex_handler.h
index ddffd87..72dd724 100644
--- a/modules/ocl/cl_retinex_handler.h
+++ b/modules/ocl/cl_retinex_handler.h
@@ -22,12 +22,11 @@
 #ifndef XCAM_CL_RETINEX_HANLDER_H
 #define XCAM_CL_RETINEX_HANLDER_H
 
-#include "xcam_utils.h"
-#include "base/xcam_3a_result.h"
-#include "x3a_stats_pool.h"
-#include "ocl/cl_image_handler.h"
-#include "ocl/cl_image_scaler.h"
-#include "ocl/cl_gauss_handler.h"
+#include <xcam_std.h>
+#include <base/xcam_3a_result.h>
+#include <x3a_stats_pool.h>
+#include <ocl/cl_image_scaler.h>
+#include <ocl/cl_gauss_handler.h>
 
 #define XCAM_RETINEX_MAX_SCALE 2
 #define XCAM_RETINEX_SCALER_FACTOR 0.5
diff --git a/modules/ocl/cl_rgb_pipe_handler.h b/modules/ocl/cl_rgb_pipe_handler.h
index 8e027a5..def6ea9 100644
--- a/modules/ocl/cl_rgb_pipe_handler.h
+++ b/modules/ocl/cl_rgb_pipe_handler.h
@@ -23,8 +23,8 @@
 #ifndef XCAM_CL_RGB_PIPE_HANLDER_H
 #define XCAM_CL_RGB_PIPE_HANLDER_H
 
-#include "xcam_utils.h"
-#include "ocl/cl_image_handler.h"
+#include <xcam_std.h>
+#include <ocl/cl_image_handler.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_tonemapping_handler.h b/modules/ocl/cl_tonemapping_handler.h
index e5c7b09..cb55955 100644
--- a/modules/ocl/cl_tonemapping_handler.h
+++ b/modules/ocl/cl_tonemapping_handler.h
@@ -21,10 +21,10 @@
 #ifndef XCAM_CL_TONEMAPPING_HANLDER_H
 #define XCAM_CL_TONEMAPPING_HANLDER_H
 
-#include "xcam_utils.h"
-#include "x3a_stats_pool.h"
-#include "ocl/cl_image_handler.h"
-#include "ocl/cl_bayer_basic_handler.h"
+#include <xcam_std.h>
+#include <x3a_stats_pool.h>
+#include <ocl/cl_image_handler.h>
+#include <ocl/cl_bayer_basic_handler.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_utils.h b/modules/ocl/cl_utils.h
index 82b791a..e4db00d 100644
--- a/modules/ocl/cl_utils.h
+++ b/modules/ocl/cl_utils.h
@@ -31,6 +31,17 @@
 
 namespace XCam {
 
+enum CLWaveletBasis {
+    CL_WAVELET_DISABLED = 0,
+    CL_WAVELET_HAT,
+    CL_WAVELET_HAAR,
+};
+
+enum CLImageChannel {
+    CL_IMAGE_CHANNEL_Y = 1,
+    CL_IMAGE_CHANNEL_UV = 1 << 1,
+};
+
 bool dump_image (SmartPtr<CLImage> image, const char *file_name);
 
 SmartPtr<CLBuffer> convert_to_clbuffer (
diff --git a/modules/ocl/cl_video_buffer.h b/modules/ocl/cl_video_buffer.h
index 5d985fa..969bff1 100644
--- a/modules/ocl/cl_video_buffer.h
+++ b/modules/ocl/cl_video_buffer.h
@@ -21,13 +21,12 @@
 #ifndef XCAM_CL_VIDEO_BUFFER_H
 #define XCAM_CL_VIDEO_BUFFER_H
 
-#include "xcam_utils.h"
-#include "smartptr.h"
-#include "safe_list.h"
-#include "xcam_mutex.h"
-#include "buffer_pool.h"
-#include "x3a_stats_pool.h"
-#include "ocl/cl_context.h"
+#include <xcam_std.h>
+#include <safe_list.h>
+#include <xcam_mutex.h>
+#include <buffer_pool.h>
+#include <x3a_stats_pool.h>
+#include <ocl/cl_context.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_video_stabilizer.cpp b/modules/ocl/cl_video_stabilizer.cpp
index 51e64d8..66deadf 100644
--- a/modules/ocl/cl_video_stabilizer.cpp
+++ b/modules/ocl/cl_video_stabilizer.cpp
@@ -19,6 +19,7 @@
  */
 
 #include "cl_video_stabilizer.h"
+#include "cl_utils.h"
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_video_stabilizer.h b/modules/ocl/cl_video_stabilizer.h
index 75f649c..315bd4a 100644
--- a/modules/ocl/cl_video_stabilizer.h
+++ b/modules/ocl/cl_video_stabilizer.h
@@ -21,11 +21,11 @@
 #ifndef XCAM_CL_VIDEO_STABILIZER_H
 #define XCAM_CL_VIDEO_STABILIZER_H
 
-#include "xcam_utils.h"
-#include "meta_data.h"
-#include "vec_mat.h"
-#include "image_projector.h"
-#include "ocl/cl_image_warp_handler.h"
+#include <xcam_std.h>
+#include <meta_data.h>
+#include <vec_mat.h>
+#include <image_projector.h>
+#include <ocl/cl_image_warp_handler.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_wavelet_denoise_handler.h b/modules/ocl/cl_wavelet_denoise_handler.h
index 7030029..0513336 100644
--- a/modules/ocl/cl_wavelet_denoise_handler.h
+++ b/modules/ocl/cl_wavelet_denoise_handler.h
@@ -21,9 +21,9 @@
 #ifndef XCAM_CL_WAVELET_DENOISE_HANLDER_H
 #define XCAM_CL_WAVELET_DENOISE_HANLDER_H
 
-#include "xcam_utils.h"
-#include "ocl/cl_image_handler.h"
-#include "base/xcam_3a_result.h"
+#include <xcam_std.h>
+#include <ocl/cl_image_handler.h>
+#include <base/xcam_3a_result.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cl_yuv_pipe_handler.h b/modules/ocl/cl_yuv_pipe_handler.h
index eb97574..9f0df25 100644
--- a/modules/ocl/cl_yuv_pipe_handler.h
+++ b/modules/ocl/cl_yuv_pipe_handler.h
@@ -22,9 +22,9 @@
 #ifndef XCAM_CL_YUV_PIPE_HANLDER_H
 #define XCAM_CL_YUV_PIPE_HANLDER_H
 
-#include "xcam_utils.h"
-#include "ocl/cl_image_handler.h"
-#include "base/xcam_3a_result.h"
+#include <xcam_std.h>
+#include <ocl/cl_image_handler.h>
+#include <base/xcam_3a_result.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cv_base_class.h b/modules/ocl/cv_base_class.h
index 7fb0520..70641c2 100644
--- a/modules/ocl/cv_base_class.h
+++ b/modules/ocl/cv_base_class.h
@@ -22,21 +22,9 @@
 #ifndef XCAM_CV_BASE_CLASS_H
 #define XCAM_CV_BASE_CLASS_H
 
-#include "cl_utils.h"
-#include <base/xcam_common.h>
-#include <base/xcam_buffer.h>
-#include <dma_video_buffer.h>
-#include <smartptr.h>
-#include "xcam_obj_debug.h"
-#include "image_file_handle.h"
-#include "cv_context.h"
-
-#include <ocl/cl_context.h>
-#include <ocl/cl_device.h>
-#include <ocl/cl_memory.h>
-
-#include <opencv2/opencv.hpp>
-#include <opencv2/core/ocl.hpp>
+#include <xcam_std.h>
+#include <video_buffer.h>
+#include <ocl/cv_context.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cv_context.cpp b/modules/ocl/cv_context.cpp
index 79d8ab7..babf5ef 100644
--- a/modules/ocl/cv_context.cpp
+++ b/modules/ocl/cv_context.cpp
@@ -20,6 +20,8 @@
  */
 
 #include "cv_context.h"
+#include "cl_device.h"
+#include "cl_memory.h"
 
 namespace XCam {
 
diff --git a/modules/ocl/cv_context.h b/modules/ocl/cv_context.h
index 613eead..17363be 100644
--- a/modules/ocl/cv_context.h
+++ b/modules/ocl/cv_context.h
@@ -19,21 +19,13 @@
  * Author: Wind Yuan <feng.yuan@intel.com>
  */
 
-#ifndef XCAM_CV_CONTEXT
-#define XCAM_CV_CONTEXT
-
-#include "cl_utils.h"
-#include <base/xcam_common.h>
-#include <base/xcam_buffer.h>
-#include <dma_video_buffer.h>
-#include <smartptr.h>
-#include "xcam_obj_debug.h"
-#include "image_file_handle.h"
-#include "xcam_mutex.h"
+#ifndef XCAM_CV_CONTEXT_H
+#define XCAM_CV_CONTEXT_H
 
+#include <xcam_std.h>
+#include <xcam_obj_debug.h>
+#include <xcam_mutex.h>
 #include <ocl/cl_context.h>
-#include <ocl/cl_device.h>
-#include <ocl/cl_memory.h>
 
 #include <opencv2/opencv.hpp>
 #include <opencv2/core/ocl.hpp>
@@ -67,4 +59,4 @@ private:
 
 }
 
-#endif // XCAM_CV_CONTEXT
+#endif // XCAM_CV_CONTEXT_H
diff --git a/modules/ocl/cv_edgetaper.h b/modules/ocl/cv_edgetaper.h
index 17fd116..9c00fc7 100644
--- a/modules/ocl/cv_edgetaper.h
+++ b/modules/ocl/cv_edgetaper.h
@@ -22,18 +22,8 @@
 #ifndef XCAM_CV_EDGETAPER_H
 #define XCAM_CV_EDGETAPER_H
 
-#include "xcam_utils.h"
-#include <base/xcam_common.h>
-#include <base/xcam_buffer.h>
-#include <dma_video_buffer.h>
-#include <smartptr.h>
-#include "xcam_obj_debug.h"
-#include "image_file_handle.h"
-#include "cv_base_class.h"
-
-#include <ocl/cl_context.h>
-#include <ocl/cl_device.h>
-#include <ocl/cl_memory.h>
+#include <xcam_std.h>
+#include <ocl/cv_base_class.h>
 
 #include <opencv2/opencv.hpp>
 #include <opencv2/core/ocl.hpp>
diff --git a/modules/ocl/cv_feature_match.cpp b/modules/ocl/cv_feature_match.cpp
index 0ec8c8a..fb5e081 100644
--- a/modules/ocl/cv_feature_match.cpp
+++ b/modules/ocl/cv_feature_match.cpp
@@ -20,6 +20,9 @@
  */
 
 #include "cv_feature_match.h"
+#include "xcam_obj_debug.h"
+#include "image_file_handle.h"
+#include "cl_utils.h"
 
 namespace XCam {
 
diff --git a/modules/ocl/cv_feature_match.h b/modules/ocl/cv_feature_match.h
index fed5577..02b038d 100644
--- a/modules/ocl/cv_feature_match.h
+++ b/modules/ocl/cv_feature_match.h
@@ -22,23 +22,16 @@
 #ifndef XCAM_CV_FEATURE_MATCH_H
 #define XCAM_CV_FEATURE_MATCH_H
 
-#include <base/xcam_common.h>
-#include <base/xcam_buffer.h>
-#include <dma_video_buffer.h>
-#include <smartptr.h>
-#include "xcam_obj_debug.h"
-#include "image_file_handle.h"
-#include "ocl/cv_base_class.h"
-#include "interface/feature_match.h"
-#include "interface/data_types.h"
+#include <xcam_std.h>
+#include <video_buffer.h>
+#include <ocl/cv_base_class.h>
+#include <interface/feature_match.h>
+#include <interface/data_types.h>
 
 #include <ocl/cl_context.h>
 #include <ocl/cl_device.h>
 #include <ocl/cl_memory.h>
 
-#include <opencv2/opencv.hpp>
-#include <opencv2/core/ocl.hpp>
-
 namespace XCam {
 
 class CVFeatureMatch
diff --git a/modules/ocl/cv_image_deblurring.h b/modules/ocl/cv_image_deblurring.h
index 03348a4..f46de35 100644
--- a/modules/ocl/cv_image_deblurring.h
+++ b/modules/ocl/cv_image_deblurring.h
@@ -22,25 +22,13 @@
 #ifndef XCAM_CV_FEATURE_DEBLURRING_H
 #define XCAM_CV_FEATURE_DEBLURRING_H
 
-#include "xcam_utils.h"
-#include <base/xcam_common.h>
-#include <base/xcam_buffer.h>
-#include <dma_video_buffer.h>
-#include <smartptr.h>
-#include "xcam_obj_debug.h"
-#include "image_file_handle.h"
-#include "cv_base_class.h"
-#include "cv_image_process_helper.h"
-#include "cv_image_sharp.h"
-#include "cv_edgetaper.h"
-#include "cv_wiener_filter.h"
-
-#include <ocl/cl_context.h>
-#include <ocl/cl_device.h>
-#include <ocl/cl_memory.h>
-
-#include <opencv2/opencv.hpp>
-#include <opencv2/core/ocl.hpp>
+#include <xcam_std.h>
+#include <video_buffer.h>
+#include <ocl/cv_base_class.h>
+#include <ocl/cv_image_process_helper.h>
+#include <ocl/cv_image_sharp.h>
+#include <ocl/cv_edgetaper.h>
+#include <ocl/cv_wiener_filter.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cv_image_process_helper.h b/modules/ocl/cv_image_process_helper.h
index f95fb33..d1dbb72 100644
--- a/modules/ocl/cv_image_process_helper.h
+++ b/modules/ocl/cv_image_process_helper.h
@@ -22,21 +22,9 @@
 #ifndef XCAM_CV_IMAGE_PROCESS_HELPER_H
 #define XCAM_CV_IMAGE_PROCESS_HELPER_H
 
-#include "xcam_utils.h"
-#include <base/xcam_common.h>
-#include <base/xcam_buffer.h>
-#include <dma_video_buffer.h>
-#include <smartptr.h>
-#include "xcam_obj_debug.h"
-#include "image_file_handle.h"
-#include "cv_base_class.h"
-
-#include <ocl/cl_context.h>
-#include <ocl/cl_device.h>
-#include <ocl/cl_memory.h>
-
-#include <opencv2/opencv.hpp>
-#include <opencv2/core/ocl.hpp>
+#include <xcam_std.h>
+#include <video_buffer.h>
+#include <ocl/cv_base_class.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cv_image_sharp.h b/modules/ocl/cv_image_sharp.h
index a296c0c..74e0ce4 100644
--- a/modules/ocl/cv_image_sharp.h
+++ b/modules/ocl/cv_image_sharp.h
@@ -22,22 +22,9 @@
 #ifndef XCAM_CV_IMAGE_SHARP_H
 #define XCAM_CV_IMAGE_SHARP_H
 
-#include "xcam_utils.h"
-#include <base/xcam_common.h>
-#include <base/xcam_buffer.h>
-#include <dma_video_buffer.h>
-#include <smartptr.h>
-#include "xcam_obj_debug.h"
-#include "image_file_handle.h"
-#include "cv_base_class.h"
-#include "cv_image_process_helper.h"
-
-#include <ocl/cl_context.h>
-#include <ocl/cl_device.h>
-#include <ocl/cl_memory.h>
-
-#include <opencv2/opencv.hpp>
-#include <opencv2/core/ocl.hpp>
+#include <xcam_std.h>
+#include <video_buffer.h>
+#include <ocl/cv_base_class.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/cv_wiener_filter.h b/modules/ocl/cv_wiener_filter.h
index c12ed93..fa70812 100644
--- a/modules/ocl/cv_wiener_filter.h
+++ b/modules/ocl/cv_wiener_filter.h
@@ -22,22 +22,10 @@
 #ifndef XCAM_CV_WIENER_FILTER_H
 #define XCAM_CV_WIENER_FILTER_H
 
-#include "xcam_utils.h"
-#include <base/xcam_common.h>
-#include <base/xcam_buffer.h>
-#include <dma_video_buffer.h>
-#include <smartptr.h>
-#include "xcam_obj_debug.h"
-#include "image_file_handle.h"
-#include "cv_base_class.h"
-#include "cv_image_process_helper.h"
-
-#include <ocl/cl_context.h>
-#include <ocl/cl_device.h>
-#include <ocl/cl_memory.h>
-
-#include <opencv2/opencv.hpp>
-#include <opencv2/core/ocl.hpp>
+#include <xcam_std.h>
+#include <video_buffer.h>
+#include <ocl/cv_base_class.h>
+#include <ocl/cv_image_process_helper.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/obsolete/cl_3a_stats_calculator.cpp b/modules/ocl/obsolete/cl_3a_stats_calculator.cpp
index ff1bfac..5454f4d 100644
--- a/modules/ocl/obsolete/cl_3a_stats_calculator.cpp
+++ b/modules/ocl/obsolete/cl_3a_stats_calculator.cpp
@@ -18,7 +18,7 @@
  * Author: Wind Yuan <feng.yuan@intel.com>
  */
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "cl_3a_stats_calculator.h"
 
 namespace XCam {
diff --git a/modules/ocl/obsolete/cl_3a_stats_calculator.h b/modules/ocl/obsolete/cl_3a_stats_calculator.h
index e52da21..0755fd3 100644
--- a/modules/ocl/obsolete/cl_3a_stats_calculator.h
+++ b/modules/ocl/obsolete/cl_3a_stats_calculator.h
@@ -21,12 +21,12 @@
 #ifndef XCAM_CL_3A_CALCULATOR_H
 #define XCAM_CL_3A_CALCULATOR_H
 
-#include "xcam_utils.h"
-#include "x3a_stats_pool.h"
-#include "stats_callback_interface.h"
-#include "ocl/cl_image_handler.h"
-#include "ocl/cl_memory.h"
-#include "ocl/cl_3a_stats_context.h"
+#include <xcam_std.h>
+#include <x3a_stats_pool.h>
+#include <stats_callback_interface.h>
+#include <ocl/cl_image_handler.h>
+#include <ocl/cl_memory.h>
+#include <ocl/cl_3a_stats_context.h>
 
 namespace XCam {
 
diff --git a/modules/ocl/obsolete/cl_bilateral_handler.cpp b/modules/ocl/obsolete/cl_bilateral_handler.cpp
index 700ae19..bb64432 100644
--- a/modules/ocl/obsolete/cl_bilateral_handler.cpp
+++ b/modules/ocl/obsolete/cl_bilateral_handler.cpp
@@ -19,7 +19,7 @@
  *             Wind Yuan <feng.yuan@intel.com>
  */
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "cl_bilateral_handler.h"
 
 namespace XCam {
diff --git a/modules/ocl/obsolete/cl_bilateral_handler.h b/modules/ocl/obsolete/cl_bilateral_handler.h
index a73b151..7034391 100644
--- a/modules/ocl/obsolete/cl_bilateral_handler.h
+++ b/modules/ocl/obsolete/cl_bilateral_handler.h
@@ -21,7 +21,7 @@
 #ifndef XCAM_CL_BILATERAL_HANLDER_H
 #define XCAM_CL_BILATERAL_HANLDER_H
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "ocl/cl_image_handler.h"
 
 namespace XCam {
diff --git a/modules/ocl/obsolete/cl_demosaic_handler.cpp b/modules/ocl/obsolete/cl_demosaic_handler.cpp
index 4dfda2c..bed7404 100644
--- a/modules/ocl/obsolete/cl_demosaic_handler.cpp
+++ b/modules/ocl/obsolete/cl_demosaic_handler.cpp
@@ -17,7 +17,7 @@
  *
  * Author: Wind Yuan <feng.yuan@intel.com>
  */
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "cl_demosaic_handler.h"
 
 namespace XCam {
diff --git a/modules/ocl/obsolete/cl_demosaic_handler.h b/modules/ocl/obsolete/cl_demosaic_handler.h
index 617353e..34cc2fa 100644
--- a/modules/ocl/obsolete/cl_demosaic_handler.h
+++ b/modules/ocl/obsolete/cl_demosaic_handler.h
@@ -21,7 +21,7 @@
 #ifndef XCAM_CL_DEMOSAIC_HANLDER_H
 #define XCAM_CL_DEMOSAIC_HANLDER_H
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "ocl/cl_image_handler.h"
 
 namespace XCam {
diff --git a/modules/ocl/obsolete/cl_dpc_handler.cpp b/modules/ocl/obsolete/cl_dpc_handler.cpp
index 9b943f5..665fb60 100644
--- a/modules/ocl/obsolete/cl_dpc_handler.cpp
+++ b/modules/ocl/obsolete/cl_dpc_handler.cpp
@@ -17,7 +17,7 @@
  *
  * Author: Shincy Tu <shincy.tu@intel.com>
  */
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "cl_dpc_handler.h"
 
 namespace XCam {
diff --git a/modules/ocl/obsolete/cl_dpc_handler.h b/modules/ocl/obsolete/cl_dpc_handler.h
index 72d4e37..749a5c3 100644
--- a/modules/ocl/obsolete/cl_dpc_handler.h
+++ b/modules/ocl/obsolete/cl_dpc_handler.h
@@ -21,7 +21,7 @@
 #ifndef XCAM_CL_DPC_HANLDER_H
 #define XCAM_CL_DPC_HANLDER_H
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "ocl/cl_image_handler.h"
 #include "base/xcam_3a_result.h"
 
diff --git a/modules/ocl/obsolete/cl_ee_handler.cpp b/modules/ocl/obsolete/cl_ee_handler.cpp
index d83eb5f..959f4dd 100644
--- a/modules/ocl/obsolete/cl_ee_handler.cpp
+++ b/modules/ocl/obsolete/cl_ee_handler.cpp
@@ -17,7 +17,7 @@
  *
  * Author: wangfei <feix.w.wang@intel.com>
  */
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "cl_ee_handler.h"
 
 namespace XCam {
diff --git a/modules/ocl/obsolete/cl_ee_handler.h b/modules/ocl/obsolete/cl_ee_handler.h
index 91dfc29..47f2899 100644
--- a/modules/ocl/obsolete/cl_ee_handler.h
+++ b/modules/ocl/obsolete/cl_ee_handler.h
@@ -21,7 +21,7 @@
 #ifndef XCAM_CL_EE_HANLDER_H
 #define XCAM_CL_EE_HANLDER_H
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "ocl/cl_image_handler.h"
 #include "base/xcam_3a_result.h"
 
diff --git a/modules/ocl/obsolete/cl_gamma_handler.cpp b/modules/ocl/obsolete/cl_gamma_handler.cpp
index 9a99174..c708f99 100644
--- a/modules/ocl/obsolete/cl_gamma_handler.cpp
+++ b/modules/ocl/obsolete/cl_gamma_handler.cpp
@@ -17,7 +17,7 @@
  *
  * Author: wangfei <feix.w.wang@intel.com>
  */
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "cl_gamma_handler.h"
 
 float default_gamma_table[XCAM_GAMMA_TABLE_SIZE] = {
diff --git a/modules/ocl/obsolete/cl_gamma_handler.h b/modules/ocl/obsolete/cl_gamma_handler.h
index 5acbe2e..86a9d6d 100644
--- a/modules/ocl/obsolete/cl_gamma_handler.h
+++ b/modules/ocl/obsolete/cl_gamma_handler.h
@@ -21,7 +21,7 @@
 #ifndef XCAM_CL_GAMMA_HANLDER_H
 #define XCAM_CL_GAMMA_HANLDER_H
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "ocl/cl_image_handler.h"
 #include "base/xcam_3a_result.h"
 
diff --git a/modules/ocl/priority_buffer_queue.h b/modules/ocl/priority_buffer_queue.h
index 68f11ab..346e6ed 100644
--- a/modules/ocl/priority_buffer_queue.h
+++ b/modules/ocl/priority_buffer_queue.h
@@ -21,9 +21,9 @@
 #ifndef XCAM_PRIORITY_BUFFER_QUEUE_H
 #define XCAM_PRIORITY_BUFFER_QUEUE_H
 
-#include "xcam_utils.h"
-#include "safe_list.h"
-#include "ocl/cl_image_handler.h"
+#include <xcam_std.h>
+#include <safe_list.h>
+#include <ocl/cl_image_handler.h>
 
 namespace XCam {
 
diff --git a/modules/soft/cv_capi_feature_match.cpp b/modules/soft/cv_capi_feature_match.cpp
index 36d841c..b0b31c3 100644
--- a/modules/soft/cv_capi_feature_match.cpp
+++ b/modules/soft/cv_capi_feature_match.cpp
@@ -36,13 +36,13 @@ CVCapiFeatureMatch::get_crop_image (
     VideoBufferInfo info = buffer->get_video_info ();
 
     uint8_t* image_buffer = buffer->map();
-    int offset = info.strides[CLNV12PlaneY] * crop_rect.pos_y + crop_rect.pos_x;
+    int offset = info.strides[NV12PlaneYIdx] * crop_rect.pos_y + crop_rect.pos_x;
 
     crop_image.resize (crop_rect.width * crop_rect.height);
     for (int i = 0; i < crop_rect.height; i++) {
         for (int j = 0; j < crop_rect.width; j++) {
             crop_image[i * crop_rect.width + j] =
-                image_buffer[offset + i * info.strides[CLNV12PlaneY] + j];
+                image_buffer[offset + i * info.strides[NV12PlaneYIdx] + j];
         }
     }
 
diff --git a/modules/soft/cv_capi_feature_match.h b/modules/soft/cv_capi_feature_match.h
index 963fc67..095463f 100644
--- a/modules/soft/cv_capi_feature_match.h
+++ b/modules/soft/cv_capi_feature_match.h
@@ -23,9 +23,9 @@
 #ifndef CV_CAPI_FEATURE_MATCH_H
 #define CV_CAPI_FEATURE_MATCH_H
 
-#include "xcam_utils.h"
-#include "video_buffer.h"
-#include "interface/feature_match.h"
+#include <xcam_std.h>
+#include <video_buffer.h>
+#include <interface/feature_match.h>
 
 #ifdef ANDROID
 #include <cv.h>
diff --git a/modules/soft/soft_blender.cpp b/modules/soft/soft_blender.cpp
index af03aa8..2141f4e 100644
--- a/modules/soft/soft_blender.cpp
+++ b/modules/soft/soft_blender.cpp
@@ -19,6 +19,7 @@
  */
 
 #include "soft_blender.h"
+#include "xcam_utils.h"
 #include "soft_image.h"
 #include "soft_worker.h"
 #include "soft_blender_tasks_priv.h"
@@ -154,10 +155,16 @@ void dump_level_buf (const SmartPtr<VideoBuffer> buf, const char *name, uint32_t
     dump_buf_perfix_path (buf, file_name);
 }
 #else
-static void dump_buf (const SmartPtr<VideoBuffer> buf, ...) { XCAM_UNUSED (buf); }
+static void dump_buf (const SmartPtr<VideoBuffer> buf, ...) {
+    XCAM_UNUSED (buf);
+}
 template <class SoftImageT>
-static void dump_soft (const SmartPtr<SoftImageT> &image, ...) { XCAM_UNUSED (image); }
-static void dump_level_buf (const SmartPtr<VideoBuffer> buf, ...) { XCAM_UNUSED (buf); }
+static void dump_soft (const SmartPtr<SoftImageT> &image, ...) {
+    XCAM_UNUSED (image);
+}
+static void dump_level_buf (const SmartPtr<VideoBuffer> buf, ...) {
+    XCAM_UNUSED (buf);
+}
 #endif
 
 SoftBlender::SoftBlender (const char *name)
diff --git a/modules/soft/soft_blender.h b/modules/soft/soft_blender.h
index 7fdbf70..b83511b 100644
--- a/modules/soft/soft_blender.h
+++ b/modules/soft/soft_blender.h
@@ -21,9 +21,9 @@
 #ifndef XCAM_SOFT_BLENDER_H
 #define XCAM_SOFT_BLENDER_H
 
-#include "xcam_utils.h"
-#include "interface/blender.h"
-#include "soft/soft_handler.h"
+#include <xcam_std.h>
+#include <interface/blender.h>
+#include <soft/soft_handler.h>
 
 #define XCAM_SOFT_PYRAMID_MAX_LEVEL 4
 #define XCAM_SOFT_PYRAMID_DEFAULT_LEVEL 3
diff --git a/modules/soft/soft_blender_tasks_priv.cpp b/modules/soft/soft_blender_tasks_priv.cpp
index 6884a73..76a3676 100644
--- a/modules/soft/soft_blender_tasks_priv.cpp
+++ b/modules/soft/soft_blender_tasks_priv.cpp
@@ -18,7 +18,6 @@
  * Author: Wind Yuan <feng.yuan@intel.com>
  */
 
-#include "xcam_utils.h"
 #include "soft_blender_tasks_priv.h"
 
 namespace XCam {
diff --git a/modules/soft/soft_blender_tasks_priv.h b/modules/soft/soft_blender_tasks_priv.h
index 3c41588..a2f2ed8 100644
--- a/modules/soft/soft_blender_tasks_priv.h
+++ b/modules/soft/soft_blender_tasks_priv.h
@@ -21,10 +21,10 @@
 #ifndef XCAM_SOFT_BLENDER_TASKS_PRIV_H
 #define XCAM_SOFT_BLENDER_TASKS_PRIV_H
 
-#include "xcam_utils.h"
-#include "soft/soft_worker.h"
-#include "soft/soft_image.h"
-#include "soft/soft_blender.h"
+#include <xcam_std.h>
+#include <soft/soft_worker.h>
+#include <soft/soft_image.h>
+#include <soft/soft_blender.h>
 
 #define SOFT_BLENDER_ALIGNMENT_X 8
 #define SOFT_BLENDER_ALIGNMENT_Y 4
diff --git a/modules/soft/soft_copy_task.h b/modules/soft/soft_copy_task.h
index d6ccc4e..d02ad47 100644
--- a/modules/soft/soft_copy_task.h
+++ b/modules/soft/soft_copy_task.h
@@ -21,11 +21,11 @@
 #ifndef XCAM_SOFT_COPY_TASK_H
 #define XCAM_SOFT_COPY_TASK_H
 
-#include "xcam_utils.h"
-#include "soft/soft_worker.h"
-#include "soft/soft_handler.h"
-#include "soft/soft_image.h"
-#include "interface/stitcher.h"
+#include <xcam_std.h>
+#include <soft/soft_worker.h>
+#include <soft/soft_handler.h>
+#include <soft/soft_image.h>
+#include <interface/stitcher.h>
 
 namespace XCam {
 
diff --git a/modules/soft/soft_geo_mapper.h b/modules/soft/soft_geo_mapper.h
index 6d94c9b..c0370d3 100644
--- a/modules/soft/soft_geo_mapper.h
+++ b/modules/soft/soft_geo_mapper.h
@@ -21,10 +21,10 @@
 #ifndef XCAM_SOFT_GEO_MAP_H
 #define XCAM_SOFT_GEO_MAP_H
 
-#include "xcam_utils.h"
-#include "interface/geo_mapper.h"
-#include "soft/soft_handler.h"
-#include "soft/soft_image.h"
+#include <xcam_std.h>
+#include <interface/geo_mapper.h>
+#include <soft/soft_handler.h>
+#include <soft/soft_image.h>
 
 namespace XCam {
 
diff --git a/modules/soft/soft_handler.h b/modules/soft/soft_handler.h
index 33990ce..e2041bf 100644
--- a/modules/soft/soft_handler.h
+++ b/modules/soft/soft_handler.h
@@ -21,10 +21,10 @@
 #ifndef XCAM_SOFT_HANDLER_H
 #define XCAM_SOFT_HANDLER_H
 
-#include "xcam_utils.h"
-#include "image_handler.h"
-#include "video_buffer.h"
-#include "worker.h"
+#include <xcam_std.h>
+#include <image_handler.h>
+#include <video_buffer.h>
+#include <worker.h>
 
 namespace XCam {
 
diff --git a/modules/soft/soft_image.h b/modules/soft/soft_image.h
index c939acb..4cbe4d9 100644
--- a/modules/soft/soft_image.h
+++ b/modules/soft/soft_image.h
@@ -21,10 +21,10 @@
 #ifndef XCAM_SOFT_IMAGE_H
 #define XCAM_SOFT_IMAGE_H
 
-#include "xcam_utils.h"
-#include "video_buffer.h"
-#include "vec_mat.h"
-#include "file_handle.h"
+#include <xcam_std.h>
+#include <video_buffer.h>
+#include <vec_mat.h>
+#include <file_handle.h>
 
 namespace XCam {
 
diff --git a/modules/soft/soft_stitcher.cpp b/modules/soft/soft_stitcher.cpp
index 5b17970..85f8cea 100644
--- a/modules/soft/soft_stitcher.cpp
+++ b/modules/soft/soft_stitcher.cpp
@@ -25,6 +25,7 @@
 #include "interface/feature_match.h"
 #include "surview_fisheye_dewarp.h"
 #include "soft_copy_task.h"
+#include "xcam_utils.h"
 #include <map>
 
 #define ENABLE_FEATURE_MATCH HAVE_OPENCV
diff --git a/modules/soft/soft_stitcher.h b/modules/soft/soft_stitcher.h
index 43259e6..693b7b6 100644
--- a/modules/soft/soft_stitcher.h
+++ b/modules/soft/soft_stitcher.h
@@ -21,9 +21,9 @@
 #ifndef XCAM_SOFT_STITCHER_H
 #define XCAM_SOFT_STITCHER_H
 
-#include "xcam_utils.h"
-#include "interface/stitcher.h"
-#include "soft_handler.h"
+#include <xcam_std.h>
+#include <interface/stitcher.h>
+#include <soft_handler.h>
 
 namespace XCam {
 
diff --git a/modules/soft/soft_video_buf_allocator.h b/modules/soft/soft_video_buf_allocator.h
index 54867f9..ecf0d4a 100644
--- a/modules/soft/soft_video_buf_allocator.h
+++ b/modules/soft/soft_video_buf_allocator.h
@@ -21,8 +21,8 @@
 #ifndef XCAM_SOFT_VIDEO_BUF_ALLOCATOR_H
 #define XCAM_SOFT_VIDEO_BUF_ALLOCATOR_H
 
-#include "xcam_utils.h"
-#include "buffer_pool.h"
+#include <xcam_std.h>
+#include <buffer_pool.h>
 
 namespace XCam {
 
diff --git a/modules/soft/soft_worker.h b/modules/soft/soft_worker.h
index 365d959..a851893 100644
--- a/modules/soft/soft_worker.h
+++ b/modules/soft/soft_worker.h
@@ -21,8 +21,8 @@
 #ifndef XCAM_SOFT_WORKER_H
 #define XCAM_SOFT_WORKER_H
 
-#include "xcam_utils.h"
-#include "worker.h"
+#include <xcam_std.h>
+#include <worker.h>
 
 #define SOFT_MAX_DIM 3
 
diff --git a/plugins/3a/aiq/aiq_wrapper.cpp b/plugins/3a/aiq/aiq_wrapper.cpp
index e430ccb..e6feb20 100644
--- a/plugins/3a/aiq/aiq_wrapper.cpp
+++ b/plugins/3a/aiq/aiq_wrapper.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <base/xcam_3a_description.h>
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "x3a_analyzer_aiq.h"
 #include "x3a_statistics_queue.h"
 #include "aiq3a_utils.h"
diff --git a/plugins/3a/hybrid/sample.cpp b/plugins/3a/hybrid/sample.cpp
index 431ec2f..2c45269 100644
--- a/plugins/3a/hybrid/sample.cpp
+++ b/plugins/3a/hybrid/sample.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <base/xcam_3a_description.h>
-#include "xcam_utils.h"
+#include <xcam_std.h>
 
 using namespace XCam;
 
diff --git a/plugins/smart/sample/sample_smart_analysis.cpp b/plugins/smart/sample/sample_smart_analysis.cpp
index c4ea459..a144946 100644
--- a/plugins/smart/sample/sample_smart_analysis.cpp
+++ b/plugins/smart/sample/sample_smart_analysis.cpp
@@ -20,7 +20,7 @@
 
 #include <base/xcam_smart_description.h>
 #include <base/xcam_buffer.h>
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "aiq3a_utils.h"
 #include "x3a_result_factory.h"
 #include "smart_analyzer.h"
diff --git a/tests/test-cl-image.cpp b/tests/test-cl-image.cpp
index 727a8b5..19000b5 100644
--- a/tests/test-cl-image.cpp
+++ b/tests/test-cl-image.cpp
@@ -38,6 +38,7 @@
 #include "ocl/cl_3d_denoise_handler.h"
 #include "ocl/cl_image_warp_handler.h"
 #include "ocl/cl_fisheye_handler.h"
+#include "ocl/cl_utils.h"
 
 using namespace XCam;
 
diff --git a/tests/test-image-blend.cpp b/tests/test-image-blend.cpp
index cf69080..a00236f 100644
--- a/tests/test-image-blend.cpp
+++ b/tests/test-image-blend.cpp
@@ -22,15 +22,15 @@
 #include "test_inline.h"
 #include <unistd.h>
 #include <getopt.h>
-#include "ocl/cl_device.h"
-#include "ocl/cl_context.h"
-#include "ocl/cl_blender.h"
-#include "image_file_handle.h"
-#include "ocl/cl_geo_map_handler.h"
+#include <ocl/cl_device.h>
+#include <ocl/cl_context.h>
+#include <ocl/cl_blender.h>
+#include <image_file_handle.h>
+#include <ocl/cl_geo_map_handler.h>
 #if HAVE_LIBDRM
-#include "drm_display.h"
+#include <drm_display.h>
 #endif
-#include "dma_video_buffer.h"
+#include <dma_video_buffer.h>
 
 using namespace XCam;
 
diff --git a/tests/test-image-deblurring.cpp b/tests/test-image-deblurring.cpp
index 466bbfd..d71a448 100644
--- a/tests/test-image-deblurring.cpp
+++ b/tests/test-image-deblurring.cpp
@@ -23,11 +23,11 @@
 #include "test_inline.h"
 #include <unistd.h>
 #include <getopt.h>
-#include "ocl/cl_device.h"
-#include "ocl/cl_context.h"
-#include "ocl/cl_blender.h"
-#include "image_file_handle.h"
-#include "ocl/cv_image_deblurring.h"
+#include <image_file_handle.h>
+#include <ocl/cl_device.h>
+#include <ocl/cl_context.h>
+#include <ocl/cl_blender.h>
+#include <ocl/cv_image_deblurring.h>
 #include <opencv2/opencv.hpp>
 #include <opencv2/core/ocl.hpp>
 
diff --git a/tests/test-image-stitching.cpp b/tests/test-image-stitching.cpp
index d1d4ffd..485b23b 100644
--- a/tests/test-image-stitching.cpp
+++ b/tests/test-image-stitching.cpp
@@ -23,11 +23,16 @@
 #include "test_inline.h"
 #include <unistd.h>
 #include <getopt.h>
-#include "ocl/cl_device.h"
-#include "ocl/cl_context.h"
-#include "image_file_handle.h"
-#include "ocl/cl_fisheye_handler.h"
-#include "ocl/cl_image_360_stitch.h"
+#include <image_file_handle.h>
+#include <calibration_parser.h>
+#include <ocl/cl_device.h>
+#include <ocl/cl_context.h>
+#include <ocl/cl_fisheye_handler.h>
+#include <ocl/cl_image_360_stitch.h>
+#include <ocl/cl_utils.h>
+#if HAVE_OPENCV
+#include <ocl/cv_base_class.h>
+#endif
 
 #define XCAM_TEST_STITCH_DEBUG 0
 #define XCAM_ALIGNED_WIDTH 16
diff --git a/tests/test-pipe-manager.cpp b/tests/test-pipe-manager.cpp
index 83c2cc8..280bfdc 100644
--- a/tests/test-pipe-manager.cpp
+++ b/tests/test-pipe-manager.cpp
@@ -18,14 +18,14 @@
   * Author: Yinhang Liu <yinhangx.liu@intel.com>
   */
 
-#include "pipe_manager.h"
-#include "smart_analyzer_loader.h"
-#include "ocl/cl_post_image_processor.h"
+#include <pipe_manager.h>
+#include <smart_analyzer_loader.h>
+#include <ocl/cl_post_image_processor.h>
 #if HAVE_LIBDRM
-#include "drm_display.h"
+#include <drm_display.h>
 #endif
 #include <getopt.h>
-#include "test_common.h"
+#include <test_common.h>
 #include <signal.h>
 #include <stdio.h>
 
@@ -426,7 +426,7 @@ int main (int argc, char *argv[])
     if (need_display) {
         need_display = false;
         XCAM_LOG_WARNING ("CLVideoBuffer doesn't support local preview, disable local preview now");
-    }   
+    }
 
     if (need_display) {
 #if HAVE_LIBDRM
@@ -441,7 +441,7 @@ int main (int argc, char *argv[])
         XCAM_LOG_WARNING ("preview is not supported, disable preview now");
         need_display = false;
 #endif
-    }   
+    }
     pipe_manager->enable_display (need_display);
 
     ret = pipe_manager->start ();
diff --git a/tests/test-soft-image.cpp b/tests/test-soft-image.cpp
index 16e9e1b..4bb17c6 100644
--- a/tests/test-soft-image.cpp
+++ b/tests/test-soft-image.cpp
@@ -20,15 +20,14 @@
 
 #include "test_common.h"
 #include "test_inline.h"
-#include "buffer_pool.h"
-#include "image_handler.h"
-#include "image_file_handle.h"
-#include "soft/soft_video_buf_allocator.h"
-#include "interface/blender.h"
-#include "interface/geo_mapper.h"
-#include "interface/stitcher.h"
-#include "calibration_parser.h"
-
+#include <buffer_pool.h>
+#include <image_handler.h>
+#include <image_file_handle.h>
+#include <soft/soft_video_buf_allocator.h>
+#include <interface/blender.h>
+#include <interface/geo_mapper.h>
+#include <interface/stitcher.h>
+#include <calibration_parser.h>
 #include <string>
 
 #define RUN_N(statement, loop, msg, ...) \
diff --git a/tests/test-video-stabilization.cpp b/tests/test-video-stabilization.cpp
index c4304da..5280467 100644
--- a/tests/test-video-stabilization.cpp
+++ b/tests/test-video-stabilization.cpp
@@ -22,18 +22,18 @@
 #include "test_inline.h"
 #include <unistd.h>
 #include <getopt.h>
-#include "ocl/cl_utils.h"
-#include "ocl/cl_device.h"
-#include "ocl/cl_context.h"
-#include "ocl/cl_blender.h"
-#include "image_file_handle.h"
-#include "ocl/cl_video_stabilizer.h"
-#include "dma_video_buffer.h"
+#include <ocl/cl_utils.h>
+#include <ocl/cl_device.h>
+#include <ocl/cl_context.h>
+#include <ocl/cl_blender.h>
+#include <image_file_handle.h>
+#include <ocl/cl_video_stabilizer.h>
+#include <dma_video_buffer.h>
 
 #if HAVE_OPENCV
 #include <opencv2/opencv.hpp>
 #include <opencv2/core/ocl.hpp>
-#include "ocl/cv_base_class.h"
+#include <ocl/cv_base_class.h>
 #endif
 
 using namespace XCam;
diff --git a/tests/test_inline.h b/tests/test_inline.h
index 2d3201e..de8a064 100644
--- a/tests/test_inline.h
+++ b/tests/test_inline.h
@@ -22,7 +22,7 @@
 #ifndef XCAM_TEST_INLINE_H
 #define XCAM_TEST_INLINE_H
 
-#include "video_buffer.h"
+#include <video_buffer.h>
 
 using namespace XCam;
 
diff --git a/xcore/Makefile.am b/xcore/Makefile.am
index 0c54709..bcadd7c 100644
--- a/xcore/Makefile.am
+++ b/xcore/Makefile.am
@@ -124,6 +124,7 @@ nobase_libxcam_coreinclude_HEADERS = \
     x3a_result.h                   \
     xcam_mutex.h                   \
     xcam_thread.h                  \
+    xcam_std.h                     \
     xcam_utils.h                   \
     xcam_obj_debug.h               \
     buffer_pool.h                  \
diff --git a/xcore/base/xcam_common.h b/xcore/base/xcam_common.h
index 474f0bb..46cc6fd 100644
--- a/xcore/base/xcam_common.h
+++ b/xcore/base/xcam_common.h
@@ -63,6 +63,7 @@ typedef enum {
 
 #define xcam_mem_clear(v_stack) memset(&(v_stack), 0, sizeof(v_stack))
 
+uint32_t xcam_version ();
 void * xcam_malloc (size_t size);
 void * xcam_malloc0 (size_t size);
 
diff --git a/xcore/buffer_pool.cpp b/xcore/buffer_pool.cpp
index 6d5fad7..ce57363 100644
--- a/xcore/buffer_pool.cpp
+++ b/xcore/buffer_pool.cpp
@@ -18,7 +18,6 @@
  * Author: Wind Yuan <feng.yuan@intel.com>
  */
 
-#include "xcam_utils.h"
 #include "buffer_pool.h"
 
 namespace XCam {
diff --git a/xcore/buffer_pool.h b/xcore/buffer_pool.h
index 7fef410..899cbf0 100644
--- a/xcore/buffer_pool.h
+++ b/xcore/buffer_pool.h
@@ -21,10 +21,9 @@
 #ifndef XCAM_BUFFER_POOL_H
 #define XCAM_BUFFER_POOL_H
 
-#include "xcam_utils.h"
-#include "smartptr.h"
-#include "safe_list.h"
-#include "video_buffer.h"
+#include <xcam_std.h>
+#include <safe_list.h>
+#include <video_buffer.h>
 
 namespace XCam {
 
diff --git a/xcore/device_manager.h b/xcore/device_manager.h
index d47bb0d..6835873 100644
--- a/xcore/device_manager.h
+++ b/xcore/device_manager.h
@@ -21,16 +21,15 @@
 #ifndef XCAM_DEVICE_MANAGER_H
 #define XCAM_DEVICE_MANAGER_H
 
-#include "xcam_utils.h"
-#include "smartptr.h"
-#include "v4l2_device.h"
-#include "v4l2_buffer_proxy.h"
-#include "x3a_analyzer.h"
-#include "smart_analyzer.h"
-#include "x3a_image_process_center.h"
-#include "image_processor.h"
-#include "poll_thread.h"
-#include "stats_callback_interface.h"
+#include <xcam_std.h>
+#include <v4l2_device.h>
+#include <v4l2_buffer_proxy.h>
+#include <x3a_analyzer.h>
+#include <smart_analyzer.h>
+#include <x3a_image_process_center.h>
+#include <image_processor.h>
+#include <poll_thread.h>
+#include <stats_callback_interface.h>
 
 namespace XCam {
 
diff --git a/xcore/dma_video_buffer.cpp b/xcore/dma_video_buffer.cpp
index 7a62a55..73abe73 100644
--- a/xcore/dma_video_buffer.cpp
+++ b/xcore/dma_video_buffer.cpp
@@ -18,7 +18,6 @@
  * Author: Wind Yuan <feng.yuan@intel.com>
  */
 
-#include "xcam_utils.h"
 #include "dma_video_buffer.h"
 
 namespace XCam {
diff --git a/xcore/dma_video_buffer.h b/xcore/dma_video_buffer.h
index f6edc21..a0d9f96 100644
--- a/xcore/dma_video_buffer.h
+++ b/xcore/dma_video_buffer.h
@@ -20,8 +20,8 @@
 #ifndef XCAM_DMA_VIDEO_BUFFER_H
 #define XCAM_DMA_VIDEO_BUFFER_H
 
-#include "xcam_utils.h"
-#include "video_buffer.h"
+#include <xcam_std.h>
+#include <video_buffer.h>
 #include <unistd.h>
 
 namespace XCam {
diff --git a/xcore/drm_bo_buffer.h b/xcore/drm_bo_buffer.h
index ad1c340..fa661d3 100644
--- a/xcore/drm_bo_buffer.h
+++ b/xcore/drm_bo_buffer.h
@@ -20,13 +20,12 @@
 #ifndef XCAM_DRM_BO_BUFFER_H
 #define XCAM_DRM_BO_BUFFER_H
 
-#include "xcam_utils.h"
-#include "smartptr.h"
-#include "safe_list.h"
-#include "xcam_mutex.h"
-#include "buffer_pool.h"
-#include "drm_display.h"
-#include "swapped_buffer.h"
+#include <xcam_std.h>
+#include <safe_list.h>
+#include <xcam_mutex.h>
+#include <buffer_pool.h>
+#include <drm_display.h>
+#include <swapped_buffer.h>
 
 namespace XCam {
 
diff --git a/xcore/drm_display.h b/xcore/drm_display.h
index 9cb3e9b..17705b7 100644
--- a/xcore/drm_display.h
+++ b/xcore/drm_display.h
@@ -21,10 +21,9 @@
 #ifndef XCAM_DRM_DISPLAY_H
 #define XCAM_DRM_DISPLAY_H
 
-#include "xcam_utils.h"
-#include "smartptr.h"
-#include "xcam_mutex.h"
-#include "v4l2_buffer_proxy.h"
+#include <xcam_std.h>
+#include <xcam_mutex.h>
+#include <v4l2_buffer_proxy.h>
 
 extern "C" {
 #include <drm.h>
diff --git a/xcore/drm_v4l2_buffer.h b/xcore/drm_v4l2_buffer.h
index 315823d..15021cf 100644
--- a/xcore/drm_v4l2_buffer.h
+++ b/xcore/drm_v4l2_buffer.h
@@ -22,9 +22,9 @@
 #ifndef XCAM_DRM_V4L2_BUFFER_H
 #define XCAM_DRM_V4L2_BUFFER_H
 
-#include "xcam_utils.h"
-#include "v4l2_buffer_proxy.h"
-#include "drm_display.h"
+#include <xcam_std.h>
+#include <v4l2_buffer_proxy.h>
+#include <drm_display.h>
 
 namespace XCam {
 
diff --git a/xcore/dynamic_analyzer.h b/xcore/dynamic_analyzer.h
index 1047c62..3835fd3 100644
--- a/xcore/dynamic_analyzer.h
+++ b/xcore/dynamic_analyzer.h
@@ -21,12 +21,13 @@
 #ifndef XCAM_DYNAMIC_ANALYZER_H
 #define XCAM_DYNAMIC_ANALYZER_H
 
+#include <xcam_std.h>
 #include <base/xcam_3a_description.h>
-#include "x3a_analyzer.h"
-#include "x3a_stats_pool.h"
-#include "handler_interface.h"
-#include "x3a_result_factory.h"
-#include "analyzer_loader.h"
+#include <x3a_analyzer.h>
+#include <x3a_stats_pool.h>
+#include <handler_interface.h>
+#include <x3a_result_factory.h>
+#include <analyzer_loader.h>
 
 namespace XCam {
 
diff --git a/xcore/dynamic_analyzer_loader.cpp b/xcore/dynamic_analyzer_loader.cpp
index 14f6c80..ca97ace 100644
--- a/xcore/dynamic_analyzer_loader.cpp
+++ b/xcore/dynamic_analyzer_loader.cpp
@@ -64,9 +64,9 @@ DynamicAnalyzerLoader::load_symbol (void* handle)
         XCAM_LOG_DEBUG ("get symbol failed from lib");
         return NULL;
     }
-    if (desc->version < XCAM_VERSION) {
+    if (desc->version < xcam_version ()) {
         XCAM_LOG_DEBUG ("get symbolfailed. version is:0x%04x, but expect:0x%04x",
-                        desc->version, XCAM_VERSION);
+                        desc->version, xcam_version ());
         return NULL;
     }
     if (desc->size < sizeof (XCam3ADescription)) {
diff --git a/xcore/dynamic_analyzer_loader.h b/xcore/dynamic_analyzer_loader.h
index 988be38..63c8fbb 100644
--- a/xcore/dynamic_analyzer_loader.h
+++ b/xcore/dynamic_analyzer_loader.h
@@ -22,10 +22,9 @@
 #ifndef XCAM_DYNAMIC_ANALYZER_LOADER_H
 #define XCAM_DYNAMIC_ANALYZER_LOADER_H
 
-#include <base/xcam_common.h>
+#include <xcam_std.h>
 #include <base/xcam_3a_description.h>
-#include "analyzer_loader.h"
-#include "smartptr.h"
+#include <analyzer_loader.h>
 
 namespace XCam {
 class X3aAnalyzer;
diff --git a/xcore/fake_poll_thread.h b/xcore/fake_poll_thread.h
index 104c50f..ee40a86 100644
--- a/xcore/fake_poll_thread.h
+++ b/xcore/fake_poll_thread.h
@@ -21,7 +21,8 @@
 #ifndef XCAM_FAKE_POLL_THREAD_H
 #define XCAM_FAKE_POLL_THREAD_H
 
-#include "poll_thread.h"
+#include <xcam_std.h>
+#include <poll_thread.h>
 
 namespace XCam {
 
diff --git a/xcore/fake_v4l2_device.h b/xcore/fake_v4l2_device.h
index 05d5855..f679c19 100644
--- a/xcore/fake_v4l2_device.h
+++ b/xcore/fake_v4l2_device.h
@@ -21,7 +21,7 @@
 #ifndef XCAM_FAKE_V4L2_DEVICE_H
 #define XCAM_FAKE_V4L2_DEVICE_H
 
-#include "v4l2_device.h"
+#include <v4l2_device.h>
 
 namespace XCam {
 
diff --git a/xcore/file_handle.h b/xcore/file_handle.h
index 47c1d66..9435d49 100644
--- a/xcore/file_handle.h
+++ b/xcore/file_handle.h
@@ -22,7 +22,7 @@
 #ifndef XCAM_FILE_HANDLE_H
 #define XCAM_FILE_HANDLE_H
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 
 namespace XCam {
 
diff --git a/xcore/handler_interface.h b/xcore/handler_interface.h
index 68ec770..a2b7865 100644
--- a/xcore/handler_interface.h
+++ b/xcore/handler_interface.h
@@ -25,9 +25,9 @@
 #include <base/xcam_3a_types.h>
 #include <base/xcam_params.h>
 
-#include "xcam_utils.h"
-#include "xcam_mutex.h"
-#include "x3a_result.h"
+#include <xcam_std.h>
+#include <xcam_mutex.h>
+#include <x3a_result.h>
 
 namespace XCam {
 
diff --git a/xcore/image_file_handle.h b/xcore/image_file_handle.h
index a78be1a..444356d 100644
--- a/xcore/image_file_handle.h
+++ b/xcore/image_file_handle.h
@@ -21,9 +21,9 @@
 #ifndef XCAM_IMAGE_FILE_HANDLE_H
 #define XCAM_IMAGE_FILE_HANDLE_H
 
-#include "xcam_utils.h"
-#include "file_handle.h"
-#include "video_buffer.h"
+#include <xcam_std.h>
+#include <file_handle.h>
+#include <video_buffer.h>
 
 namespace XCam {
 
diff --git a/xcore/image_handler.h b/xcore/image_handler.h
index 5254daf..2c3fba8 100644
--- a/xcore/image_handler.h
+++ b/xcore/image_handler.h
@@ -21,10 +21,10 @@
 #ifndef XCAM_IMAGE_HANDLER_H
 #define XCAM_IMAGE_HANDLER_H
 
-#include "xcam_utils.h"
-#include "meta_data.h"
-#include "buffer_pool.h"
-#include "worker.h"
+#include <xcam_std.h>
+#include <meta_data.h>
+#include <buffer_pool.h>
+#include <worker.h>
 
 #define DECLARE_HANDLER_CALLBACK(CbClass, Next, mem_func)                \
     class CbClass : public ::XCam::ImageHandler::Callback {              \
diff --git a/xcore/image_processor.h b/xcore/image_processor.h
index 53f3622..bb7bd4f 100644
--- a/xcore/image_processor.h
+++ b/xcore/image_processor.h
@@ -21,11 +21,10 @@
 #ifndef XCAM_IMAGE_PROCESSOR_H
 #define XCAM_IMAGE_PROCESSOR_H
 
-#include "xcam_utils.h"
-#include "video_buffer.h"
-#include "x3a_result.h"
-#include "smartptr.h"
-#include "safe_list.h"
+#include <xcam_std.h>
+#include <video_buffer.h>
+#include <x3a_result.h>
+#include <safe_list.h>
 
 namespace XCam {
 
diff --git a/xcore/image_projector.h b/xcore/image_projector.h
index fff2b8c..ff1c8bf 100644
--- a/xcore/image_projector.h
+++ b/xcore/image_projector.h
@@ -21,9 +21,9 @@
 #ifndef XCAM_IMAGE_PROJECTIVE_2D_H
 #define XCAM_IMAGE_PROJECTIVE_2D_H
 
-#include "xcam_utils.h"
-#include "meta_data.h"
-#include "vec_mat.h"
+#include <xcam_std.h>
+#include <meta_data.h>
+#include <vec_mat.h>
 #include <vector>
 
 namespace XCam {
diff --git a/xcore/interface/blender.h b/xcore/interface/blender.h
index b4598b9..93b5fbe 100644
--- a/xcore/interface/blender.h
+++ b/xcore/interface/blender.h
@@ -21,9 +21,9 @@
 #ifndef XCAM_INTERFACE_BLENDER_H
 #define XCAM_INTERFACE_BLENDER_H
 
-#include "xcam_utils.h"
-#include "interface/data_types.h"
-#include "video_buffer.h"
+#include <xcam_std.h>
+#include <video_buffer.h>
+#include <interface/data_types.h>
 
 #define XCAM_BLENDER_IMAGE_NUM 2
 
@@ -70,12 +70,10 @@ public:
         return _alignment_y;
     }
 
-#if 1
     virtual XCamReturn blend (
         const SmartPtr<VideoBuffer> &in0,
         const SmartPtr<VideoBuffer> &in1,
         SmartPtr<VideoBuffer> &out_buf);
-#endif
 
 protected:
     bool auto_calc_merge_window (
diff --git a/xcore/interface/data_types.h b/xcore/interface/data_types.h
index 04364ad..c8077da 100644
--- a/xcore/interface/data_types.h
+++ b/xcore/interface/data_types.h
@@ -22,7 +22,7 @@
 #ifndef XCAM_INTERFACE_DATA_TYPES_H
 #define XCAM_INTERFACE_DATA_TYPES_H
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 
 namespace XCam {
 
diff --git a/xcore/interface/feature_match.h b/xcore/interface/feature_match.h
index be1a043..8e05aa4 100644
--- a/xcore/interface/feature_match.h
+++ b/xcore/interface/feature_match.h
@@ -22,14 +22,9 @@
 #ifndef XCAM_FEATURE_MATCH_H
 #define XCAM_FEATURE_MATCH_H
 
-#include <base/xcam_common.h>
-#include <base/xcam_buffer.h>
-#include <smartptr.h>
-#include "xcam_obj_debug.h"
-#include "image_file_handle.h"
-#include "interface/data_types.h"
-
-#include <vector>
+#include <xcam_std.h>
+#include <video_buffer.h>
+#include <interface/data_types.h>
 
 namespace XCam {
 
diff --git a/xcore/interface/geo_mapper.h b/xcore/interface/geo_mapper.h
index d7c5f30..0ddd495 100644
--- a/xcore/interface/geo_mapper.h
+++ b/xcore/interface/geo_mapper.h
@@ -21,9 +21,9 @@
 #ifndef XCAM_INTERFACE_GEO_MAPPER_H
 #define XCAM_INTERFACE_GEO_MAPPER_H
 
-#include "xcam_utils.h"
-#include "interface/data_types.h"
-#include "video_buffer.h"
+#include <xcam_std.h>
+#include <video_buffer.h>
+#include <interface/data_types.h>
 
 namespace XCam {
 
@@ -61,4 +61,4 @@ private:
 };
 
 }
-#endif //XCAM_INTERFACE_GEO_MAPPER_H
\ No newline at end of file
+#endif //XCAM_INTERFACE_GEO_MAPPER_H
diff --git a/xcore/interface/stitcher.h b/xcore/interface/stitcher.h
index 23038de..5960a46 100644
--- a/xcore/interface/stitcher.h
+++ b/xcore/interface/stitcher.h
@@ -22,11 +22,10 @@
 #ifndef XCAM_INTERFACE_STITCHER_H
 #define XCAM_INTERFACE_STITCHER_H
 
-#include "xcam_utils.h"
-#include "interface/data_types.h"
+#include <xcam_std.h>
+#include <interface/data_types.h>
 #include <vector>
-#include "video_buffer.h"
-#include "calibration_parser.h"
+#include <video_buffer.h>
 
 #define XCAM_STITCH_FISHEYE_MAX_NUM    6
 #define XCAM_STITCH_MAX_CAMERAS XCAM_STITCH_FISHEYE_MAX_NUM
diff --git a/xcore/meta_data.h b/xcore/meta_data.h
index 957fa25..2bfd6c4 100644
--- a/xcore/meta_data.h
+++ b/xcore/meta_data.h
@@ -21,8 +21,7 @@
 #ifndef XCAM_META_DATA_H
 #define XCAM_META_DATA_H
 
-#include "xcam_utils.h"
-#include "smartptr.h"
+#include <xcam_std.h>
 #include <list>
 
 namespace XCam {
diff --git a/xcore/pipe_manager.h b/xcore/pipe_manager.h
index fcc5f73..8bba7d3 100644
--- a/xcore/pipe_manager.h
+++ b/xcore/pipe_manager.h
@@ -22,11 +22,10 @@
 #ifndef XCAM_PIPE_MANAGER_H
 #define XCAM_PIPE_MANAGER_H
 
-#include <base/xcam_common.h>
-#include "smartptr.h"
-#include "smart_analyzer.h"
-#include "x3a_image_process_center.h"
-#include "stats_callback_interface.h"
+#include <xcam_std.h>
+#include <smart_analyzer.h>
+#include <x3a_image_process_center.h>
+#include <stats_callback_interface.h>
 
 namespace XCam {
 
diff --git a/xcore/poll_thread.h b/xcore/poll_thread.h
index 656ad18..0cdd34d 100644
--- a/xcore/poll_thread.h
+++ b/xcore/poll_thread.h
@@ -21,13 +21,13 @@
 #ifndef XCAM_POLL_THREAD_H
 #define XCAM_POLL_THREAD_H
 
-#include "xcam_utils.h"
-#include "xcam_mutex.h"
-#include "x3a_event.h"
-#include "v4l2_buffer_proxy.h"
-#include "x3a_stats_pool.h"
-#include "v4l2_device.h"
-#include "stats_callback_interface.h"
+#include <xcam_std.h>
+#include <xcam_mutex.h>
+#include <x3a_event.h>
+#include <v4l2_buffer_proxy.h>
+#include <x3a_stats_pool.h>
+#include <v4l2_device.h>
+#include <stats_callback_interface.h>
 
 namespace XCam {
 
diff --git a/xcore/safe_list.h b/xcore/safe_list.h
index b422c2e..36263e6 100644
--- a/xcore/safe_list.h
+++ b/xcore/safe_list.h
@@ -25,8 +25,7 @@
 #include <base/xcam_common.h>
 #include <errno.h>
 #include <list>
-#include "smartptr.h"
-#include "xcam_mutex.h"
+#include <xcam_mutex.h>
 
 namespace XCam {
 
diff --git a/xcore/smart_analysis_handler.h b/xcore/smart_analysis_handler.h
index 4569dfe..8e0748c 100644
--- a/xcore/smart_analysis_handler.h
+++ b/xcore/smart_analysis_handler.h
@@ -21,9 +21,10 @@
 #ifndef XCAM_SMART_ANALYSIS_HANDLER_H
 #define XCAM_SMART_ANALYSIS_HANDLER_H
 
+#include <xcam_std.h>
 #include <base/xcam_smart_description.h>
 #include <map>
-#include "x3a_result_factory.h"
+#include <x3a_result_factory.h>
 
 namespace XCam {
 
diff --git a/xcore/smart_analyzer.h b/xcore/smart_analyzer.h
index c70ba51..6e9851b 100644
--- a/xcore/smart_analyzer.h
+++ b/xcore/smart_analyzer.h
@@ -20,9 +20,10 @@
 #ifndef XCAM_SMART_ANALYZER_H
 #define XCAM_SMART_ANALYZER_H
 
-#include "xcam_analyzer.h"
-#include "smart_analysis_handler.h"
-#include "x3a_result_factory.h"
+#include <xcam_std.h>
+#include <xcam_analyzer.h>
+#include <smart_analysis_handler.h>
+#include <x3a_result_factory.h>
 
 namespace XCam {
 
diff --git a/xcore/smart_analyzer_loader.cpp b/xcore/smart_analyzer_loader.cpp
index a50ee88..ab3187d 100644
--- a/xcore/smart_analyzer_loader.cpp
+++ b/xcore/smart_analyzer_loader.cpp
@@ -129,9 +129,9 @@ SmartAnalyzerLoader::load_symbol (void* handle)
         XCAM_LOG_DEBUG ("get symbol failed from lib");
         return NULL;
     }
-    if (desc->version < XCAM_VERSION) {
+    if (desc->version < xcam_version ()) {
         XCAM_LOG_WARNING ("get symbol version is:0x%04x, but expect:0x%04x",
-                          desc->version, XCAM_VERSION);
+                          desc->version, xcam_version ());
     }
     if (desc->size < sizeof (XCamSmartAnalysisDescription)) {
         XCAM_LOG_DEBUG ("get symbol failed, XCamSmartAnalysisDescription size is:%" PRIu32 ", but expect:%" PRIuS,
diff --git a/xcore/smart_analyzer_loader.h b/xcore/smart_analyzer_loader.h
index f01549e..dd79d89 100644
--- a/xcore/smart_analyzer_loader.h
+++ b/xcore/smart_analyzer_loader.h
@@ -21,10 +21,9 @@
 #ifndef XCAM_SMART_ANALYZER_LOADER_H
 #define XCAM_SMART_ANALYZER_LOADER_H
 
-#include "xcam_utils.h"
-#include "smartptr.h"
-#include "analyzer_loader.h"
-#include "smart_analysis_handler.h"
+#include <xcam_std.h>
+#include <analyzer_loader.h>
+#include <smart_analysis_handler.h>
 #include <base/xcam_smart_description.h>
 #include <list>
 
diff --git a/xcore/smart_buffer_priv.cpp b/xcore/smart_buffer_priv.cpp
index 93b495f..d9f9522 100644
--- a/xcore/smart_buffer_priv.cpp
+++ b/xcore/smart_buffer_priv.cpp
@@ -18,7 +18,7 @@
  * Author: Wind Yuan <feng.yuan@intel.com>
  */
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "base/xcam_buffer.h"
 #include "video_buffer.h"
 #if HAVE_LIBDRM
diff --git a/xcore/stats_callback_interface.h b/xcore/stats_callback_interface.h
index 57b6821..0054c05 100644
--- a/xcore/stats_callback_interface.h
+++ b/xcore/stats_callback_interface.h
@@ -21,8 +21,8 @@
 #ifndef XCAM_STATS_CALLBACK_H
 #define XCAM_STATS_CALLBACK_H
 
-#include "xcam_utils.h"
-#include "xcam_mutex.h"
+#include <xcam_std.h>
+#include <xcam_mutex.h>
 
 
 namespace XCam {
diff --git a/xcore/surview_fisheye_dewarp.h b/xcore/surview_fisheye_dewarp.h
index 02aecb7..8b2cdf6 100644
--- a/xcore/surview_fisheye_dewarp.h
+++ b/xcore/surview_fisheye_dewarp.h
@@ -21,9 +21,9 @@
 #ifndef XCAM_SURVIEW_FISHEYE_DEWARP_H
 #define XCAM_SURVIEW_FISHEYE_DEWARP_H
 
-#include "calibration_parser.h"
-#include "vec_mat.h"
-#include "interface/data_types.h"
+#include <xcam_std.h>
+#include <vec_mat.h>
+#include <interface/data_types.h>
 
 namespace XCam {
 
diff --git a/xcore/swapped_buffer.cpp b/xcore/swapped_buffer.cpp
index b45d195..a740959 100644
--- a/xcore/swapped_buffer.cpp
+++ b/xcore/swapped_buffer.cpp
@@ -18,7 +18,7 @@
  * Author: Wind Yuan <feng.yuan@intel.com>
  */
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include "swapped_buffer.h"
 
 namespace XCam {
diff --git a/xcore/swapped_buffer.h b/xcore/swapped_buffer.h
index 1774c83..bd29923 100644
--- a/xcore/swapped_buffer.h
+++ b/xcore/swapped_buffer.h
@@ -21,9 +21,8 @@
 #ifndef XCAM_SWAPPED_BUFFER_H
 #define XCAM_SWAPPED_BUFFER_H
 
-#include "xcam_utils.h"
-#include "smartptr.h"
-#include "buffer_pool.h"
+#include <xcam_std.h>
+#include <buffer_pool.h>
 
 namespace XCam {
 
diff --git a/xcore/thread_pool.h b/xcore/thread_pool.h
index e297c88..4e808d9 100644
--- a/xcore/thread_pool.h
+++ b/xcore/thread_pool.h
@@ -21,10 +21,9 @@
 #ifndef XCAM_THREAD_POOL_H
 #define XCAM_THREAD_POOL_H
 
-#include "xcam_utils.h"
-#include "safe_list.h"
-#include "smartptr.h"
-#include "xcam_thread.h"
+#include <xcam_std.h>
+#include <safe_list.h>
+#include <xcam_thread.h>
 
 namespace XCam {
 
diff --git a/xcore/uvc_device.h b/xcore/uvc_device.h
index 2ed1d39..bec14fc 100644
--- a/xcore/uvc_device.h
+++ b/xcore/uvc_device.h
@@ -21,10 +21,10 @@
 #ifndef XCAM_UVC_DEVICE_H
 #define XCAM_UVC_DEVICE_H
 
-#include "xcam_utils.h"
-#include "v4l2_device.h"
+#include <xcam_std.h>
+#include <v4l2_device.h>
 #if HAVE_LIBDRM
-#include "drm_display.h"
+#include <drm_display.h>
 #endif
 
 namespace XCam {
diff --git a/xcore/v4l2_buffer_proxy.h b/xcore/v4l2_buffer_proxy.h
index 19b520a..94bd397 100644
--- a/xcore/v4l2_buffer_proxy.h
+++ b/xcore/v4l2_buffer_proxy.h
@@ -21,9 +21,8 @@
 #ifndef XCAM_V4L2_BUFFER_PROXY_H
 #define XCAM_V4L2_BUFFER_PROXY_H
 
-#include "xcam_utils.h"
-#include "buffer_pool.h"
-#include "smartptr.h"
+#include <xcam_std.h>
+#include <buffer_pool.h>
 #include <linux/videodev2.h>
 
 namespace XCam {
diff --git a/xcore/v4l2_device.h b/xcore/v4l2_device.h
index 79f46be..b4ad7ad 100644
--- a/xcore/v4l2_device.h
+++ b/xcore/v4l2_device.h
@@ -21,8 +21,7 @@
 #ifndef XCAM_V4L2_DEVICE_H
 #define XCAM_V4L2_DEVICE_H
 
-#include "xcam_utils.h"
-#include "smartptr.h"
+#include <xcam_std.h>
 #include <linux/videodev2.h>
 #include <list>
 #include <vector>
diff --git a/xcore/vec_mat.h b/xcore/vec_mat.h
index 9dcafe8..51add21 100644
--- a/xcore/vec_mat.h
+++ b/xcore/vec_mat.h
@@ -21,7 +21,7 @@
 #ifndef XCAM_VECTOR_MATRIX_H
 #define XCAM_VECTOR_MATRIX_H
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include <cmath>
 
 
diff --git a/xcore/video_buffer.h b/xcore/video_buffer.h
index e3db0f0..f740c87 100644
--- a/xcore/video_buffer.h
+++ b/xcore/video_buffer.h
@@ -21,10 +21,9 @@
 #ifndef XCAM_VIDEO_BUFFER_H
 #define XCAM_VIDEO_BUFFER_H
 
-#include "xcam_utils.h"
-#include "smartptr.h"
-#include "meta_data.h"
-#include "base/xcam_buffer.h"
+#include <xcam_std.h>
+#include <meta_data.h>
+#include <base/xcam_buffer.h>
 #include <list>
 
 namespace XCam {
diff --git a/xcore/worker.h b/xcore/worker.h
index a16aabb..16807c1 100644
--- a/xcore/worker.h
+++ b/xcore/worker.h
@@ -21,8 +21,7 @@
 #ifndef XCAM_WORKER_H
 #define XCAM_WORKER_H
 
-#include "xcam_utils.h"
-#include "smartptr.h"
+#include <xcam_std.h>
 
 #define ENABLE_FUNC_OBJ 0
 
diff --git a/xcore/x3a_analyzer.h b/xcore/x3a_analyzer.h
index 74c96f1..ab5a62f 100644
--- a/xcore/x3a_analyzer.h
+++ b/xcore/x3a_analyzer.h
@@ -21,9 +21,9 @@
 #ifndef XCAM_3A_ANALYZER_H
 #define XCAM_3A_ANALYZER_H
 
-#include "xcam_utils.h"
-#include "xcam_analyzer.h"
-#include "handler_interface.h"
+#include <xcam_std.h>
+#include <xcam_analyzer.h>
+#include <handler_interface.h>
 
 namespace XCam {
 
diff --git a/xcore/x3a_analyzer_manager.h b/xcore/x3a_analyzer_manager.h
index 6d6e23b..7dedcc8 100644
--- a/xcore/x3a_analyzer_manager.h
+++ b/xcore/x3a_analyzer_manager.h
@@ -21,9 +21,9 @@
 #ifndef XCAM_3A_ANALYZER_MANAGER_H
 #define XCAM_3A_ANALYZER_MANAGER_H
 
-#include "xcam_utils.h"
-#include "x3a_analyzer.h"
-#include "dynamic_analyzer_loader.h"
+#include <xcam_std.h>
+#include <x3a_analyzer.h>
+#include <dynamic_analyzer_loader.h>
 
 namespace XCam {
 
diff --git a/xcore/x3a_analyzer_simple.h b/xcore/x3a_analyzer_simple.h
index 846845f..49cab50 100644
--- a/xcore/x3a_analyzer_simple.h
+++ b/xcore/x3a_analyzer_simple.h
@@ -21,9 +21,9 @@
 #ifndef XCAM_3A_ANALYZER_SIMPLE_H
 #define XCAM_3A_ANALYZER_SIMPLE_H
 
-#include "xcam_utils.h"
-#include "x3a_analyzer.h"
-#include "x3a_stats_pool.h"
+#include <xcam_std.h>
+#include <x3a_analyzer.h>
+#include <x3a_stats_pool.h>
 
 namespace XCam {
 
diff --git a/xcore/x3a_event.h b/xcore/x3a_event.h
index d8052a7..301860b 100644
--- a/xcore/x3a_event.h
+++ b/xcore/x3a_event.h
@@ -21,12 +21,12 @@
 #ifndef XCAM_3A_EVENT_H
 #define XCAM_3A_EVENT_H
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 
 namespace XCam {
 
 class X3aEvent
-    //:public ObjectLife
+//:public ObjectLife
 {
 public:
     enum Type {
diff --git a/xcore/x3a_image_process_center.h b/xcore/x3a_image_process_center.h
index 4121ea2..b72bbb3 100644
--- a/xcore/x3a_image_process_center.h
+++ b/xcore/x3a_image_process_center.h
@@ -21,8 +21,8 @@
 #ifndef XCAM_3A_IMAGE_PROCESS_CENTER_H
 #define XCAM_3A_IMAGE_PROCESS_CENTER_H
 
-#include "xcam_utils.h"
-#include "image_processor.h"
+#include <xcam_std.h>
+#include <image_processor.h>
 
 namespace XCam {
 
diff --git a/xcore/x3a_result.h b/xcore/x3a_result.h
index 83a819a..8fc9284 100644
--- a/xcore/x3a_result.h
+++ b/xcore/x3a_result.h
@@ -21,8 +21,7 @@
 #ifndef XCAM_3A_RESULT_H
 #define XCAM_3A_RESULT_H
 
-#include "xcam_utils.h"
-#include "smartptr.h"
+#include <xcam_std.h>
 #include <base/xcam_3a_result.h>
 #include <base/xcam_smart_result.h>
 #include <list>
@@ -114,7 +113,7 @@ public:
         set_ptr ((void*) _result);
         _result->head.type = (XCam3aResultType) type;
         _result->head.process_type = _process_type;
-        _result->head.version = XCAM_VERSION;
+        _result->head.version = xcam_version ();
     }
     ~X3aStandardResultT () {
         xcam_free (_result);
diff --git a/xcore/x3a_result_factory.h b/xcore/x3a_result_factory.h
index d30ea6e..88a555c 100644
--- a/xcore/x3a_result_factory.h
+++ b/xcore/x3a_result_factory.h
@@ -21,10 +21,9 @@
 #ifndef XCAM_3A_RESULT_FACTORY_H
 #define XCAM_3A_RESULT_FACTORY_H
 
-#include "xcam_utils.h"
-#include "smartptr.h"
-#include "xcam_mutex.h"
-#include "x3a_result.h"
+#include <xcam_std.h>
+#include <xcam_mutex.h>
+#include <x3a_result.h>
 
 namespace XCam {
 
diff --git a/xcore/x3a_stats_pool.h b/xcore/x3a_stats_pool.h
index a485611..ed50694 100644
--- a/xcore/x3a_stats_pool.h
+++ b/xcore/x3a_stats_pool.h
@@ -21,8 +21,8 @@
 #ifndef XCAM_3A_STATS_POOL_H
 #define XCAM_3A_STATS_POOL_H
 
-#include "xcam_utils.h"
-#include "buffer_pool.h"
+#include <xcam_std.h>
+#include <buffer_pool.h>
 #include <base/xcam_3a_stats.h>
 
 namespace XCam {
diff --git a/xcore/xcam_analyzer.h b/xcore/xcam_analyzer.h
index 70bd40a..086fcc6 100644
--- a/xcore/xcam_analyzer.h
+++ b/xcore/xcam_analyzer.h
@@ -22,11 +22,11 @@
 #ifndef XCAM_ANALYZER_H
 #define XCAM_ANALYZER_H
 
-#include "xcam_utils.h"
-#include "handler_interface.h"
-#include "xcam_thread.h"
-#include "video_buffer.h"
-#include "safe_list.h"
+#include <xcam_std.h>
+#include <handler_interface.h>
+#include <xcam_thread.h>
+#include <video_buffer.h>
+#include <safe_list.h>
 
 namespace XCam {
 
diff --git a/xcore/xcam_common.cpp b/xcore/xcam_common.cpp
index 4dd6383..f982060 100644
--- a/xcore/xcam_common.cpp
+++ b/xcore/xcam_common.cpp
@@ -18,6 +18,10 @@
  * Author: Wind Yuan <feng.yuan@intel.com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <base/xcam_common.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -26,6 +30,11 @@
 
 static char log_file_name[XCAM_MAX_STR_SIZE] = {0};
 
+uint32_t xcam_version ()
+{
+    return XCAM_VERSION;
+}
+
 void * xcam_malloc(size_t size)
 {
     return malloc (size);
diff --git a/xcore/xcam_mutex.h b/xcore/xcam_mutex.h
index 90fb30d..b294570 100644
--- a/xcore/xcam_mutex.h
+++ b/xcore/xcam_mutex.h
@@ -21,7 +21,7 @@
 #ifndef XCAM_MUTEX_H
 #define XCAM_MUTEX_H
 
-#include "xcam_utils.h"
+#include <xcam_std.h>
 #include <pthread.h>
 #include <sys/time.h>
 
diff --git a/xcore/xcam_std.h b/xcore/xcam_std.h
new file mode 100644
index 0000000..ca98b11
--- /dev/null
+++ b/xcore/xcam_std.h
@@ -0,0 +1,49 @@
+/*
+ * xcam_std.h - xcam std
+ *
+ *  Copyright (c) 2014-2017 Intel Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Author: Wind Yuan <feng.yuan@intel.com>
+ */
+
+#ifndef XCAM_STD_H
+#define XCAM_STD_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <base/xcam_common.h>
+#include <xcam_obj_debug.h>
+extern "C" {
+#include <linux/videodev2.h>
+}
+#include <cinttypes>
+#include <vector>
+#include <smartptr.h>
+
+namespace XCam {
+
+static const int64_t InvalidTimestamp = INT64_C(-1);
+
+enum NV12PlaneIdx {
+    NV12PlaneYIdx = 0,
+    NV12PlaneUVIdx,
+    NV12PlaneMax,
+};
+
+};
+
+#endif //XCAM_STD_H
\ No newline at end of file
diff --git a/xcore/xcam_thread.h b/xcore/xcam_thread.h
index f15ff9b..dfb7b22 100644
--- a/xcore/xcam_thread.h
+++ b/xcore/xcam_thread.h
@@ -21,8 +21,8 @@
 #ifndef XCAM_THREAD_H
 #define XCAM_THREAD_H
 
-#include "xcam_utils.h"
-#include "xcam_mutex.h"
+#include <xcam_std.h>
+#include <xcam_mutex.h>
 
 namespace XCam {
 
diff --git a/xcore/xcam_utils.h b/xcore/xcam_utils.h
index eb67283..02e7f53 100644
--- a/xcore/xcam_utils.h
+++ b/xcore/xcam_utils.h
@@ -1,7 +1,7 @@
 /*
  * xcam_utils.h - xcam utilities
  *
- *  Copyright (c) 2014-2015 Intel Corporation
+ *  Copyright (c) 2014-2017 Intel Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,40 +21,10 @@
 #ifndef XCAM_UTILS_H
 #define XCAM_UTILS_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <base/xcam_common.h>
-#include <xcam_obj_debug.h>
-extern "C" {
-#include <linux/videodev2.h>
-}
-#include <cinttypes>
-#include <smartptr.h>
-#include <vector>
+#include <xcam_std.h>
 
 namespace XCam {
 
-static const int64_t InvalidTimestamp = INT64_C(-1);
-
-enum CLWaveletBasis {
-    CL_WAVELET_DISABLED = 0,
-    CL_WAVELET_HAT,
-    CL_WAVELET_HAAR,
-};
-
-enum CLImageChannel {
-    CL_IMAGE_CHANNEL_Y = 1,
-    CL_IMAGE_CHANNEL_UV = 1 << 1,
-};
-
-enum CLNV12PlaneIdx {
-    CLNV12PlaneY = 0,
-    CLNV12PlaneUV,
-    CLNV12PlaneMax,
-};
-
 double
 linear_interpolate_p2 (
     double value_start, double value_end,