Reorganize toolkit includes.