wrap the include
Merge branch 'fix/remove-apache-dependency'