Improved separation of predefs in header file