diff --git a/os/various/cpp_wrappers/syscalls_cpp.cpp b/os/various/cpp_wrappers/syscalls_cpp.cpp
index 84a449a9f..d7d6d92a8 100644
--- a/os/various/cpp_wrappers/syscalls_cpp.cpp
+++ b/os/various/cpp_wrappers/syscalls_cpp.cpp
@@ -5,74 +5,37 @@
 
 #include "syscalls_cpp.hpp"
 
-/**
- *
- */
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 void _exit(int status){
    (void) status;
    osalSysHalt("Unrealized");
    while(TRUE){}
 }
-#ifdef __cplusplus
-}
-#endif
 
-/**
- *
- */
-#ifdef __cplusplus
-extern "C" {
-#endif
 pid_t _getpid(void){
    return 1;
 }
-#ifdef __cplusplus
-}
-#endif
 
-/**
- *
- */
 #undef errno
 extern int errno;
-#ifdef __cplusplus
-extern "C" {
-#endif
 int _kill(int pid, int sig) {
   (void)pid;
   (void)sig;
   errno = EINVAL;
   return -1;
 }
-#ifdef __cplusplus
-}
-#endif
 
-/**
- *
- */
-#ifdef __cplusplus
-extern "C" {
-#endif
 void _open_r(void){
   return;
 }
-#ifdef __cplusplus
-}
-#endif
 
-/**
- *
- */
-#ifdef __cplusplus
-extern "C" {
-#endif
-  void __cxa_pure_virtual() {
-    osalSysHalt("Pure virtual function call.");
-  }
+void __cxa_pure_virtual() {
+  osalSysHalt("Pure virtual function call.");
+}
+
 #ifdef __cplusplus
 }
 #endif