Remove a few extra includes in common/