This is a continuation of the previous include sort patch, which only sorted for .c files.
That way we can call the code for local container/VM imports "import" without confusion.