Fix legacy (2.x) compiler definitions