Sort the Makefile headers a bit