Fixed NAFQA-212. Check for include and require calls
- messaging system improved