Rename the define name to a correct one.
Use macro to declare namespace.
Move Map out of XCF head file.