Merge "init: removed unused includes"