Partial reversion of global indentation of macro processor header files...

Partial reversion of global indentation of macro processor header files introduced in e2d5a835

The global indentation introduced in e2d5a835 made the macro processor header files difficult to read. Revert spacing changes that made simple, inline, one-line functions take up 5 lines making headers tougher to read. Similary change for constructors, not to place each brace on an individual line.

(cherry picked from commit f2271eb8)