  
 Index: /Users/ochafik/src/dyncall/dyncall/dynload/dynload_darwin.c
 ===================================================================
---- /Users/ochafik/src/dyncall/dyncall/dynload/dynload_darwin.c	(revision 670)
+--- /Users/ochafik/src/dyncall/dyncall/dynload/dynload_darwin.c	(revision 745)
 +++ /Users/ochafik/src/dyncall/dyncall/dynload/dynload_darwin.c	(working copy)
-@@ -26,6 +26,9 @@
- 
- 
- #include "dynload.h"
-+#include "dynload_macros.h"
-+#include "dyncall_macros.h"
-+#include "dyncall_alloc.h"
- 
- #include <dlfcn.h>
- #include <string.h>
-@@ -56,7 +59,6 @@
- 	return lib;
- }
- 
--
- void* dlFindSymbol(DLLib* libHandle, const char* symbol)
- {
-   return dlsym(libHandle && libHandle->handle ? libHandle->handle : RTLD_DEFAULT, symbol);
+@@ -27,7 +27,10 @@
+ 
+ 
+ #include "dynload.h"
++//#include "dynload_macros.h"
++//#include "dyncall_macros.h"
+ #include "dyncall_alloc.h"
++
+ #include <dlfcn.h>
+ #include <string.h>
+ 
+@@ -63,7 +66,6 @@
+         return lib;
+ }
+ 
+-
+ void* dlFindSymbol(DLLib* libHandle, const char* symbol)
+ {
+   return dlsym(libHandle && libHandle->handle ? libHandle->handle : RTLD_DEFAULT, symbol);
 Index: /Users/ochafik/src/dyncall/dyncall/dynload/dynload.h
 ===================================================================
---- /Users/ochafik/src/dyncall/dyncall/dynload/dynload.h	(revision 670)
+--- /Users/ochafik/src/dyncall/dyncall/dynload/dynload.h	(revision 745)
 +++ /Users/ochafik/src/dyncall/dyncall/dynload/dynload.h	(working copy)
 @@ -24,6 +24,9 @@
  #ifndef DYNLOAD_H

 	const struct NLIST_TYPE* nl;
Index: /Users/ochafik/src/dyncall/dyncall/dynload/dynload.c
===================================================================
--- /Users/ochafik/src/dyncall/dyncall/dynload/dynload.c	(revision 670)
+++ /Users/ochafik/src/dyncall/dyncall/dynload/dynload.c	(working copy)
@@ -18,11 +18,14 @@
 */
 
 #include "dynload.h"
+#include "dynload_macros.h"
+#include "dyncall_macros.h"
+#include "dyncall_alloc.h"
 
 #if defined(DC_WINDOWS)
 #  include "dynload_windows.c"
 #elif defined(DC_UNIX)

 #    include "dynload_darwin.c"
 #  else
 #    include "dynload_unix.c"
Index: /Users/ochafik/src/dyncall/dyncall/buildsys/gmake/prolog.gmake
===================================================================
--- /Users/ochafik/src/dyncall/dyncall/buildsys/gmake/prolog.gmake	(revision 745)
+++ /Users/ochafik/src/dyncall/dyncall/buildsys/gmake/prolog.gmake	(working copy)
@@ -28,7 +28,7 @@
 
 # config settings
 
-$(if $(wildcard "${TOP}/ConfigVars"),$(error hmm),$(error File 'ConfigVars' not found at top directory. Run 'configure' - or, if you use CMake, run 'make -f Makefile' please.))
+#$(if $(wildcard "${TOP}/ConfigVars"),$(error hmm),$(error File 'ConfigVars' not found at top directory. Run 'configure' - or, if you use CMake, run 'make -f Makefile' please.))
 include $(TOP)/ConfigVars
 
 
