Index: /trunk/src/kmk/dir.c
===================================================================
--- /trunk/src/kmk/dir.c	(revision 2772)
+++ /trunk/src/kmk/dir.c	(revision 2773)
@@ -1321,5 +1321,9 @@
 /* Hooks for globbing.  */
 
+#if defined(KMK) && !defined(__OS2__)
+# include "glob/glob.h"
+#else
 #include <glob.h>
+#endif
 
 /* Structure describing state of iterating through a directory hash table.  */
Index: /trunk/src/kmk/kmk_cc_exec.h
===================================================================
--- /trunk/src/kmk/kmk_cc_exec.h	(revision 2772)
+++ /trunk/src/kmk/kmk_cc_exec.h	(revision 2773)
@@ -33,10 +33,11 @@
 void  kmk_cc_print_stats(void);
 
+struct variable;
 extern struct kmk_cc_evalprog   *kmk_cc_compile_variable_for_eval(struct variable *pVar);
 extern struct kmk_cc_expandprog *kmk_cc_compile_variable_for_expand(struct variable *pVar);
-char *kmk_exec_expand_to_var_buf(struct variable *pVar, char *pchDst);
-void  kmk_exec_evalval(struct variable *pVar);
-void  kmk_cc_variable_changed(struct variable *pVar);
-void  kmk_cc_variable_deleted(struct variable *pVar);
+extern char *kmk_exec_expand_to_var_buf(struct variable *pVar, char *pchDst);
+extern void kmk_exec_evalval(struct variable *pVar);
+extern void kmk_cc_variable_changed(struct variable *pVar);
+extern void kmk_cc_variable_deleted(struct variable *pVar);