Move common elements to includes