diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/em/Jamfile b/src/add-ons/kernel/drivers/network/ipro1000/dev/em/Jamfile
index eb732e88a0..5511caf34f 100644
--- a/src/add-ons/kernel/drivers/network/ipro1000/dev/em/Jamfile
+++ b/src/add-ons/kernel/drivers/network/ipro1000/dev/em/Jamfile
@@ -1,7 +1,5 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network ipro1000 dev em ;
 
-SubDirCcFlags -Wall ;
-
 UsePrivateHeaders kernel net ;
 
 UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
diff --git a/src/libs/compat/freebsd_network/Jamfile b/src/libs/compat/freebsd_network/Jamfile
index 6c22eebf6c..c49d460046 100644
--- a/src/libs/compat/freebsd_network/Jamfile
+++ b/src/libs/compat/freebsd_network/Jamfile
@@ -7,7 +7,7 @@ UseHeaders [ FDirName $(SUBDIR) compat ] : true ;
 
 SubDirCcFlags [ FDefines _KERNEL=1 KTR=1 ] ;
 
-Library libfreebsd_network.a :
+KernelStaticLibrary libfreebsd_network.a :
 	bus.c
 	callout.c
 	compat.c
diff --git a/src/libs/compat/freebsd_network/compat/sys/callout.h b/src/libs/compat/freebsd_network/compat/sys/callout.h
index 9fe4e530bb..8395676d12 100644
--- a/src/libs/compat/freebsd_network/compat/sys/callout.h
+++ b/src/libs/compat/freebsd_network/compat/sys/callout.h
@@ -1,7 +1,7 @@
 #ifndef _FBSD_COMPAT_SYS_CALLOUT_H_
 #define _FBSD_COMPAT_SYS_CALLOUT_H_
 
-#include <net_stack.h>
+#include <sys/haiku-module.h>
 
 #include <sys/mutex.h>
 #include <sys/queue.h>
diff --git a/src/libs/compat/freebsd_network/compat/sys/haiku-module.h b/src/libs/compat/freebsd_network/compat/sys/haiku-module.h
index bbaac2d30d..731c0d4415 100644
--- a/src/libs/compat/freebsd_network/compat/sys/haiku-module.h
+++ b/src/libs/compat/freebsd_network/compat/sys/haiku-module.h
@@ -9,6 +9,11 @@
 #define _FBSD_COMPAT_SYS_HAIKU_MODULE_H_
 
 #include <Drivers.h> /* for device_hooks */
+#include <KernelExport.h>
+
+#include <lock.h> /* mutex, recursive_lock for mtx */
+#include <net_stack.h> /* net_timer, for callout */
+#undef ASSERT /* private/kernel/debug.h sets it */
 
 typedef struct device *device_t;
 typedef struct devclass *devclass_t;
diff --git a/src/libs/compat/freebsd_network/compat/sys/kernel.h b/src/libs/compat/freebsd_network/compat/sys/kernel.h
index 3409d7fdf1..41e7946e29 100644
--- a/src/libs/compat/freebsd_network/compat/sys/kernel.h
+++ b/src/libs/compat/freebsd_network/compat/sys/kernel.h
@@ -5,8 +5,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <KernelExport.h>
-
+#include <sys/haiku-module.h>
 #include <sys/module.h>
 
 #define hz	1000000LL
diff --git a/src/libs/compat/freebsd_network/compat/sys/mutex.h b/src/libs/compat/freebsd_network/compat/sys/mutex.h
index 3a8f908de6..ad88914f42 100644
--- a/src/libs/compat/freebsd_network/compat/sys/mutex.h
+++ b/src/libs/compat/freebsd_network/compat/sys/mutex.h
@@ -1,7 +1,7 @@
 #ifndef _FBSD_COMPAT_SYS_MUTEX_H_
 #define _FBSD_COMPAT_SYS_MUTEX_H_
 
-#include <lock.h>
+#include <sys/haiku-module.h>
 
 struct mtx {
 	int type;
diff --git a/src/libs/compat/freebsd_network/fbsd_busdma_x86.c b/src/libs/compat/freebsd_network/fbsd_busdma_x86.c
index f70015391e..cbb9e41ddb 100644
--- a/src/libs/compat/freebsd_network/fbsd_busdma_x86.c
+++ b/src/libs/compat/freebsd_network/fbsd_busdma_x86.c
@@ -1000,7 +1000,7 @@ alloc_bounce_zone(bus_dma_tag_t dmat)
 	bz->boundary = dmat->boundary;
 	snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount);
 	busdma_zonecount++;
-	snprintf(bz->lowaddrid, 18, "%lx", (uintmax_t)bz->lowaddr);
+	snprintf(bz->lowaddrid, 18, "%llx", (uintmax_t)bz->lowaddr);
 	STAILQ_INSERT_TAIL(&bounce_zone_list, bz, links);
 	dmat->bounce_zone = bz;