More cleanup of project files, preprocessor definitions, etc