Revert additional headers from 667137, as these are

not propogated by Makefile.in as of 2.2 branch.  If
we desire these, they should be all synced together.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@667140 13f79535-47bb-0310-9956-ffa450edef68