fix include file paths
more fixes for bambam part after code import