Some .h consistencies