2 files changed, 9 insertions, 4 deletions

diff --git a/rbutil/mkamsboot/mkamsboot.h b/rbutil/mkamsboot/mkamsboot.h
index 3e58341884..51f5b2f699 100644
--- a/rbutil/mkamsboot/mkamsboot.h
+++ b/rbutil/mkamsboot/mkamsboot.h
@@ -28,6 +28,10 @@
 #include <stdint.h>
 #include <sys/types.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif 
+
 /* Supported models */
 enum {
     MODEL_UNKNOWN = -1,
@@ -152,4 +156,8 @@ int total_size(int model, int rb_packedsize, int of_packedsize);
 */
 int firmware_revision(int model);
 
+#ifdef __cplusplus
+};
+#endif 
+
 #endif
diff --git a/rbutil/rbutilqt/base/bootloaderinstallams.cpp b/rbutil/rbutilqt/base/bootloaderinstallams.cpp
index 9b357aedb6..7de6ee6837 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallams.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallams.cpp
@@ -21,10 +21,7 @@
 #include "bootloaderinstallbase.h"
 #include "bootloaderinstallams.h"
 
-extern "C"
-{
-    #include "../mkamsboot/mkamsboot.h"
-};
+#include "../mkamsboot/mkamsboot.h"
 
 BootloaderInstallAms::BootloaderInstallAms(QObject *parent)
         : BootloaderInstallBase(parent)