Add Homebrew specific inclusions & clean-up