Ported back WinPcap driver from 2.x to 1.x
diff --git a/contiki-win32/conf/uip-conf.h b/contiki-win32/conf/uip-conf.h
index 47217ea..8f2bd98 100644
--- a/contiki-win32/conf/uip-conf.h
+++ b/contiki-win32/conf/uip-conf.h
@@ -29,7 +29,7 @@
  *
  * This file is part of the Contiki Destop OS
  *
- * $Id: uip-conf.h,v 1.3 2004/08/22 12:38:04 oliverschmidt Exp $
+ * $Id: uip-conf.h,v 1.4 2007/09/05 16:11:06 oliverschmidt Exp $
  *
  */
 #ifndef __UIP_CONF_H__
@@ -38,7 +38,6 @@
 #define UIP_CONF_MAX_CONNECTIONS 40
 #define UIP_CONF_MAX_LISTENPORTS 40
 #define UIP_CONF_BUFFER_SIZE     800
-#define UIP_CONF_LLH_LEN         0
 
 #define UIP_CONF_BYTE_ORDER      LITTLE_ENDIAN
 
diff --git a/contiki-win32/contiki.dsw b/contiki-win32/contiki.dsw
deleted file mode 100644
index 5c8ab56..0000000
--- a/contiki-win32/contiki.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "win32"=".\win32.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/contiki-win32/contiki.sln b/contiki-win32/contiki.sln
index fff19d3..3c0a737 100644
--- a/contiki-win32/contiki.sln
+++ b/contiki-win32/contiki.sln
@@ -5,19 +5,19 @@
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug PPP|Win32 = Debug PPP|Win32
-		Debug RawSock|Win32 = Debug RawSock|Win32
+		Debug WPCAP|Win32 = Debug WPCAP|Win32
 		Release PPP|Win32 = Release PPP|Win32
-		Release RawSock|Win32 = Release RawSock|Win32
+		Release WPCAP|Win32 = Release WPCAP|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{29C0B44D-61E9-407E-9133-6B68612624FF}.Debug PPP|Win32.ActiveCfg = Debug PPP|Win32
 		{29C0B44D-61E9-407E-9133-6B68612624FF}.Debug PPP|Win32.Build.0 = Debug PPP|Win32
-		{29C0B44D-61E9-407E-9133-6B68612624FF}.Debug RawSock|Win32.ActiveCfg = Debug RawSock|Win32
-		{29C0B44D-61E9-407E-9133-6B68612624FF}.Debug RawSock|Win32.Build.0 = Debug RawSock|Win32
+		{29C0B44D-61E9-407E-9133-6B68612624FF}.Debug WPCAP|Win32.ActiveCfg = Debug WPCAP|Win32
+		{29C0B44D-61E9-407E-9133-6B68612624FF}.Debug WPCAP|Win32.Build.0 = Debug WPCAP|Win32
 		{29C0B44D-61E9-407E-9133-6B68612624FF}.Release PPP|Win32.ActiveCfg = Release PPP|Win32
 		{29C0B44D-61E9-407E-9133-6B68612624FF}.Release PPP|Win32.Build.0 = Release PPP|Win32
-		{29C0B44D-61E9-407E-9133-6B68612624FF}.Release RawSock|Win32.ActiveCfg = Release RawSock|Win32
-		{29C0B44D-61E9-407E-9133-6B68612624FF}.Release RawSock|Win32.Build.0 = Release RawSock|Win32
+		{29C0B44D-61E9-407E-9133-6B68612624FF}.Release WPCAP|Win32.ActiveCfg = Release WPCAP|Win32
+		{29C0B44D-61E9-407E-9133-6B68612624FF}.Release WPCAP|Win32.Build.0 = Release WPCAP|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/contiki-win32/main.c b/contiki-win32/main.c
index 5900ffb..5218a2a 100644
--- a/contiki-win32/main.c
+++ b/contiki-win32/main.c
@@ -32,7 +32,7 @@
  *
  * This file is part of the Contiki desktop environment 
  *
- * $Id: main.c,v 1.12 2005/04/19 23:07:15 oliverschmidt Exp $
+ * $Id: main.c,v 1.13 2007/09/05 16:11:04 oliverschmidt Exp $
  *
  */
 
@@ -81,25 +81,6 @@
 {
   u16_t addr[2];
 
-#ifdef WITH_RAWSOCK
-  if(argc != 2) {
-    cprintf("\n"
-            "usage: Contiki <addr>\n"
-            "\n"
-            "  <addr> Host IP address of interface to be used by Contiki\n"
-	    "\n"
-            "notes:\n"
-	    "\n"
-            "  - Contiki needs Windows 2000 or later to run.\n"
-	    "\n"
-            "  - Contiki needs administrative rights to run.\n"
-	    "\n"
-            "  - The IP address to be used by Contiki has to be different from the Host IP\n"
-            "    address specified here.\n");
-    exit(EXIT_FAILURE);
-  }
-#endif /* WITH_RAWSOCK */
-
   ek_init();
 
   tcpip_init(NULL);
@@ -113,16 +94,22 @@
   program_handler_init();
 
 #if 0
-  uip_ipaddr(addr, 192,168,0,3);
+  uip_ipaddr(addr, 192,168,0,2);
   uip_sethostaddr(addr);
  
+  uip_ipaddr(addr, 255,255,255,0);
+  uip_setnetmask(addr);
+
+  uip_ipaddr(addr, 192,168,0,1);
+  uip_setdraddr(addr);
+
   uip_ipaddr(addr, 192,168,0,1);
   resolv_conf(addr);
 #endif
 
-#ifdef WITH_RAWSOCK
+#ifdef WITH_WPCAP
   packet_service_init(NULL);
-#endif /* WITH_RAWSOCK */
+#endif /* WITH_WPCAP */
 
 #ifdef WITH_PPP
   ppp_arch_init();
diff --git a/contiki-win32/uip/rawsock-service.c b/contiki-win32/uip/rawsock-service.c
deleted file mode 100644
index 4c49648..0000000
--- a/contiki-win32/uip/rawsock-service.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "packet-service.h"
-#include "rawsock.h"
-
-static struct packet_service_state
-state = {PACKET_SERVICE_VERSION, rawsock_send};
-
-EK_EVENTHANDLER(eventhandler, ev, data);
-EK_POLLHANDLER(pollhandler);
-EK_PROCESS(proc, PACKET_SERVICE_NAME, EK_PRIO_NORMAL,
-	   eventhandler, pollhandler, &state);
-
-/*---------------------------------------------------------------------------*/
-EK_PROCESS_INIT(packet_service_init, arg)
-{
-  ek_service_start(PACKET_SERVICE_NAME, &proc);
-}
-/*---------------------------------------------------------------------------*/
-EK_EVENTHANDLER(eventhandler, ev, data)
-{
-  switch(ev) {
-  case EK_EVENT_INIT:
-  case EK_EVENT_REPLACE:
-    rawsock_init();
-    break;
-  case EK_EVENT_REQUEST_REPLACE:
-    ek_replace(data, NULL);
-    LOADER_UNLOAD();
-    break;
-  case EK_EVENT_REQUEST_EXIT:
-    rawsock_fini();
-    ek_exit();
-    LOADER_UNLOAD();
-    break;
-  default:
-    break;
-  }
-}
-/*---------------------------------------------------------------------------*/
-EK_POLLHANDLER(pollhandler)
-{
-  uip_len = rawsock_poll();
-  if(0 < uip_len) tcpip_input();
-}
-/*---------------------------------------------------------------------------*/
diff --git a/contiki-win32/uip/wpcap-service.c b/contiki-win32/uip/wpcap-service.c
new file mode 100644
index 0000000..f80ac08
--- /dev/null
+++ b/contiki-win32/uip/wpcap-service.c
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2007, Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of the uIP TCP/IP stack.
+ * 
+ * Author: Oliver Schmidt <ol.sc@web.de>
+ *
+ * $Id: wpcap-service.c,v 1.1 2007/09/05 16:11:08 oliverschmidt Exp $
+ */
+
+#include <memory.h>
+
+#include "packet-service.h"
+#include "uip_arp.h"
+#include "wpcap.h"
+
+static void output(u8_t *hdr, u16_t hdrlen, u8_t *data, u16_t datalen);
+
+static struct packet_service_state
+state = {PACKET_SERVICE_VERSION, output};
+
+EK_EVENTHANDLER(eventhandler, ev, data);
+EK_POLLHANDLER(pollhandler);
+EK_PROCESS(proc, PACKET_SERVICE_NAME, EK_PRIO_NORMAL,
+	   eventhandler, pollhandler, &state);
+
+/*---------------------------------------------------------------------------*/
+static void
+output(u8_t *hdr, u16_t hdrlen, u8_t *data, u16_t datalen)
+{
+  /* Just copy all data into uip_buf. */
+  memcpy(hdr + hdrlen, data, datalen);
+  uip_arp_out();
+  wpcap_send();
+}
+/*---------------------------------------------------------------------------*/
+EK_PROCESS_INIT(packet_service_init, arg)
+{
+  ek_service_start(PACKET_SERVICE_NAME, &proc);
+}
+/*---------------------------------------------------------------------------*/
+EK_EVENTHANDLER(eventhandler, ev, data)
+{
+  switch(ev) {
+  case EK_EVENT_INIT:
+  case EK_EVENT_REPLACE:
+    wpcap_init();
+    break;
+  case EK_EVENT_REQUEST_REPLACE:
+    ek_replace(data, NULL);
+    LOADER_UNLOAD();
+    break;
+  case EK_EVENT_REQUEST_EXIT:
+    wpcap_exit();
+    ek_exit();
+    LOADER_UNLOAD();
+    break;
+  default:
+    break;
+  }
+}
+/*---------------------------------------------------------------------------*/
+EK_POLLHANDLER(pollhandler)
+{
+#define BUF ((struct uip_eth_hdr *)&uip_buf[0])
+  
+  /* Poll Ethernet device to see if there is a frame avaliable. */
+  uip_len = wpcap_poll();
+  if(uip_len > 0) {
+    /* A frame was avaliable (and is now read into the uip_buf), so
+       we process it. */
+    if(BUF->type == HTONS(UIP_ETHTYPE_IP)) {
+      uip_arp_ipin();
+      uip_len -= sizeof(struct uip_eth_hdr);
+      tcpip_input();
+    } else if(BUF->type == HTONS(UIP_ETHTYPE_ARP)) {
+      uip_arp_arpin();
+      /* If the above function invocation resulted in data that
+         should be sent out on the network, the global variable
+         uip_len is set to a value > 0. */
+      if(uip_len > 0) {
+        wpcap_send();
+      }
+    }
+  }
+}
+/*---------------------------------------------------------------------------*/
diff --git a/contiki-win32/uip/wpcap.c b/contiki-win32/uip/wpcap.c
new file mode 100644
index 0000000..22e5063
--- /dev/null
+++ b/contiki-win32/uip/wpcap.c
@@ -0,0 +1,260 @@
+/*
+ * Copyright (c) 2007, Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of the uIP TCP/IP stack.
+ * 
+ * Author: Oliver Schmidt <ol.sc@web.de>
+ *
+ * $Id: wpcap.c,v 1.1 2007/09/05 16:11:08 oliverschmidt Exp $
+ */
+
+#define WIN32_LEAN_AND_MEAN
+#define _WIN32_WINNT 0x0501
+#include <windows.h>
+#include <winsock2.h>
+#include <iphlpapi.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <malloc.h>
+
+#define htonl contiki_htonl /* htonl is defined in winsock2 */
+#define htons contiki_htons /* htons is defined in winsock2 */
+
+#include "uip.h"
+#include "uip_arp.h"
+#include "ctk.h"
+#include "wpcap.h"
+
+struct pcap;
+
+struct pcap_if {
+  struct pcap_if *next;
+  char *name;
+  char *description;
+  struct pcap_addr {
+    struct pcap_addr *next;
+    struct sockaddr *addr;
+    struct sockaddr *netmask;
+    struct sockaddr *broadaddr;
+    struct sockaddr *dstaddr;
+  } *addresses;
+  DWORD flags;
+};
+
+struct pcap_pkthdr {
+  struct timeval ts;
+  DWORD caplen;
+  DWORD len;
+};
+
+HMODULE wpcap;
+
+static struct pcap *pcap;
+
+static int (* pcap_findalldevs)(struct pcap_if **, char *);
+static struct pcap *(* pcap_open_live)(char *, int, int, int, char *);
+static int (* pcap_next_ex)(struct pcap *, struct pcap_pkthdr **, unsigned char **);
+static int (* pcap_sendpacket)(struct pcap *, unsigned char *, int);
+
+#define BUF ((struct uip_eth_hdr *)&uip_buf[0])
+
+extern void debug_printf(char *format, ...);
+
+/*---------------------------------------------------------------------------*/
+static void
+error_exit(char *message)
+{
+  console_exit();
+  cprintf(message);
+  exit(EXIT_FAILURE);
+}
+/*---------------------------------------------------------------------------*/
+static void
+init_pcap(struct in_addr addr)
+{
+  struct pcap_if *interfaces;
+  char error[256];
+
+  if(pcap_findalldevs(&interfaces, error) == -1) {
+    error_exit(error);
+  }
+
+  while(interfaces != NULL) {
+    debug_printf("init_pcap: found interface: %s\n", interfaces->description);
+
+    if(interfaces->addresses != NULL && 
+       interfaces->addresses->addr != NULL &&
+       interfaces->addresses->addr->sa_family == AF_INET) {
+
+      struct in_addr interface_addr;
+      interface_addr = ((struct sockaddr_in *)interfaces->addresses->addr)->sin_addr;
+      debug_printf("init_pcap:    with address: %s\n", inet_ntoa(interface_addr));
+
+      if(interface_addr.s_addr == addr.s_addr) {
+        break;
+      }     
+    }
+    interfaces = interfaces->next;
+  }
+
+  if(interfaces == NULL) {
+    error_exit("no interface found with ip addr specified on cmdline\n");
+  }
+
+  pcap = pcap_open_live(interfaces->name, UIP_BUFSIZE, 0, -1, error);
+  if(pcap == NULL) {
+    error_exit(error);
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+set_ethaddr(struct in_addr addr)
+{
+  PIP_ADAPTER_ADDRESSES adapters;
+  ULONG size = 0;
+
+  if(GetAdaptersAddresses(AF_INET, GAA_FLAG_SKIP_ANYCAST |
+				   GAA_FLAG_SKIP_MULTICAST |
+				   GAA_FLAG_SKIP_DNS_SERVER,
+				   NULL, NULL, &size) != ERROR_BUFFER_OVERFLOW) {
+    error_exit("error on access to adapter list size\n");
+  }
+  adapters = alloca(size);
+  if(GetAdaptersAddresses(AF_INET, GAA_FLAG_SKIP_ANYCAST |
+				   GAA_FLAG_SKIP_MULTICAST |
+				   GAA_FLAG_SKIP_DNS_SERVER,
+				   NULL, adapters, &size) != ERROR_SUCCESS) {
+    error_exit("error on access to adapter list\n");
+  }
+
+  while(adapters != NULL) {
+
+    char buffer[256];
+    WideCharToMultiByte(CP_ACP, 0, adapters->Description, -1,
+			buffer, sizeof(buffer), NULL, NULL);
+    debug_printf("set_ethaddr: found adapter: %s\n", buffer);
+
+    if(adapters->FirstUnicastAddress != NULL &&
+       adapters->FirstUnicastAddress->Address.lpSockaddr != NULL &&
+       adapters->FirstUnicastAddress->Address.lpSockaddr->sa_family == AF_INET) {
+
+      struct in_addr adapter_addr;
+      adapter_addr = ((struct sockaddr_in *)adapters->FirstUnicastAddress->Address.lpSockaddr)->sin_addr;
+      debug_printf("set_ethaddr:  with address: %s\n", inet_ntoa(adapter_addr));
+
+      if(adapter_addr.s_addr == addr.s_addr) {
+	if(adapters->PhysicalAddressLength != 6) {
+	  error_exit("ip addr specified on cmdline does not belong to an ethernet card\n");
+	}
+	debug_printf("set_ethaddr:  ethernetaddr: %02X-%02X-%02X-%02X-%02X-%02X\n",
+		     adapters->PhysicalAddress[0], adapters->PhysicalAddress[1],
+		     adapters->PhysicalAddress[2], adapters->PhysicalAddress[3],
+		     adapters->PhysicalAddress[4], adapters->PhysicalAddress[5]);
+
+	uip_setethaddr((*(struct uip_eth_addr *)adapters->PhysicalAddress));
+	break;
+      }
+    }
+    adapters = adapters->Next;
+  }
+
+  if(adapters == NULL) {
+    error_exit("no adapter found with ip addr specified on cmdline\n");
+  }
+}
+/*---------------------------------------------------------------------------*/
+void
+wpcap_init(void)
+{
+  struct in_addr addr;
+
+  addr.s_addr = inet_addr(__argv[1]);
+  if(addr.s_addr == INADDR_NONE) {
+    error_exit("usage: <program> <ip addr of ethernet card to share>\n");
+  }
+  debug_printf("wpcap_init: cmdline address: %s\n", inet_ntoa(addr));
+
+  wpcap = LoadLibrary("wpcap.dll");
+  (FARPROC)pcap_findalldevs = GetProcAddress(wpcap, "pcap_findalldevs");
+  (FARPROC)pcap_open_live   = GetProcAddress(wpcap, "pcap_open_live");
+  (FARPROC)pcap_next_ex     = GetProcAddress(wpcap, "pcap_next_ex");
+  (FARPROC)pcap_sendpacket  = GetProcAddress(wpcap, "pcap_sendpacket");
+
+  if(pcap_findalldevs == NULL || pcap_open_live  == NULL ||
+     pcap_next_ex     == NULL || pcap_sendpacket == NULL) {
+    error_exit("error on access to winpcap library\n");
+  }
+
+  init_pcap(addr);
+  set_ethaddr(addr);
+}
+/*---------------------------------------------------------------------------*/
+u16_t
+wpcap_poll(void)
+{
+  struct pcap_pkthdr *packet_header;
+  unsigned char *packet;
+
+  if(pcap == NULL) {
+    return 0;
+  }
+
+  switch(pcap_next_ex(pcap, &packet_header, &packet)) {
+  case -1: 
+    error_exit("error on read\n");
+  case 0:
+    return 0;
+  }
+
+  if(packet_header->caplen > UIP_BUFSIZE) {
+    return 0;
+  }
+
+  CopyMemory(uip_buf, packet, packet_header->caplen);
+  return (u16_t)packet_header->caplen;
+}
+/*---------------------------------------------------------------------------*/
+void
+wpcap_send(void)
+{
+  if(pcap_sendpacket(pcap, uip_buf, uip_len) == -1) {
+    error_exit("error on send\n");
+  }
+}
+/*---------------------------------------------------------------------------*/
+void
+wpcap_exit(void)
+{
+  FreeLibrary(wpcap);
+  pcap = NULL;
+}
+/*---------------------------------------------------------------------------*/
diff --git a/contiki-win32/uip/wpcap.h b/contiki-win32/uip/wpcap.h
new file mode 100644
index 0000000..8e83d65
--- /dev/null
+++ b/contiki-win32/uip/wpcap.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2007, Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of the uIP TCP/IP stack.
+ * 
+ * Author: Oliver Schmidt <ol.sc@web.de>
+ *
+ * $Id: wpcap.h,v 1.1 2007/09/05 16:11:08 oliverschmidt Exp $
+ */
+
+#ifndef __WPCAP_H__
+#define __WPCAP_H__
+
+void wpcap_init(void);
+u16_t wpcap_poll(void);
+void wpcap_send(void);
+void wpcap_exit(void);
+
+#endif /* __WPCAP_H__ */
diff --git a/contiki-win32/win32.dsp b/contiki-win32/win32.dsp
deleted file mode 100644
index 2037d51..0000000
--- a/contiki-win32/win32.dsp
+++ /dev/null
@@ -1,1143 +0,0 @@
-# Microsoft Developer Studio Project File - Name="win32" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=win32 - Win32 Debug PPP
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "win32.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "win32.mak" CFG="win32 - Win32 Debug PPP"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "win32 - Win32 Debug RawSock" (based on "Win32 (x86) Console Application")
-!MESSAGE "win32 - Win32 Release RawSock" (based on "Win32 (x86) Console Application")
-!MESSAGE "win32 - Win32 Debug PPP" (based on "Win32 (x86) Console Application")
-!MESSAGE "win32 - Win32 Release PPP" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 1
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "win32 - Win32 Debug RawSock"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "win32___Win32_Debug_RawSock"
-# PROP BASE Intermediate_Dir "win32___Win32_Debug_RawSock"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_RawSock"
-# PROP Intermediate_Dir "Debug_RawSock"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /I "conf" /I "ctk" /I "lib" /I "ppp" /I "uip" /I "../contiki/apps" /I "../contiki/ctk" /I "../contiki/ek" /I "../contiki/lib" /I "../contiki/ppp" /I "../contiki/uip" /D "WITH_ASCII" /D "WITH_UIP" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "conf" /I "ctk" /I "lib" /I "ppp" /I "uip" /I "../contiki/apps" /I "../contiki/ctk" /I "../contiki/ek" /I "../contiki/lib" /I "../contiki/ppp" /I "../contiki/uip" /D "_DEBUG" /D "WITH_RAWSOCK" /D "WITH_ASCII" /D "WITH_UIP" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/Contiki.exe" /pdbtype:sept
-# ADD LINK32 ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug_RawSock/Contiki.exe" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release RawSock"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "win32___Win32_Release_RawSock"
-# PROP BASE Intermediate_Dir "win32___Win32_Release_RawSock"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_RawSock"
-# PROP Intermediate_Dir "Release_RawSock"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /I "conf" /I "ctk" /I "lib" /I "ppp" /I "uip" /I "../contiki/apps" /I "../contiki/ctk" /I "../contiki/ek" /I "../contiki/lib" /I "../contiki/ppp" /I "../contiki/uip" /D "WITH_ASCII" /D "WITH_UIP" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O1 /I "conf" /I "ctk" /I "lib" /I "ppp" /I "uip" /I "../contiki/apps" /I "../contiki/ctk" /I "../contiki/ek" /I "../contiki/lib" /I "../contiki/ppp" /I "../contiki/uip" /D "NDEBUG" /D "WITH_RAWSOCK" /D "WITH_ASCII" /D "WITH_UIP" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"Release/Contiki.exe"
-# ADD LINK32 ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"Release_RawSock/Contiki.exe"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Debug PPP"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "win32___Win32_Debug_PPP"
-# PROP BASE Intermediate_Dir "win32___Win32_Debug_PPP"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_PPP"
-# PROP Intermediate_Dir "Debug_PPP"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /I "conf" /I "ctk" /I "lib" /I "ppp" /I "uip" /I "../contiki/apps" /I "../contiki/ctk" /I "../contiki/ek" /I "../contiki/lib" /I "../contiki/ppp" /I "../contiki/uip" /D "WITH_ASCII" /D "WITH_UIP" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "conf" /I "ctk" /I "lib" /I "ppp" /I "uip" /I "../contiki/apps" /I "../contiki/ctk" /I "../contiki/ek" /I "../contiki/lib" /I "../contiki/ppp" /I "../contiki/uip" /D "_DEBUG" /D "WITH_PPP" /D "WITH_ASCII" /D "WITH_UIP" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug_RawSock/Contiki.exe" /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug_PPP/Contiki.exe" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release PPP"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "win32___Win32_Release_PPP"
-# PROP BASE Intermediate_Dir "win32___Win32_Release_PPP"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_PPP"
-# PROP Intermediate_Dir "Release_PPP"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /I "conf" /I "ctk" /I "lib" /I "ppp" /I "uip" /I "../contiki/apps" /I "../contiki/ctk" /I "../contiki/ek" /I "../contiki/lib" /I "../contiki/ppp" /I "../contiki/uip" /D "WITH_ASCII" /D "WITH_UIP" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O1 /I "conf" /I "ctk" /I "lib" /I "ppp" /I "uip" /I "../contiki/apps" /I "../contiki/ctk" /I "../contiki/ek" /I "../contiki/lib" /I "../contiki/ppp" /I "../contiki/uip" /D "NDEBUG" /D "WITH_PPP" /D "WITH_ASCII" /D "WITH_UIP" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"Release_RawSock/Contiki.exe"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"Release_PPP/Contiki.exe"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "win32 - Win32 Debug RawSock"
-# Name "win32 - Win32 Release RawSock"
-# Name "win32 - Win32 Debug PPP"
-# Name "win32 - Win32 Release PPP"
-# Begin Group "contiki-apps"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE="..\contiki\apps\about-dsc.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\about-dsc.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\about.c
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\calc-dsc.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\calc-dsc.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\calc.c
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\dhcp-dsc.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\dhcp-dsc.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\dhcp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\dhcp.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\editor-dsc.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\editor-dsc.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\editor.c
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\email-dsc.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\email-dsc.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\email.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\email.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\ftp-dsc.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\ftp-dsc.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\ftp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\ftpc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\ftpc.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\html-strings.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\html-strings.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\htmlparser.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\htmlparser.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\http-strings.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\http-strings.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\http-user-agent-string.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\http-user-agent-string.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\httpd-cgi.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\httpd-cgi.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\httpd-fs.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\httpd-fs.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\httpd-fsdata.c"
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\httpd-fsdata.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\httpd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\httpd.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\irc-dsc.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\irc-dsc.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\irc.c
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\ircc-strings.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\ircc-strings.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\ircc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\ircc.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\netconf-dsc.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\netconf-dsc.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\netconf.c
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\processes-dsc.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\processes-dsc.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\processes.c
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\program-handler.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\program-handler.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\shell-dsc.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\shell-dsc.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\shell-gui.c"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\shell.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\shell.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\simpletelnet.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\simpletelnet.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\smtp-socket.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\smtp-strings.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\smtp-strings.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\smtp.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\telnet-dsc.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\telnet-dsc.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\telnet.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\telnet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\webclient.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\webclient.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\webserver-dsc.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\webserver-dsc.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\webserver.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\webserver.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\www-dsc.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\apps\www-dsc.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\www.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\apps\www.h
-# End Source File
-# End Group
-# Begin Group "contiki-ctk"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE="..\contiki\ctk\ctk-conio.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\ctk\ctk-conio.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\ctk\ctk-draw.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\ctk\ctk-mouse.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\ctk\ctk.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\ctk\ctk.h
-# End Source File
-# End Group
-# Begin Group "contiki-ek"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\contiki\ek\arg.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\ek\arg.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\ek\contiki-version.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\ek\contiki.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\ek\dsc.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\ek\ek-service.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\ek\ek-service.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\ek\ek.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\ek\ek.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\ek\lc-switch.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\ek\lc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\ek\loader.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\ek\log.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\ek\pt.h
-# End Source File
-# End Group
-# Begin Group "contiki-lib"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\contiki\lib\cc.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\lib\cfs-service.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\lib\cfs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\lib\cfs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\lib\clock.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\lib\ctk-filedialog.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\lib\ctk-filedialog.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\lib\ctk-textentry-cmdline.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\lib\ctk-textentry-cmdline.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\lib\ctk-textentry-multiline.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\lib\ctk-textentry-multiline.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\lib\memb.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\lib\memb.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\lib\petsciiconv.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\lib\timer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\lib\timer.h
-# End Source File
-# End Group
-# Begin Group "contiki-ppp"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\contiki\ppp\ahdlc.c
-
-!IF  "$(CFG)" == "win32 - Win32 Debug RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Debug PPP"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release PPP"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\ppp\ahdlc.h
-
-!IF  "$(CFG)" == "win32 - Win32 Debug RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Debug PPP"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release PPP"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\ppp\ipcp.c
-
-!IF  "$(CFG)" == "win32 - Win32 Debug RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Debug PPP"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release PPP"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\ppp\ipcp.h
-
-!IF  "$(CFG)" == "win32 - Win32 Debug RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Debug PPP"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release PPP"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\ppp\lcp.c
-
-!IF  "$(CFG)" == "win32 - Win32 Debug RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Debug PPP"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release PPP"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\ppp\lcp.h
-
-!IF  "$(CFG)" == "win32 - Win32 Debug RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Debug PPP"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release PPP"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\ppp\pap.c
-
-!IF  "$(CFG)" == "win32 - Win32 Debug RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Debug PPP"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release PPP"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\ppp\pap.h
-
-!IF  "$(CFG)" == "win32 - Win32 Debug RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Debug PPP"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release PPP"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\ppp\ppp-service.c"
-
-!IF  "$(CFG)" == "win32 - Win32 Debug RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Debug PPP"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release PPP"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\ppp\ppp.c
-
-!IF  "$(CFG)" == "win32 - Win32 Debug RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Debug PPP"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release PPP"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\ppp\ppp.h
-
-!IF  "$(CFG)" == "win32 - Win32 Debug RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Debug PPP"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release PPP"
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "contiki-uip"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\contiki\uip\dhcpc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\uip\dhcpc.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\uip\packet-service.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\uip\psock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\uip\psock.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\uip\resolv.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\uip\resolv.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\uip\tcpip.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\uip\tcpip.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\uip\uip-fw.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\uip\uip-fw.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\contiki\uip\uip-split.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\uip\uip.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\uip\uip.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\uip\uip_arch.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\uip\uip_arp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\uip\uipbuf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\uip\uipbuf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\uip\uiplib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\uip\uiplib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\contiki\uip\uipopt.h
-# End Source File
-# End Group
-# Begin Group "contiki-win32"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\main.c
-# End Source File
-# End Group
-# Begin Group "contiki-win32-conf"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=".\conf\cc-conf.h"
-# End Source File
-# Begin Source File
-
-SOURCE=".\conf\clock-conf.h"
-# End Source File
-# Begin Source File
-
-SOURCE=".\conf\ctk-conf.h"
-# End Source File
-# Begin Source File
-
-SOURCE=".\conf\ctk-conio-conf.h"
-# End Source File
-# Begin Source File
-
-SOURCE=".\conf\ek-conf.h"
-# End Source File
-# Begin Source File
-
-SOURCE=".\conf\email-conf.h"
-# End Source File
-# Begin Source File
-
-SOURCE=".\conf\irc-conf.h"
-# End Source File
-# Begin Source File
-
-SOURCE=".\conf\log-conf.h"
-# End Source File
-# Begin Source File
-
-SOURCE=".\conf\ppp-conf.h"
-# End Source File
-# Begin Source File
-
-SOURCE=".\conf\program-handler-conf.h"
-# End Source File
-# Begin Source File
-
-SOURCE=".\conf\shell-gui-conf.h"
-# End Source File
-# Begin Source File
-
-SOURCE=".\conf\uip-conf.h"
-# End Source File
-# Begin Source File
-
-SOURCE=".\conf\www-conf.h"
-# End Source File
-# End Group
-# Begin Group "contiki-win32-ctk"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=".\ctk\ctk-arch.c"
-# End Source File
-# Begin Source File
-
-SOURCE=".\ctk\ctk-arch.h"
-# End Source File
-# Begin Source File
-
-SOURCE=".\ctk\ctk-console.c"
-# End Source File
-# Begin Source File
-
-SOURCE=".\ctk\ctk-console.h"
-# End Source File
-# End Group
-# Begin Group "contiki-win32-lib"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=".\lib\cfs-win32.c"
-# End Source File
-# Begin Source File
-
-SOURCE=".\lib\cfs-win32.h"
-# End Source File
-# Begin Source File
-
-SOURCE=.\lib\debug.c
-# End Source File
-# End Group
-# Begin Group "contiki-win32-ppp"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\ppp\ppp_arch.c
-
-!IF  "$(CFG)" == "win32 - Win32 Debug RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Debug PPP"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release PPP"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\ppp\ppp_arch.h
-
-!IF  "$(CFG)" == "win32 - Win32 Debug RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release RawSock"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Debug PPP"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release PPP"
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "contiki-win32-uip"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=".\uip\rawsock-service.c"
-
-!IF  "$(CFG)" == "win32 - Win32 Debug RawSock"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release RawSock"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Debug PPP"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release PPP"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\uip\rawsock.c
-
-!IF  "$(CFG)" == "win32 - Win32 Debug RawSock"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release RawSock"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Debug PPP"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release PPP"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\uip\rawsock.h
-
-!IF  "$(CFG)" == "win32 - Win32 Debug RawSock"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release RawSock"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Debug PPP"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release PPP"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\uip\uip_arch.c
-
-!IF  "$(CFG)" == "win32 - Win32 Debug RawSock"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release RawSock"
-
-# SUBTRACT CPP /O<none>
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Debug PPP"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Release PPP"
-
-# SUBTRACT CPP /O<none>
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\uip\uip_arch.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/contiki-win32/win32.vcproj b/contiki-win32/win32.vcproj
index 9cc430a..a4b1ab9 100644
--- a/contiki-win32/win32.vcproj
+++ b/contiki-win32/win32.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="win32"
 	ProjectGUID="{29C0B44D-61E9-407E-9133-6B68612624FF}"
+	RootNamespace="win32"
 	>
 	<Platforms>
 		<Platform
@@ -133,8 +134,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="1"
-				InlineFunctionExpansion="1"
+				Optimization="0"
 				AdditionalIncludeDirectories="conf,ctk,lib,ppp,uip,../contiki/apps,../contiki/ctk,../contiki/ek,../contiki/lib,../contiki/ppp,../contiki/uip"
 				PreprocessorDefinitions="NDEBUG;WITH_PPP;WITH_ASCII;WITH_UIP;_CONSOLE"
 				StringPooling="true"
@@ -195,9 +195,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release RawSock|Win32"
-			OutputDirectory=".\Release_RawSock"
-			IntermediateDirectory=".\Release_RawSock"
+			Name="Release WPCAP|Win32"
+			OutputDirectory=".\Release_WPCAP"
+			IntermediateDirectory=".\Release_WPCAP"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -218,22 +218,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\Release_RawSock/win32.tlb"
+				TypeLibraryName=".\Release_WPCAP/win32.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="1"
-				InlineFunctionExpansion="1"
+				Optimization="0"
 				AdditionalIncludeDirectories="conf,ctk,lib,ppp,uip,../contiki/apps,../contiki/ctk,../contiki/ek,../contiki/lib,../contiki/ppp,../contiki/uip"
-				PreprocessorDefinitions="NDEBUG;WITH_RAWSOCK;WITH_ASCII;WITH_UIP;_CONSOLE"
+				PreprocessorDefinitions="NDEBUG;WITH_WPCAP;WITH_ETHERNET;WITH_ASCII;WITH_UIP;_CONSOLE"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release_RawSock/win32.pch"
-				AssemblerListingLocation=".\Release_RawSock/"
-				ObjectFile=".\Release_RawSock/"
-				ProgramDataBaseFileName=".\Release_RawSock/"
+				PrecompiledHeaderFile=".\Release_WPCAP/win32.pch"
+				AssemblerListingLocation=".\Release_WPCAP/"
+				ObjectFile=".\Release_WPCAP/"
+				ProgramDataBaseFileName=".\Release_WPCAP/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 			/>
@@ -250,11 +249,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib"
-				OutputFile="Release_RawSock/Contiki.exe"
+				AdditionalDependencies="ws2_32.lib  iphlpapi.lib"
+				OutputFile="Release_WPCAP/Contiki.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\Release_RawSock/Contiki.pdb"
+				ProgramDatabaseFile=".\Release_WPCAP/Contiki.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -270,7 +269,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\Release_RawSock/win32.bsc"
+				OutputFile=".\Release_WPCAP/win32.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -286,9 +285,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug RawSock|Win32"
-			OutputDirectory=".\Debug_RawSock"
-			IntermediateDirectory=".\Debug_RawSock"
+			Name="Debug WPCAP|Win32"
+			OutputDirectory=".\Debug_WPCAP"
+			IntermediateDirectory=".\Debug_WPCAP"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -309,21 +308,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug_RawSock/win32.tlb"
+				TypeLibraryName=".\Debug_WPCAP/win32.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="conf,ctk,lib,ppp,uip,../contiki/apps,../contiki/ctk,../contiki/ek,../contiki/lib,../contiki/ppp,../contiki/uip"
-				PreprocessorDefinitions="_DEBUG;WITH_RAWSOCK;WITH_ASCII;WITH_UIP;_CONSOLE"
+				PreprocessorDefinitions="_DEBUG;WITH_WPCAP;WITH_ETHERNET;WITH_ASCII;WITH_UIP;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug_RawSock/win32.pch"
-				AssemblerListingLocation=".\Debug_RawSock/"
-				ObjectFile=".\Debug_RawSock/"
-				ProgramDataBaseFileName=".\Debug_RawSock/"
+				PrecompiledHeaderFile=".\Debug_WPCAP/win32.pch"
+				AssemblerListingLocation=".\Debug_WPCAP/"
+				ObjectFile=".\Debug_WPCAP/"
+				ProgramDataBaseFileName=".\Debug_WPCAP/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -341,12 +340,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib"
-				OutputFile="Debug_RawSock/Contiki.exe"
+				AdditionalDependencies="ws2_32.lib  iphlpapi.lib"
+				OutputFile="Debug_WPCAP/Contiki.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug_RawSock/Contiki.pdb"
+				ProgramDatabaseFile=".\Debug_WPCAP/Contiki.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -362,7 +361,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\Debug_RawSock/win32.bsc"
+				OutputFile=".\Debug_WPCAP/win32.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -387,42 +386,6 @@
 			<File
 				RelativePath="..\contiki\apps\about-dsc.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\about-dsc.h"
@@ -431,82 +394,10 @@
 			<File
 				RelativePath="..\contiki\apps\about.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\calc-dsc.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\calc-dsc.h"
@@ -515,82 +406,10 @@
 			<File
 				RelativePath="..\contiki\apps\calc.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\dhcp-dsc.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\dhcp-dsc.h"
@@ -599,42 +418,6 @@
 			<File
 				RelativePath="..\contiki\apps\dhcp.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\dhcp.h"
@@ -643,42 +426,6 @@
 			<File
 				RelativePath="..\contiki\apps\editor-dsc.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\editor-dsc.h"
@@ -687,82 +434,10 @@
 			<File
 				RelativePath="..\contiki\apps\editor.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\email-dsc.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\email-dsc.h"
@@ -771,42 +446,6 @@
 			<File
 				RelativePath="..\contiki\apps\email.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\email.h"
@@ -815,42 +454,6 @@
 			<File
 				RelativePath="..\contiki\apps\ftp-dsc.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\ftp-dsc.h"
@@ -859,82 +462,10 @@
 			<File
 				RelativePath="..\contiki\apps\ftp.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\ftpc.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\ftpc.h"
@@ -943,42 +474,6 @@
 			<File
 				RelativePath="..\contiki\apps\html-strings.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\html-strings.h"
@@ -987,42 +482,6 @@
 			<File
 				RelativePath="..\contiki\apps\htmlparser.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\htmlparser.h"
@@ -1031,42 +490,6 @@
 			<File
 				RelativePath="..\contiki\apps\http-strings.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\http-strings.h"
@@ -1075,42 +498,6 @@
 			<File
 				RelativePath="..\contiki\apps\http-user-agent-string.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\http-user-agent-string.h"
@@ -1119,42 +506,6 @@
 			<File
 				RelativePath="..\contiki\apps\httpd-cgi.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\httpd-cgi.h"
@@ -1163,42 +514,6 @@
 			<File
 				RelativePath="..\contiki\apps\httpd-fs.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\httpd-fs.h"
@@ -1213,8 +528,6 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1223,28 +536,22 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release RawSock|Win32"
+					Name="Release WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug RawSock|Win32"
+					Name="Debug WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
@@ -1255,42 +562,6 @@
 			<File
 				RelativePath="..\contiki\apps\httpd.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\httpd.h"
@@ -1299,42 +570,6 @@
 			<File
 				RelativePath="..\contiki\apps\irc-dsc.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\irc-dsc.h"
@@ -1343,82 +578,10 @@
 			<File
 				RelativePath="..\contiki\apps\irc.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\ircc-strings.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\ircc-strings.h"
@@ -1427,42 +590,6 @@
 			<File
 				RelativePath="..\contiki\apps\ircc.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\ircc.h"
@@ -1471,42 +598,6 @@
 			<File
 				RelativePath="..\contiki\apps\netconf-dsc.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\netconf-dsc.h"
@@ -1515,82 +606,10 @@
 			<File
 				RelativePath="..\contiki\apps\netconf.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\processes-dsc.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\processes-dsc.h"
@@ -1599,82 +618,10 @@
 			<File
 				RelativePath="..\contiki\apps\processes.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\program-handler.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\program-handler.h"
@@ -1683,42 +630,6 @@
 			<File
 				RelativePath="..\contiki\apps\shell-dsc.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\shell-dsc.h"
@@ -1727,82 +638,10 @@
 			<File
 				RelativePath="..\contiki\apps\shell-gui.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\shell.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\shell.h"
@@ -1811,42 +650,6 @@
 			<File
 				RelativePath="..\contiki\apps\simpletelnet.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\simpletelnet.h"
@@ -1855,82 +658,10 @@
 			<File
 				RelativePath="..\contiki\apps\smtp-socket.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\smtp-strings.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\smtp-strings.h"
@@ -1943,42 +674,6 @@
 			<File
 				RelativePath="..\contiki\apps\telnet-dsc.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\telnet-dsc.h"
@@ -1987,42 +682,6 @@
 			<File
 				RelativePath="..\contiki\apps\telnet.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\telnet.h"
@@ -2031,42 +690,6 @@
 			<File
 				RelativePath="..\contiki\apps\webclient.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\webclient.h"
@@ -2075,42 +698,6 @@
 			<File
 				RelativePath="..\contiki\apps\webserver-dsc.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\webserver-dsc.h"
@@ -2119,42 +706,6 @@
 			<File
 				RelativePath="..\contiki\apps\webserver.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\webserver.h"
@@ -2163,42 +714,6 @@
 			<File
 				RelativePath="..\contiki\apps\www-dsc.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\www-dsc.h"
@@ -2207,42 +722,6 @@
 			<File
 				RelativePath="..\contiki\apps\www.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\apps\www.h"
@@ -2255,42 +734,6 @@
 			<File
 				RelativePath="..\contiki\ctk\ctk-conio.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\ctk\ctk-conio.h"
@@ -2307,42 +750,6 @@
 			<File
 				RelativePath="..\contiki\ctk\ctk.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\ctk\ctk.h"
@@ -2355,42 +762,6 @@
 			<File
 				RelativePath="..\contiki\ek\arg.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\ek\arg.h"
@@ -2411,42 +782,6 @@
 			<File
 				RelativePath="..\contiki\ek\ek-service.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\ek\ek-service.h"
@@ -2455,42 +790,6 @@
 			<File
 				RelativePath="..\contiki\ek\ek.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\ek\ek.h"
@@ -2531,42 +830,6 @@
 			<File
 				RelativePath="..\contiki\lib\cfs.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\lib\cfs.h"
@@ -2579,42 +842,6 @@
 			<File
 				RelativePath="..\contiki\lib\ctk-filedialog.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\lib\ctk-filedialog.h"
@@ -2623,42 +850,6 @@
 			<File
 				RelativePath="..\contiki\lib\ctk-textentry-cmdline.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\lib\ctk-textentry-cmdline.h"
@@ -2667,42 +858,6 @@
 			<File
 				RelativePath="..\contiki\lib\ctk-textentry-multiline.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\lib\ctk-textentry-multiline.h"
@@ -2711,42 +866,6 @@
 			<File
 				RelativePath="..\contiki\lib\memb.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\lib\memb.h"
@@ -2759,42 +878,6 @@
 			<File
 				RelativePath="..\contiki\lib\timer.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\lib\timer.h"
@@ -2808,41 +891,19 @@
 				RelativePath="..\contiki\ppp\ahdlc.c"
 				>
 				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
+					Name="Release WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug RawSock|Win32"
+					Name="Debug WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
@@ -2850,7 +911,7 @@
 				RelativePath="..\contiki\ppp\ahdlc.h"
 				>
 				<FileConfiguration
-					Name="Release RawSock|Win32"
+					Name="Release WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -2858,7 +919,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug RawSock|Win32"
+					Name="Debug WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -2870,41 +931,19 @@
 				RelativePath="..\contiki\ppp\ipcp.c"
 				>
 				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
+					Name="Release WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug RawSock|Win32"
+					Name="Debug WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
@@ -2912,7 +951,7 @@
 				RelativePath="..\contiki\ppp\ipcp.h"
 				>
 				<FileConfiguration
-					Name="Release RawSock|Win32"
+					Name="Release WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -2920,7 +959,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug RawSock|Win32"
+					Name="Debug WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -2932,41 +971,19 @@
 				RelativePath="..\contiki\ppp\lcp.c"
 				>
 				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
+					Name="Release WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug RawSock|Win32"
+					Name="Debug WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
@@ -2974,7 +991,7 @@
 				RelativePath="..\contiki\ppp\lcp.h"
 				>
 				<FileConfiguration
-					Name="Release RawSock|Win32"
+					Name="Release WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -2982,7 +999,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug RawSock|Win32"
+					Name="Debug WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -2994,41 +1011,19 @@
 				RelativePath="..\contiki\ppp\pap.c"
 				>
 				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
+					Name="Release WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug RawSock|Win32"
+					Name="Debug WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
@@ -3036,7 +1031,7 @@
 				RelativePath="..\contiki\ppp\pap.h"
 				>
 				<FileConfiguration
-					Name="Release RawSock|Win32"
+					Name="Release WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -3044,7 +1039,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug RawSock|Win32"
+					Name="Debug WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -3056,41 +1051,19 @@
 				RelativePath="..\contiki\ppp\ppp-service.c"
 				>
 				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
+					Name="Release WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug RawSock|Win32"
+					Name="Debug WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
@@ -3098,41 +1071,19 @@
 				RelativePath="..\contiki\ppp\ppp.c"
 				>
 				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
+					Name="Release WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug RawSock|Win32"
+					Name="Debug WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
@@ -3140,7 +1091,7 @@
 				RelativePath="..\contiki\ppp\ppp.h"
 				>
 				<FileConfiguration
-					Name="Release RawSock|Win32"
+					Name="Release WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -3148,7 +1099,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug RawSock|Win32"
+					Name="Debug WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -3163,42 +1114,6 @@
 			<File
 				RelativePath="..\contiki\uip\dhcpc.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\uip\dhcpc.h"
@@ -3211,42 +1126,6 @@
 			<File
 				RelativePath="..\contiki\uip\psock.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\uip\psock.h"
@@ -3255,42 +1134,6 @@
 			<File
 				RelativePath="..\contiki\uip\resolv.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\uip\resolv.h"
@@ -3299,42 +1142,6 @@
 			<File
 				RelativePath="..\contiki\uip\tcpip.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\uip\tcpip.h"
@@ -3343,42 +1150,6 @@
 			<File
 				RelativePath="..\contiki\uip\uip-fw.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\uip\uip-fw.h"
@@ -3391,42 +1162,6 @@
 			<File
 				RelativePath="..\contiki\uip\uip.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\uip\uip.h"
@@ -3437,48 +1172,32 @@
 				>
 			</File>
 			<File
+				RelativePath="..\contiki\uip\uip_arp.c"
+				>
+				<FileConfiguration
+					Name="Debug PPP|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release PPP|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\contiki\uip\uip_arp.h"
 				>
 			</File>
 			<File
 				RelativePath="..\contiki\uip\uipbuf.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\uip\uipbuf.h"
@@ -3487,42 +1206,6 @@
 			<File
 				RelativePath="..\contiki\uip\uiplib.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\contiki\uip\uiplib.h"
@@ -3539,42 +1222,6 @@
 			<File
 				RelativePath="main.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
@@ -3639,42 +1286,6 @@
 			<File
 				RelativePath="ctk\ctk-arch.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="ctk\ctk-arch.h"
@@ -3683,42 +1294,6 @@
 			<File
 				RelativePath="ctk\ctk-console.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="ctk\ctk-console.h"
@@ -3731,42 +1306,6 @@
 			<File
 				RelativePath="lib\cfs-win32.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="lib\cfs-win32.h"
@@ -3775,42 +1314,6 @@
 			<File
 				RelativePath="lib\debug.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
@@ -3820,41 +1323,19 @@
 				RelativePath="ppp\ppp_arch.c"
 				>
 				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
+					Name="Release WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug RawSock|Win32"
+					Name="Debug WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
@@ -3862,7 +1343,7 @@
 				RelativePath="ppp\ppp_arch.h"
 				>
 				<FileConfiguration
-					Name="Release RawSock|Win32"
+					Name="Release WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -3870,7 +1351,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug RawSock|Win32"
+					Name="Debug WPCAP|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -3883,155 +1364,73 @@
 			Name="contiki-win32-uip"
 			>
 			<File
-				RelativePath="uip\rawsock-service.c"
-				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="uip\rawsock.c"
-				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="uip\rawsock.h"
-				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
 				RelativePath="uip\uip_arch.c"
 				>
-				<FileConfiguration
-					Name="Debug PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release PPP|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="4"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="4"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug RawSock|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="uip\uip_arch.h"
 				>
 			</File>
+			<File
+				RelativePath="uip\wpcap-service.c"
+				>
+				<FileConfiguration
+					Name="Debug PPP|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release PPP|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="uip\wpcap.c"
+				>
+				<FileConfiguration
+					Name="Debug PPP|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release PPP|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="uip\wpcap.h"
+				>
+				<FileConfiguration
+					Name="Debug PPP|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release PPP|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>