Fixed imports and search paths so that CMake (and thus Travis) build should work.