Updated order in CMakeLists.txt so that includes actually have an effect...