updated: aligned snort includes to latest upstream.