fix linkage and includes