diff --git a/src/box/box.cc b/src/box/box.cc
index 34c22b4ef4b4526118d1ce9dd52c76420b16d90d..eed8cb5ce6e45ae6f687c7400f9d9bd23559d125 100644
--- a/src/box/box.cc
+++ b/src/box/box.cc
@@ -347,7 +347,7 @@ box_sync_replication_source(void)
 	}
 }
 
-extern "C" void
+void
 box_set_replication_source(void)
 {
 	if (recovery->writer == NULL) {
@@ -374,7 +374,7 @@ box_set_replication_source(void)
 	}
 }
 
-extern "C" void
+void
 box_set_listen(void)
 {
 	const char *uri = cfg_gets("listen");
@@ -405,7 +405,7 @@ box_cfg_listen_eq(struct uri *what)
 		memcmp(uri.host, what->host, uri.host_len) == 0);
 }
 
-extern "C" void
+void
 box_set_wal_mode(void)
 {
 	const char *mode_name = cfg_gets("wal_mode");
@@ -423,31 +423,31 @@ box_set_wal_mode(void)
 		recovery_update_mode(recovery, mode);
 }
 
-extern "C" void
+void
 box_set_log_level(void)
 {
 	say_set_log_level(cfg_geti("log_level"));
 }
 
-extern "C" void
+void
 box_set_io_collect_interval(void)
 {
 	ev_set_io_collect_interval(loop(), cfg_getd("io_collect_interval"));
 }
 
-extern "C" void
+void
 box_set_snap_io_rate_limit(void)
 {
 	recovery_update_io_rate_limit(recovery, cfg_getd("snap_io_rate_limit"));
 }
 
-extern "C" void
+void
 box_set_too_long_threshold(void)
 {
 	too_long_threshold = cfg_getd("too_long_threshold");
 }
 
-extern "C" void
+void
 box_set_readahead(void)
 {
 	int readahead = cfg_geti("readahead");
@@ -455,7 +455,7 @@ box_set_readahead(void)
 	iobuf_set_readahead(readahead);
 }
 
-extern "C" void
+void
 box_set_panic_on_wal_error(void)
 {
 	recovery_setup_panic(recovery,
diff --git a/src/box/box.h b/src/box/box.h
index 072e259b3d055b70141302f598718fbb1c1c7bc8..30eaf71376849b799094d497ffc4bf15b63d6844 100644
--- a/src/box/box.h
+++ b/src/box/box.h
@@ -81,6 +81,9 @@ int box_snapshot(void);
  */
 const char *box_status(void);
 
+#if defined(__cplusplus)
+} /* extern "C" */
+
 void
 box_process_auth(struct request *request);
 
@@ -113,8 +116,7 @@ void box_set_too_long_threshold(void);
 void box_set_readahead(void);
 void box_set_panic_on_wal_error(void);
 
-#if defined(__cplusplus)
-}
+extern "C" {
 #endif /* defined(__cplusplus) */
 
 struct box_function_ctx {
@@ -282,4 +284,8 @@ box_upsert(uint32_t space_id, uint32_t index_id, const char *tuple,
 int
 box_process1(struct request *request, box_tuple_t **result);
 
+#if defined(__cplusplus)
+} /* extern "C" */
+#endif /* defined(__cplusplus) */
+
 #endif /* INCLUDES_TARANTOOL_BOX_H */