diff --git a/ai/asr/keyword_spotting/audio_cache.h b/ai/asr/keyword_spotting/audio_cache.h
index 6e4f1a68d65cbd4174f78d573542fd1036402f48..9665663c685bc1e900b3e493d0cd68d144f6aef9 100644
--- a/ai/asr/keyword_spotting/audio_cache.h
+++ b/ai/asr/keyword_spotting/audio_cache.h
@@ -16,9 +16,6 @@
 #ifndef AUDIO_CACHE_H
 #define AUDIO_CACHE_H
 
-#include <cstdint>
-#include <mutex>
-
 namespace KWS {
 class AudioCache {
 public:
diff --git a/ai/asr/keyword_spotting/kws_manager.h b/ai/asr/keyword_spotting/kws_manager.h
index 17c9b897f26d9cf71ed71947eacd75a084fa39d4..f77d2b9ca9a792b07abda04b6f0238e6725e09e8 100644
--- a/ai/asr/keyword_spotting/kws_manager.h
+++ b/ai/asr/keyword_spotting/kws_manager.h
@@ -31,8 +31,8 @@
 #include "media_info.h"
 
 namespace KWS {
-const int32_t AUDIO_SAMPLE_RATE = 16000; // 16kHz
-const int32_t AUDIO_CODEC_BITRATE = 32000; // 32kHz
+constexpr int32_t AUDIO_SAMPLE_RATE = 16000; // 16kHz
+constexpr int32_t AUDIO_CODEC_BITRATE = 32000; // 32kHz
 
 const std::vector<std::string> WORD_CONTENT = {
     "Hi Xiaowen",
@@ -40,7 +40,7 @@ const std::vector<std::string> WORD_CONTENT = {
     "Unknown"
 };
 
-enum KwsStatus {
+enum KwsStatus : int {
     IDLE = 1000,
     PREPARED,
     RUNNING,
diff --git a/ai/cv/image_classification/camera_manager.h b/ai/cv/image_classification/camera_manager.h
index 664a71645032547d210e1fa4a455b697c1b39c7c..37dc8e5a4cf4381f972b0fe781b3509174d98fdc 100644
--- a/ai/cv/image_classification/camera_manager.h
+++ b/ai/cv/image_classification/camera_manager.h
@@ -40,8 +40,8 @@
 
 namespace IC {
 // Settings of camera
-const int32_t CAMERA_PIC_WIDTH = 1920;
-const int32_t CAMERA_PIC_HEIGHT = 1080;
+constexpr int32_t CAMERA_PIC_WIDTH = 1920;
+constexpr int32_t CAMERA_PIC_HEIGHT = 1080;
 const std::string CAMERA_SAVE_PATH = "/storage/Capture.jpg";
 
 // condition_variable for camera
diff --git a/ai/cv/image_classification/image_classification_sample.cpp b/ai/cv/image_classification/image_classification_sample.cpp
index d24097e82ce3ed5ba926d05d2b79c94f2b406a79..20054cae6ffb28a9b73c73c9d46e417125603f50 100644
--- a/ai/cv/image_classification/image_classification_sample.cpp
+++ b/ai/cv/image_classification/image_classification_sample.cpp
@@ -27,6 +27,10 @@ using namespace OHOS::AI;
 using namespace OHOS::Media;
 
 namespace {
+const int WIDTH_DEST = 224;
+const int HEIGHT_DEST = 224;
+const int NUM_CHANNELS = 3;
+
 const auto DELETE_PIC_BUFFER = [](uint8_t *&buffer) {
     if (buffer != nullptr) {
         delete[] buffer;
diff --git a/ai/cv/image_classification/picture_utils.cpp b/ai/cv/image_classification/picture_utils.cpp
index c6b222c0c83a47ee231388c97f5056662f8ef748..e504ebda93922d73515bfa1587472161e959b16e 100644
--- a/ai/cv/image_classification/picture_utils.cpp
+++ b/ai/cv/image_classification/picture_utils.cpp
@@ -25,6 +25,8 @@
 using namespace std;
 
 namespace IC {
+const int NUM_CHANNELS = 3;
+
 int WriteJpegFile(const string &filename, int quality,
     uint8_t *srcBuffer, int srcWidth, int srcHeight)
 {
@@ -59,7 +61,7 @@ int WriteJpegFile(const string &filename, int quality,
     }
     jpeg_finish_compress(&cinfo);
 
-    fclose(outfile);
+    (void)fclose(outfile);
     jpeg_destroy_compress(&cinfo);
     return IC_RETCODE_SUCCESS;
 }
@@ -135,7 +137,7 @@ uint8_t *ReadJpegFile(const string &filename, int &srcWidth, int &srcHeight)
 
     (void)jpeg_finish_decompress(&cinfo);
     jpeg_destroy_decompress(&cinfo);
-    fclose(infile);
+    (void)fclose(infile);
     return buffer;
 }
 
diff --git a/ai/cv/image_classification/picture_utils.h b/ai/cv/image_classification/picture_utils.h
index dad7381de71d09168831cbb4887f3d1d1d899f56..c0c7369d513bc8b45112e96428cc22756fa54917 100644
--- a/ai/cv/image_classification/picture_utils.h
+++ b/ai/cv/image_classification/picture_utils.h
@@ -32,14 +32,14 @@ struct MyErrorMgr {
 using MyErrorPtr = MyErrorMgr *;
 
 // The index order of BGR format
-enum BgrIndex {
+enum BgrIndex : int {
     BGR_BLUE = 0,
     BGR_GREEN,
     BGR_RED,
 };
 
 // The index order of RGB format
-enum RgbIndex {
+enum RgbIndex : int {
     RGB_RED = 0,
     RGB_GREEN,
     RGB_BLUE,
@@ -55,9 +55,6 @@ struct PicInfo {
 
 // Change this to your own settings
 const std::string JPEG_SRC_PATH = "/storage/data/image_classification_demo.jpg";
-const int WIDTH_DEST = 224;
-const int HEIGHT_DEST = 224;
-const int NUM_CHANNELS = 3;
 
 int WriteJpegFile(const std::string &filename, int quality, uint8_t *srcBuffer, int srcWidth, int srcHeight);
 int WriteBgrFile(const std::string &filename, uint8_t *dataBuffer, int bufferSize);
diff --git a/ai/cv/image_classification/resize_computer.cpp b/ai/cv/image_classification/resize_computer.cpp
index c119b5ca2a0e849fe27e10fcb8094e2cc38d57cb..1d712b8a8b716e9595d93f80526149ddeeeb126f 100644
--- a/ai/cv/image_classification/resize_computer.cpp
+++ b/ai/cv/image_classification/resize_computer.cpp
@@ -18,6 +18,7 @@
 
 namespace IC {
 const int RESIZE_CONSTANT = 2;
+const int NUM_CHANNELS = 3;
 
 ResizeComputer::ResizeComputer(const PicInfo &pInfo)
 {