[U-Boot] [PATCHv3 3/8] mkenvimage: Correct the includes and add a missing one