some include fixes and switch snagw to build with includes