fixup includes for shape input