Fix include mixup.
Do things in the right order to make sure the keycode defines are set
the same way for everyone.
diff --git a/contiki-cpc/ctk/ctk-arch.h b/contiki-cpc/ctk/ctk-arch.h
index 59d0641..ea17df2 100644
--- a/contiki-cpc/ctk/ctk-arch.h
+++ b/contiki-cpc/ctk/ctk-arch.h
@@ -36,6 +36,8 @@
#ifndef __CTK_ARCH_H__
#define __CTK_ARCH_H__
+#include "ctk-arch2.h"
+
#if CTK_HIRES
#include "ctk-hires.h"
#endif
@@ -52,7 +54,6 @@
//#define ctk_arch_isprint(c) isprint(c)
-#include "ctk-arch2.h"
#endif /* __CTK_ARCH_H__ */
diff --git a/contiki-cpc/ctk/ctk-arch2.h b/contiki-cpc/ctk/ctk-arch2.h
index 1d39254..51ee45b 100644
--- a/contiki-cpc/ctk/ctk-arch2.h
+++ b/contiki-cpc/ctk/ctk-arch2.h
@@ -11,14 +11,6 @@
#define ctk_arch_keyavail kbhit
#define ctk_arch_getkey cgetc
-// have to undefine because of it being defined in
-// ctk-conio.h
-#undef CH_ENTER
-#undef CH_F1
-#undef CH_F3
-#undef CH_CURS_LEFT
-#undef CH_CURS_RIGHT
-
#define CH_ENTER 0x0d
#define CH_STOP 0x01b
#define CH_F1 0x031