Move implementation of ResetComboBox in pComboBox.
Some headers cleanup.