Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/647432/?format=api
{ "id": 647432, "url": "http://patchwork.ozlabs.org/api/patches/647432/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1468333894-419-18-git-send-email-armbru@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1468333894-419-18-git-send-email-armbru@redhat.com>", "list_archive_url": null, "date": "2016-07-12T14:31:33", "name": "[PULL,17/18] Clean up decorations and whitespace around header guards", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "6dd763c17169aa099637a335579c0c882ead7bc4", "submitter": { "id": 2645, "url": "http://patchwork.ozlabs.org/api/people/2645/?format=api", "name": "Markus Armbruster", "email": "armbru@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1468333894-419-18-git-send-email-armbru@redhat.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/647432/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/647432/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Received": [ "from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3rplLd3vgYz9s5w\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 13 Jul 2016 00:52:41 +1000 (AEST)", "from localhost ([::1]:41022 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1bMz39-0005va-8a\n\tfor incoming@patchwork.ozlabs.org; Tue, 12 Jul 2016 10:52:39 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:44169)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <armbru@redhat.com>) id 1bMyj7-0003HR-C0\n\tfor qemu-devel@nongnu.org; Tue, 12 Jul 2016 10:32:08 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <armbru@redhat.com>) id 1bMyiw-0001n1-U2\n\tfor qemu-devel@nongnu.org; Tue, 12 Jul 2016 10:31:56 -0400", "from mx1.redhat.com ([209.132.183.28]:37981)\n\tby eggs.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <armbru@redhat.com>) id 1bMyiw-0001mi-EV\n\tfor qemu-devel@nongnu.org; Tue, 12 Jul 2016 10:31:46 -0400", "from int-mx11.intmail.prod.int.phx2.redhat.com\n\t(int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 159D63B720\n\tfor <qemu-devel@nongnu.org>; Tue, 12 Jul 2016 14:31:46 +0000 (UTC)", "from blackfin.pond.sub.org (ovpn-116-29.ams2.redhat.com\n\t[10.36.116.29])\n\tby int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with\n\tESMTP id u6CEVfUv008622\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256\n\tverify=NO)\n\tfor <qemu-devel@nongnu.org>; Tue, 12 Jul 2016 10:31:43 -0400", "by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid A9E241133060; Tue, 12 Jul 2016 16:31:34 +0200 (CEST)" ], "From": "Markus Armbruster <armbru@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Tue, 12 Jul 2016 16:31:33 +0200", "Message-Id": "<1468333894-419-18-git-send-email-armbru@redhat.com>", "In-Reply-To": "<1468333894-419-1-git-send-email-armbru@redhat.com>", "References": "<1468333894-419-1-git-send-email-armbru@redhat.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "X-Scanned-By": "MIMEDefang 2.68 on 10.5.11.24", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tTue, 12 Jul 2016 14:31:46 +0000 (UTC)", "Content-Transfer-Encoding": "quoted-printable", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]", "X-Received-From": "209.132.183.28", "Subject": "[Qemu-devel] [PULL 17/18] Clean up decorations and whitespace\n\taround header guards", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "Cleaned up with scripts/clean-header-guards.pl.\n\nSigned-off-by: Markus Armbruster <armbru@redhat.com>\nReviewed-by: Richard Henderson <rth@twiddle.net>\n---\n audio/audio.h | 3 ++-\n audio/audio_int.h | 3 ++-\n audio/audio_pt_int.h | 2 +-\n audio/mixeng.h | 3 ++-\n bsd-user/i386/target_syscall.h | 2 +-\n bsd-user/sparc/target_syscall.h | 2 +-\n bsd-user/sparc64/target_syscall.h | 2 +-\n bsd-user/x86_64/target_syscall.h | 2 +-\n hw/audio/gusemu.h | 2 +-\n hw/audio/gustate.h | 2 +-\n hw/audio/lm4549.h | 2 +-\n hw/audio/pl041.h | 2 +-\n hw/display/qxl.h | 2 +-\n hw/display/vga_int.h | 3 ++-\n hw/intc/gic_internal.h | 2 +-\n hw/intc/gicv3_internal.h | 2 +-\n hw/lm32/lm32.h | 2 +-\n hw/net/ne2000.h | 2 +-\n hw/net/pcnet.h | 2 +-\n hw/pci-bridge/xio3130_upstream.h | 2 +-\n hw/s390x/s390-virtio.h | 2 +-\n hw/xen/xen-host-pci-device.h | 2 +-\n hw/xen/xen_pt.h | 2 +-\n hw/xenpv/xen_domainbuild.h | 2 +-\n include/block/blockjob.h | 3 ++-\n include/block/thread-pool.h | 2 +-\n include/exec/cpu-common.h | 4 ++--\n include/exec/gen-icount.h | 2 +-\n include/exec/helper-gen.h | 2 +-\n include/exec/helper-proto.h | 2 +-\n include/exec/helper-tcg.h | 2 +-\n include/exec/softmmu-semi.h | 3 ++-\n include/fpu/softfloat.h | 2 +-\n include/hw/acpi/acpi.h | 3 ++-\n include/hw/arm/pxa.h | 5 +++--\n include/hw/arm/soc_dma.h | 3 +--\n include/hw/audio/pcspk.h | 2 +-\n include/hw/block/flash.h | 2 +-\n include/hw/bt.h | 2 +-\n include/hw/char/escc.h | 2 +-\n include/hw/char/lm32_juart.h | 2 +-\n include/hw/char/serial.h | 3 ++-\n include/hw/cris/etraxfs_dma.h | 2 +-\n include/hw/display/dpcd.h | 2 +-\n include/hw/dma/xlnx_dpdma.h | 2 +-\n include/hw/empty_slot.h | 2 +-\n include/hw/fw-path-provider.h | 2 +-\n include/hw/i2c/pm_smbus.h | 2 +-\n include/hw/i386/apic_internal.h | 3 ++-\n include/hw/i386/ioapic.h | 2 +-\n include/hw/i386/ioapic_internal.h | 2 +-\n include/hw/input/ps2.h | 2 +-\n include/hw/isa/i8257.h | 1 -\n include/hw/isa/i8259_internal.h | 2 +-\n include/hw/nmi.h | 2 +-\n include/hw/pci/pci_bridge.h | 2 +-\n include/hw/pci/pci_ids.h | 3 ++-\n include/hw/pcmcia.h | 2 +-\n include/hw/platform-bus.h | 4 ++--\n include/hw/ppc/mac_dbdma.h | 3 ++-\n include/hw/ppc/ppc.h | 2 +-\n include/hw/smbios/smbios.h | 3 ++-\n include/hw/stream.h | 2 +-\n include/hw/sysbus.h | 4 ++--\n include/hw/timer/i8254.h | 2 +-\n include/hw/timer/i8254_internal.h | 2 +-\n include/hw/timer/mc146818rtc.h | 2 +-\n include/hw/unicore32/puv3.h | 3 ++-\n include/hw/usb/ehci-regs.h | 2 +-\n include/hw/usb/uhci-regs.h | 2 +-\n include/hw/vfio/vfio-common.h | 3 ++-\n include/hw/vfio/vfio-platform.h | 2 +-\n include/hw/watchdog/wdt_diag288.h | 2 +-\n include/hw/xen/xen.h | 3 ++-\n include/hw/xen/xen_backend.h | 2 +-\n include/hw/xen/xen_common.h | 4 +---\n include/migration/qemu-file.h | 4 +++-\n include/migration/vmstate.h | 3 ++-\n include/monitor/monitor.h | 2 +-\n include/qemu/bcd.h | 2 +-\n include/qemu/cutils.h | 2 +-\n include/qemu/fprintf-fn.h | 3 +--\n include/qemu/hbitmap.h | 2 +-\n include/qemu/help_option.h | 2 +-\n include/qemu/host-utils.h | 3 ++-\n include/qemu/id.h | 2 +-\n include/qemu/main-loop.h | 2 +-\n include/qemu/path.h | 2 +-\n include/qemu/ratelimit.h | 2 +-\n include/qemu/rcu_queue.h | 2 +-\n include/qemu/readline.h | 2 +-\n include/qemu/seqlock.h | 3 ++-\n include/qemu/unicode.h | 2 +-\n include/sysemu/xen-mapcache.h | 3 +--\n include/trace-tcg.h | 2 +-\n include/trace.h | 2 +-\n linux-user/uname.h | 4 ++--\n net/tap-linux.h | 2 +-\n slirp/bootp.h | 3 ++-\n slirp/main.h | 3 ++-\n slirp/tftp.h | 3 ++-\n target-cris/crisv32-decode.h | 3 ++-\n target-tricore/cpu-qom.h | 2 +-\n tcg/tci/tcg-target.h | 3 +--\n trace/control-internal.h | 4 +---\n trace/control.h | 2 +-\n trace/event-internal.h | 2 +-\n trace/ftrace.h | 4 +---\n trace/mem-internal.h | 2 +-\n trace/mem.h | 2 +-\n ui/curses_keys.h | 2 +-\n 111 files changed, 140 insertions(+), 126 deletions(-)", "diff": "diff --git a/audio/audio.h b/audio/audio.h\nindex b41a970..11e56c9 100644\n--- a/audio/audio.h\n+++ b/audio/audio.h\n@@ -21,6 +21,7 @@\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n * THE SOFTWARE.\n */\n+\n #ifndef QEMU_AUDIO_H\n #define QEMU_AUDIO_H\n \n@@ -162,4 +163,4 @@ static inline void *advance (void *p, int incr)\n int wav_start_capture (CaptureState *s, const char *path, int freq,\n int bits, int nchannels);\n \n-#endif /* audio.h */\n+#endif /* QEMU_AUDIO_H */\ndiff --git a/audio/audio_int.h b/audio/audio_int.h\nindex 566df5e..5bcb1c6 100644\n--- a/audio/audio_int.h\n+++ b/audio/audio_int.h\n@@ -21,6 +21,7 @@\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n * THE SOFTWARE.\n */\n+\n #ifndef QEMU_AUDIO_INT_H\n #define QEMU_AUDIO_INT_H\n \n@@ -257,4 +258,4 @@ static inline int audio_ring_dist (int dst, int src, int len)\n #define AUDIO_FUNC __FILE__ \":\" AUDIO_STRINGIFY (__LINE__)\n #endif\n \n-#endif /* audio_int.h */\n+#endif /* QEMU_AUDIO_INT_H */\ndiff --git a/audio/audio_pt_int.h b/audio/audio_pt_int.h\nindex 0dfff76..4c0c15b 100644\n--- a/audio/audio_pt_int.h\n+++ b/audio/audio_pt_int.h\n@@ -19,4 +19,4 @@ int audio_pt_wait (struct audio_pt *, const char *);\n int audio_pt_unlock_and_signal (struct audio_pt *, const char *);\n int audio_pt_join (struct audio_pt *, void **, const char *);\n \n-#endif /* audio_pt_int.h */\n+#endif /* QEMU_AUDIO_PT_INT_H */\ndiff --git a/audio/mixeng.h b/audio/mixeng.h\nindex 9de443b..b53a5ef 100644\n--- a/audio/mixeng.h\n+++ b/audio/mixeng.h\n@@ -21,6 +21,7 @@\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n * THE SOFTWARE.\n */\n+\n #ifndef QEMU_MIXENG_H\n #define QEMU_MIXENG_H\n \n@@ -48,4 +49,4 @@ void st_rate_stop (void *opaque);\n void mixeng_clear (struct st_sample *buf, int len);\n void mixeng_volume (struct st_sample *buf, int len, struct mixeng_volume *vol);\n \n-#endif /* mixeng.h */\n+#endif /* QEMU_MIXENG_H */\ndiff --git a/bsd-user/i386/target_syscall.h b/bsd-user/i386/target_syscall.h\nindex 82d1c58..8f20138 100644\n--- a/bsd-user/i386/target_syscall.h\n+++ b/bsd-user/i386/target_syscall.h\n@@ -162,4 +162,4 @@ struct target_vm86plus_struct {\n \n #define UNAME_MACHINE \"i386\"\n \n-#endif /* TARGET_SYSCALL_H */\n+#endif /* TARGET_SYSCALL_H */\ndiff --git a/bsd-user/sparc/target_syscall.h b/bsd-user/sparc/target_syscall.h\nindex c7eec6b..dfdf9f8 100644\n--- a/bsd-user/sparc/target_syscall.h\n+++ b/bsd-user/sparc/target_syscall.h\n@@ -11,4 +11,4 @@ struct target_pt_regs {\n \n #define UNAME_MACHINE \"sun4\"\n \n-#endif /* TARGET_SYSCALL_H */\n+#endif /* TARGET_SYSCALL_H */\ndiff --git a/bsd-user/sparc64/target_syscall.h b/bsd-user/sparc64/target_syscall.h\nindex 2f06100..3a9f4c2 100644\n--- a/bsd-user/sparc64/target_syscall.h\n+++ b/bsd-user/sparc64/target_syscall.h\n@@ -12,4 +12,4 @@ struct target_pt_regs {\n \n #define UNAME_MACHINE \"sun4u\"\n \n-#endif /* TARGET_SYSCALL_H */\n+#endif /* TARGET_SYSCALL_H */\ndiff --git a/bsd-user/x86_64/target_syscall.h b/bsd-user/x86_64/target_syscall.h\nindex 85a9766..211ce29 100644\n--- a/bsd-user/x86_64/target_syscall.h\n+++ b/bsd-user/x86_64/target_syscall.h\n@@ -118,4 +118,4 @@ struct target_msqid64_ds {\n #define TARGET_ARCH_GET_FS 0x1003\n #define TARGET_ARCH_GET_GS 0x1004\n \n-#endif /* TARGET_SYSCALL_H */\n+#endif /* TARGET_SYSCALL_H */\ndiff --git a/hw/audio/gusemu.h b/hw/audio/gusemu.h\nindex b7f0751..9aec7bf 100644\n--- a/hw/audio/gusemu.h\n+++ b/hw/audio/gusemu.h\n@@ -101,4 +101,4 @@ void gus_irqgen(GUSEmuState *state, unsigned int elapsed_time);\n /* lower values won´t provide any benefit at all, higher values can cause audible timing delays */\n /* note: masked timers are also calculated by this function, thus it might be needed even without any IRQs in use! */\n \n-#endif /* gusemu.h */\n+#endif /* GUSEMU_H */\ndiff --git a/hw/audio/gustate.h b/hw/audio/gustate.h\nindex ece903a..d162971 100644\n--- a/hw/audio/gustate.h\n+++ b/hw/audio/gustate.h\n@@ -129,4 +129,4 @@\n \n #define gusdataend (VSRegsEnd+4)\n \n-#endif /* gustate.h */\n+#endif /* GUSTATE_H */\ndiff --git a/hw/audio/lm4549.h b/hw/audio/lm4549.h\nindex 812a7a4..74c3ee8 100644\n--- a/hw/audio/lm4549.h\n+++ b/hw/audio/lm4549.h\n@@ -40,4 +40,4 @@ uint32_t lm4549_read(lm4549_state *s, hwaddr offset);\n void lm4549_write(lm4549_state *s, hwaddr offset, uint32_t value);\n uint32_t lm4549_write_samples(lm4549_state *s, uint32_t left, uint32_t right);\n \n-#endif /* #ifndef HW_LM4549_H */\n+#endif /* HW_LM4549_H */\ndiff --git a/hw/audio/pl041.h b/hw/audio/pl041.h\nindex 427ab6d..515db47 100644\n--- a/hw/audio/pl041.h\n+++ b/hw/audio/pl041.h\n@@ -132,4 +132,4 @@ enum {\n #define RXTOFEC3 (1 << 11)\n #define RXTOFEC4 (1 << 12)\n \n-#endif /* #ifndef HW_PL041_H */\n+#endif /* HW_PL041_H */\ndiff --git a/hw/display/qxl.h b/hw/display/qxl.h\nindex fdb619d..d2d49dd 100644\n--- a/hw/display/qxl.h\n+++ b/hw/display/qxl.h\n@@ -1,5 +1,5 @@\n #ifndef HW_QXL_H\n-#define HW_QXL_H 1\n+#define HW_QXL_H\n \n #include \"qemu-common.h\"\n \ndiff --git a/hw/display/vga_int.h b/hw/display/vga_int.h\nindex 29a5c03..dd6c958 100644\n--- a/hw/display/vga_int.h\n+++ b/hw/display/vga_int.h\n@@ -21,8 +21,9 @@\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n * THE SOFTWARE.\n */\n+\n #ifndef HW_VGA_INT_H\n-#define HW_VGA_INT_H 1\n+#define HW_VGA_INT_H\n \n #include \"hw/hw.h\"\n #include \"exec/memory.h\"\ndiff --git a/hw/intc/gic_internal.h b/hw/intc/gic_internal.h\nindex 20c1e8a..3f31174 100644\n--- a/hw/intc/gic_internal.h\n+++ b/hw/intc/gic_internal.h\n@@ -100,4 +100,4 @@ static inline bool gic_test_pending(GICState *s, int irq, int cm)\n }\n }\n \n-#endif /* !QEMU_ARM_GIC_INTERNAL_H */\n+#endif /* QEMU_ARM_GIC_INTERNAL_H */\ndiff --git a/hw/intc/gicv3_internal.h b/hw/intc/gicv3_internal.h\nindex 6ce5d49..8f3567e 100644\n--- a/hw/intc/gicv3_internal.h\n+++ b/hw/intc/gicv3_internal.h\n@@ -328,4 +328,4 @@ static inline void gicv3_cache_all_target_cpustates(GICv3State *s)\n }\n }\n \n-#endif /* !QEMU_ARM_GIC_INTERNAL_H */\n+#endif /* QEMU_ARM_GICV3_INTERNAL_H */\ndiff --git a/hw/lm32/lm32.h b/hw/lm32/lm32.h\nindex e338bfe..db9eb29 100644\n--- a/hw/lm32/lm32.h\n+++ b/hw/lm32/lm32.h\n@@ -1,5 +1,5 @@\n #ifndef HW_LM32_H\n-#define HW_LM32_H 1\n+#define HW_LM32_H\n \n #include \"hw/char/lm32_juart.h\"\n \ndiff --git a/hw/net/ne2000.h b/hw/net/ne2000.h\nindex d022b28..d213dcc 100644\n--- a/hw/net/ne2000.h\n+++ b/hw/net/ne2000.h\n@@ -1,5 +1,5 @@\n #ifndef HW_NE2000_H\n-#define HW_NE2000_H 1\n+#define HW_NE2000_H\n \n #define NE2000_PMEM_SIZE (32*1024)\n #define NE2000_PMEM_START (16*1024)\ndiff --git a/hw/net/pcnet.h b/hw/net/pcnet.h\nindex dec8de8..40831a7 100644\n--- a/hw/net/pcnet.h\n+++ b/hw/net/pcnet.h\n@@ -1,5 +1,5 @@\n #ifndef HW_PCNET_H\n-#define HW_PCNET_H 1\n+#define HW_PCNET_H\n \n #define PCNET_IOPORT_SIZE 0x20\n #define PCNET_PNPMMIO_SIZE 0x20\ndiff --git a/hw/pci-bridge/xio3130_upstream.h b/hw/pci-bridge/xio3130_upstream.h\nindex 08c1d5f..d0ab757 100644\n--- a/hw/pci-bridge/xio3130_upstream.h\n+++ b/hw/pci-bridge/xio3130_upstream.h\n@@ -7,4 +7,4 @@ PCIEPort *xio3130_upstream_init(PCIBus *bus, int devfn, bool multifunction,\n const char *bus_name, pci_map_irq_fn map_irq,\n uint8_t port);\n \n-#endif /* QEMU_XIO3130_H */\n+#endif /* QEMU_XIO3130_UPSTREAM_H */\ndiff --git a/hw/s390x/s390-virtio.h b/hw/s390x/s390-virtio.h\nindex ffd014c..f588b80 100644\n--- a/hw/s390x/s390-virtio.h\n+++ b/hw/s390x/s390-virtio.h\n@@ -10,7 +10,7 @@\n */\n \n #ifndef HW_S390_VIRTIO_H\n-#define HW_S390_VIRTIO_H 1\n+#define HW_S390_VIRTIO_H\n \n #include \"hw/nmi.h\"\n #include \"standard-headers/asm-s390/kvm_virtio.h\"\ndiff --git a/hw/xen/xen-host-pci-device.h b/hw/xen/xen-host-pci-device.h\nindex 6acf36e..4d8d34e 100644\n--- a/hw/xen/xen-host-pci-device.h\n+++ b/hw/xen/xen-host-pci-device.h\n@@ -55,4 +55,4 @@ int xen_host_pci_set_block(XenHostPCIDevice *d, int pos, uint8_t *buf,\n \n int xen_host_pci_find_ext_cap_offset(XenHostPCIDevice *s, uint32_t cap);\n \n-#endif /* !XEN_HOST_PCI_DEVICE_H_ */\n+#endif /* XEN_HOST_PCI_DEVICE_H */\ndiff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h\nindex c2f8e1f..191d9ca 100644\n--- a/hw/xen/xen_pt.h\n+++ b/hw/xen/xen_pt.h\n@@ -332,4 +332,4 @@ int xen_pt_register_vga_regions(XenHostPCIDevice *dev);\n int xen_pt_unregister_vga_regions(XenHostPCIDevice *dev);\n void xen_pt_setup_vga(XenPCIPassthroughState *s, XenHostPCIDevice *dev,\n Error **errp);\n-#endif /* !XEN_PT_H */\n+#endif /* XEN_PT_H */\ndiff --git a/hw/xenpv/xen_domainbuild.h b/hw/xenpv/xen_domainbuild.h\nindex 29a91ea..652d9b4 100644\n--- a/hw/xenpv/xen_domainbuild.h\n+++ b/hw/xenpv/xen_domainbuild.h\n@@ -1,5 +1,5 @@\n #ifndef QEMU_HW_XEN_DOMAINBUILD_H\n-#define QEMU_HW_XEN_DOMAINBUILD_H 1\n+#define QEMU_HW_XEN_DOMAINBUILD_H\n \n #include \"hw/xen/xen_common.h\"\n \ndiff --git a/include/block/blockjob.h b/include/block/blockjob.h\nindex 7dc720c..f7f5687 100644\n--- a/include/block/blockjob.h\n+++ b/include/block/blockjob.h\n@@ -22,8 +22,9 @@\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n * THE SOFTWARE.\n */\n+\n #ifndef BLOCKJOB_H\n-#define BLOCKJOB_H 1\n+#define BLOCKJOB_H\n \n #include \"block/block.h\"\n \ndiff --git a/include/block/thread-pool.h b/include/block/thread-pool.h\nindex 42eb5e8..7dd7d73 100644\n--- a/include/block/thread-pool.h\n+++ b/include/block/thread-pool.h\n@@ -16,7 +16,7 @@\n */\n \n #ifndef QEMU_THREAD_POOL_H\n-#define QEMU_THREAD_POOL_H 1\n+#define QEMU_THREAD_POOL_H\n \n #include \"block/block.h\"\n \ndiff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h\nindex 9ac1eaf..952bcfe 100644\n--- a/include/exec/cpu-common.h\n+++ b/include/exec/cpu-common.h\n@@ -1,5 +1,5 @@\n #ifndef CPU_COMMON_H\n-#define CPU_COMMON_H 1\n+#define CPU_COMMON_H\n \n /* CPU interfaces that are target independent. */\n \n@@ -117,4 +117,4 @@ int qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque);\n \n #endif\n \n-#endif /* !CPU_COMMON_H */\n+#endif /* CPU_COMMON_H */\ndiff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h\nindex a011324..1af03d8 100644\n--- a/include/exec/gen-icount.h\n+++ b/include/exec/gen-icount.h\n@@ -1,5 +1,5 @@\n #ifndef GEN_ICOUNT_H\n-#define GEN_ICOUNT_H 1\n+#define GEN_ICOUNT_H\n \n #include \"qemu/timer.h\"\n \ndiff --git a/include/exec/helper-gen.h b/include/exec/helper-gen.h\nindex be96254..8239ffc 100644\n--- a/include/exec/helper-gen.h\n+++ b/include/exec/helper-gen.h\n@@ -2,7 +2,7 @@\n This one expands generation functions for tcg opcodes. */\n \n #ifndef HELPER_GEN_H\n-#define HELPER_GEN_H 1\n+#define HELPER_GEN_H\n \n #include \"exec/helper-head.h\"\n \ndiff --git a/include/exec/helper-proto.h b/include/exec/helper-proto.h\nindex 0090137..954bef8 100644\n--- a/include/exec/helper-proto.h\n+++ b/include/exec/helper-proto.h\n@@ -2,7 +2,7 @@\n This one expands prototypes for the helper functions. */\n \n #ifndef HELPER_PROTO_H\n-#define HELPER_PROTO_H 1\n+#define HELPER_PROTO_H\n \n #include \"exec/helper-head.h\"\n \ndiff --git a/include/exec/helper-tcg.h b/include/exec/helper-tcg.h\nindex 62d87a3..bb92877 100644\n--- a/include/exec/helper-tcg.h\n+++ b/include/exec/helper-tcg.h\n@@ -2,7 +2,7 @@\n This one defines data structures private to tcg.c. */\n \n #ifndef HELPER_TCG_H\n-#define HELPER_TCG_H 1\n+#define HELPER_TCG_H\n \n #include \"exec/helper-head.h\"\n \ndiff --git a/include/exec/softmmu-semi.h b/include/exec/softmmu-semi.h\nindex 3a58c3f..7eefad8 100644\n--- a/include/exec/softmmu-semi.h\n+++ b/include/exec/softmmu-semi.h\n@@ -6,8 +6,9 @@\n *\n * This code is licensed under the GPL\n */\n+\n #ifndef SOFTMMU_SEMI_H\n-#define SOFTMMU_SEMI_H 1\n+#define SOFTMMU_SEMI_H\n \n static inline uint64_t softmmu_tget64(CPUArchState *env, target_ulong addr)\n {\ndiff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h\nindex 95a1103..0e57ee5 100644\n--- a/include/fpu/softfloat.h\n+++ b/include/fpu/softfloat.h\n@@ -751,4 +751,4 @@ static inline int float128_is_any_nan(float128 a)\n *----------------------------------------------------------------------------*/\n float128 float128_default_nan(float_status *status);\n \n-#endif /* !SOFTFLOAT_H */\n+#endif /* SOFTFLOAT_H */\ndiff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h\nindex c717f15..7b3d93c 100644\n--- a/include/hw/acpi/acpi.h\n+++ b/include/hw/acpi/acpi.h\n@@ -1,5 +1,6 @@\n #ifndef QEMU_HW_ACPI_H\n #define QEMU_HW_ACPI_H\n+\n /*\n * Copyright (c) 2009 Isaku Yamahata <yamahata at valinux co jp>\n * VA Linux Systems Japan K.K.\n@@ -188,4 +189,4 @@ struct AcpiSlicOem {\n };\n int acpi_get_slic_oem(AcpiSlicOem *oem);\n \n-#endif /* !QEMU_HW_ACPI_H */\n+#endif /* QEMU_HW_ACPI_H */\ndiff --git a/include/hw/arm/pxa.h b/include/hw/arm/pxa.h\nindex 074feac..dd1a48b 100644\n--- a/include/hw/arm/pxa.h\n+++ b/include/hw/arm/pxa.h\n@@ -6,8 +6,9 @@\n *\n * This code is licensed under the GNU GPL v2.\n */\n+\n #ifndef PXA_H\n-# define PXA_H\t\t\t\"pxa.h\"\n+#define PXA_H\n \n #include \"exec/memory.h\"\n #include \"target-arm/cpu-qom.h\"\n@@ -189,4 +190,4 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space, unsigned int sdram_size,\n const char *revision);\n PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size);\n \n-#endif\t/* PXA_H */\n+#endif /* PXA_H */\ndiff --git a/include/hw/arm/soc_dma.h b/include/hw/arm/soc_dma.h\nindex 7379731..fae3229 100644\n--- a/include/hw/arm/soc_dma.h\n+++ b/include/hw/arm/soc_dma.h\n@@ -19,8 +19,7 @@\n */\n \n #ifndef HW_SOC_DMA_H\n-#define HW_SOC_DMA_H 1\n-\n+#define HW_SOC_DMA_H\n \n #include \"exec/memory.h\"\n #include \"hw/irq.h\"\ndiff --git a/include/hw/audio/pcspk.h b/include/hw/audio/pcspk.h\nindex 33e46a5..172afbf 100644\n--- a/include/hw/audio/pcspk.h\n+++ b/include/hw/audio/pcspk.h\n@@ -44,4 +44,4 @@ static inline ISADevice *pcspk_init(ISABus *bus, ISADevice *pit)\n return isadev;\n }\n \n-#endif /* !HW_PCSPK_H */\n+#endif /* HW_PCSPK_H */\ndiff --git a/include/hw/block/flash.h b/include/hw/block/flash.h\nindex a088baa..67c3aa3 100644\n--- a/include/hw/block/flash.h\n+++ b/include/hw/block/flash.h\n@@ -1,5 +1,5 @@\n #ifndef HW_FLASH_H\n-#define HW_FLASH_H 1\n+#define HW_FLASH_H\n \n /* NOR flash devices */\n \ndiff --git a/include/hw/bt.h b/include/hw/bt.h\nindex c7c7909..185e79d 100644\n--- a/include/hw/bt.h\n+++ b/include/hw/bt.h\n@@ -24,7 +24,7 @@\n */\n \n #ifndef HW_BT_H\n-#define HW_BT_H 1\n+#define HW_BT_H\n \n #include \"hw/irq.h\"\n \ndiff --git a/include/hw/char/escc.h b/include/hw/char/escc.h\nindex 2742d70..297e2eb 100644\n--- a/include/hw/char/escc.h\n+++ b/include/hw/char/escc.h\n@@ -1,5 +1,5 @@\n #ifndef HW_ESCC_H\n-#define HW_ESCC_H 1\n+#define HW_ESCC_H\n \n /* escc.c */\n #define TYPE_ESCC \"escc\"\ndiff --git a/include/hw/char/lm32_juart.h b/include/hw/char/lm32_juart.h\nindex 70dc416..e7c6fb5 100644\n--- a/include/hw/char/lm32_juart.h\n+++ b/include/hw/char/lm32_juart.h\n@@ -10,4 +10,4 @@ uint32_t lm32_juart_get_jrx(DeviceState *d);\n void lm32_juart_set_jtx(DeviceState *d, uint32_t jtx);\n void lm32_juart_set_jrx(DeviceState *d, uint32_t jrx);\n \n-#endif /* QEMU_HW_LM32_JUART_H */\n+#endif /* QEMU_HW_CHAR_LM32_JUART_H */\ndiff --git a/include/hw/char/serial.h b/include/hw/char/serial.h\nindex 9feddc6..a4fd3d5 100644\n--- a/include/hw/char/serial.h\n+++ b/include/hw/char/serial.h\n@@ -22,8 +22,9 @@\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n * THE SOFTWARE.\n */\n+\n #ifndef HW_SERIAL_H\n-#define HW_SERIAL_H 1\n+#define HW_SERIAL_H\n \n #include \"hw/hw.h\"\n #include \"sysemu/sysemu.h\"\ndiff --git a/include/hw/cris/etraxfs_dma.h b/include/hw/cris/etraxfs_dma.h\nindex 38104a6..f6f33e0 100644\n--- a/include/hw/cris/etraxfs_dma.h\n+++ b/include/hw/cris/etraxfs_dma.h\n@@ -1,5 +1,5 @@\n #ifndef HW_ETRAXFS_DMA_H\n-#define HW_ETRAXFS_DMA_H 1\n+#define HW_ETRAXFS_DMA_H\n \n struct dma_context_metadata {\n \t/* data descriptor md */\ndiff --git a/include/hw/display/dpcd.h b/include/hw/display/dpcd.h\nindex 274dc2e..6880ee3 100644\n--- a/include/hw/display/dpcd.h\n+++ b/include/hw/display/dpcd.h\n@@ -102,4 +102,4 @@ typedef struct DPCDState DPCDState;\n #define DPCD_SINK_STATUS 0x205\n #define DPCD_RECEIVE_PORT_0_STATUS 0x01\n \n-#endif /* !DPCD_H */\n+#endif /* DPCD_H */\ndiff --git a/include/hw/dma/xlnx_dpdma.h b/include/hw/dma/xlnx_dpdma.h\nindex ae571a0..664df28 100644\n--- a/include/hw/dma/xlnx_dpdma.h\n+++ b/include/hw/dma/xlnx_dpdma.h\n@@ -82,4 +82,4 @@ void xlnx_dpdma_set_host_data_location(XlnxDPDMAState *s, uint8_t channel,\n */\n void xlnx_dpdma_trigger_vsync_irq(XlnxDPDMAState *s);\n \n-#endif /* !XLNX_DPDMA_H */\n+#endif /* XLNX_DPDMA_H */\ndiff --git a/include/hw/empty_slot.h b/include/hw/empty_slot.h\nindex 6079602..123a9f8 100644\n--- a/include/hw/empty_slot.h\n+++ b/include/hw/empty_slot.h\n@@ -1,5 +1,5 @@\n #ifndef HW_EMPTY_SLOT_H\n-#define HW_EMPTY_SLOT_H 1\n+#define HW_EMPTY_SLOT_H\n \n /* empty_slot.c */\n void empty_slot_init(hwaddr addr, uint64_t slot_size);\ndiff --git a/include/hw/fw-path-provider.h b/include/hw/fw-path-provider.h\nindex 7afaec0..050cb05 100644\n--- a/include/hw/fw-path-provider.h\n+++ b/include/hw/fw-path-provider.h\n@@ -16,7 +16,7 @@\n */\n \n #ifndef FW_PATH_PROVIDER_H\n-#define FW_PATH_PROVIDER_H 1\n+#define FW_PATH_PROVIDER_H\n \n #include \"qemu-common.h\"\n #include \"qom/object.h\"\ndiff --git a/include/hw/i2c/pm_smbus.h b/include/hw/i2c/pm_smbus.h\nindex 926603f..2a837af 100644\n--- a/include/hw/i2c/pm_smbus.h\n+++ b/include/hw/i2c/pm_smbus.h\n@@ -17,4 +17,4 @@ typedef struct PMSMBus {\n \n void pm_smbus_init(DeviceState *parent, PMSMBus *smb);\n \n-#endif /* !PM_SMBUS_H */\n+#endif /* PM_SMBUS_H */\ndiff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h\nindex 74fe935..73ce716 100644\n--- a/include/hw/i386/apic_internal.h\n+++ b/include/hw/i386/apic_internal.h\n@@ -17,6 +17,7 @@\n * You should have received a copy of the GNU Lesser General Public\n * License along with this library; if not, see <http://www.gnu.org/licenses/>\n */\n+\n #ifndef QEMU_APIC_INTERNAL_H\n #define QEMU_APIC_INTERNAL_H\n \n@@ -222,4 +223,4 @@ static inline int apic_get_bit(uint32_t *tab, int index)\n return !!(tab[i] & mask);\n }\n \n-#endif /* !QEMU_APIC_INTERNAL_H */\n+#endif /* QEMU_APIC_INTERNAL_H */\ndiff --git a/include/hw/i386/ioapic.h b/include/hw/i386/ioapic.h\nindex 6245388..9c8816f 100644\n--- a/include/hw/i386/ioapic.h\n+++ b/include/hw/i386/ioapic.h\n@@ -25,4 +25,4 @@\n \n void ioapic_eoi_broadcast(int vector);\n \n-#endif /* !HW_IOAPIC_H */\n+#endif /* HW_IOAPIC_H */\ndiff --git a/include/hw/i386/ioapic_internal.h b/include/hw/i386/ioapic_internal.h\nindex cab9e67..0542aa1 100644\n--- a/include/hw/i386/ioapic_internal.h\n+++ b/include/hw/i386/ioapic_internal.h\n@@ -112,4 +112,4 @@ void ioapic_reset_common(DeviceState *dev);\n \n void ioapic_print_redtbl(Monitor *mon, IOAPICCommonState *s);\n \n-#endif /* !QEMU_IOAPIC_INTERNAL_H */\n+#endif /* QEMU_IOAPIC_INTERNAL_H */\ndiff --git a/include/hw/input/ps2.h b/include/hw/input/ps2.h\nindex 7c45ce7..b9ceee4 100644\n--- a/include/hw/input/ps2.h\n+++ b/include/hw/input/ps2.h\n@@ -35,4 +35,4 @@ void ps2_queue(void *, int b);\n void ps2_keyboard_set_translation(void *opaque, int mode);\n void ps2_mouse_fake_event(void *opaque);\n \n-#endif /* !HW_PS2_H */\n+#endif /* HW_PS2_H */\ndiff --git a/include/hw/isa/i8257.h b/include/hw/isa/i8257.h\nindex 8c44d36..aa211c0 100644\n--- a/include/hw/isa/i8257.h\n+++ b/include/hw/isa/i8257.h\n@@ -39,4 +39,3 @@ typedef struct I8257State {\n } I8257State;\n \n #endif\n-\ndiff --git a/include/hw/isa/i8259_internal.h b/include/hw/isa/i8259_internal.h\nindex cded509..6954b6e 100644\n--- a/include/hw/isa/i8259_internal.h\n+++ b/include/hw/isa/i8259_internal.h\n@@ -80,4 +80,4 @@ void pic_reset_common(PICCommonState *s);\n ISADevice *i8259_init_chip(const char *name, ISABus *bus, bool master);\n \n \n-#endif /* !QEMU_I8259_INTERNAL_H */\n+#endif /* QEMU_I8259_INTERNAL_H */\ndiff --git a/include/hw/nmi.h b/include/hw/nmi.h\nindex b541772..d092c68 100644\n--- a/include/hw/nmi.h\n+++ b/include/hw/nmi.h\n@@ -20,7 +20,7 @@\n */\n \n #ifndef NMI_H\n-#define NMI_H 1\n+#define NMI_H\n \n #include \"qemu-common.h\"\n #include \"qom/object.h\"\ndiff --git a/include/hw/pci/pci_bridge.h b/include/hw/pci/pci_bridge.h\nindex ed4aff6..847fd7d 100644\n--- a/include/hw/pci/pci_bridge.h\n+++ b/include/hw/pci/pci_bridge.h\n@@ -67,4 +67,4 @@ void pci_bridge_map_irq(PCIBridge *br, const char* bus_name,\n #define PCI_BRIDGE_CTL_DISCARD_STATUS\t0x400\t/* Discard timer status */\n #define PCI_BRIDGE_CTL_DISCARD_SERR\t0x800\t/* Discard timer SERR# enable */\n \n-#endif /* QEMU_PCI_BRIDGE_H */\n+#endif /* QEMU_PCI_BRIDGE_H */\ndiff --git a/include/hw/pci/pci_ids.h b/include/hw/pci/pci_ids.h\nindex db85afa..d77ca60 100644\n--- a/include/hw/pci/pci_ids.h\n+++ b/include/hw/pci/pci_ids.h\n@@ -7,8 +7,9 @@\n *\n * QEMU-specific definitions belong in pci.h\n */\n+\n #ifndef HW_PCI_IDS_H\n-#define HW_PCI_IDS_H 1\n+#define HW_PCI_IDS_H\n \n /* Device classes and subclasses */\n \ndiff --git a/include/hw/pcmcia.h b/include/hw/pcmcia.h\nindex 98406ff..79cac9c 100644\n--- a/include/hw/pcmcia.h\n+++ b/include/hw/pcmcia.h\n@@ -1,5 +1,5 @@\n #ifndef HW_PCMCIA_H\n-#define HW_PCMCIA_H 1\n+#define HW_PCMCIA_H\n \n /* PCMCIA/Cardbus */\n \ndiff --git a/include/hw/platform-bus.h b/include/hw/platform-bus.h\nindex bd42b83..a00775c 100644\n--- a/include/hw/platform-bus.h\n+++ b/include/hw/platform-bus.h\n@@ -1,5 +1,5 @@\n #ifndef HW_PLATFORM_BUS_H\n-#define HW_PLATFORM_BUS_H 1\n+#define HW_PLATFORM_BUS_H\n \n /*\n * Platform Bus device to support dynamic Sysbus devices\n@@ -54,4 +54,4 @@ int platform_bus_get_irqn(PlatformBusDevice *platform_bus, SysBusDevice *sbdev,\n hwaddr platform_bus_get_mmio_addr(PlatformBusDevice *pbus, SysBusDevice *sbdev,\n int n);\n \n-#endif /* !HW_PLATFORM_BUS_H */\n+#endif /* HW_PLATFORM_BUS_H */\ndiff --git a/include/hw/ppc/mac_dbdma.h b/include/hw/ppc/mac_dbdma.h\nindex d15a6cc..a860387 100644\n--- a/include/hw/ppc/mac_dbdma.h\n+++ b/include/hw/ppc/mac_dbdma.h\n@@ -19,8 +19,9 @@\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n * THE SOFTWARE.\n */\n+\n #ifndef HW_MAC_DBDMA_H\n-#define HW_MAC_DBDMA_H 1\n+#define HW_MAC_DBDMA_H\n \n #include \"exec/memory.h\"\n #include \"qemu/iov.h\"\ndiff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h\nindex 5617dc4..520c72a 100644\n--- a/include/hw/ppc/ppc.h\n+++ b/include/hw/ppc/ppc.h\n@@ -1,5 +1,5 @@\n #ifndef HW_PPC_H\n-#define HW_PPC_H 1\n+#define HW_PPC_H\n \n #include \"target-ppc/cpu-qom.h\"\n \ndiff --git a/include/hw/smbios/smbios.h b/include/hw/smbios/smbios.h\nindex ba36746..1cd53cc 100644\n--- a/include/hw/smbios/smbios.h\n+++ b/include/hw/smbios/smbios.h\n@@ -1,5 +1,6 @@\n #ifndef QEMU_SMBIOS_H\n #define QEMU_SMBIOS_H\n+\n /*\n * SMBIOS Support\n *\n@@ -266,4 +267,4 @@ void smbios_get_tables(const struct smbios_phys_mem_area *mem_array,\n const unsigned int mem_array_size,\n uint8_t **tables, size_t *tables_len,\n uint8_t **anchor, size_t *anchor_len);\n-#endif /*QEMU_SMBIOS_H */\n+#endif /* QEMU_SMBIOS_H */\ndiff --git a/include/hw/stream.h b/include/hw/stream.h\nindex 30ccc56..c370ba0 100644\n--- a/include/hw/stream.h\n+++ b/include/hw/stream.h\n@@ -1,5 +1,5 @@\n #ifndef STREAM_H\n-#define STREAM_H 1\n+#define STREAM_H\n \n #include \"qemu-common.h\"\n #include \"qom/object.h\"\ndiff --git a/include/hw/sysbus.h b/include/hw/sysbus.h\nindex a495937..e73a5b2 100644\n--- a/include/hw/sysbus.h\n+++ b/include/hw/sysbus.h\n@@ -1,5 +1,5 @@\n #ifndef HW_SYSBUS_H\n-#define HW_SYSBUS_H 1\n+#define HW_SYSBUS_H\n \n /* Devices attached directly to the main system bus. */\n \n@@ -118,4 +118,4 @@ static inline DeviceState *sysbus_try_create_simple(const char *name,\n return sysbus_try_create_varargs(name, addr, irq, NULL);\n }\n \n-#endif /* !HW_SYSBUS_H */\n+#endif /* HW_SYSBUS_H */\ndiff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h\nindex 27a0fb6..5adae9f 100644\n--- a/include/hw/timer/i8254.h\n+++ b/include/hw/timer/i8254.h\n@@ -80,4 +80,4 @@ static inline ISADevice *kvm_pit_init(ISABus *bus, int base)\n void pit_set_gate(ISADevice *dev, int channel, int val);\n void pit_get_channel_info(ISADevice *dev, int channel, PITChannelInfo *info);\n \n-#endif /* !HW_I8254_H */\n+#endif /* HW_I8254_H */\ndiff --git a/include/hw/timer/i8254_internal.h b/include/hw/timer/i8254_internal.h\nindex e7cb757..dc09cc0 100644\n--- a/include/hw/timer/i8254_internal.h\n+++ b/include/hw/timer/i8254_internal.h\n@@ -73,4 +73,4 @@ void pit_get_channel_info_common(PITCommonState *s, PITChannelState *sc,\n PITChannelInfo *info);\n void pit_reset_common(PITCommonState *s);\n \n-#endif /* !QEMU_I8254_INTERNAL_H */\n+#endif /* QEMU_I8254_INTERNAL_H */\ndiff --git a/include/hw/timer/mc146818rtc.h b/include/hw/timer/mc146818rtc.h\nindex eaf6497..7c8e64b 100644\n--- a/include/hw/timer/mc146818rtc.h\n+++ b/include/hw/timer/mc146818rtc.h\n@@ -10,4 +10,4 @@ ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq);\n void rtc_set_memory(ISADevice *dev, int addr, int val);\n int rtc_get_memory(ISADevice *dev, int addr);\n \n-#endif /* !MC146818RTC_H */\n+#endif /* MC146818RTC_H */\ndiff --git a/include/hw/unicore32/puv3.h b/include/hw/unicore32/puv3.h\nindex f37adcb..5a4839f 100644\n--- a/include/hw/unicore32/puv3.h\n+++ b/include/hw/unicore32/puv3.h\n@@ -8,6 +8,7 @@\n * published by the Free Software Foundation, or any later version.\n * See the COPYING file in the top-level directory.\n */\n+\n #ifndef QEMU_HW_PUV3_H\n #define QEMU_HW_PUV3_H\n \n@@ -46,4 +47,4 @@\n #define DPRINTF(fmt, ...) do {} while (0)\n #endif\n \n-#endif /* !QEMU_HW_PUV3_H */\n+#endif /* QEMU_HW_PUV3_H */\ndiff --git a/include/hw/usb/ehci-regs.h b/include/hw/usb/ehci-regs.h\nindex 616f1b8..3e91b8e 100644\n--- a/include/hw/usb/ehci-regs.h\n+++ b/include/hw/usb/ehci-regs.h\n@@ -1,5 +1,5 @@\n #ifndef HW_USB_EHCI_REGS_H\n-#define HW_USB_EHCI_REGS_H 1\n+#define HW_USB_EHCI_REGS_H\n \n /* Capability Registers Base Address - section 2.2 */\n #define CAPLENGTH 0x0000 /* 1-byte, 0x0001 reserved */\ndiff --git a/include/hw/usb/uhci-regs.h b/include/hw/usb/uhci-regs.h\nindex c7315c5..fd45d29 100644\n--- a/include/hw/usb/uhci-regs.h\n+++ b/include/hw/usb/uhci-regs.h\n@@ -1,5 +1,5 @@\n #ifndef HW_USB_UHCI_REGS_H\n-#define HW_USB_UHCI_REGS_H 1\n+#define HW_USB_UHCI_REGS_H\n \n #define UHCI_CMD_FGR (1 << 4)\n #define UHCI_CMD_EGSM (1 << 3)\ndiff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h\nindex 07f7188..94dfae3 100644\n--- a/include/hw/vfio/vfio-common.h\n+++ b/include/hw/vfio/vfio-common.h\n@@ -17,6 +17,7 @@\n * Copyright (C) 2008, Red Hat, Amit Shah (amit.shah@redhat.com)\n * Copyright (C) 2008, IBM, Muli Ben-Yehuda (muli@il.ibm.com)\n */\n+\n #ifndef HW_VFIO_VFIO_COMMON_H\n #define HW_VFIO_VFIO_COMMON_H\n \n@@ -174,4 +175,4 @@ int vfio_spapr_create_window(VFIOContainer *container,\n int vfio_spapr_remove_window(VFIOContainer *container,\n hwaddr offset_within_address_space);\n \n-#endif /* !HW_VFIO_VFIO_COMMON_H */\n+#endif /* HW_VFIO_VFIO_COMMON_H */\ndiff --git a/include/hw/vfio/vfio-platform.h b/include/hw/vfio/vfio-platform.h\nindex b468f80..9baaa2db 100644\n--- a/include/hw/vfio/vfio-platform.h\n+++ b/include/hw/vfio/vfio-platform.h\n@@ -74,4 +74,4 @@ typedef struct VFIOPlatformDeviceClass {\n #define VFIO_PLATFORM_DEVICE_GET_CLASS(obj) \\\n OBJECT_GET_CLASS(VFIOPlatformDeviceClass, (obj), TYPE_VFIO_PLATFORM)\n \n-#endif /*HW_VFIO_VFIO_PLATFORM_H*/\n+#endif /* HW_VFIO_VFIO_PLATFORM_H */\ndiff --git a/include/hw/watchdog/wdt_diag288.h b/include/hw/watchdog/wdt_diag288.h\nindex 7f3fd45..706d96b 100644\n--- a/include/hw/watchdog/wdt_diag288.h\n+++ b/include/hw/watchdog/wdt_diag288.h\n@@ -33,4 +33,4 @@ typedef struct DIAG288Class {\n uint64_t func, uint64_t timeout);\n } DIAG288Class;\n \n-#endif /* WDT_DIAG288_H */\n+#endif /* WDT_DIAG288_H */\ndiff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h\nindex b2cd992..a8f3afb 100644\n--- a/include/hw/xen/xen.h\n+++ b/include/hw/xen/xen.h\n@@ -1,5 +1,6 @@\n #ifndef QEMU_HW_XEN_H\n-#define QEMU_HW_XEN_H 1\n+#define QEMU_HW_XEN_H\n+\n /*\n * public xen header\n * stuff needed outside xen-*.c, i.e. interfaces to qemu.\ndiff --git a/include/hw/xen/xen_backend.h b/include/hw/xen/xen_backend.h\nindex 6e18a46..754c0a4 100644\n--- a/include/hw/xen/xen_backend.h\n+++ b/include/hw/xen/xen_backend.h\n@@ -1,5 +1,5 @@\n #ifndef QEMU_HW_XEN_BACKEND_H\n-#define QEMU_HW_XEN_BACKEND_H 1\n+#define QEMU_HW_XEN_BACKEND_H\n \n #include \"hw/xen/xen_common.h\"\n #include \"sysemu/sysemu.h\"\ndiff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h\nindex 5eabf37..640c31e 100644\n--- a/include/hw/xen/xen_common.h\n+++ b/include/hw/xen/xen_common.h\n@@ -1,7 +1,5 @@\n #ifndef QEMU_HW_XEN_COMMON_H\n-#define QEMU_HW_XEN_COMMON_H 1\n-\n-\n+#define QEMU_HW_XEN_COMMON_H\n \n /*\n * If we have new enough libxenctrl then we do not want/need these compat\ndiff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h\nindex 2409a98..abedd46 100644\n--- a/include/migration/qemu-file.h\n+++ b/include/migration/qemu-file.h\n@@ -21,8 +21,10 @@\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n * THE SOFTWARE.\n */\n+\n #ifndef QEMU_FILE_H\n-#define QEMU_FILE_H 1\n+#define QEMU_FILE_H\n+\n #include \"qemu-common.h\"\n #include \"exec/cpu-common.h\"\n #include \"io/channel.h\"\ndiff --git a/include/migration/vmstate.h b/include/migration/vmstate.h\nindex 8e31b9b..1638ee5 100644\n--- a/include/migration/vmstate.h\n+++ b/include/migration/vmstate.h\n@@ -23,8 +23,9 @@\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n * THE SOFTWARE.\n */\n+\n #ifndef QEMU_VMSTATE_H\n-#define QEMU_VMSTATE_H 1\n+#define QEMU_VMSTATE_H\n \n #ifndef CONFIG_USER_ONLY\n #include \"migration/qemu-file.h\"\ndiff --git a/include/monitor/monitor.h b/include/monitor/monitor.h\nindex aa0f373..c5c9ea2 100644\n--- a/include/monitor/monitor.h\n+++ b/include/monitor/monitor.h\n@@ -51,4 +51,4 @@ int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd);\n void monitor_fdset_dup_fd_remove(int dup_fd);\n int monitor_fdset_dup_fd_find(int dup_fd);\n \n-#endif /* !MONITOR_H */\n+#endif /* MONITOR_H */\ndiff --git a/include/qemu/bcd.h b/include/qemu/bcd.h\nindex b4c9b64..dfebacf 100644\n--- a/include/qemu/bcd.h\n+++ b/include/qemu/bcd.h\n@@ -1,5 +1,5 @@\n #ifndef QEMU_BCD_H\n-#define QEMU_BCD_H 1\n+#define QEMU_BCD_H\n \n /* Convert a byte between binary and BCD. */\n static inline uint8_t to_bcd(uint8_t val)\ndiff --git a/include/qemu/cutils.h b/include/qemu/cutils.h\nindex db7adad..3e4ea23 100644\n--- a/include/qemu/cutils.h\n+++ b/include/qemu/cutils.h\n@@ -1,5 +1,5 @@\n #ifndef QEMU_CUTILS_H\n-#define QEMU_CUTILS_H 1\n+#define QEMU_CUTILS_H\n \n #include \"qemu/fprintf-fn.h\"\n \ndiff --git a/include/qemu/fprintf-fn.h b/include/qemu/fprintf-fn.h\nindex b6bad35..9068a96 100644\n--- a/include/qemu/fprintf-fn.h\n+++ b/include/qemu/fprintf-fn.h\n@@ -6,8 +6,7 @@\n */\n \n #ifndef QEMU_FPRINTF_FN_H\n-#define QEMU_FPRINTF_FN_H 1\n-\n+#define QEMU_FPRINTF_FN_H\n \n typedef int (*fprintf_function)(FILE *f, const char *fmt, ...)\n GCC_FMT_ATTR(2, 3);\ndiff --git a/include/qemu/hbitmap.h b/include/qemu/hbitmap.h\nindex e29188c..8ab721e 100644\n--- a/include/qemu/hbitmap.h\n+++ b/include/qemu/hbitmap.h\n@@ -10,7 +10,7 @@\n */\n \n #ifndef HBITMAP_H\n-#define HBITMAP_H 1\n+#define HBITMAP_H\n \n #include \"bitops.h\"\n #include \"host-utils.h\"\ndiff --git a/include/qemu/help_option.h b/include/qemu/help_option.h\nindex e39a66e..328d2a8 100644\n--- a/include/qemu/help_option.h\n+++ b/include/qemu/help_option.h\n@@ -1,5 +1,5 @@\n #ifndef QEMU_HELP_OPTION_H\n-#define QEMU_HELP_OPTION_H 1\n+#define QEMU_HELP_OPTION_H\n \n /**\n * is_help_option:\ndiff --git a/include/qemu/host-utils.h b/include/qemu/host-utils.h\nindex 3de7d4e..46187bb 100644\n--- a/include/qemu/host-utils.h\n+++ b/include/qemu/host-utils.h\n@@ -22,8 +22,9 @@\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n * THE SOFTWARE.\n */\n+\n #ifndef HOST_UTILS_H\n-#define HOST_UTILS_H 1\n+#define HOST_UTILS_H\n \n #include \"qemu/bswap.h\"\n \ndiff --git a/include/qemu/id.h b/include/qemu/id.h\nindex 7d90335..40c7010 100644\n--- a/include/qemu/id.h\n+++ b/include/qemu/id.h\n@@ -1,5 +1,5 @@\n #ifndef QEMU_ID_H\n-#define QEMU_ID_H 1\n+#define QEMU_ID_H\n \n typedef enum IdSubSystems {\n ID_QDEV,\ndiff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h\nindex 19b5de3..3fa7cfe 100644\n--- a/include/qemu/main-loop.h\n+++ b/include/qemu/main-loop.h\n@@ -23,7 +23,7 @@\n */\n \n #ifndef QEMU_MAIN_LOOP_H\n-#define QEMU_MAIN_LOOP_H 1\n+#define QEMU_MAIN_LOOP_H\n \n #include \"block/aio.h\"\n \ndiff --git a/include/qemu/path.h b/include/qemu/path.h\nindex ed5fee0..c6292a9 100644\n--- a/include/qemu/path.h\n+++ b/include/qemu/path.h\n@@ -1,5 +1,5 @@\n #ifndef QEMU_PATH_H\n-#define QEMU_PATH_H 1\n+#define QEMU_PATH_H\n \n void init_paths(const char *prefix);\n const char *path(const char *pathname);\ndiff --git a/include/qemu/ratelimit.h b/include/qemu/ratelimit.h\nindex d413a4a..1e3cb13 100644\n--- a/include/qemu/ratelimit.h\n+++ b/include/qemu/ratelimit.h\n@@ -12,7 +12,7 @@\n */\n \n #ifndef QEMU_RATELIMIT_H\n-#define QEMU_RATELIMIT_H 1\n+#define QEMU_RATELIMIT_H\n \n typedef struct {\n int64_t next_slice_time;\ndiff --git a/include/qemu/rcu_queue.h b/include/qemu/rcu_queue.h\nindex 3aca7a5..01be774 100644\n--- a/include/qemu/rcu_queue.h\n+++ b/include/qemu/rcu_queue.h\n@@ -131,4 +131,4 @@ extern \"C\" {\n #ifdef __cplusplus\n }\n #endif\n-#endif /* QEMU_RCU_QUEUE.H */\n+#endif /* QEMU_RCU_QUEUE_H */\ndiff --git a/include/qemu/readline.h b/include/qemu/readline.h\nindex 49efe4e..c08cf74 100644\n--- a/include/qemu/readline.h\n+++ b/include/qemu/readline.h\n@@ -60,4 +60,4 @@ ReadLineState *readline_init(ReadLinePrintfFunc *printf_func,\n void *opaque,\n ReadLineCompletionFunc *completion_finder);\n \n-#endif /* !READLINE_H */\n+#endif /* READLINE_H */\ndiff --git a/include/qemu/seqlock.h b/include/qemu/seqlock.h\nindex 18eb3fd..2e2be4c 100644\n--- a/include/qemu/seqlock.h\n+++ b/include/qemu/seqlock.h\n@@ -10,8 +10,9 @@\n * See the COPYING file in the top-level directory.\n *\n */\n+\n #ifndef QEMU_SEQLOCK_H\n-#define QEMU_SEQLOCK_H 1\n+#define QEMU_SEQLOCK_H\n \n #include \"qemu/atomic.h\"\n #include \"qemu/thread.h\"\ndiff --git a/include/qemu/unicode.h b/include/qemu/unicode.h\nindex d873165..71c72db 100644\n--- a/include/qemu/unicode.h\n+++ b/include/qemu/unicode.h\n@@ -1,5 +1,5 @@\n #ifndef QEMU_UNICODE_H\n-#define QEMU_UNICODE_H 1\n+#define QEMU_UNICODE_H\n \n int mod_utf8_codepoint(const char *s, size_t n, char **end);\n \ndiff --git a/include/sysemu/xen-mapcache.h b/include/sysemu/xen-mapcache.h\nindex c849489..b8c93b9 100644\n--- a/include/sysemu/xen-mapcache.h\n+++ b/include/sysemu/xen-mapcache.h\n@@ -9,7 +9,6 @@\n #ifndef XEN_MAPCACHE_H\n #define XEN_MAPCACHE_H\n \n-\n typedef hwaddr (*phys_offset_to_gaddr_t)(hwaddr start_addr,\n ram_addr_t size,\n void *opaque);\n@@ -52,4 +51,4 @@ static inline void xen_invalidate_map_cache(void)\n \n #endif\n \n-#endif /* !XEN_MAPCACHE_H */\n+#endif /* XEN_MAPCACHE_H */\ndiff --git a/include/trace-tcg.h b/include/trace-tcg.h\nindex 6f6bdbb..edab4b1 100644\n--- a/include/trace-tcg.h\n+++ b/include/trace-tcg.h\n@@ -4,4 +4,4 @@\n #include \"trace/generated-tcg-tracers.h\"\n #include \"trace/generated-events.h\"\n \n-#endif /* TRACE_TCG_H */\n+#endif /* TRACE_TCG_H */\ndiff --git a/include/trace.h b/include/trace.h\nindex 44a1f1f..9a01e44 100644\n--- a/include/trace.h\n+++ b/include/trace.h\n@@ -4,4 +4,4 @@\n #include \"trace/generated-tracers.h\"\n #include \"trace/generated-events.h\"\n \n-#endif /* TRACE_H */\n+#endif /* TRACE_H */\ndiff --git a/linux-user/uname.h b/linux-user/uname.h\nindex cc62e76..4503094 100644\n--- a/linux-user/uname.h\n+++ b/linux-user/uname.h\n@@ -1,5 +1,5 @@\n #ifndef UNAME_H\n-#define UNAME_H 1\n+#define UNAME_H\n \n #include <sys/utsname.h>\n #include <linux/utsname.h>\n@@ -7,4 +7,4 @@\n const char *cpu_to_uname_machine(void *cpu_env);\n int sys_uname(struct new_utsname *buf);\n \n-#endif /* UNAME _H */\n+#endif /* UNAME_H */\ndiff --git a/net/tap-linux.h b/net/tap-linux.h\nindex 1dc3a9f..2f36d10 100644\n--- a/net/tap-linux.h\n+++ b/net/tap-linux.h\n@@ -50,4 +50,4 @@\n #define TUN_F_TSO_ECN\t0x08\t/* I can handle TSO with ECN bits. */\n #define TUN_F_UFO\t0x10\t/* I can handle UFO packets */\n \n-#endif /* QEMU_TAP_H */\n+#endif /* QEMU_TAP_LINUX_H */\ndiff --git a/slirp/bootp.h b/slirp/bootp.h\nindex ec3b687..3945257 100644\n--- a/slirp/bootp.h\n+++ b/slirp/bootp.h\n@@ -1,6 +1,7 @@\n /* bootp/dhcp defines */\n+\n #ifndef SLIRP_BOOTP_H\n-#define SLIRP_BOOTP_H 1\n+#define SLIRP_BOOTP_H\n \n #define BOOTP_SERVER\t67\n #define BOOTP_CLIENT\t68\ndiff --git a/slirp/main.h b/slirp/main.h\nindex f2e58cf..90053ce 100644\n--- a/slirp/main.h\n+++ b/slirp/main.h\n@@ -4,8 +4,9 @@\n * Please read the file COPYRIGHT for the\n * terms and conditions of the copyright.\n */\n+\n #ifndef SLIRP_MAIN_H\n-#define SLIRP_MAIN_H 1\n+#define SLIRP_MAIN_H\n \n #ifdef HAVE_SYS_SELECT_H\n #include <sys/select.h>\ndiff --git a/slirp/tftp.h b/slirp/tftp.h\nindex 1cb1adf..2cd276d 100644\n--- a/slirp/tftp.h\n+++ b/slirp/tftp.h\n@@ -1,6 +1,7 @@\n /* tftp defines */\n+\n #ifndef SLIRP_TFTP_H\n-#define SLIRP_TFTP_H 1\n+#define SLIRP_TFTP_H\n \n #define TFTP_SESSIONS_MAX 20\n \ndiff --git a/target-cris/crisv32-decode.h b/target-cris/crisv32-decode.h\nindex cdba377..cdc2f8c 100644\n--- a/target-cris/crisv32-decode.h\n+++ b/target-cris/crisv32-decode.h\n@@ -17,8 +17,9 @@\n * You should have received a copy of the GNU Lesser General Public\n * License along with this library; if not, see <http://www.gnu.org/licenses/>.\n */\n+\n #ifndef CRISV32_DECODE_H\n-#define CRISV32_DECODE_H 1\n+#define CRISV32_DECODE_H\n \n /* Convenient binary macros. */\n #define HEX__(n) 0x##n##LU\ndiff --git a/target-tricore/cpu-qom.h b/target-tricore/cpu-qom.h\nindex 399c98f..6a69756 100644\n--- a/target-tricore/cpu-qom.h\n+++ b/target-tricore/cpu-qom.h\n@@ -41,4 +41,4 @@ typedef struct TriCoreCPUClass {\n \n typedef struct TriCoreCPU TriCoreCPU;\n \n-#endif /*QEMU_TRICORE_CPU_QOM_H */\n+#endif /* QEMU_TRICORE_CPU_QOM_H */\ndiff --git a/tcg/tci/tcg-target.h b/tcg/tci/tcg-target.h\nindex 3942f9c..868228b 100644\n--- a/tcg/tci/tcg-target.h\n+++ b/tcg/tci/tcg-target.h\n@@ -37,10 +37,9 @@\n * Therefore, we need both 32 and 64 bit virtual machines (interpreter).\n */\n \n-#if !defined(TCG_TARGET_H)\n+#ifndef TCG_TARGET_H\n #define TCG_TARGET_H\n \n-\n #define TCG_TARGET_INTERPRETER 1\n #define TCG_TARGET_INSN_UNIT_SIZE 1\n #define TCG_TARGET_TLB_DISPLACEMENT_BITS 32\ndiff --git a/trace/control-internal.h b/trace/control-internal.h\nindex dcf67f5..deacc8f 100644\n--- a/trace/control-internal.h\n+++ b/trace/control-internal.h\n@@ -10,8 +10,6 @@\n #ifndef TRACE__CONTROL_INTERNAL_H\n #define TRACE__CONTROL_INTERNAL_H\n \n-\n-\n extern TraceEvent trace_events[];\n extern bool trace_events_dstate[];\n extern int trace_events_enabled_count;\n@@ -72,4 +70,4 @@ static inline void trace_event_set_state_dynamic(TraceEvent *ev, bool state)\n trace_events_dstate[id] = state;\n }\n \n-#endif /* TRACE__CONTROL_INTERNAL_H */\n+#endif /* TRACE__CONTROL_INTERNAL_H */\ndiff --git a/trace/control.h b/trace/control.h\nindex a2dd3ea..452a800 100644\n--- a/trace/control.h\n+++ b/trace/control.h\n@@ -203,4 +203,4 @@ char *trace_opt_parse(const char *optarg);\n \n #include \"trace/control-internal.h\"\n \n-#endif /* TRACE__CONTROL_H */\n+#endif /* TRACE__CONTROL_H */\ndiff --git a/trace/event-internal.h b/trace/event-internal.h\nindex 86f6a51..e4ea2e7 100644\n--- a/trace/event-internal.h\n+++ b/trace/event-internal.h\n@@ -28,4 +28,4 @@ typedef struct TraceEvent {\n } TraceEvent;\n \n \n-#endif /* TRACE__EVENT_INTERNAL_H */\n+#endif /* TRACE__EVENT_INTERNAL_H */\ndiff --git a/trace/ftrace.h b/trace/ftrace.h\nindex 92372e3..cb5e35d 100644\n--- a/trace/ftrace.h\n+++ b/trace/ftrace.h\n@@ -1,8 +1,6 @@\n #ifndef TRACE_FTRACE_H\n #define TRACE_FTRACE_H\n \n-\n-\n #define MAX_TRACE_STRLEN 512\n #define _STR(x) #x\n #define STR(x) _STR(x)\n@@ -11,4 +9,4 @@ extern int trace_marker_fd;\n \n bool ftrace_init(void);\n \n-#endif /* ! TRACE_FTRACE_H */\n+#endif /* TRACE_FTRACE_H */\ndiff --git a/trace/mem-internal.h b/trace/mem-internal.h\nindex a75e0ff..ddda934 100644\n--- a/trace/mem-internal.h\n+++ b/trace/mem-internal.h\n@@ -43,4 +43,4 @@ static inline uint8_t trace_mem_build_info(\n return res;\n }\n \n-#endif /* TRACE__MEM_INTERNAL_H */\n+#endif /* TRACE__MEM_INTERNAL_H */\ndiff --git a/trace/mem.h b/trace/mem.h\nindex c76a572..9c88bcb 100644\n--- a/trace/mem.h\n+++ b/trace/mem.h\n@@ -31,4 +31,4 @@ static uint8_t trace_mem_build_info(TCGMemOp size, bool sign_extend,\n \n #include \"trace/mem-internal.h\"\n \n-#endif /* TRACE__MEM_H */\n+#endif /* TRACE__MEM_H */\ndiff --git a/ui/curses_keys.h b/ui/curses_keys.h\nindex f746744..e39ef9e 100644\n--- a/ui/curses_keys.h\n+++ b/ui/curses_keys.h\n@@ -23,7 +23,7 @@\n */\n \n #ifndef QEMU_CURSES_KEYS_H\n-#define QEMU_CURSES_KEYS_H 1\n+#define QEMU_CURSES_KEYS_H\n \n #include <curses.h>\n #include \"keymaps.h\"\n", "prefixes": [ "PULL", "17/18" ] }