mbartle

When running `make check`, clang is much fussier about the order of header includes than gcc is. It complains about the use of `operator