Refactored standalone includes to their own package.