Moved user includes.
Updated CMake config.