remove old baseline sources
fix includes