simplified several unnecessary inclusions/linkages