Using -D is always inferior to something in a source file, where dependency tracking works right. The renaming of the symbols is certainly fine and I suggest you send that separately first.