mv defines.h smtpd-defines.h to avoid a potential conflict with portable's openbsd-compat/defines.h
remove unused #define's
Merge branch 'master' into portable