Merge "cert_create: Remove some unused header files inclusions" into integration