Index: build/generator/gen_base.py
===================================================================
--- build/generator/gen_base.py (revision 16590)
+++ build/generator/gen_base.py (working copy)
@@ -876,7 +876,8 @@
     # autogenerated SWIG header files
     for fname in filenames:
       if _is_public_include(fname):
-        hdrs = { self._domain["proxy.swg"][0]: None }
+        hdrs = { self._domain["proxy.swg"][0]: None,
+                 self._domain["apr.swg"][0]: None }
         for h in self._deps[fname].keys():
           if _is_public_include(h):
             hdrs[_swig_include_wrapper(h)] = None
@@ -884,6 +885,7 @@
             hdrs[h] = None
         swig_fname = _swig_include_wrapper(fname)
         swig_bname = os.path.basename(swig_fname)
+        hdrs[fname] = None
         self._deps[swig_fname] = hdrs
         self._domain[swig_bname] = [ swig_fname ]