Add a couple more standard macros. Fix the header.