diff --git a/trunk/configure b/trunk/configure
index b29d709cb..4b041e8a2 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -363,7 +363,7 @@ CORE_OBJS="${MODULE_OBJS[@]}"
 MODULE_ID="KERNEL" 
 MODULE_DEPENDS=("CORE") 
 ModuleLibIncs=(${SRS_OBJS_DIR})
-MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_stream" "srs_kernel_buffer" 
+MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_stream"
         "srs_kernel_utility" "srs_kernel_flv" "srs_kernel_codec" "srs_kernel_file" 
         "srs_kernel_consts")
 KERNEL_INCS="src/kernel"; MODULE_DIR=${KERNEL_INCS} . auto/modules.sh
@@ -374,7 +374,7 @@ MODULE_ID="RTMP"
 MODULE_DEPENDS=("CORE" "KERNEL") 
 ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot})
 MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_stack" "srs_protocol_rtmp"
-        "srs_protocol_handshake" "srs_protocol_utility" "srs_protocol_msg_array")
+        "srs_protocol_handshake" "srs_protocol_utility" "srs_protocol_msg_array" "srs_protocol_buffer")
 RTMP_INCS="src/rtmp"; MODULE_DIR=${RTMP_INCS} . auto/modules.sh
 RTMP_OBJS="${MODULE_OBJS[@]}"
 #
diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp
index 8cd71c8e1..4915514e6 100644
--- a/trunk/src/app/srs_app_hls.cpp
+++ b/trunk/src/app/srs_app_hls.cpp
@@ -68,7 +68,7 @@ using namespace std;
 #include <srs_kernel_utility.hpp>
 #include <srs_app_avc_aac.hpp>
 #include <srs_kernel_file.hpp>
-#include <srs_kernel_buffer.hpp>
+#include <srs_protocol_buffer.hpp>
 
 // max PES packets size to flush the video.
 #define SRS_AUTO_HLS_AUDIO_CACHE_SIZE 1024 * 1024
diff --git a/trunk/src/kernel/srs_kernel_buffer.cpp b/trunk/src/rtmp/srs_protocol_buffer.cpp
similarity index 98%
rename from trunk/src/kernel/srs_kernel_buffer.cpp
rename to trunk/src/rtmp/srs_protocol_buffer.cpp
index 89c6f1672..b371e2f04 100644
--- a/trunk/src/kernel/srs_kernel_buffer.cpp
+++ b/trunk/src/rtmp/srs_protocol_buffer.cpp
@@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include <srs_kernel_buffer.hpp>
+#include <srs_protocol_buffer.hpp>
 
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
diff --git a/trunk/src/kernel/srs_kernel_buffer.hpp b/trunk/src/rtmp/srs_protocol_buffer.hpp
similarity index 98%
rename from trunk/src/kernel/srs_kernel_buffer.hpp
rename to trunk/src/rtmp/srs_protocol_buffer.hpp
index 681b65a95..ff6ac02c7 100644
--- a/trunk/src/kernel/srs_kernel_buffer.hpp
+++ b/trunk/src/rtmp/srs_protocol_buffer.hpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define SRS_KERNEL_BUFFER_HPP
 
 /*
-#include <srs_kernel_buffer.hpp>
+#include <srs_protocol_buffer.hpp>
 */
 
 #include <srs_core.hpp>
diff --git a/trunk/src/rtmp/srs_protocol_io.hpp b/trunk/src/rtmp/srs_protocol_io.hpp
index bc816309f..f4b2d4603 100644
--- a/trunk/src/rtmp/srs_protocol_io.hpp
+++ b/trunk/src/rtmp/srs_protocol_io.hpp
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <sys/uio.h>
 #endif
 
-#include <srs_kernel_buffer.hpp>
+#include <srs_protocol_buffer.hpp>
 
 /**
 * the system io reader/writer architecture:
diff --git a/trunk/src/srs/srs.upp b/trunk/src/srs/srs.upp
index 8e3d6ff11..3e0b8a62a 100755
--- a/trunk/src/srs/srs.upp
+++ b/trunk/src/srs/srs.upp
@@ -16,8 +16,6 @@ file
 	..\core\srs_core_autofree.hpp,
 	..\core\srs_core_autofree.cpp,
 	kernel readonly separator,
-	..\kernel\srs_kernel_buffer.hpp,
-	..\kernel\srs_kernel_buffer.cpp,
 	..\kernel\srs_kernel_codec.hpp,
 	..\kernel\srs_kernel_codec.cpp,
 	..\kernel\srs_kernel_consts.hpp,
@@ -37,6 +35,8 @@ file
 	rtmp-protocol readonly separator,
 	..\rtmp\srs_protocol_amf0.hpp,
 	..\rtmp\srs_protocol_amf0.cpp,
+        ..\rtmp\srs_protocol_buffer.hpp,
+        ..\rtmp\srs_protocol_buffer.cpp,
 	..\rtmp\srs_protocol_handshake.hpp,
 	..\rtmp\srs_protocol_handshake.cpp,
 	..\rtmp\srs_protocol_io.hpp,
diff --git a/trunk/src/utest/srs_utest_kernel.hpp b/trunk/src/utest/srs_utest_kernel.hpp
index 44b7fd676..11d220e95 100644
--- a/trunk/src/utest/srs_utest_kernel.hpp
+++ b/trunk/src/utest/srs_utest_kernel.hpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <string>
 #include <srs_kernel_file.hpp>
-#include <srs_kernel_buffer.hpp>
+#include <srs_protocol_buffer.hpp>
 
 class MockBufferReader: public ISrsBufferReader
 {
diff --git a/trunk/src/utest/srs_utest_protocol.hpp b/trunk/src/utest/srs_utest_protocol.hpp
index 8ffb69112..b97d8fbe9 100644
--- a/trunk/src/utest/srs_utest_protocol.hpp
+++ b/trunk/src/utest/srs_utest_protocol.hpp
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <srs_protocol_rtmp.hpp>
 #include <srs_protocol_handshake.hpp>
-#include <srs_kernel_buffer.hpp>
+#include <srs_protocol_buffer.hpp>
 
 #ifdef SRS_AUTO_SSL
 using namespace _srs_internal;