Organized imports in ninja-core

The subject says it :-)

Just ignore the other commits. I reverted them. Should have done this in a feature-branch. Sorry for that.