Fixed NAFQA-212. Check for include and require calls
- cross-platform compatibility added
Merge remote-tracking branch 'origin/NAFQA-212_security_include' into Release2