Macros or multiple includes?

We have two means of creating functions for different architectures: macros (as currently used for multiplication) and repeated inclusion (as currently used for kernels).  They're both sort of hacky, but I think multiple inclusion is cleaner.  It lets us have a function without a backslash at the end of the line and edit it like a function.  Can we switch multiply to be multiple inclusion?  