Index: build/generator/gen_base.py
===================================================================
--- build/generator/gen_base.py (revision 16581)
+++ build/generator/gen_base.py (working copy)
@@ -876,12 +876,15 @@
     # 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,
+                 fname: None }
         for h in self._deps[fname].keys():
           if _is_public_include(h):
             hdrs[_swig_include_wrapper(h)] = None
           else:
-            hdrs[h] = None
+            raise RuntimeError, "Public include '%s' depends on '%s', " \
+                "which is not a public include! What's going on?" % (fname, h)
         swig_fname = _swig_include_wrapper(fname)
         swig_bname = os.path.basename(swig_fname)
         self._deps[swig_fname] = hdrs
Index: build/generator/gen_make.py
===================================================================
--- build/generator/gen_make.py (revision 16581)
+++ build/generator/gen_make.py (working copy)
@@ -189,7 +189,6 @@
       self.ofile.write(
         'autogen-swig-%s: swig-headers %s\n' % (short[lang], lang_deps) +
         'swig-%s: autogen-swig-%s\n' % (short[lang], short[lang]) +
-        'install-swig-%s: autogen-swig-%s\n' % (short[lang], short[lang]) +
         'autogen-swig: autogen-swig-%s\n' % short[lang] +
         'extraclean-swig-%s: extraclean-swig-headers\n' % short[lang] +
         'clean-swig-%s: clean-swig-headers\n' % short[lang] +