--- glob2/libgag/include/StreamBackend.h.ark	2009-10-01 08:51:39.359899489 +0000
+++ glob2/libgag/include/StreamBackend.h	2009-10-01 08:51:47.980730492 +0000
@@ -28,6 +28,9 @@
 #ifdef putc
 #undef putc
 #endif
+#ifdef getc
+#undef getc
+#endif
 
 namespace GAGCore
 {
--- glob2/libusl/src/token.cpp.ark	2009-10-01 09:05:58.177312945 +0000
+++ glob2/libusl/src/token.cpp	2009-10-01 09:06:06.603561805 +0000
@@ -2,6 +2,7 @@
 #include <cassert>
 #include <regex.h>
 #include <stdlib.h> 
+#include <cstdio>
 
 struct Token::Type::Regexp
 {