diff --git a/libowlps/libowlps.c b/libowlps/libowlps.c
index 94a66d1..08535e6 100644
--- a/libowlps/libowlps.c
+++ b/libowlps/libowlps.c
@@ -13,6 +13,8 @@
 #include <time.h>
 #include <signal.h>
 
+#include <arpa/inet.h>
+
 #include <assert.h>
 
 #define DEBUG
diff --git a/libowlps/owlps.h b/libowlps/owlps.h
index b46f6bd..d277f54 100644
--- a/libowlps/owlps.h
+++ b/libowlps/owlps.h
@@ -11,8 +11,12 @@ extern "C" {
 
 
 #include <stdint.h> // We'll use <cstdint> with C++ 0x
-#include <arpa/inet.h>
-#include <net/ethernet.h>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <netinet/if_ether.h>
 
 
 // Port on which the positioning request is sent by the mobile:
diff --git a/owlps-aggregator/owlps-aggregatord.c b/owlps-aggregator/owlps-aggregatord.c
index 3db4ee3..61c4fa2 100644
--- a/owlps-aggregator/owlps-aggregatord.c
+++ b/owlps-aggregator/owlps-aggregatord.c
@@ -13,6 +13,7 @@
 #include <signal.h>
 #include <pthread.h>
 #include <semaphore.h>
+#include <arpa/inet.h>
 
 #include <confuse.h>
 
diff --git a/owlps-listener/owlps-listenerd.c b/owlps-listener/owlps-listenerd.c
index a08182e..602c247 100644
--- a/owlps-listener/owlps-listenerd.c
+++ b/owlps-listener/owlps-listenerd.c
@@ -28,6 +28,7 @@
 // Used by get_mac_addr():
 #include <netinet/udp.h>
 #include <netinet/ip.h>
+#include <arpa/inet.h>
 
 #include <assert.h>