Index: build/generator/gen_make.py
===================================================================
--- build/generator/gen_make.py	(revision 16900)
+++ build/generator/gen_make.py	(working copy)
@@ -528,16 +528,11 @@
     standalone.write('abs_builddir = %s\n' % os.getcwd())
     standalone.write('SWIG = swig\n')
     standalone.write('PYTHON = python\n')
-    swig_includes = ['-Iapr/include', '-Iapr-util/include']
+    swig_includes = []
     for dirs in self.include_dirs, self.swig_include_dirs:
       for dir in string.split(string.strip(dirs)):
         swig_includes.append("-I%s" % dir)
         swig_includes.append("-I$(abs_srcdir)/%s" % dir)
-    if not os.path.exists("apr/include"):
-      try:
-        swig_includes.append("-I%s" % _exec.output("apr-config --includedir"))
-      except AssertionError:
-        pass
     standalone.write('SWIG_INCLUDES = %s\n' % string.join(swig_includes))
     standalone.write(open("build-outputs.mk","r").read())
     standalone.close()
Index: subversion/bindings/swig/include/apr.swg
===================================================================
--- subversion/bindings/swig/include/apr.swg	(revision 16900)
+++ subversion/bindings/swig/include/apr.swg	(working copy)
@@ -51,16 +51,8 @@
 #endif
 
 /* ----------------------------------------------------------------------- */
+#define __attribute__(x)
 
-#ifdef WIN32
-/* Fool SWIG into understanding the __int64 datatype */
-#define __int64 long long
-#endif
-%import apr.h
-#ifdef WIN32
-#undef __int64
-#endif
-
 /* ### be nice to have all the error values and macros. there are some
    ### problems including this file, tho. SWIG isn't smart enough with some
    ### of the preprocessing and thinks there is a macro redefinition */