Using target_include_directories and some cleanup.