diff --git a/cpu/6502/net/ethernet-drv.c b/cpu/6502/net/ethernet-drv.c
index de0bcd814..f7b18f94a 100644
--- a/cpu/6502/net/ethernet-drv.c
+++ b/cpu/6502/net/ethernet-drv.c
@@ -28,16 +28,16 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: ethernet-drv.c,v 1.1 2007/11/20 21:10:20 oliverschmidt Exp $
+ * @(#)$Id: ethernet-drv.c,v 1.2 2007/11/27 20:54:10 oliverschmidt Exp $
  */
 
 #include <stdio.h>
 
 #include "contiki-net.h"
-#include "ethernet.h"
+#include "net/ethernet.h"
 #include "net/uip-neighbor.h"
 
-#include "ethernet-drv.h"
+#include "net/ethernet-drv.h"
 
 #define BUF ((struct uip_eth_hdr *)&uip_buf[0])
 
diff --git a/cpu/native/net/wpcap-drv.c b/cpu/native/net/wpcap-drv.c
index bc65464ec..ea2ee7e55 100644
--- a/cpu/native/net/wpcap-drv.c
+++ b/cpu/native/net/wpcap-drv.c
@@ -28,14 +28,14 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: wpcap-drv.c,v 1.2 2007/05/23 22:13:29 oliverschmidt Exp $
+ * @(#)$Id: wpcap-drv.c,v 1.3 2007/11/27 20:57:18 oliverschmidt Exp $
  */
 
 #include "contiki-net.h"
-#include "wpcap.h"
 #include "net/uip-neighbor.h"
+#include "net/wpcap.h"
 
-#include "wpcap-drv.h"
+#include "net/wpcap-drv.h"
 
 #define BUF ((struct uip_eth_hdr *)&uip_buf[0])
 
diff --git a/cpu/native/net/wpcap.c b/cpu/native/net/wpcap.c
index c8db5eb2c..194ac2946 100644
--- a/cpu/native/net/wpcap.c
+++ b/cpu/native/net/wpcap.c
@@ -30,7 +30,7 @@
  *
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: wpcap.c,v 1.11 2007/11/17 21:33:53 oliverschmidt Exp $
+ * $Id: wpcap.c,v 1.12 2007/11/27 20:57:18 oliverschmidt Exp $
  */
 
 #define WIN32_LEAN_AND_MEAN
@@ -53,7 +53,8 @@
 
 #include "contiki-net.h"
 #include "sys/log.h"
-#include "wpcap.h"
+
+#include "net/wpcap.h"
 
 #ifdef __CYGWIN__
 __attribute__((dllimport)) extern char **__argv[];