From 6bcac143557ce6dc6cb03bed6fdf039cae55e577 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Thu, 9 Jun 2022 20:11:52 +0800
Subject: [PATCH] Prefix with srs_protocol in protocol directory.

---
 trunk/configure                                           | 8 ++++----
 trunk/src/app/srs_app_bandwidth.cpp                       | 2 +-
 trunk/src/app/srs_app_caster_flv.cpp                      | 2 +-
 trunk/src/app/srs_app_config.cpp                          | 2 +-
 trunk/src/app/srs_app_coworkers.cpp                       | 2 +-
 trunk/src/app/srs_app_dash.cpp                            | 2 +-
 trunk/src/app/srs_app_dvr.cpp                             | 2 +-
 trunk/src/app/srs_app_edge.cpp                            | 4 ++--
 trunk/src/app/srs_app_encoder.cpp                         | 2 +-
 trunk/src/app/srs_app_forward.cpp                         | 4 ++--
 trunk/src/app/srs_app_hds.cpp                             | 4 ++--
 trunk/src/app/srs_app_hls.cpp                             | 4 ++--
 trunk/src/app/srs_app_http_api.cpp                        | 2 +-
 trunk/src/app/srs_app_http_api.hpp                        | 2 +-
 trunk/src/app/srs_app_http_conn.cpp                       | 4 ++--
 trunk/src/app/srs_app_http_hooks.cpp                      | 2 +-
 trunk/src/app/srs_app_http_static.cpp                     | 4 ++--
 trunk/src/app/srs_app_http_stream.cpp                     | 4 ++--
 trunk/src/app/srs_app_mpegts_udp.cpp                      | 4 ++--
 trunk/src/app/srs_app_ng_exec.cpp                         | 2 +-
 trunk/src/app/srs_app_recv_thread.cpp                     | 4 ++--
 trunk/src/app/srs_app_rtc_api.hpp                         | 2 +-
 trunk/src/app/srs_app_rtc_conn.cpp                        | 8 ++++----
 trunk/src/app/srs_app_rtc_conn.hpp                        | 2 +-
 trunk/src/app/srs_app_rtc_dtls.cpp                        | 2 +-
 trunk/src/app/srs_app_rtc_server.cpp                      | 4 ++--
 trunk/src/app/srs_app_rtc_source.cpp                      | 4 ++--
 trunk/src/app/srs_app_rtmp_conn.cpp                       | 4 ++--
 trunk/src/app/srs_app_rtmp_conn.hpp                       | 2 +-
 trunk/src/app/srs_app_security.hpp                        | 2 +-
 trunk/src/app/srs_app_source.cpp                          | 6 +++---
 trunk/src/app/srs_app_statistic.cpp                       | 2 +-
 trunk/src/app/srs_app_statistic.hpp                       | 2 +-
 trunk/src/main/srs_main_ingest_hls.cpp                    | 4 ++--
 trunk/src/protocol/srs_protocol_format.cpp                | 2 +-
 trunk/src/protocol/srs_protocol_http_client.hpp           | 2 +-
 trunk/src/protocol/srs_protocol_http_conn.cpp             | 2 +-
 trunk/src/protocol/srs_protocol_http_conn.hpp             | 2 +-
 .../{srs_http_stack.cpp => srs_protocol_http_stack.cpp}   | 2 +-
 .../{srs_http_stack.hpp => srs_protocol_http_stack.hpp}   | 0
 .../{srs_raw_avc.cpp => srs_protocol_raw_avc.cpp}         | 2 +-
 .../{srs_raw_avc.hpp => srs_protocol_raw_avc.hpp}         | 0
 .../{srs_rtc_stun_stack.cpp => srs_protocol_rtc_stun.cpp} | 4 ++--
 .../{srs_rtc_stun_stack.hpp => srs_protocol_rtc_stun.hpp} | 0
 trunk/src/protocol/srs_protocol_rtmp_conn.cpp             | 2 +-
 ...rtmp_handshake.cpp => srs_protocol_rtmp_handshake.cpp} | 4 ++--
 ...rtmp_handshake.hpp => srs_protocol_rtmp_handshake.hpp} | 0
 ...rtmp_msg_array.cpp => srs_protocol_rtmp_msg_array.cpp} | 4 ++--
 ...rtmp_msg_array.hpp => srs_protocol_rtmp_msg_array.hpp} | 0
 .../{srs_rtmp_stack.cpp => srs_protocol_rtmp_stack.cpp}   | 4 ++--
 .../{srs_rtmp_stack.hpp => srs_protocol_rtmp_stack.hpp}   | 0
 .../{srs_rtsp_stack.cpp => srs_protocol_rtsp_stack.cpp}   | 2 +-
 .../{srs_rtsp_stack.hpp => srs_protocol_rtsp_stack.hpp}   | 0
 trunk/src/protocol/srs_protocol_utility.cpp               | 6 +++---
 trunk/src/srt/srt_to_rtmp.hpp                             | 2 +-
 trunk/src/utest/srs_utest_avc.cpp                         | 2 +-
 trunk/src/utest/srs_utest_config.cpp                      | 2 +-
 trunk/src/utest/srs_utest_http.cpp                        | 2 +-
 trunk/src/utest/srs_utest_http.hpp                        | 2 +-
 trunk/src/utest/srs_utest_protocol.cpp                    | 6 +++---
 trunk/src/utest/srs_utest_protocol.hpp                    | 4 ++--
 trunk/src/utest/srs_utest_rtmp.cpp                        | 6 +++---
 trunk/src/utest/srs_utest_service.cpp                     | 2 +-
 63 files changed, 88 insertions(+), 88 deletions(-)
 rename trunk/src/protocol/{srs_http_stack.cpp => srs_protocol_http_stack.cpp} (99%)
 rename trunk/src/protocol/{srs_http_stack.hpp => srs_protocol_http_stack.hpp} (100%)
 rename trunk/src/protocol/{srs_raw_avc.cpp => srs_protocol_raw_avc.cpp} (99%)
 rename trunk/src/protocol/{srs_raw_avc.hpp => srs_protocol_raw_avc.hpp} (100%)
 rename trunk/src/protocol/{srs_rtc_stun_stack.cpp => srs_protocol_rtc_stun.cpp} (99%)
 rename trunk/src/protocol/{srs_rtc_stun_stack.hpp => srs_protocol_rtc_stun.hpp} (100%)
 rename trunk/src/protocol/{srs_rtmp_handshake.cpp => srs_protocol_rtmp_handshake.cpp} (99%)
 rename trunk/src/protocol/{srs_rtmp_handshake.hpp => srs_protocol_rtmp_handshake.hpp} (100%)
 rename trunk/src/protocol/{srs_rtmp_msg_array.cpp => srs_protocol_rtmp_msg_array.cpp} (90%)
 rename trunk/src/protocol/{srs_rtmp_msg_array.hpp => srs_protocol_rtmp_msg_array.hpp} (100%)
 rename trunk/src/protocol/{srs_rtmp_stack.cpp => srs_protocol_rtmp_stack.cpp} (99%)
 rename trunk/src/protocol/{srs_rtmp_stack.hpp => srs_protocol_rtmp_stack.hpp} (100%)
 rename trunk/src/protocol/{srs_rtsp_stack.cpp => srs_protocol_rtsp_stack.cpp} (99%)
 rename trunk/src/protocol/{srs_rtsp_stack.hpp => srs_protocol_rtsp_stack.hpp} (100%)

diff --git a/trunk/configure b/trunk/configure
index 2ade18f4b93..0ccb7aa168b 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -223,13 +223,13 @@ 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_rtmp_stack"
-        "srs_rtmp_handshake" "srs_protocol_utility" "srs_rtmp_msg_array" "srs_protocol_stream"
-        "srs_raw_avc" "srs_rtsp_stack" "srs_http_stack" "srs_protocol_kbps" "srs_protocol_json"
+MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_rtmp_stack"
+        "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"
         "srs_protocol_http_conn" "srs_protocol_rtmp_conn" "srs_protocol_conn")
 if [[ $SRS_RTC == YES ]]; then
-    MODULE_FILES+=("srs_rtc_stun_stack")
+    MODULE_FILES+=("srs_protocol_rtc_stun")
     ModuleLibIncs+=(${LibSrtpRoot})
 fi
 if [[ $SRS_FFMPEG_FIT == YES ]]; then
diff --git a/trunk/src/app/srs_app_bandwidth.cpp b/trunk/src/app/srs_app_bandwidth.cpp
index 2d8dbabd8d1..9348423e663 100644
--- a/trunk/src/app/srs_app_bandwidth.cpp
+++ b/trunk/src/app/srs_app_bandwidth.cpp
@@ -11,7 +11,7 @@
 
 using namespace std;
 
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_app_config.hpp>
 #include <srs_core_autofree.hpp>
diff --git a/trunk/src/app/srs_app_caster_flv.cpp b/trunk/src/app/srs_app_caster_flv.cpp
index 5fb8b6560f6..68ff38d06ae 100644
--- a/trunk/src/app/srs_app_caster_flv.cpp
+++ b/trunk/src/app/srs_app_caster_flv.cpp
@@ -17,7 +17,7 @@ using namespace std;
 #include <srs_app_http_conn.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_flv.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_utility.hpp>
 #include <srs_app_st.hpp>
 #include <srs_app_utility.hpp>
diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp
index 204ca2eeed3..d69bdfb6df5 100644
--- a/trunk/src/app/srs_app_config.cpp
+++ b/trunk/src/app/srs_app_config.cpp
@@ -38,7 +38,7 @@ using namespace std;
 #include <srs_protocol_json.hpp>
 #include <srs_app_http_hooks.hpp>
 #include <srs_kernel_utility.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 
 using namespace srs_internal;
 
diff --git a/trunk/src/app/srs_app_coworkers.cpp b/trunk/src/app/srs_app_coworkers.cpp
index c932626198a..ee93effdfb6 100644
--- a/trunk/src/app/srs_app_coworkers.cpp
+++ b/trunk/src/app/srs_app_coworkers.cpp
@@ -11,7 +11,7 @@ using namespace std;
 
 #include <srs_protocol_json.hpp>
 #include <srs_kernel_error.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_app_config.hpp>
 #include <srs_protocol_utility.hpp>
 #include <srs_protocol_utility.hpp>
diff --git a/trunk/src/app/srs_app_dash.cpp b/trunk/src/app/srs_app_dash.cpp
index f889356f1c4..591b65fca0b 100644
--- a/trunk/src/app/srs_app_dash.cpp
+++ b/trunk/src/app/srs_app_dash.cpp
@@ -9,7 +9,7 @@
 #include <srs_kernel_error.hpp>
 #include <srs_app_source.hpp>
 #include <srs_app_config.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_kernel_codec.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_app_utility.hpp>
diff --git a/trunk/src/app/srs_app_dvr.cpp b/trunk/src/app/srs_app_dvr.cpp
index 6e53a2efa55..20b0a373e9a 100644
--- a/trunk/src/app/srs_app_dvr.cpp
+++ b/trunk/src/app/srs_app_dvr.cpp
@@ -12,7 +12,7 @@
 using namespace std;
 
 #include <srs_app_config.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_app_http_hooks.hpp>
diff --git a/trunk/src/app/srs_app_edge.cpp b/trunk/src/app/srs_app_edge.cpp
index 4e3e6e02d3a..39a7004ef26 100644
--- a/trunk/src/app/srs_app_edge.cpp
+++ b/trunk/src/app/srs_app_edge.cpp
@@ -14,7 +14,7 @@
 using namespace std;
 
 #include <srs_kernel_error.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_io.hpp>
 #include <srs_app_config.hpp>
 #include <srs_protocol_utility.hpp>
@@ -23,7 +23,7 @@ using namespace std;
 #include <srs_app_pithy_print.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_protocol_kbps.hpp>
-#include <srs_rtmp_msg_array.hpp>
+#include <srs_protocol_rtmp_msg_array.hpp>
 #include <srs_app_utility.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_kernel_utility.hpp>
diff --git a/trunk/src/app/srs_app_encoder.cpp b/trunk/src/app/srs_app_encoder.cpp
index 92208544945..7c3bfa00e31 100644
--- a/trunk/src/app/srs_app_encoder.cpp
+++ b/trunk/src/app/srs_app_encoder.cpp
@@ -12,7 +12,7 @@ using namespace std;
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_app_config.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_app_pithy_print.hpp>
 #include <srs_app_ffmpeg.hpp>
 #include <srs_kernel_utility.hpp>
diff --git a/trunk/src/app/srs_app_forward.cpp b/trunk/src/app/srs_app_forward.cpp
index 5464ff6bdb4..0578cc05cae 100755
--- a/trunk/src/app/srs_app_forward.cpp
+++ b/trunk/src/app/srs_app_forward.cpp
@@ -19,10 +19,10 @@ using namespace std;
 #include <srs_kernel_log.hpp>
 #include <srs_app_config.hpp>
 #include <srs_app_pithy_print.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_utility.hpp>
 #include <srs_protocol_kbps.hpp>
-#include <srs_rtmp_msg_array.hpp>
+#include <srs_protocol_rtmp_msg_array.hpp>
 #include <srs_app_utility.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_kernel_codec.hpp>
diff --git a/trunk/src/app/srs_app_hds.cpp b/trunk/src/app/srs_app_hds.cpp
index 726e021f24e..8e2ffd86e73 100644
--- a/trunk/src/app/srs_app_hds.cpp
+++ b/trunk/src/app/srs_app_hds.cpp
@@ -17,10 +17,10 @@
 using namespace std;
 
 #include <srs_app_hds.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_codec.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_kernel_buffer.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_utility.hpp>
diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp
index 3a46bd1b7f9..c12efb355bb 100644
--- a/trunk/src/app/srs_app_hls.cpp
+++ b/trunk/src/app/srs_app_hls.cpp
@@ -20,11 +20,11 @@ using namespace std;
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_codec.hpp>
 #include <srs_protocol_amf0.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_app_config.hpp>
 #include <srs_app_source.hpp>
 #include <srs_core_autofree.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_app_pithy_print.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_kernel_codec.hpp>
diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp
index 1516430620b..ce84f39c283 100644
--- a/trunk/src/app/srs_app_http_api.cpp
+++ b/trunk/src/app/srs_app_http_api.cpp
@@ -20,7 +20,7 @@ using namespace std;
 #include <srs_kernel_utility.hpp>
 #include <srs_app_utility.hpp>
 #include <srs_app_statistic.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_app_dvr.hpp>
 #include <srs_app_config.hpp>
 #include <srs_app_source.hpp>
diff --git a/trunk/src/app/srs_app_http_api.hpp b/trunk/src/app/srs_app_http_api.hpp
index 3f4762be4f7..761808e759b 100644
--- a/trunk/src/app/srs_app_http_api.hpp
+++ b/trunk/src/app/srs_app_http_api.hpp
@@ -24,7 +24,7 @@ class SrsHttpConn;
 
 #include <srs_app_st.hpp>
 #include <srs_app_conn.hpp>
-#include <srs_http_stack.hpp>
+#include <srs_protocol_http_stack.hpp>
 #include <srs_app_reload.hpp>
 #include <srs_app_http_conn.hpp>
 
diff --git a/trunk/src/app/srs_app_http_conn.cpp b/trunk/src/app/srs_app_http_conn.cpp
index 2a4042419a6..98432a631ca 100644
--- a/trunk/src/app/srs_app_http_conn.cpp
+++ b/trunk/src/app/srs_app_http_conn.cpp
@@ -24,9 +24,9 @@ using namespace std;
 #include <srs_kernel_utility.hpp>
 #include <srs_kernel_file.hpp>
 #include <srs_kernel_flv.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_app_source.hpp>
-#include <srs_rtmp_msg_array.hpp>
+#include <srs_protocol_rtmp_msg_array.hpp>
 #include <srs_kernel_aac.hpp>
 #include <srs_kernel_mp3.hpp>
 #include <srs_kernel_ts.hpp>
diff --git a/trunk/src/app/srs_app_http_hooks.cpp b/trunk/src/app/srs_app_http_hooks.cpp
index f49b4a5ed1b..e674ab59554 100644
--- a/trunk/src/app/srs_app_http_hooks.cpp
+++ b/trunk/src/app/srs_app_http_hooks.cpp
@@ -10,7 +10,7 @@
 using namespace std;
 
 #include <srs_kernel_error.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_app_st.hpp>
 #include <srs_protocol_json.hpp>
 #include <srs_app_dvr.hpp>
diff --git a/trunk/src/app/srs_app_http_static.cpp b/trunk/src/app/srs_app_http_static.cpp
index c475bd78416..84aee13d168 100644
--- a/trunk/src/app/srs_app_http_static.cpp
+++ b/trunk/src/app/srs_app_http_static.cpp
@@ -24,9 +24,9 @@ using namespace std;
 #include <srs_kernel_utility.hpp>
 #include <srs_kernel_file.hpp>
 #include <srs_kernel_flv.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_app_source.hpp>
-#include <srs_rtmp_msg_array.hpp>
+#include <srs_protocol_rtmp_msg_array.hpp>
 #include <srs_kernel_aac.hpp>
 #include <srs_kernel_mp3.hpp>
 #include <srs_kernel_ts.hpp>
diff --git a/trunk/src/app/srs_app_http_stream.cpp b/trunk/src/app/srs_app_http_stream.cpp
index 7911dd3ec14..48a94843cbc 100755
--- a/trunk/src/app/srs_app_http_stream.cpp
+++ b/trunk/src/app/srs_app_http_stream.cpp
@@ -27,9 +27,9 @@ using namespace std;
 #include <srs_kernel_utility.hpp>
 #include <srs_kernel_file.hpp>
 #include <srs_kernel_flv.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_app_source.hpp>
-#include <srs_rtmp_msg_array.hpp>
+#include <srs_protocol_rtmp_msg_array.hpp>
 #include <srs_kernel_aac.hpp>
 #include <srs_kernel_mp3.hpp>
 #include <srs_kernel_ts.hpp>
diff --git a/trunk/src/app/srs_app_mpegts_udp.cpp b/trunk/src/app/srs_app_mpegts_udp.cpp
index 334a425c410..0acb65d5973 100644
--- a/trunk/src/app/srs_app_mpegts_udp.cpp
+++ b/trunk/src/app/srs_app_mpegts_udp.cpp
@@ -24,12 +24,12 @@ using namespace std;
 #include <srs_kernel_file.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_utility.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_app_st.hpp>
 #include <srs_protocol_utility.hpp>
 #include <srs_app_utility.hpp>
 #include <srs_protocol_amf0.hpp>
-#include <srs_raw_avc.hpp>
+#include <srs_protocol_raw_avc.hpp>
 #include <srs_app_pithy_print.hpp>
 #include <srs_app_rtmp_conn.hpp>
 #include <srs_protocol_utility.hpp>
diff --git a/trunk/src/app/srs_app_ng_exec.cpp b/trunk/src/app/srs_app_ng_exec.cpp
index 5afb2d92631..e566c39e897 100644
--- a/trunk/src/app/srs_app_ng_exec.cpp
+++ b/trunk/src/app/srs_app_ng_exec.cpp
@@ -12,7 +12,7 @@ using namespace std;
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_app_config.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_app_pithy_print.hpp>
 #include <srs_app_process.hpp>
 #include <srs_kernel_utility.hpp>
diff --git a/trunk/src/app/srs_app_recv_thread.cpp b/trunk/src/app/srs_app_recv_thread.cpp
index df87bbf4eaf..602f03b64b6 100644
--- a/trunk/src/app/srs_app_recv_thread.cpp
+++ b/trunk/src/app/srs_app_recv_thread.cpp
@@ -6,8 +6,8 @@
 
 #include <srs_app_recv_thread.hpp>
 
-#include <srs_rtmp_stack.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_app_rtmp_conn.hpp>
 #include <srs_protocol_stream.hpp>
 #include <srs_kernel_utility.hpp>
diff --git a/trunk/src/app/srs_app_rtc_api.hpp b/trunk/src/app/srs_app_rtc_api.hpp
index ef75b0a7742..20f465790b3 100644
--- a/trunk/src/app/srs_app_rtc_api.hpp
+++ b/trunk/src/app/srs_app_rtc_api.hpp
@@ -9,7 +9,7 @@
 
 #include <srs_core.hpp>
 
-#include <srs_http_stack.hpp>
+#include <srs_protocol_http_stack.hpp>
 
 class SrsRtcServer;
 class SrsRequest;
diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp
index d1e8c451dd9..285923630a2 100644
--- a/trunk/src/app/srs_app_rtc_conn.cpp
+++ b/trunk/src/app/srs_app_rtc_conn.cpp
@@ -24,16 +24,16 @@ using namespace std;
 #include <srs_kernel_rtc_rtp.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
-#include <srs_rtc_stun_stack.hpp>
-#include <srs_rtmp_stack.hpp>
-#include <srs_rtmp_msg_array.hpp>
+#include <srs_protocol_rtc_stun.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_msg_array.hpp>
 #include <srs_app_utility.hpp>
 #include <srs_app_config.hpp>
 #include <srs_app_rtc_queue.hpp>
 #include <srs_app_source.hpp>
 #include <srs_app_server.hpp>
 #include <srs_protocol_utility.hpp>
-#include <srs_http_stack.hpp>
+#include <srs_protocol_http_stack.hpp>
 #include <srs_app_http_api.hpp>
 #include <srs_app_statistic.hpp>
 #include <srs_app_pithy_print.hpp>
diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp
index f61a6dadaf0..dccf60c0cf6 100644
--- a/trunk/src/app/srs_app_rtc_conn.hpp
+++ b/trunk/src/app/srs_app_rtc_conn.hpp
@@ -11,7 +11,7 @@
 #include <srs_app_listener.hpp>
 #include <srs_protocol_st.hpp>
 #include <srs_kernel_utility.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_app_hybrid.hpp>
 #include <srs_app_hourglass.hpp>
 #include <srs_app_rtc_sdp.hpp>
diff --git a/trunk/src/app/srs_app_rtc_dtls.cpp b/trunk/src/app/srs_app_rtc_dtls.cpp
index b7639d50c9a..4bf3c58acb4 100644
--- a/trunk/src/app/srs_app_rtc_dtls.cpp
+++ b/trunk/src/app/srs_app_rtc_dtls.cpp
@@ -14,7 +14,7 @@ using namespace std;
 #include <srs_kernel_error.hpp>
 #include <srs_app_config.hpp>
 #include <srs_core_autofree.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_app_utility.hpp>
 #include <srs_kernel_rtc_rtp.hpp>
 #include <srs_app_log.hpp>
diff --git a/trunk/src/app/srs_app_rtc_server.cpp b/trunk/src/app/srs_app_rtc_server.cpp
index 780650468b2..995f242b97e 100644
--- a/trunk/src/app/srs_app_rtc_server.cpp
+++ b/trunk/src/app/srs_app_rtc_server.cpp
@@ -18,8 +18,8 @@ using namespace std;
 #include <srs_app_pithy_print.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_app_rtc_conn.hpp>
-#include <srs_rtc_stun_stack.hpp>
-#include <srs_http_stack.hpp>
+#include <srs_protocol_rtc_stun.hpp>
+#include <srs_protocol_http_stack.hpp>
 #include <srs_app_server.hpp>
 #include <srs_app_http_api.hpp>
 #include <srs_app_rtc_dtls.hpp>
diff --git a/trunk/src/app/srs_app_rtc_source.cpp b/trunk/src/app/srs_app_rtc_source.cpp
index d43429a47e4..a5bc4e9a39d 100644
--- a/trunk/src/app/srs_app_rtc_source.cpp
+++ b/trunk/src/app/srs_app_rtc_source.cpp
@@ -10,12 +10,12 @@
 #include <unistd.h>
 
 #include <srs_app_conn.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_app_config.hpp>
 #include <srs_app_source.hpp>
 #include <srs_kernel_flv.hpp>
 #include <srs_kernel_codec.hpp>
-#include <srs_rtmp_msg_array.hpp>
+#include <srs_protocol_rtmp_msg_array.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_protocol_format.hpp>
 #include <srs_kernel_buffer.hpp>
diff --git a/trunk/src/app/srs_app_rtmp_conn.cpp b/trunk/src/app/srs_app_rtmp_conn.cpp
index 303f2d9f136..26ccb0d9da0 100644
--- a/trunk/src/app/srs_app_rtmp_conn.cpp
+++ b/trunk/src/app/srs_app_rtmp_conn.cpp
@@ -16,7 +16,7 @@ using namespace std;
 
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_app_source.hpp>
 #include <srs_app_server.hpp>
@@ -29,7 +29,7 @@ using namespace std;
 #include <srs_app_http_hooks.hpp>
 #include <srs_app_edge.hpp>
 #include <srs_app_utility.hpp>
-#include <srs_rtmp_msg_array.hpp>
+#include <srs_protocol_rtmp_msg_array.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_app_recv_thread.hpp>
 #include <srs_core_performance.hpp>
diff --git a/trunk/src/app/srs_app_rtmp_conn.hpp b/trunk/src/app/srs_app_rtmp_conn.hpp
index cc02125bce1..23f83c8f886 100644
--- a/trunk/src/app/srs_app_rtmp_conn.hpp
+++ b/trunk/src/app/srs_app_rtmp_conn.hpp
@@ -14,7 +14,7 @@
 #include <srs_app_st.hpp>
 #include <srs_app_conn.hpp>
 #include <srs_app_reload.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_rtmp_conn.hpp>
 
 class SrsServer;
diff --git a/trunk/src/app/srs_app_security.hpp b/trunk/src/app/srs_app_security.hpp
index 7a2697c2a4d..81d2009ce78 100644
--- a/trunk/src/app/srs_app_security.hpp
+++ b/trunk/src/app/srs_app_security.hpp
@@ -11,7 +11,7 @@
 
 #include <string>
 
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_utility.hpp>
 
 class SrsConfDirective;
diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp
index 1ff0dd290f6..c440dc0c084 100755
--- a/trunk/src/app/srs_app_source.cpp
+++ b/trunk/src/app/srs_app_source.cpp
@@ -11,7 +11,7 @@
 using namespace std;
 
 #include <srs_kernel_log.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_kernel_codec.hpp>
 #include <srs_kernel_rtc_rtp.hpp>
@@ -19,13 +19,13 @@ using namespace std;
 #include <srs_app_forward.hpp>
 #include <srs_app_config.hpp>
 #include <srs_app_encoder.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_app_dvr.hpp>
 #include <srs_kernel_buffer.hpp>
 #include <srs_app_edge.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_kernel_codec.hpp>
-#include <srs_rtmp_msg_array.hpp>
+#include <srs_protocol_rtmp_msg_array.hpp>
 #include <srs_app_hds.hpp>
 #include <srs_app_statistic.hpp>
 #include <srs_core_autofree.hpp>
diff --git a/trunk/src/app/srs_app_statistic.cpp b/trunk/src/app/srs_app_statistic.cpp
index fbbeb12c62a..86106757032 100644
--- a/trunk/src/app/srs_app_statistic.cpp
+++ b/trunk/src/app/srs_app_statistic.cpp
@@ -10,7 +10,7 @@
 #include <sstream>
 using namespace std;
 
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_json.hpp>
 #include <srs_protocol_kbps.hpp>
 #include <srs_app_conn.hpp>
diff --git a/trunk/src/app/srs_app_statistic.hpp b/trunk/src/app/srs_app_statistic.hpp
index dc04987e84c..fa4bbbd475a 100644
--- a/trunk/src/app/srs_app_statistic.hpp
+++ b/trunk/src/app/srs_app_statistic.hpp
@@ -14,7 +14,7 @@
 #include <vector>
 
 #include <srs_kernel_codec.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 
 class SrsKbps;
 class SrsWallClock;
diff --git a/trunk/src/main/srs_main_ingest_hls.cpp b/trunk/src/main/srs_main_ingest_hls.cpp
index eb7a3cc5b37..e95976d6398 100644
--- a/trunk/src/main/srs_main_ingest_hls.cpp
+++ b/trunk/src/main/srs_main_ingest_hls.cpp
@@ -20,8 +20,8 @@ using namespace std;
 #include <srs_kernel_ts.hpp>
 #include <srs_protocol_utility.hpp>
 #include <srs_protocol_amf0.hpp>
-#include <srs_raw_avc.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_raw_avc.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_utility.hpp>
 #include <srs_protocol_http_client.hpp>
 #include <srs_protocol_log.hpp>
diff --git a/trunk/src/protocol/srs_protocol_format.cpp b/trunk/src/protocol/srs_protocol_format.cpp
index d0212f2be16..afb1445995f 100644
--- a/trunk/src/protocol/srs_protocol_format.cpp
+++ b/trunk/src/protocol/srs_protocol_format.cpp
@@ -8,7 +8,7 @@
 
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_codec.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_kernel_buffer.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_utility.hpp>
diff --git a/trunk/src/protocol/srs_protocol_http_client.hpp b/trunk/src/protocol/srs_protocol_http_client.hpp
index ed160c6ff4a..5164290054a 100644
--- a/trunk/src/protocol/srs_protocol_http_client.hpp
+++ b/trunk/src/protocol/srs_protocol_http_client.hpp
@@ -15,7 +15,7 @@
 #include <openssl/ssl.h>
 
 #include <srs_protocol_st.hpp>
-#include <srs_http_stack.hpp>
+#include <srs_protocol_http_stack.hpp>
 
 class SrsHttpUri;
 class SrsHttpParser;
diff --git a/trunk/src/protocol/srs_protocol_http_conn.cpp b/trunk/src/protocol/srs_protocol_http_conn.cpp
index 77afe94bb3a..c426fde0cd2 100644
--- a/trunk/src/protocol/srs_protocol_http_conn.cpp
+++ b/trunk/src/protocol/srs_protocol_http_conn.cpp
@@ -17,7 +17,7 @@ using namespace std;
 #include <srs_kernel_utility.hpp>
 #include <srs_protocol_utility.hpp>
 #include <srs_core_autofree.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_conn.hpp>
 
 SrsHttpParser::SrsHttpParser()
diff --git a/trunk/src/protocol/srs_protocol_http_conn.hpp b/trunk/src/protocol/srs_protocol_http_conn.hpp
index cd9b687341d..030ae30c897 100644
--- a/trunk/src/protocol/srs_protocol_http_conn.hpp
+++ b/trunk/src/protocol/srs_protocol_http_conn.hpp
@@ -11,7 +11,7 @@
 
 #include <string>
 
-#include <srs_http_stack.hpp>
+#include <srs_protocol_http_stack.hpp>
 
 class ISrsConnection;
 class SrsFastStream;
diff --git a/trunk/src/protocol/srs_http_stack.cpp b/trunk/src/protocol/srs_protocol_http_stack.cpp
similarity index 99%
rename from trunk/src/protocol/srs_http_stack.cpp
rename to trunk/src/protocol/srs_protocol_http_stack.cpp
index 592850d8b9f..b6254590d35 100644
--- a/trunk/src/protocol/srs_http_stack.cpp
+++ b/trunk/src/protocol/srs_protocol_http_stack.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT or MulanPSL-2.0
 //
 
-#include <srs_http_stack.hpp>
+#include <srs_protocol_http_stack.hpp>
 
 #include <stdlib.h>
 #include <sstream>
diff --git a/trunk/src/protocol/srs_http_stack.hpp b/trunk/src/protocol/srs_protocol_http_stack.hpp
similarity index 100%
rename from trunk/src/protocol/srs_http_stack.hpp
rename to trunk/src/protocol/srs_protocol_http_stack.hpp
diff --git a/trunk/src/protocol/srs_raw_avc.cpp b/trunk/src/protocol/srs_protocol_raw_avc.cpp
similarity index 99%
rename from trunk/src/protocol/srs_raw_avc.cpp
rename to trunk/src/protocol/srs_protocol_raw_avc.cpp
index ad9deef8ddd..2dbd56f179f 100644
--- a/trunk/src/protocol/srs_raw_avc.cpp
+++ b/trunk/src/protocol/srs_protocol_raw_avc.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT or MulanPSL-2.0
 //
 
-#include <srs_raw_avc.hpp>
+#include <srs_protocol_raw_avc.hpp>
 
 #include <string.h>
 using namespace std;
diff --git a/trunk/src/protocol/srs_raw_avc.hpp b/trunk/src/protocol/srs_protocol_raw_avc.hpp
similarity index 100%
rename from trunk/src/protocol/srs_raw_avc.hpp
rename to trunk/src/protocol/srs_protocol_raw_avc.hpp
diff --git a/trunk/src/protocol/srs_rtc_stun_stack.cpp b/trunk/src/protocol/srs_protocol_rtc_stun.cpp
similarity index 99%
rename from trunk/src/protocol/srs_rtc_stun_stack.cpp
rename to trunk/src/protocol/srs_protocol_rtc_stun.cpp
index 5b201064a3c..4f967a9b2a8 100644
--- a/trunk/src/protocol/srs_rtc_stun_stack.cpp
+++ b/trunk/src/protocol/srs_protocol_rtc_stun.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT or MulanPSL-2.0
 //
 
-#include <srs_rtc_stun_stack.hpp>
+#include <srs_protocol_rtc_stun.hpp>
 
 using namespace std;
 
@@ -17,7 +17,7 @@ using namespace std;
 #include <srs_kernel_buffer.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_utility.hpp>
-#include <srs_rtmp_handshake.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 
 static srs_error_t hmac_encode(const std::string& algo, const char* key, const int& key_length,  
         const char* input, const int input_length, char* output, unsigned int& output_length)
diff --git a/trunk/src/protocol/srs_rtc_stun_stack.hpp b/trunk/src/protocol/srs_protocol_rtc_stun.hpp
similarity index 100%
rename from trunk/src/protocol/srs_rtc_stun_stack.hpp
rename to trunk/src/protocol/srs_protocol_rtc_stun.hpp
diff --git a/trunk/src/protocol/srs_protocol_rtmp_conn.cpp b/trunk/src/protocol/srs_protocol_rtmp_conn.cpp
index 3f76fdc298c..d5ff72c10ab 100644
--- a/trunk/src/protocol/srs_protocol_rtmp_conn.cpp
+++ b/trunk/src/protocol/srs_protocol_rtmp_conn.cpp
@@ -10,7 +10,7 @@
 using namespace std;
 
 #include <srs_protocol_kbps.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_st.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_protocol_utility.hpp>
diff --git a/trunk/src/protocol/srs_rtmp_handshake.cpp b/trunk/src/protocol/srs_protocol_rtmp_handshake.cpp
similarity index 99%
rename from trunk/src/protocol/srs_rtmp_handshake.cpp
rename to trunk/src/protocol/srs_protocol_rtmp_handshake.cpp
index ec8dd78ccd2..eaaeda3e114 100644
--- a/trunk/src/protocol/srs_rtmp_handshake.cpp
+++ b/trunk/src/protocol/srs_protocol_rtmp_handshake.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT or MulanPSL-2.0
 //
 
-#include <srs_rtmp_handshake.hpp>
+#include <srs_protocol_rtmp_handshake.hpp>
 
 #include <time.h>
 
@@ -13,7 +13,7 @@
 #include <srs_kernel_log.hpp>
 #include <srs_protocol_io.hpp>
 #include <srs_protocol_utility.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_kernel_buffer.hpp>
 #include <srs_kernel_utility.hpp>
 
diff --git a/trunk/src/protocol/srs_rtmp_handshake.hpp b/trunk/src/protocol/srs_protocol_rtmp_handshake.hpp
similarity index 100%
rename from trunk/src/protocol/srs_rtmp_handshake.hpp
rename to trunk/src/protocol/srs_protocol_rtmp_handshake.hpp
diff --git a/trunk/src/protocol/srs_rtmp_msg_array.cpp b/trunk/src/protocol/srs_protocol_rtmp_msg_array.cpp
similarity index 90%
rename from trunk/src/protocol/srs_rtmp_msg_array.cpp
rename to trunk/src/protocol/srs_protocol_rtmp_msg_array.cpp
index cf856aee0b1..8b6a386bb18 100644
--- a/trunk/src/protocol/srs_rtmp_msg_array.cpp
+++ b/trunk/src/protocol/srs_protocol_rtmp_msg_array.cpp
@@ -4,9 +4,9 @@
 // SPDX-License-Identifier: MIT or MulanPSL-2.0
 //
 
-#include <srs_rtmp_msg_array.hpp>
+#include <srs_protocol_rtmp_msg_array.hpp>
 
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 
 SrsMessageArray::SrsMessageArray(int max_msgs)
 {
diff --git a/trunk/src/protocol/srs_rtmp_msg_array.hpp b/trunk/src/protocol/srs_protocol_rtmp_msg_array.hpp
similarity index 100%
rename from trunk/src/protocol/srs_rtmp_msg_array.hpp
rename to trunk/src/protocol/srs_protocol_rtmp_msg_array.hpp
diff --git a/trunk/src/protocol/srs_rtmp_stack.cpp b/trunk/src/protocol/srs_protocol_rtmp_stack.cpp
similarity index 99%
rename from trunk/src/protocol/srs_rtmp_stack.cpp
rename to trunk/src/protocol/srs_protocol_rtmp_stack.cpp
index 056155f238d..b00c5308355 100644
--- a/trunk/src/protocol/srs_rtmp_stack.cpp
+++ b/trunk/src/protocol/srs_protocol_rtmp_stack.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT or MulanPSL-2.0
 //
 
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 
 #include <srs_protocol_amf0.hpp>
 #include <srs_protocol_io.hpp>
@@ -13,7 +13,7 @@
 #include <srs_kernel_utility.hpp>
 #include <srs_protocol_stream.hpp>
 #include <srs_protocol_utility.hpp>
-#include <srs_rtmp_handshake.hpp>
+#include <srs_protocol_rtmp_handshake.hpp>
 
 // for srs-librtmp, @see https://github.com/ossrs/srs/issues/213
 #ifndef _WIN32
diff --git a/trunk/src/protocol/srs_rtmp_stack.hpp b/trunk/src/protocol/srs_protocol_rtmp_stack.hpp
similarity index 100%
rename from trunk/src/protocol/srs_rtmp_stack.hpp
rename to trunk/src/protocol/srs_protocol_rtmp_stack.hpp
diff --git a/trunk/src/protocol/srs_rtsp_stack.cpp b/trunk/src/protocol/srs_protocol_rtsp_stack.cpp
similarity index 99%
rename from trunk/src/protocol/srs_rtsp_stack.cpp
rename to trunk/src/protocol/srs_protocol_rtsp_stack.cpp
index 5f22cb75df8..7c21a8a1058 100644
--- a/trunk/src/protocol/srs_rtsp_stack.cpp
+++ b/trunk/src/protocol/srs_protocol_rtsp_stack.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT or MulanPSL-2.0
 //
 
-#include <srs_rtsp_stack.hpp>
+#include <srs_protocol_rtsp_stack.hpp>
 
 #include <stdlib.h>
 #include <map>
diff --git a/trunk/src/protocol/srs_rtsp_stack.hpp b/trunk/src/protocol/srs_protocol_rtsp_stack.hpp
similarity index 100%
rename from trunk/src/protocol/srs_rtsp_stack.hpp
rename to trunk/src/protocol/srs_protocol_rtsp_stack.hpp
diff --git a/trunk/src/protocol/srs_protocol_utility.cpp b/trunk/src/protocol/srs_protocol_utility.cpp
index 6535ca1c230..778e44f0396 100644
--- a/trunk/src/protocol/srs_protocol_utility.cpp
+++ b/trunk/src/protocol/srs_protocol_utility.cpp
@@ -18,10 +18,10 @@ using namespace std;
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_kernel_buffer.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_kernel_codec.hpp>
 #include <srs_kernel_consts.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_io.hpp>
 
 #include <unistd.h>
@@ -40,7 +40,7 @@ using namespace std;
 #include <srs_kernel_consts.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_utility.hpp>
-#include <srs_http_stack.hpp>
+#include <srs_protocol_http_stack.hpp>
 
 /**
  * resolve the vhost in query string
diff --git a/trunk/src/srt/srt_to_rtmp.hpp b/trunk/src/srt/srt_to_rtmp.hpp
index ff5b4e12fe2..cd54ff63c70 100644
--- a/trunk/src/srt/srt_to_rtmp.hpp
+++ b/trunk/src/srt/srt_to_rtmp.hpp
@@ -18,7 +18,7 @@
 #include <condition_variable>
 #include <srs_kernel_ts.hpp>
 #include <srs_app_rtmp_conn.hpp>
-#include <srs_raw_avc.hpp>
+#include <srs_protocol_raw_avc.hpp>
 #include <srs_protocol_utility.hpp>
 #include <unordered_map>
 
diff --git a/trunk/src/utest/srs_utest_avc.cpp b/trunk/src/utest/srs_utest_avc.cpp
index 70ed492be97..8e6c769a7f7 100644
--- a/trunk/src/utest/srs_utest_avc.cpp
+++ b/trunk/src/utest/srs_utest_avc.cpp
@@ -5,7 +5,7 @@
 //
 #include <srs_utest_avc.hpp>
 
-#include <srs_raw_avc.hpp>
+#include <srs_protocol_raw_avc.hpp>
 #include <srs_kernel_buffer.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_core_autofree.hpp>
diff --git a/trunk/src/utest/srs_utest_config.cpp b/trunk/src/utest/srs_utest_config.cpp
index 87551e3342b..7a967484734 100644
--- a/trunk/src/utest/srs_utest_config.cpp
+++ b/trunk/src/utest/srs_utest_config.cpp
@@ -14,7 +14,7 @@ using namespace std;
 #include <srs_core_performance.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_protocol_st.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_utest_kernel.hpp>
 
 MockSrsConfigBuffer::MockSrsConfigBuffer(string buf)
diff --git a/trunk/src/utest/srs_utest_http.cpp b/trunk/src/utest/srs_utest_http.cpp
index b8d3700f0b0..4d06e362e1c 100644
--- a/trunk/src/utest/srs_utest_http.cpp
+++ b/trunk/src/utest/srs_utest_http.cpp
@@ -8,7 +8,7 @@
 #include <sstream>
 using namespace std;
 
-#include <srs_http_stack.hpp>
+#include <srs_protocol_http_stack.hpp>
 #include <srs_protocol_http_conn.hpp>
 #include <srs_utest_protocol.hpp>
 #include <srs_protocol_json.hpp>
diff --git a/trunk/src/utest/srs_utest_http.hpp b/trunk/src/utest/srs_utest_http.hpp
index 1f0dec8378d..059f69951ab 100644
--- a/trunk/src/utest/srs_utest_http.hpp
+++ b/trunk/src/utest/srs_utest_http.hpp
@@ -13,7 +13,7 @@
 #include <srs_utest.hpp>
 
 #include <srs_utest_protocol.hpp>
-#include <srs_http_stack.hpp>
+#include <srs_protocol_http_stack.hpp>
 #include <srs_protocol_http_conn.hpp>
 
 #include <string>
diff --git a/trunk/src/utest/srs_utest_protocol.cpp b/trunk/src/utest/srs_utest_protocol.cpp
index 2be8a1a79c5..1f9986f346c 100644
--- a/trunk/src/utest/srs_utest_protocol.cpp
+++ b/trunk/src/utest/srs_utest_protocol.cpp
@@ -10,12 +10,12 @@ using namespace std;
 #include <srs_kernel_error.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_protocol_utility.hpp>
-#include <srs_rtmp_msg_array.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_msg_array.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_app_st.hpp>
 #include <srs_protocol_amf0.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_http_conn.hpp>
 
 MockEmptyIO::MockEmptyIO()
diff --git a/trunk/src/utest/srs_utest_protocol.hpp b/trunk/src/utest/srs_utest_protocol.hpp
index 673a8a647bf..3d1c4259485 100644
--- a/trunk/src/utest/srs_utest_protocol.hpp
+++ b/trunk/src/utest/srs_utest_protocol.hpp
@@ -15,8 +15,8 @@
 #include <string>
 #include <srs_protocol_utility.hpp>
 
-#include <srs_rtmp_stack.hpp>
-#include <srs_rtmp_handshake.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_stream.hpp>
 #include <srs_protocol_kbps.hpp>
 
diff --git a/trunk/src/utest/srs_utest_rtmp.cpp b/trunk/src/utest/srs_utest_rtmp.cpp
index bc6ea693943..60eba2e8422 100644
--- a/trunk/src/utest/srs_utest_rtmp.cpp
+++ b/trunk/src/utest/srs_utest_rtmp.cpp
@@ -8,12 +8,12 @@
 #include <srs_kernel_error.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_protocol_utility.hpp>
-#include <srs_rtmp_msg_array.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_msg_array.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_app_st.hpp>
 #include <srs_protocol_amf0.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_http_conn.hpp>
 #include <srs_kernel_buffer.hpp>
 #include <srs_kernel_codec.hpp>
diff --git a/trunk/src/utest/srs_utest_service.cpp b/trunk/src/utest/srs_utest_service.cpp
index 6113f839172..1bee3ff9b8a 100644
--- a/trunk/src/utest/srs_utest_service.cpp
+++ b/trunk/src/utest/srs_utest_service.cpp
@@ -14,7 +14,7 @@ using namespace std;
 
 #include <srs_protocol_st.hpp>
 #include <srs_protocol_http_conn.hpp>
-#include <srs_rtmp_stack.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_utest_protocol.hpp>
 #include <srs_utest_http.hpp>