Fixed and standardized includes