Updated include paths for the moved files under net/

apps/antelope/aql-adt.c

@@ -42,7 +42,7 @@
 #include "aql.h"
 
 #define DEBUG   DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 static unsigned char char_buf[DB_MAX_CHAR_SIZE_PER_ROW];
 static uint8_t next_free_offset;

apps/antelope/aql-exec.c

@@ -42,7 +42,7 @@
 #include <string.h>
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 #include "index.h"
 #include "relation.h"

apps/antelope/index-inline.c

@@ -48,7 +48,7 @@
 #include "storage.h"
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 struct search_handle {
   index_t *index;

apps/antelope/index-maxheap.c

@@ -64,7 +64,7 @@
 #include "storage.h"
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 #define BRANCH_FACTOR	2
 #define BUCKET_SIZE	128

apps/antelope/index-memhash.c

@@ -42,7 +42,7 @@
 #include "index.h"
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 static db_result_t create(index_t *);
 static db_result_t destroy(index_t *);

apps/antelope/index.c

@@ -40,7 +40,7 @@
 #include "lib/list.h"
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 #include "antelope.h"
 #include "attribute.h"

apps/antelope/relation.c

@@ -42,7 +42,7 @@
 #include "lib/memb.h"
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 #include "db-options.h"
 #include "index.h"

apps/antelope/result.c

@@ -37,7 +37,7 @@
 #include <string.h>
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 #include "result.h"
 #include "storage.h"

apps/antelope/storage-cfs.c

@@ -43,7 +43,7 @@
 #include "lib/random.h"
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 #include "db-options.h"
 #include "storage.h"

apps/codeprop/codeprop.c

@@ -71,7 +71,7 @@
 #include "sys/clock.h"
 
 #include "loader/elfloader.h"
-#include "net/tcpip.h"
+#include "net/ip/tcpip.h"
 
 #include "dev/eeprom.h"
 #include "dev/leds.h"

apps/codeprop/tcp_loader.c

@@ -37,7 +37,7 @@
 #include "sys/etimer.h"
 #include "loader/elfloader_compat.h"
 
-#include "net/uip.h"
+#include "net/ip/uip.h"
 
 #include "dev/xmem.h"
 

apps/codeprop/tcp_loader2.c

@@ -39,7 +39,7 @@
 #include "loader/cle.h"
 #include "loader/cmod.h"
 
-#include "net/uip.h"
+#include "net/ip/uip.h"
 
 #include "dev/xmem.h"
 

apps/dhcp/dhcp.c

@@ -1,6 +1,6 @@
 #include "contiki-net.h"
 #include "ctk/ctk.h"
-#include "net/dhcpc.h"
+#include "net/ip/dhcpc.h"
 
 
 

apps/ftp/ftp.c

@@ -40,7 +40,7 @@
 #include "contiki.h"
 #include "ctk/ctk.h"
 #include "cfs/cfs.h"
-#include "net/resolv.h"
+#include "net/ip/resolv.h"
 
 #define MAX_USERNAMELEN 16
 #define MAX_PASSWORDLEN 16

apps/servreg-hack/servreg-hack.c

@@ -44,9 +44,9 @@
 #include "contiki-lib.h"
 #include "contiki-net.h"
 
-#include "net/uip.h"
+#include "net/ip/uip.h"
 
-#include "net/uip-ds6.h"
+#include "net/ipv6/uip-ds6.h"
 
 #include "servreg-hack.h"
 

apps/servreg-hack/servreg-hack.h

@@ -64,7 +64,7 @@
 #define SERVREG_HACK_H
 
 #include "contiki-conf.h"
-#include "net/uip.h"
+#include "net/ip/uip.h"
 
 typedef uint8_t servreg_hack_id_t;
 typedef void servreg_hack_item_t;

apps/slip-cmd/packetutils.c

@@ -30,7 +30,7 @@
 #include "contiki.h"
 #include "net/packetbuf.h"
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 /*---------------------------------------------------------------------------*/
 int