Fix includes and linkage paths