Feature clean include in components

Do some clean work in components. The remain unclean is componentdialog and spicedialog.
I'm currently working on spicedialog clean work and will send PR ASAP.