diff --git a/src/conio/ansi_cio.c b/src/conio/ansi_cio.c
index ad11e2e3809478fe82f1ab3c483a0ecc68c2503b..f719dd1a54632150e1435d5cef0eee863dd0f680 100644
--- a/src/conio/ansi_cio.c
+++ b/src/conio/ansi_cio.c
@@ -44,14 +44,7 @@
 	struct termios tio_default;				/* Initial term settings */
 #endif
 
-#if (defined CIOLIB_IMPORTS)
- #undef CIOLIB_IMPORTS
-#endif
-#if (defined CIOLIB_EXPORTS)
- #undef CIOLIB_EXPORTS
-#endif
-
-#include "ciolib.h"
+#include <ciolib.h>
 #include "ansi_cio.h"
 
 int	CIOLIB_ANSI_TIMEOUT=500;
diff --git a/src/conio/win32cio.c b/src/conio/win32cio.c
index dae4523fb1c3111b6d5c833be150c9c6e6b6561b..7d89510feea705b57540997d68db6a85d56c1cab 100644
--- a/src/conio/win32cio.c
+++ b/src/conio/win32cio.c
@@ -38,14 +38,7 @@
  #include <malloc.h>	/* alloca() on Win32 */
 #endif
 
-#if (defined CIOLIB_IMPORTS)
- #undef CIOLIB_IMPORTS
-#endif
-#if (defined CIOLIB_EXPORTS)
- #undef CIOLIB_EXPORTS
-#endif
-
-#include "ciolib.h"
+#include <ciolib.h>
 #include "vidmodes.h"
 #include "win32cio.h"
 
@@ -57,7 +50,7 @@ struct keyvals {
 		,ALT;
 };
 
-const struct keyvals keyval[] =
+CIOLIBEXPORTVAR const struct keyvals keyval[] =
 {
 	{VK_BACK, 0x08, 0x08, 0x7f, 0x0e00},
 	{VK_TAB, 0x09, 0x0f00, 0x9400, 0xa500},