forgot two #undef's