diff --git a/gst/gdp/dataprotocol.c b/gst/gdp/dataprotocol.c
index 9210f29901..dabcb202e9 100644
--- a/gst/gdp/dataprotocol.c
+++ b/gst/gdp/dataprotocol.c
@@ -167,7 +167,6 @@ gst_dp_header_from_buffer (const GstBuffer * buffer, GstDPHeaderFlag flags,
   guint16 flags_mask;
 
   g_return_val_if_fail (GST_IS_BUFFER (buffer), FALSE);
-  g_return_val_if_fail (GST_BUFFER_REFCOUNT_VALUE (buffer) > 0, FALSE);
   g_return_val_if_fail (header, FALSE);
 
   *length = GST_DP_HEADER_LENGTH;
@@ -188,9 +187,8 @@ gst_dp_header_from_buffer (const GstBuffer * buffer, GstDPHeaderFlag flags,
 
   /* data flags */
   /* we only copy KEY_UNIT,DELTA_UNIT and IN_CAPS flags */
-  flags_mask = GST_DATA_FLAG_SHIFT (GST_BUFFER_PREROLL) |
-      GST_DATA_FLAG_SHIFT (GST_BUFFER_IN_CAPS) |
-      GST_DATA_FLAG_SHIFT (GST_BUFFER_DELTA_UNIT);
+  flags_mask = GST_BUFFER_FLAG_PREROLL | GST_BUFFER_FLAG_IN_CAPS |
+      GST_BUFFER_FLAG_DELTA_UNIT;
 
   GST_WRITE_UINT16_BE (h + 40, GST_BUFFER_FLAGS (buffer) & flags_mask);
 
diff --git a/gst/gdp/dataprotocol.h b/gst/gdp/dataprotocol.h
index ca394ccf9a..da3c2b9337 100644
--- a/gst/gdp/dataprotocol.h
+++ b/gst/gdp/dataprotocol.h
@@ -24,7 +24,6 @@
 #ifndef __GST_DATA_PROTOCOL_H__
 #define __GST_DATA_PROTOCOL_H__
 
-#include <gst/gstdata.h>
 #include <gst/gstbuffer.h>
 #include <gst/gstevent.h>
 #include <gst/gstcaps.h>
diff --git a/gst/gdp/dp-private.h b/gst/gdp/dp-private.h
index 77f7f8b630..386916e14d 100644
--- a/gst/gdp/dp-private.h
+++ b/gst/gdp/dp-private.h
@@ -23,7 +23,6 @@
 #ifndef __GST_DP_PRIVATE_H__
 #define __GST_DP_PRIVATE_H__
 
-#include <gst/gstdata.h>
 #include <gst/gstbuffer.h>
 #include <gst/gstevent.h>
 #include <gst/gstcaps.h>