fixing header files as per the integration constraints