Next try at fixing preprocessor defines