Update some dependancies. Move the final two files out of apr/inc and into

apr/include.  Basically just finish some cleanup from some changes I've
been making over the last two days.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84147 13f79535-47bb-0310-9956-ffa450edef68