cast: cleanup rtp header and parsing

media/cast/net/rtp/cast_message_builder.h

Index: media/cast/net/rtp/cast_message_builder.h
diff --git a/media/cast/net/rtp/cast_message_builder.h b/media/cast/net/rtp/cast_message_builder.h
index 58d8e9a2bc61dc6af5b87c6e0fabf59574255f0d..ab9b72fced9969b579082c0c9adb8aa21be753af 100644
--- a/media/cast/net/rtp/cast_message_builder.h
+++ b/media/cast/net/rtp/cast_message_builder.h
@@ -4,14 +4,14 @@
 
 // Handles NACK list and manages ACK.
 
-#ifndef MEDIA_CAST_FRAMER_CAST_MESSAGE_BUILDER_H_
-#define MEDIA_CAST_FRAMER_CAST_MESSAGE_BUILDER_H_
+#ifndef MEDIA_CAST_NET_RTP_CAST_MESSAGE_BUILDER_H_
+#define MEDIA_CAST_NET_RTP_CAST_MESSAGE_BUILDER_H_
 
 #include <deque>
 #include <map>
 
 #include "media/cast/net/rtcp/rtcp.h"
-#include "media/cast/net/rtp/rtp_receiver_defines.h"
+#include "media/cast/net/rtp/rtp_defines.h"
 
 namespace media {
 namespace cast {
@@ -66,4 +66,4 @@ class CastMessageBuilder {
 }  // namespace cast
 }  // namespace media
 
-#endif  //  MEDIA_CAST_FRAMER_CAST_MESSAGE_BUILDER_H_
+#endif  //  MEDIA_CAST_NET_RTP_CAST_MESSAGE_BUILDER_H_