cleanup magic numbers; add ifndefs to headers