diff --git a/contiki-win32/main.c b/contiki-win32/main.c
index 5e2a784..3caf307 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.4 2004/09/12 20:03:56 oliverschmidt Exp $
+ * $Id: main.c,v 1.5 2005/01/26 23:36:39 oliverschmidt Exp $
  *
  */
 
@@ -66,13 +66,12 @@
   return clock();
 }
 /*-----------------------------------------------------------------------------------*/
-void ppp_arch_putchar(void) {}
-void ppp_arch_getchar(void) {}
 void
 main(int argc)
 {
   u16_t addr[2];
 
+#ifdef WITH_SOCKETS
   if(argc != 2) {
     cprintf("\n"
             "usage: Contiki <addr>\n"
@@ -92,6 +91,7 @@
             "    is to add a static entry into the ARP cache of communication peers.\n");
     exit(EXIT_FAILURE);
   }
+#endif /* WITH_SOCKETS */
 
   ek_init();
   tcpip_init(NULL);
@@ -104,14 +104,21 @@
   program_handler_init();
 
 #if 1
-  uip_ipaddr(addr, 192,168,0,3);
+  uip_ipaddr(addr, 192,168,0,4);
   uip_sethostaddr(addr);
  
 /* uip_ipaddr(addr, 192,168,0,1); */
 /* resolv_conf(addr);             */
 #endif
 
+#ifdef WITH_SOCKETS
   rawsock_service_init(NULL);
+#endif /* WITH_SOCKETS */
+
+#ifdef WITH_PPP
+//  ppp_arch_init();
+//  ppp_service_init(NULL);
+#endif /* WITH_PPP */
 
   program_handler_add(&netconf_dsc,   "Network setup",  1);
   program_handler_add(&www_dsc,       "Web browser",    1);
@@ -121,6 +128,9 @@
   program_handler_add(&processes_dsc, "Processes",      1);
   program_handler_add(&about_dsc,     "About Contiki",  0);
 
+//  ppp_init();
+//  ppp_connect();
+
   while(1) {
     ek_run();
 
diff --git a/contiki-win32/win32.dsp b/contiki-win32/win32.dsp
index 04d25dc..4850049 100644
--- a/contiki-win32/win32.dsp
+++ b/contiki-win32/win32.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=win32 - Win32 Debug
+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 
@@ -13,75 +13,131 @@
 !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"
+!MESSAGE NMAKE /f "win32.mak" CFG="win32 - Win32 Debug PPP"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "win32 - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "win32 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "win32 - Win32 Debug Sockets" (based on "Win32 (x86) Console Application")
+!MESSAGE "win32 - Win32 Release Sockets" (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 0
+# PROP AllowPerConfigDependencies 1
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "win32 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD 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 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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
-# 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/Contiki.exe"
-
-!ELSEIF  "$(CFG)" == "win32 - Win32 Debug"
+!IF  "$(CFG)" == "win32 - Win32 Debug Sockets"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Output_Dir "win32___Win32_Debug_Sockets"
+# PROP BASE Intermediate_Dir "win32___Win32_Debug_Sockets"
+# PROP BASE Ignore_Export_Lib 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
+# PROP Output_Dir "Debug_Sockets"
+# PROP Intermediate_Dir "Debug_Sockets"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /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 "WITH_ASCII" /D "WITH_UIP" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# 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_SOCKETS" /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /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/Contiki.exe" /pdbtype:sept
+# 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_Sockets/Contiki.exe" /pdbtype:sept
+
+!ELSEIF  "$(CFG)" == "win32 - Win32 Release Sockets"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "win32___Win32_Release_Sockets"
+# PROP BASE Intermediate_Dir "win32___Win32_Release_Sockets"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release_Sockets"
+# PROP Intermediate_Dir "Release_Sockets"
+# 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 /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 "NDEBUG" /D "WITH_SOCKETS" /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_Sockets/Contiki.exe"
+
+!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_Sockets/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 /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 "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_Sockets/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 Release"
-# Name "win32 - Win32 Debug"
+# Name "win32 - Win32 Debug Sockets"
+# Name "win32 - Win32 Release Sockets"
+# Name "win32 - Win32 Debug PPP"
+# Name "win32 - Win32 Release PPP"
 # Begin Group "contiki-apps"
 
 # PROP Default_Filter ""
@@ -360,46 +416,211 @@
 # Begin Source File
 
 SOURCE=..\contiki\ppp\ahdlc.c
+
+!IF  "$(CFG)" == "win32 - Win32 Debug Sockets"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "win32 - Win32 Release Sockets"
+
+# 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 Sockets"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "win32 - Win32 Release Sockets"
+
+# 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 Sockets"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "win32 - Win32 Release Sockets"
+
+# 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 Sockets"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "win32 - Win32 Release Sockets"
+
+# 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 Sockets"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "win32 - Win32 Release Sockets"
+
+# 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 Sockets"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "win32 - Win32 Release Sockets"
+
+# 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 Sockets"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "win32 - Win32 Release Sockets"
+
+# 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 Sockets"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "win32 - Win32 Release Sockets"
+
+# 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 Sockets"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "win32 - Win32 Release Sockets"
+
+# 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 Sockets"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "win32 - Win32 Release Sockets"
+
+# 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 Sockets"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "win32 - Win32 Release Sockets"
+
+# 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"
@@ -499,6 +720,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=".\conf\email-conf.h"
+# End Source File
+# Begin Source File
+
 SOURCE=".\conf\log-conf.h"
 # End Source File
 # Begin Source File
@@ -547,7 +772,41 @@
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\ppp\ppp_arch.c
+
+!IF  "$(CFG)" == "win32 - Win32 Debug Sockets"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "win32 - Win32 Release Sockets"
+
+# 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 Sockets"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "win32 - Win32 Release Sockets"
+
+# 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"
@@ -556,14 +815,59 @@
 # Begin Source File
 
 SOURCE=".\uip\rawsock-service.c"
+
+!IF  "$(CFG)" == "win32 - Win32 Debug Sockets"
+
+!ELSEIF  "$(CFG)" == "win32 - Win32 Release Sockets"
+
+!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 Sockets"
+
+!ELSEIF  "$(CFG)" == "win32 - Win32 Release Sockets"
+
+!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 Sockets"
+
+!ELSEIF  "$(CFG)" == "win32 - Win32 Release Sockets"
+
+!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