Remove need to change commctrl.h