fixing bad defines...this isn't C++ anyway