replace hard coded buffer sizes using #defines

replace hard coded buffer sizes using #defines #1170