Sync'd with fixes from trunk.

Added includes for prototypes; removed unused vars;
axed C++ comments.


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