diff --git a/cpu/6502/6502def.h b/cpu/6502/6502def.h
index aa90befd8..2a5f94621 100644
--- a/cpu/6502/6502def.h
+++ b/cpu/6502/6502def.h
@@ -30,7 +30,7 @@
*
* Author: Oliver Schmidt
*
- * @(#)$Id: 6502def.h,v 1.4 2007/12/16 17:03:27 oliverschmidt Exp $
+ * @(#)$Id: 6502def.h,v 1.5 2007/12/23 12:32:43 oliverschmidt Exp $
*/
#ifndef __6502DEF_H__
@@ -60,6 +60,34 @@ typedef unsigned short uip_stats_t;
#define UIP_ARCH_ADD32 1
#define UIP_ARCH_CHKSUM 1
+#if WITH_CLIENT
+#define UIP_CONF_ACTIVE_OPEN 1
+#else /* WITH_CLIENT */
+#define UIP_CONF_ACTIVE_OPEN 0
+#endif /* WITH_CLIENT */
+
+#if WITH_DNS
+#define UIP_CONF_UDP 1
+#define UIP_CONF_UDP_CHECKSUMS 1
+#else /* WITH_DNS */
+#define UIP_CONF_UDP 0
+#define UIP_CONF_UDP_CHECKSUMS 0
+#endif /* WITH_DNS */
+
+#define CTK_CONF_WIDGET_FLAGS 0
+#define CTK_CONF_WINDOWS 0
+#define CTK_CONF_WINDOWMOVE 0
+#define CTK_CONF_WINDOWCLOSE 0
+#define CTK_CONF_ICONS 0
+#define CTK_CONF_MENUS 0
+#define CTK_CONF_SCREENSAVER 0
+
+#if WITH_MOUSE
+#define CTK_CONF_MOUSE_SUPPORT 1
+#else /* WITH_MOUSE */
+#define CTK_CONF_MOUSE_SUPPORT 0
+#endif /* WITH_MOUSE */
+
#define ctk_arch_keyavail kbhit
#define ctk_arch_getkey cgetc
#define ctk_arch_isprint isprint
diff --git a/platform/apple2enh/contiki-conf.h b/platform/apple2enh/contiki-conf.h
index 7ab09b44a..65d2080c1 100644
--- a/platform/apple2enh/contiki-conf.h
+++ b/platform/apple2enh/contiki-conf.h
@@ -30,7 +30,7 @@
*
* Author: Oliver Schmidt
*
- * $Id: contiki-conf.h,v 1.9 2007/12/20 22:59:41 oliverschmidt Exp $
+ * $Id: contiki-conf.h,v 1.10 2007/12/23 12:36:41 oliverschmidt Exp $
*/
#ifndef __CONTIKI_CONF_H__
@@ -40,23 +40,14 @@
#define LOG_CONF_ENABLED 1
-#define UIP_CONF_BUFFER_SIZE 1500
-#define UIP_CONF_TCP_SPLIT 1
-#define UIP_CONF_UDP_CHECKSUMS 1
-#define UIP_CONF_LOGGING 1
+#define UIP_CONF_BUFFER_SIZE 1500
+#define UIP_CONF_TCP_SPLIT 1
+#define UIP_CONF_LOGGING 1
#define CTK_CONF_MENU_KEY CH_ESC
#define CTK_CONF_WINDOWSWITCH_KEY 0x17 /* Ctrl-W */
#define CTK_CONF_WIDGETUP_KEY 0x01 /* Ctrl-A */
#define CTK_CONF_WIDGETDOWN_KEY '\t' /* Tab or Ctrl-I */
-#define CTK_CONF_WIDGET_FLAGS 0
-#define CTK_CONF_WINDOWS 0
-#define CTK_CONF_WINDOWMOVE 0
-#define CTK_CONF_WINDOWCLOSE 0
-#define CTK_CONF_ICONS 0
-#define CTK_CONF_MENUS 0
-#define CTK_CONF_SCREENSAVER 0
-#define CTK_CONF_MOUSE_SUPPORT 1
#define MOUSE_CONF_DRIVER "a2e.stdmou.mou"
#define MOUSE_CONF_XTOC(x) ((x) * 2 / 7)
diff --git a/platform/c64/contiki-conf.h b/platform/c64/contiki-conf.h
index 31db99d95..86642dc65 100644
--- a/platform/c64/contiki-conf.h
+++ b/platform/c64/contiki-conf.h
@@ -30,7 +30,7 @@
*
* Author: Oliver Schmidt
*
- * $Id: contiki-conf.h,v 1.12 2007/12/20 22:52:18 oliverschmidt Exp $
+ * $Id: contiki-conf.h,v 1.13 2007/12/23 12:38:09 oliverschmidt Exp $
*/
#ifndef __CONTIKI_CONF_H__
@@ -40,23 +40,14 @@
#define LOG_CONF_ENABLED 1
-#define UIP_CONF_BUFFER_SIZE 1500
-#define UIP_CONF_TCP_SPLIT 1
-#define UIP_CONF_UDP_CHECKSUMS 1
-#define UIP_CONF_LOGGING 1
+#define UIP_CONF_BUFFER_SIZE 1500
+#define UIP_CONF_TCP_SPLIT 1
+#define UIP_CONF_LOGGING 1
#define CTK_CONF_MENU_KEY CH_F1
#define CTK_CONF_WINDOWSWITCH_KEY CH_F3
#define CTK_CONF_WIDGETUP_KEY CH_F5
#define CTK_CONF_WIDGETDOWN_KEY CH_F7
-#define CTK_CONF_WIDGET_FLAGS 0
-#define CTK_CONF_WINDOWS 0
-#define CTK_CONF_WINDOWMOVE 0
-#define CTK_CONF_WINDOWCLOSE 0
-#define CTK_CONF_ICONS 0
-#define CTK_CONF_MENUS 0
-#define CTK_CONF_SCREENSAVER 0
-#define CTK_CONF_MOUSE_SUPPORT 1
#define MOUSE_CONF_DRIVER "c64-1351.mou"
#define MOUSE_CONF_XTOC(x) ((x) / 8)