Use simple define clauses to help dryice

@nightwing DryIce doesn't like all the module system magic of acorn. This simplifies the headers.