cast: cleanup rtp header and parsing

media/cast/net/rtp/frame_buffer.h

Index: media/cast/net/rtp/frame_buffer.h
diff --git a/media/cast/net/rtp/frame_buffer.h b/media/cast/net/rtp/frame_buffer.h
index 1089433eae205b91813dcff5d220f2699a827f4a..b7cd320b42cfb92a7bc27cf62524287ca2652da5 100644
--- a/media/cast/net/rtp/frame_buffer.h
+++ b/media/cast/net/rtp/frame_buffer.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_CAST_FRAMER_FRAME_BUFFER
-#define MEDIA_CAST_FRAMER_FRAME_BUFFER
+#ifndef MEDIA_CAST_NET_RTP_FRAME_BUFFER_H_
+#define MEDIA_CAST_NET_RTP_FRAME_BUFFER_H_
 
 #include <map>
 #include <vector>
 
 #include "media/cast/cast_config.h"
-#include "media/cast/net/rtp/rtp_receiver_defines.h"
+#include "media/cast/net/rtp/rtp_defines.h"
 
 namespace media {
 namespace cast {
@@ -55,4 +55,4 @@ class FrameBuffer {
 }  // namespace cast
 }  // namespace media
 
-#endif  // MEDIA_CAST_FRAMER_FRAME_BUFFER
+#endif  // MEDIA_CAST_NET_RTP_FRAME_BUFFER_H_