Merge 09546add6f02672beabde470aa7c2ecf70b223ac on remote branch

Change-Id: Ie60239725e3ec495ae91247b25c401dd05a83e59
diff --git a/futility/dump_kernel_config_lib.c b/futility/dump_kernel_config_lib.c
index c2d5943..4fe990c 100644
--- a/futility/dump_kernel_config_lib.c
+++ b/futility/dump_kernel_config_lib.c
@@ -5,10 +5,10 @@
  * Exports the kernel commandline from a given partition/image.
  */
 
+#include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/mman.h>
-#include <sys/fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>