diff --git a/platform/win32/ctk/ctk-arch.h b/platform/win32/ctk/ctk-arch.h
deleted file mode 100644
index 3019ed497..000000000
--- a/platform/win32/ctk/ctk-arch.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2006, 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 Contiki operating system.
- * 
- * Author: Oliver Schmidt <ol.sc@web.de>
- *
- * $Id: ctk-arch.h,v 1.1 2006/08/13 16:36:01 oliverschmidt Exp $
- */
-#ifndef __CTK_ARCH_H__
-#define __CTK_ARCH_H__
-
-#include <ctype.h>
-
-#define CH_ENTER	'\r'
-#define CH_DEL		'\b'
-#define CH_CURS_UP  	-1
-#define CH_CURS_LEFT	-2
-#define CH_CURS_RIGHT	-3
-#define CH_CURS_DOWN	-4
-
-#define CH_ULCORNER	0xDA
-#define CH_URCORNER	0xBF
-#define CH_LLCORNER	0xC0
-#define CH_LRCORNER	0xD9
-
-#include "ctk/ctk-conio.h"
-#include "ctk-console.h"
-
-#undef  ctk_arch_getkey
-ctk_arch_key_t ctk_arch_getkey(void);
-
-#undef  ctk_arch_keyavail
-unsigned char ctk_arch_keyavail(void);
-
-#define ctk_arch_isprint    isprint
-#define cputc		    console_cputc
-#define cputs		    console_cputs
-
-#define COLOR_BLACK	(0)
-#define COLOR_BLUE	(1)
-#define COLOR_GRAY	(1 | 2 | 4)
-#define COLOR_CYAN	(1 | 2 | 8)
-#define COLOR_YELLOW	(2 | 4 | 8)
-#define COLOR_WHITE	(1 | 2 | 4 | 8)
-
-#endif /* __CTK_ARCH_H__ */
diff --git a/platform/win32/ctk/ctk-console.h b/platform/win32/ctk/ctk-console.h
index 4d0cbfa60..ff6331340 100644
--- a/platform/win32/ctk/ctk-console.h
+++ b/platform/win32/ctk/ctk-console.h
@@ -30,11 +30,14 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: ctk-console.h,v 1.1 2006/08/13 16:36:01 oliverschmidt Exp $
+ * $Id: ctk-console.h,v 1.2 2006/08/14 23:50:51 oliverschmidt Exp $
  */
 #ifndef __CTK_CONSOLE_H__
 #define __CTK_CONSOLE_H__
 
+#define cputc console_cputc
+#define cputs console_cputs
+
 void console_init(void);
 void console_exit(void);
 unsigned char console_resize(void);
@@ -59,4 +62,7 @@ void cputsxy(unsigned char x, unsigned char y, char *str);
 void cputcxy(unsigned char x, unsigned char y, char c);
 void textcolor(unsigned char c);
 
+ctk_arch_key_t ctk_arch_getkey(void);
+unsigned char ctk_arch_keyavail(void);
+
 #endif /* __CTK_CONSOLE_H__ */