[MERGE] libcompat round 4

[Amos Jeffries]

adds removal of a few bad include paths and a duplicate assert.h on top 
of round 3.