Bring preprocessor guard into accordance