Revert "Delete .h Macros"

This reverts commit c05764ad0ddd3430836873a44c53c27cbfb43f7a.