diff --git a/src/libs/compat/freebsd_network/compat/sys/mbuf.h b/src/libs/compat/freebsd_network/compat/sys/mbuf.h
index 2b043401da..8c6e6c5b03 100644
--- a/src/libs/compat/freebsd_network/compat/sys/mbuf.h
+++ b/src/libs/compat/freebsd_network/compat/sys/mbuf.h
@@ -76,15 +76,8 @@
 #define CSUM_PSEUDO_HDR	0x0800
 #define CSUM_DELAY_DATA	(CSUM_TCP | CSUM_UDP)
 
-// TODO After all network driver are updated to the FreeBSD 8 version this can
-// changed
-#if __FreeBSD_version__ >= 8
 #define MEXTADD(m, buf, size, free, arg1, arg2, flags, type) \
 	m_extadd((m), (caddr_t)(buf), (size), (free),(arg1),(arg2),(flags), (type))
-#else
-#define MEXTADD(m, buf, size, free, args, flags, type) \
-	m_extadd((m), (caddr_t)(buf), (size), (free),(args),(flags), (type))
-#endif
 
 
 extern int max_linkhdr;
@@ -171,15 +164,8 @@ struct mbuf*	m_devget(char*, int, int, struct ifnet*,
 struct mbuf*	m_dup(struct mbuf*, int);
 int				m_dup_pkthdr(struct mbuf*, struct mbuf*, int);
 
-// TODO After all network driver are updated to the FreeBSD 8 version this can
-// changed
-#if __FreeBSD_version__ >= 8
 void			m_extadd(struct mbuf*, caddr_t, u_int, void(*) (void*, void*),
 	void*, void*, int, int);
-#else
-void 			m_extadd(struct mbuf*, caddr_t, u_int, void(*) (void*, void*),
-	void*, int, int);
-#endif
 
 u_int			m_fixhdr(struct mbuf*);
 struct mbuf*	m_free(struct mbuf*);
diff --git a/src/libs/compat/freebsd_network/mbuf.c b/src/libs/compat/freebsd_network/mbuf.c
index ce96d5d38e..4c6c79e27c 100644
--- a/src/libs/compat/freebsd_network/mbuf.c
+++ b/src/libs/compat/freebsd_network/mbuf.c
@@ -245,23 +245,12 @@ m_free(struct mbuf *memoryBuffer)
 }
 
 
-// TODO once all driver are updated to FreeBSD 8 this can be changed
-#if __FreeBSD_version__ >= 8
 m_extadd(struct mbuf *memoryBuffer, caddr_t buffer, u_int size,
     void (*freeHook)(void *, void *), void *arg1, void *arg2, int flags, int type)
 {
 	// TODO: implement?
 	panic("m_extadd() called.");
 }
-#else
-void
-m_extadd(struct mbuf *memoryBuffer, caddr_t buffer, u_int size,
-    void (*freeHook)(void *, void *), void *args, int flags, int type)
-{
-	// TODO: implement?
-	panic("m_extadd() called.");
-}
-#endif
 
 
 status_t