I moved all these defines closer to the top of the file, but I don't think it was really a necessary change. It can be put back to where it was.