diff --git a/services/source/bootstrap_service.h b/services/source/bootstrap_service.h
index 0f0e7222eee96989a8b0ef2d2fc5643207fce68c..5c6ad80e1afbd8da263cd5dfab8d41e3eaadb32f 100644
--- a/services/source/bootstrap_service.h
+++ b/services/source/bootstrap_service.h
@@ -65,9 +65,16 @@ extern "C" {
         (initCall);                                     \
     })
 
-#define INIT_APP_CALL(name) APP_CALL(name, 0);
+#define INIT_APP_CALL(name)                             \
+    do {                                                \
+        APP_CALL(name, 0);                              \
+    } while (0)
+
+#define INIT_TEST_CALL()                                \
+    do {                                                \
+        MODULE_CALL(test, 0);                           \
+    } while (0)
 
-#define INIT_TEST_CALL()    MODULE_CALL(test, 0);
 #elif (defined(__ICCARM__))
 #define APP_BEGIN(name, step) __section_begin(APP_NAME(name, step))
 #define APP_END(name, step) __section_end(APP_NAME(name, step))