Added missing includes for combobox