diff --git a/apps/program-handler/program-handler.h b/apps/program-handler/program-handler.h
index ff240ecc4..1281ec821 100644
--- a/apps/program-handler/program-handler.h
+++ b/apps/program-handler/program-handler.h
@@ -29,7 +29,7 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: program-handler.h,v 1.1 2006/06/17 22:41:12 adamdunkels Exp $
+ * $Id: program-handler.h,v 1.2 2006/08/26 23:54:00 oliverschmidt Exp $
  *
  */
 #ifndef __PROGRAM_HANDLER_H__
@@ -42,7 +42,7 @@
 extern char program_handler_screensaver[];
 
 void program_handler_init(void);
-void program_handler_load(char *name, char *arg);
+CCIF void program_handler_load(char *name, char *arg);
 void program_handler_setscreensaver(char *name);
 
 void program_handler_add(struct dsc *dsc, char *menuname,
diff --git a/core/cfs/cfs.h b/core/cfs/cfs.h
index a752fa9d8..d53392d70 100644
--- a/core/cfs/cfs.h
+++ b/core/cfs/cfs.h
@@ -54,7 +54,7 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: cfs.h,v 1.2 2006/08/15 09:38:33 nifi Exp $
+ * $Id: cfs.h,v 1.3 2006/08/26 23:54:38 oliverschmidt Exp $
  */
 #ifndef __CFS_H__
 #define __CFS_H__
@@ -185,7 +185,7 @@ int cfs_readdir(struct cfs_dir *dirp, struct cfs_dirent *dirent);
  */
 int cfs_closedir(struct cfs_dir *dirp);
 
-const struct cfs_service_interface *cfs_find_service(void);
+CCIF const struct cfs_service_interface *cfs_find_service(void);
 
 #define cfs_open(name, flags)   (cfs_find_service()->open(name, flags))
 #define cfs_close(fd)           (cfs_find_service()->close(fd))
diff --git a/core/ctk/ctk-draw.h b/core/ctk/ctk-draw.h
index d99720677..39f8c06f5 100644
--- a/core/ctk/ctk-draw.h
+++ b/core/ctk/ctk-draw.h
@@ -45,7 +45,7 @@
  *
  * This file is part of the Contiki desktop OS.
  *
- * $Id: ctk-draw.h,v 1.1 2006/06/17 22:41:15 adamdunkels Exp $
+ * $Id: ctk-draw.h,v 1.2 2006/08/26 23:56:18 oliverschmidt Exp $
  *
  */
 
@@ -273,8 +273,8 @@ void ctk_draw_menus(struct ctk_menus *menus);
 
 
 /* Returns width and height of screen. */
-unsigned char ctk_draw_width(void);
-unsigned char ctk_draw_height(void);
+CCIF unsigned char ctk_draw_width(void);
+CCIF unsigned char ctk_draw_height(void);
 
 
 extern unsigned char ctk_draw_windowborder_width,
diff --git a/core/ctk/ctk.h b/core/ctk/ctk.h
index a6fe072e9..951c54e76 100644
--- a/core/ctk/ctk.h
+++ b/core/ctk/ctk.h
@@ -43,7 +43,7 @@
  *
  * This file is part of the Contiki desktop OS.
  *
- * $Id: ctk.h,v 1.1 2006/06/17 22:41:16 adamdunkels Exp $
+ * $Id: ctk.h,v 1.2 2006/08/26 23:55:32 oliverschmidt Exp $
  *
  */
 
@@ -677,28 +677,28 @@ unsigned char ctk_mode_get(void);
 /*void ctk_redraw(void);*/
 
 /* Functions for manipulating windows. */
-void ctk_window_new(struct ctk_window *window,
-		    unsigned char w, unsigned char h,
-		    char *title);
-void ctk_window_clear(struct ctk_window *w);
-void ctk_window_open(struct ctk_window *w);
+CCIF void ctk_window_new(struct ctk_window *window,
+			 unsigned char w, unsigned char h,
+			 char *title);
+CCIF void ctk_window_clear(struct ctk_window *w);
+CCIF void ctk_window_open(struct ctk_window *w);
 #define ctk_window_move(w,xpos,ypos) do { (w)->x=xpos; (w)->y=ypos; } while(0)
-void ctk_window_close(struct ctk_window *w);
-void ctk_window_redraw(struct ctk_window *w);
+CCIF void ctk_window_close(struct ctk_window *w);
+CCIF void ctk_window_redraw(struct ctk_window *w);
 #define ctk_window_isopen(w) ((w)->next != NULL)
 
 
 /* Functions for manipulating dialogs. */
-void ctk_dialog_new(struct ctk_window *window,
-		    unsigned char w, unsigned char h);
-void ctk_dialog_open(struct ctk_window *d);
-void ctk_dialog_close(void);
+CCIF void ctk_dialog_new(struct ctk_window *window,
+			unsigned char w, unsigned char h);
+CCIF void ctk_dialog_open(struct ctk_window *d);
+CCIF void ctk_dialog_close(void);
 
 /* Functions for manipulating menus. */
-void ctk_menu_new(struct ctk_menu *menu, char *title);
-void ctk_menu_add(struct ctk_menu *menu);
-void ctk_menu_remove(struct ctk_menu *menu);
-unsigned char ctk_menuitem_add(struct ctk_menu *menu, char *name);
+CCIF void ctk_menu_new(struct ctk_menu *menu, char *title);
+CCIF void ctk_menu_add(struct ctk_menu *menu);
+CCIF void ctk_menu_remove(struct ctk_menu *menu);
+CCIF unsigned char ctk_menuitem_add(struct ctk_menu *menu, char *name);
 
 /* Functions for icons. */
 
@@ -726,8 +726,8 @@ void ctk_icon_add(struct ctk_widget *icon, struct process *p);
  */
 #define CTK_WIDGET_ADD(win, widg) \
  ctk_widget_add(win, (struct ctk_widget *)widg)
-void CC_FASTCALL ctk_widget_add(struct ctk_window *window,
-				struct ctk_widget *widget);
+CCIF void CC_FASTCALL ctk_widget_add(struct ctk_window *window,
+				     struct ctk_widget *widget);
 
 /**
  * Set focus to a widget.
@@ -745,7 +745,7 @@ void CC_FASTCALL ctk_widget_add(struct ctk_window *window,
  */
 #define CTK_WIDGET_REDRAW(widg) \
  ctk_widget_redraw((struct ctk_widget *)widg)
-void ctk_widget_redraw(struct ctk_widget *w);
+CCIF void ctk_widget_redraw(struct ctk_widget *w);
 
 /**
  * Obtain the type of a widget.
@@ -912,11 +912,11 @@ void ctk_widget_redraw(struct ctk_widget *w);
 
 /* Desktop interface. */
 void ctk_desktop_redraw(struct ctk_desktop *d);
-unsigned char ctk_desktop_width(struct ctk_desktop *d);
+CCIF unsigned char ctk_desktop_width(struct ctk_desktop *d);
 unsigned char ctk_desktop_height(struct ctk_desktop *d);
 
 /* Signals. */
-extern process_event_t ctk_signal_keypress,
+CCIF extern process_event_t ctk_signal_keypress,
   ctk_signal_widget_activate,
   ctk_signal_widget_select,
   ctk_signal_timer,
@@ -945,7 +945,7 @@ extern unsigned short ctk_screensaver_timeout;
 #endif /* CTK_CONF_SCREENSAVER */
 
 /* These should no longer be used: */
-extern process_event_t ctk_signal_button_activate,
+CCIF extern process_event_t ctk_signal_button_activate,
   ctk_signal_button_hover,
   ctk_signal_hyperlink_activate,
   ctk_signal_hyperlink_hover;
diff --git a/core/net/resolv.h b/core/net/resolv.h
index 25c529b32..48831f7c5 100644
--- a/core/net/resolv.h
+++ b/core/net/resolv.h
@@ -34,7 +34,7 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: resolv.h,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $
+ * $Id: resolv.h,v 1.2 2006/08/26 23:58:45 oliverschmidt Exp $
  *
  */
 #ifndef __RESOLV_H__
@@ -45,17 +45,17 @@
 /**
  * Event that is broadcasted when a DNS name has been resolved.
  */
-extern process_event_t resolv_event_found;
+CCIF extern process_event_t resolv_event_found;
 
 /* Callbacks. */
 void resolv_found(char *name, u16_t *ipaddr);
 
 /* Functions. */
-void resolv_conf(u16_t *dnsserver);
-u16_t *resolv_getserver(void);
+CCIF void resolv_conf(u16_t *dnsserver);
+CCIF u16_t *resolv_getserver(void);
 void resolv_init(char *arg);
-u16_t *resolv_lookup(char *name);
-void resolv_query(char *name);
+CCIF u16_t *resolv_lookup(char *name);
+CCIF void resolv_query(char *name);
 
 PROCESS_NAME(resolv_process);
 
diff --git a/core/net/tcpip.h b/core/net/tcpip.h
index 3f9e71eca..99b0fb898 100644
--- a/core/net/tcpip.h
+++ b/core/net/tcpip.h
@@ -60,7 +60,7 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: tcpip.h,v 1.3 2006/08/10 16:43:32 bg- Exp $
+ * $Id: tcpip.h,v 1.4 2006/08/26 23:58:45 oliverschmidt Exp $
  */
 #ifndef __TCPIP_H__
 #define __TCPIP_H__
@@ -105,8 +105,8 @@ void tcpip_uipcall(void);
  * process whenever an event occurs on the connection.
  *
  */
-void tcp_attach(struct uip_conn *conn,
-		void *appstate);
+CCIF void tcp_attach(struct uip_conn *conn,
+		     void *appstate);
 #define tcp_markconn(conn, appstate) tcp_attach(conn, appstate)
 
 /**
@@ -123,7 +123,7 @@ void tcp_attach(struct uip_conn *conn,
  * \param port The port number in network byte order.
  *
  */
-void tcp_listen(u16_t port);
+CCIF void tcp_listen(u16_t port);
 
 /**
  * Close a listening TCP port.
@@ -137,7 +137,7 @@ void tcp_listen(u16_t port);
  * \param port The port number in network byte order.
  *
  */
-void tcp_unlisten(u16_t port);
+CCIF void tcp_unlisten(u16_t port);
 
 /**
  * Open a TCP connection to the specified IP address and port.
@@ -162,8 +162,8 @@ void tcp_unlisten(u16_t port);
  * memory could not be allocated for the connection.
  *
  */
-struct uip_conn *tcp_connect(uip_ipaddr_t *ripaddr, u16_t port,
-			     void *appstate);
+CCIF struct uip_conn *tcp_connect(uip_ipaddr_t *ripaddr, u16_t port,
+				  void *appstate);
 
 /**
  * Cause a specified TCP connection to be polled.
@@ -223,8 +223,8 @@ void udp_attach(struct uip_udp_conn *conn,
  * \return A pointer to the newly created connection, or NULL if
  * memory could not be allocated for the connection.
  */
-struct uip_udp_conn *udp_new(uip_ipaddr_t *ripaddr, u16_t port,
-			     void *appstate);
+CCIF struct uip_udp_conn *udp_new(uip_ipaddr_t *ripaddr, u16_t port,
+				  void *appstate);
 
 /**
  * Create a new UDP broadcast connection.
@@ -269,7 +269,7 @@ struct uip_udp_conn *udp_broadcast_new(u16_t port, void *appstate);
  * \param conn A pointer to the UDP connection that should be polled.
  *
  */
-void tcpip_poll_udp(struct uip_udp_conn *conn);
+CCIF void tcpip_poll_udp(struct uip_udp_conn *conn);
 
 /** @} */
 
@@ -278,7 +278,7 @@ void tcpip_poll_udp(struct uip_udp_conn *conn);
  *
  * This event is posted to a process whenever a uIP event has occured.
  */
-extern process_event_t tcpip_event;
+CCIF extern process_event_t tcpip_event;
 
 /**
  * \name TCP/IP packet processing
diff --git a/core/net/uip.h b/core/net/uip.h
index f6a6789a2..b7c14d045 100644
--- a/core/net/uip.h
+++ b/core/net/uip.h
@@ -46,7 +46,7 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: uip.h,v 1.3 2006/08/14 13:58:28 bg- Exp $
+ * $Id: uip.h,v 1.4 2006/08/26 23:58:45 oliverschmidt Exp $
  *
  */
 
@@ -548,7 +548,7 @@ struct uip_conn *uip_connect(uip_ipaddr_t *ripaddr, u16_t port);
  *
  * \hideinitializer
  */
-void uip_send(const void *data, int len);
+CCIF void uip_send(const void *data, int len);
 
 /**
  * The length of any incoming data that is currently avaliable (if avaliable)
@@ -1089,7 +1089,7 @@ struct uip_udp_conn *uip_udp_new(uip_ipaddr_t *ripaddr, u16_t rport);
  * network byte order, use the HTONS() macro instead.
  */
 #ifndef htons
-u16_t htons(u16_t val);
+CCIF u16_t htons(u16_t val);
 #endif /* htons */
 #ifndef ntohs
 #define ntohs htons
@@ -1104,7 +1104,7 @@ u16_t htons(u16_t val);
  * called. If the application wishes to send data, the application may
  * use this space to write the data into before calling uip_send().
  */
-extern void *uip_appdata;
+CCIF extern void *uip_appdata;
 
 #if UIP_URGDATA > 0
 /* u8_t *uip_urgdata:
@@ -1139,7 +1139,7 @@ extern void *uip_urgdata;
  * packet.
  *
  */
-extern u16_t uip_len;
+CCIF extern u16_t uip_len;
 
 /** @} */
 
@@ -1195,9 +1195,9 @@ struct uip_conn {
  * The uip_conn pointer can be used to access the current TCP
  * connection.
  */
-extern struct uip_conn *uip_conn;
+CCIF extern struct uip_conn *uip_conn;
 /* The array containing all uIP connections. */
-extern struct uip_conn uip_conns[UIP_CONNS];
+CCIF extern struct uip_conn uip_conns[UIP_CONNS];
 /**
  * \addtogroup uiparch
  * @{
@@ -1310,7 +1310,7 @@ extern struct uip_stats uip_stat;
  * that are defined in this file. Please read below for more
  * infomation.
  */
-extern u8_t uip_flags;
+CCIF extern u8_t uip_flags;
 
 /* The following flags may be set in the global variable uip_flags
    before calling the application callback. The UIP_ACKDATA,
@@ -1535,9 +1535,9 @@ struct uip_udpip_hdr {
 
 
 #if UIP_FIXEDADDR
-extern const uip_ipaddr_t uip_hostaddr, uip_netmask, uip_draddr;
+CCIF extern const uip_ipaddr_t uip_hostaddr, uip_netmask, uip_draddr;
 #else /* UIP_FIXEDADDR */
-extern uip_ipaddr_t uip_hostaddr, uip_netmask, uip_draddr;
+CCIF extern uip_ipaddr_t uip_hostaddr, uip_netmask, uip_draddr;
 #endif /* UIP_FIXEDADDR */
 extern const uip_ipaddr_t uip_broadcast_addr;
 extern const uip_ipaddr_t all_zeroes_addr;
diff --git a/core/net/uip_arp.h b/core/net/uip_arp.h
index b9a7bfb39..5bb074ad7 100644
--- a/core/net/uip_arp.h
+++ b/core/net/uip_arp.h
@@ -45,7 +45,7 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: uip_arp.h,v 1.1 2006/06/17 22:41:19 adamdunkels Exp $
+ * $Id: uip_arp.h,v 1.2 2006/08/26 23:58:45 oliverschmidt Exp $
  *
  */
 
@@ -55,7 +55,7 @@
 #include "net/uip.h"
 
 
-extern struct uip_eth_addr uip_ethaddr;
+CCIF extern struct uip_eth_addr uip_ethaddr;
 
 /**
  * The Ethernet header.
diff --git a/core/net/uiplib.h b/core/net/uiplib.h
index 8ebc0ee7e..7baffc965 100644
--- a/core/net/uiplib.h
+++ b/core/net/uiplib.h
@@ -37,7 +37,7 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: uiplib.h,v 1.1 2006/06/17 22:41:19 adamdunkels Exp $
+ * $Id: uiplib.h,v 1.2 2006/08/26 23:58:45 oliverschmidt Exp $
  *
  */
 #ifndef __UIPLIB_H__
@@ -64,7 +64,7 @@
  * \retval 0 If the IP address could not be parsed.
  * \retval Non-zero If the IP address was parsed. 
  */
-unsigned char uiplib_ipaddrconv(char *addrstr, unsigned char *addr);
+CCIF unsigned char uiplib_ipaddrconv(char *addrstr, unsigned char *addr);
 
 /** @} */
 
diff --git a/core/sys/dsc.h b/core/sys/dsc.h
index b89b52cfb..4906c482c 100644
--- a/core/sys/dsc.h
+++ b/core/sys/dsc.h
@@ -56,7 +56,7 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: dsc.h,v 1.1 2006/06/17 22:41:20 adamdunkels Exp $
+ * $Id: dsc.h,v 1.2 2006/08/26 23:59:39 oliverschmidt Exp $
  *
  */
 #ifndef __DSC_H__
@@ -110,7 +110,7 @@ struct dsc {
  */
 #if WITH_LOADER_ARCH
 #define DSC(dscname, description, prgname, process, icon) \
-        const struct dsc dscname = {description, prgname, icon}
+        CLIF const struct dsc dscname = {description, prgname, icon}
 #else /* WITH_LOADER_ARCH */
 #define DSC(dscname, description, prgname, process, icon) \
     PROCESS_NAME(process); \
diff --git a/core/sys/etimer.h b/core/sys/etimer.h
index 40a98f52e..aa4b5734b 100644
--- a/core/sys/etimer.h
+++ b/core/sys/etimer.h
@@ -58,7 +58,7 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: etimer.h,v 1.1 2006/06/17 22:41:20 adamdunkels Exp $
+ * $Id: etimer.h,v 1.2 2006/08/26 23:59:39 oliverschmidt Exp $
  */
 #ifndef __ETIMER_H__
 #define __ETIMER_H__
@@ -96,7 +96,7 @@ struct etimer {
  *             process that called the etimer_set() function.
  *
  */
-void etimer_set(struct etimer *et, clock_time_t interval);
+CCIF void etimer_set(struct etimer *et, clock_time_t interval);
 
 /**
  * \brief      Reset an event timer with the same interval as was
@@ -181,7 +181,7 @@ clock_time_t etimer_start_time(struct etimer *et);
  *             This function tests if an event timer has expired and
  *             returns true or false depending on its status.
  */
-int  etimer_expired(struct etimer *et);
+CCIF int etimer_expired(struct etimer *et);
 
 /**
  * \brief      Stop a pending event timer.
diff --git a/core/sys/process.h b/core/sys/process.h
index 2706209f6..314b0d084 100644
--- a/core/sys/process.h
+++ b/core/sys/process.h
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: process.h,v 1.2 2006/08/17 15:39:25 bg- Exp $
+ * @(#)$Id: process.h,v 1.3 2006/08/26 23:59:39 oliverschmidt Exp $
  */
 
 /**
@@ -279,7 +279,7 @@ static PT_THREAD(process_thread_##name(struct pt *process_pt,	\
 #else  /* PROCESS_LOADABLE */
 #define PROCESS_LOAD(name)
 #endif /* PROCESS_LOADABLE */
-extern const struct process *process_load;
+CLIF extern const struct process *process_load;
 
 /**
  * Declare the name of a process.
@@ -374,7 +374,7 @@ void process_start(struct process *p, char *arg);
  * \retval PROCESS_ERR_FULL The event queue was full and the event could
  * not be posted.
  */
-int  process_post(struct process *p, process_event_t ev, process_data_t data);
+CCIF int process_post(struct process *p, process_event_t ev, process_data_t data);
 
 /**
  * Post a synchronous event to a process.
@@ -399,7 +399,7 @@ void process_post_synch(struct process *p,
  *
  * \sa PROCESS_CURRENT()
  */
-void process_exit(struct process *p);
+CCIF void process_exit(struct process *p);
 
 
 /**
@@ -412,7 +412,7 @@ void process_exit(struct process *p);
  * \hideinitializer
  */
 #define PROCESS_CURRENT() process_current
-extern struct process *process_current;
+CCIF extern struct process *process_current;
 
 #define PROCESS_SET_FLAGS(flags)
 #define PROCESS_NO_BROADCAST
@@ -524,7 +524,7 @@ int process_nevents(void);
 
 /** @} */
 
-extern struct process *process_list;
+CCIF extern struct process *process_list;
 
 #define PROCESS_LIST() process_list