Moved some define where they belong