fix includes

Not sure why, but I hit some compile errors...  it looks like some header file names/paths have changed.