Moved more defines to internal.h. Squashed some warnings in win32