These header files don't follow the correct order. Fix this. Signed-off-by: Simon Glass <sjg@chromium.org>