Fix trimming -D from defines