Removed unnecessary includes that broke build if APR not available.