Merge "Add missing includes"