add complete include path
add logging