Cleanup: Include sorting.h instead of simplesort.h