fixed includes and key strut