fixed up include paths
fixed link