More stuff out of defines.h