Fix some more include paths
Various additional build / linking fixes