diff --git a/ports/msvc6/lwipopts.h b/ports/msvc6/lwipopts.h
index 8682c16..ff5e692 100644
--- a/ports/msvc6/lwipopts.h
+++ b/ports/msvc6/lwipopts.h
@@ -144,7 +144,7 @@ a lot of data that needs to be copied, this should be set high. */
  * for certain critical regions during buffer allocation, deallocation and memory
  * allocation and deallocation.
  */
-#define SYS_LIGHTWEIGHT_PROT    1
+#define SYS_LIGHTWEIGHT_PROT    (NO_SYS==0)
 
 /* ---------- TCP options ---------- */
 #define LWIP_TCP                1
@@ -237,7 +237,7 @@ a lot of data that needs to be copied, this should be set high. */
 
 /* ---------- PPP options ---------- */
 
-#define PPP_SUPPORT      1      /* Set > 0 for PPP */
+#define PPP_SUPPORT      0      /* Set > 0 for PPP */
 
 #if PPP_SUPPORT > 0
 
diff --git a/ports/msvc6/sys_arch.c b/ports/msvc6/sys_arch.c
index 1e83437..d96ee8a 100644
--- a/ports/msvc6/sys_arch.c
+++ b/ports/msvc6/sys_arch.c
@@ -36,10 +36,9 @@
 
 #include <windows.h>
 #include <time.h>
-#include <arch/cc.h>
 
+#include <lwip/opt.h>
 #include <lwip/stats.h>
-#include <lwip/arch.h>
 #include <lwip/debug.h>
 #include <lwip/sys.h>
 
diff --git a/ports/msvc6/test.c b/ports/msvc6/test.c
index e9bc664..5a3eb41 100644
--- a/ports/msvc6/test.c
+++ b/ports/msvc6/test.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * test.c - This file is part of lwIPtest
+ * test.c - This file is part of lwIP test
  *
  */
 
@@ -41,9 +41,12 @@
 
 #include "lwip/debug.h"
 #include "lwip/stats.h"
-#include "lwip/sockets.h"
+#include "lwip/init.h"
 #include "lwip/tcpip.h"
 
+#include "lwip/tcp.h"
+#include "lwip/udp.h"
+
 #include "netif/loopif.h"
 
 #include "httpd.h"
@@ -115,9 +118,7 @@ void mcast_init(void)
     
     remote_addr.addr = inet_addr("232.0.0.0");
     
-    LOCK_TCPIP_CORE();
     err = udp_sendto(pcb, p, &remote_addr, ntohs(20000));
-    UNLOCK_TCPIP_CORE();
     
     pbuf_free(p);
   }