diff --git a/targets/ARCH/COMMON/common_lib.h b/targets/ARCH/COMMON/common_lib.h
index f74e360503806bb1fb2e1f19857d0afab1b0d815..68a14db161e9c0ace813cae245f716b1ed606b58 100644
--- a/targets/ARCH/COMMON/common_lib.h
+++ b/targets/ARCH/COMMON/common_lib.h
@@ -129,20 +129,18 @@ struct openair0_device_t {
 #ifdef __cplusplus
 extern "C"
 {
+#endif
+
 /* return 0 if OK, < 0 if error */
 int openair0_device_init(openair0_device* device, openair0_config_t *openair0_cfg);
 openair0_timestamp get_usrp_time(openair0_device *device);
-  int openair0_set_frequencies(openair0_device* device, openair0_config_t *openair0_cfg);
+int openair0_set_frequencies(openair0_device* device, openair0_config_t *openair0_cfg);
 int openair0_set_rx_frequencies(openair0_device* device, openair0_config_t *openair0_cfg);
 
 int openair0_set_gains(openair0_device* device, openair0_config_t *openair0_cfg);
+
+#ifdef __cplusplus
 }
-#else
-int openair0_device_init(openair0_device* device, openair0_config_t *openair0_cfg);
-openair0_timestamp get_usrp_time(openair0_device *device);
-int openair0_set_frequencies(openair0_device* device, openair0_config_t *openair0_cfg);
-int openair0_set_rx_frequencies(openair0_device* device, openair0_config_t *openair0_cfg);
-int openair0_set_gains(openair0_device* device, openair0_config_t *openair0_cfg);
 #endif
 
 #endif // COMMON_LIB_H