Availability macros are private
Updates a few changed file references
Don't include unneeded headers.