fix includes/linking stuff