diff --git a/openbsc/src/libmgcp/mgcp_network.c b/openbsc/src/libmgcp/mgcp_network.c
index c3f43dd..07e1515 100644
--- a/openbsc/src/libmgcp/mgcp_network.c
+++ b/openbsc/src/libmgcp/mgcp_network.c
@@ -25,6 +25,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
+#include <time.h>
+#include <limits.h>
 
 #include <sys/socket.h>
 #include <arpa/inet.h>
@@ -32,9 +34,10 @@
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/select.h>
 
+#include <osmocom/netif/rtp.h>
+
 #include <openbsc/mgcp.h>
 #include <openbsc/mgcp_internal.h>
-#include <openbsc/rtp.h>
 
 #include <openbsc/osmux.h>
 
diff --git a/openbsc/src/libtrau/rtp_proxy.c b/openbsc/src/libtrau/rtp_proxy.c
index 523f2b4..52616a0 100644
--- a/openbsc/src/libtrau/rtp_proxy.c
+++ b/openbsc/src/libtrau/rtp_proxy.c
@@ -36,22 +36,13 @@
 #include <openbsc/rtp_proxy.h>
 #include <openbsc/mncc.h>
 #include <openbsc/trau_upqueue.h>
-#include <openbsc/rtp.h>
+
+#include <osmocom/netif/rtp.h>
 
 /* attempt to determine byte order */
 #include <sys/param.h>
 #include <limits.h>
 
-#ifndef __BYTE_ORDER
-# ifdef __APPLE__
-#  define __BYTE_ORDER __DARWIN_BYTE_ORDER
-#  define __LITTLE_ENDIAN __DARWIN_LITTLE_ENDIAN
-#  define __BIG_ENDIAN __DARWIN_BIG_ENDIAN
-# else
-#  error "__BYTE_ORDER should be defined by someone"
-# endif
-#endif
-
 static LLIST_HEAD(rtp_sockets);
 
 /* should we mangle the CNAME inside SDES of RTCP packets? We disable
@@ -66,21 +57,10 @@
 
 #define RTP_ALLOC_SIZE	1500
 
-/* according to RFC 1889 */
-struct rtcp_hdr {
-	uint8_t byte0;
-	uint8_t type;
-	uint16_t length;
-} __attribute__((packed));
-
 #define RTCP_TYPE_SDES	202
 	
 #define RTCP_IE_CNAME	1
 
-struct rtp_x_hdr {
-	uint16_t by_profile;
-	uint16_t length;
-} __attribute__((packed));
 
 #define RTP_VERSION	2