@@ -22,6 +22,8 @@
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
+#include <getopt.h>
+
#include "qemu-version.h"
#include "qapi/error.h"
#include "qapi/util.h"
@@ -43,7 +45,6 @@
#include "block/qapi.h"
#include "crypto/init.h"
#include "trace/control.h"
-#include <getopt.h>
#define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \
"\n" QEMU_COPYRIGHT "\n"
@@ -17,6 +17,10 @@
*/
#include "qemu/osdep.h"
+#include <getopt.h>
+#include <libgen.h>
+#include <pthread.h>
+
#include "qapi/error.h"
#include "qemu-common.h"
#include "qemu/cutils.h"
@@ -38,10 +42,6 @@
#include "trace/control.h"
#include "qemu-version.h"
-#include <getopt.h>
-#include <libgen.h>
-#include <pthread.h>
-
#define SOCKET_PATH "/var/lock/qemu-nbd-%s"
#define QEMU_NBD_OPT_CACHE 256
#define QEMU_NBD_OPT_AIO 257
HACKING recommends listing system includes right after osdep.h, and before any other in-project headers. Signed-off-by: Eric Blake <eblake@redhat.com> --- qemu-img.c | 3 ++- qemu-nbd.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-)