diff --git a/boards/x86-multiboot-common/include/multiboot.h b/boards/x86-multiboot-common/include/multiboot.h
index 1834eb9634..2ad18254c3 100644
--- a/boards/x86-multiboot-common/include/multiboot.h
+++ b/boards/x86-multiboot-common/include/multiboot.h
@@ -230,4 +230,8 @@ typedef struct multiboot_mod_list multiboot_module_t;
 
 #endif  /** ! ASM_FILE */
 
-#endif  /** ! MULTIBOOT_HEADER */
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /** ! MULTIBOOT_H_ */