s3-waf: add popt and tdb include dirs to the includes list