Porting over more includes/commons to modules.