adding more headers, fixing up setup script to handle 'AppleInternal' directory