diff --git a/trunk/configure b/trunk/configure
index 4c89902e2..dca978867 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -223,7 +223,7 @@ KERNEL_OBJS="${MODULE_OBJS[@]}"
 MODULE_ID="PROTOCOL" 
 MODULE_DEPENDS=("CORE" "KERNEL") 
 ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSTRoot} ${LibSSLRoot})
-MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_conn"
+MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_conn" "srs_protocol_rtmp_handshake"
         "srs_protocol_rtmp_stack" "srs_protocol_utility" "srs_protocol_rtmp_msg_array" "srs_protocol_stream"
         "srs_protocol_raw_avc" "srs_protocol_rtsp_stack" "srs_protocol_http_stack" "srs_protocol_kbps" "srs_protocol_json"
         "srs_protocol_format" "srs_protocol_log" "srs_protocol_st" "srs_protocol_http_client"
@@ -404,7 +404,10 @@ fi
 if [ $SRS_UTEST = YES ]; then
     MODULE_FILES=("srs_utest" "srs_utest_amf0" "srs_utest_protocol" "srs_utest_kernel" "srs_utest_core"
         "srs_utest_config" "srs_utest_rtmp" "srs_utest_http" "srs_utest_avc" "srs_utest_reload"
-        "srs_utest_mp4" "srs_utest_service" "srs_utest_app" "srs_utest_rtc" "srs_utest_srt")
+        "srs_utest_mp4" "srs_utest_service" "srs_utest_app" "srs_utest_rtc")
+    if [[ $SRS_SRT == YES ]]; then
+        MODULE_FILES+=("srs_utest_srt")
+    fi
     ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSTRoot} ${LibSSLRoot})
     if [[ $SRS_RTC == YES ]]; then
         ModuleLibIncs+=(${LibSrtpRoot})
diff --git a/trunk/src/app/srs_app_utility.cpp b/trunk/src/app/srs_app_utility.cpp
index 76b3d039c..9541b527e 100644
--- a/trunk/src/app/srs_app_utility.cpp
+++ b/trunk/src/app/srs_app_utility.cpp
@@ -1093,6 +1093,11 @@ void srs_update_rtmp_server(int nb_conn, SrsKbps* kbps)
     nb_tcp_total = 0;
     nb_tcp_mem = 0;
     nb_udp4 = 0;
+
+    (void)nb_socks;
+    (void)nb_tcp_mem;
+    (void)nb_tcp4_hashed;
+    (void)nb_tcp_orphans;
 #endif
 
     int nb_tcp_estab = 0;
diff --git a/trunk/src/kernel/srs_kernel_utility.cpp b/trunk/src/kernel/srs_kernel_utility.cpp
index 896c0fb63..a04856ee3 100644
--- a/trunk/src/kernel/srs_kernel_utility.cpp
+++ b/trunk/src/kernel/srs_kernel_utility.cpp
@@ -1041,7 +1041,6 @@ srs_error_t srs_av_base64_encode(std::string plaintext, std::string& cipher)
     cipher.clear();
 
     uint32_t val = 0;
-    int di = 0;
     int si = 0;
     int n = (plaintext.length() / 3) * 3;
     uint8_t* p =  (uint8_t*)plaintext.c_str();
@@ -1055,7 +1054,6 @@ srs_error_t srs_av_base64_encode(std::string plaintext, std::string& cipher)
         cipher += encoder[val&0x3f];
 
         si += 3;
-        di += 4;
     }
 
     int remain = plaintext.length() - si;
diff --git a/trunk/src/utest/srs_utest_protocol.hpp b/trunk/src/utest/srs_utest_protocol.hpp
index 3d1c42594..1114c3fc7 100644
--- a/trunk/src/utest/srs_utest_protocol.hpp
+++ b/trunk/src/utest/srs_utest_protocol.hpp
@@ -16,7 +16,7 @@
 #include <srs_protocol_utility.hpp>
 
 #include <srs_protocol_rtmp_stack.hpp>
-#include <srs_protocol_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_handshake.hpp>
 #include <srs_protocol_stream.hpp>
 #include <srs_protocol_kbps.hpp>