diff --git a/src/kernel.h b/src/kernel.h
index 3de4dac..ccfa6c4 100644
--- a/src/kernel.h
+++ b/src/kernel.h
@@ -23,7 +23,14 @@
 #define KERN_SYSCALL_TBL_4                          0xFFEAAA60 // works with home menu
 #define KERN_SYSCALL_TBL_5                          0xFFEAAE60 // works with browser (previously KERN_SYSCALL_TBL)
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 void doKernelSetup();
 
 void doKernelSetup2();
+
+#ifdef __cplusplus
+}
+#endif
\ No newline at end of file
diff --git a/src/utils/StringTools.h b/src/utils/StringTools.h
index 851aa73..6c53f0d 100644
--- a/src/utils/StringTools.h
+++ b/src/utils/StringTools.h
@@ -23,8 +23,7 @@
  *
  * for WiiXplorer 2010
  ***************************************************************************/
-#ifndef __STRING_TOOLS_H
-#define __STRING_TOOLS_H
+#pragma once
 
 #include <vector>
 #include <string>
@@ -60,6 +59,3 @@ public:
 
     static std::vector<std::string> stringSplit(const std::string &value, const std::string &splitter);
 };
-
-#endif /* __STRING_TOOLS_H */
-