diff --git a/lpc.h b/lpc.h
index 9a27677..53b2fb4 100644
--- a/lpc.h
+++ b/lpc.h
@@ -4,18 +4,10 @@
 #ifndef LPC_H
 #define LPC_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 int init_lpc_dev(struct mbox_context *context);
 void free_lpc_dev(struct mbox_context *context);
 int point_to_flash(struct mbox_context *context);
 int point_to_memory(struct mbox_context *context);
 int reset_lpc(struct mbox_context *context);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* LPC_H */
diff --git a/vpnor/lpc_reset.cpp b/vpnor/lpc_reset.cpp
index 6c5a5d6..98fa2be 100644
--- a/vpnor/lpc_reset.cpp
+++ b/vpnor/lpc_reset.cpp
@@ -17,8 +17,11 @@
  *
  */
 
+extern "C" {
 #include "mbox.h"
 #include "lpc.h"
+}
+
 #include "mboxd_pnor_partition_table.h"
 
 /*