diff --git a/sys/embunit/ColorTextColors.h b/sys/embunit/ColorTextColors.h
index 335dccc0abbe191ba1d2b4a3acf5537e98dee5b7..eb057b700409d8b4f3f651cb7a277344e3af142b 100644
--- a/sys/embunit/ColorTextColors.h
+++ b/sys/embunit/ColorTextColors.h
@@ -13,8 +13,8 @@
  *
  * @author Janos Kutscherauer <noshky@gmail.com>
  */
-#ifndef __COLORTEXTCOLORS_H__
-#define __COLORTEXTCOLORS_H__
+#ifndef EMBUNIT_COLORTEXTCOLORS_H_
+#define EMBUNIT_COLORTEXTCOLORS_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -53,5 +53,5 @@ extern "C" {
 }
 #endif
 
-#endif/*__COLORTEXTCOLORS_H__*/
+#endif/* EMBUNIT_COLORTEXTCOLORS_H_ */
 /** @} */
diff --git a/sys/include/embUnit.h b/sys/include/embUnit.h
index 7ddf7c26489ec7b80486ea1b1c93618636dc0e81..22052d2a84d6ea4b6cc714e01a8a3cc2e1f2aad5 100644
--- a/sys/include/embUnit.h
+++ b/sys/include/embUnit.h
@@ -16,8 +16,8 @@
  * @author Martine Lenders <mlenders@inf.fu-berlin.de>
  */
 
-#ifndef __SYS__EMB_UNIT__H
-#define __SYS__EMB_UNIT__H
+#ifndef SYS_EMB_UNIT_H
+#define SYS_EMB_UNIT_H
 
 #include "embUnit/embUnit.h"
 
@@ -64,4 +64,4 @@ extern "C" {
 }
 #endif
 
-#endif
+#endif /* SYS_EMB_UNIT_H */
diff --git a/sys/include/embUnit/AssertImpl.h b/sys/include/embUnit/AssertImpl.h
index ca644b94a15050afc4591d465433d690c97bb89e..c82d36523c12cea2b41552dd56c257372d67ae74 100644
--- a/sys/include/embUnit/AssertImpl.h
+++ b/sys/include/embUnit/AssertImpl.h
@@ -32,8 +32,8 @@
  *
  * $Id: AssertImpl.h,v 1.6 2003/09/16 11:09:53 arms22 Exp $
  */
-#ifndef __ASSERTIMPL_H__
-#define __ASSERTIMPL_H__
+#ifndef EMBUNIT_ASSERTIMPL_H_
+#define EMBUNIT_ASSERTIMPL_H_
 
 #ifdef  __cplusplus
 extern "C" {
@@ -100,4 +100,4 @@ void assertImplementationCStr(const char *expected,const char *actual, long line
 }
 #endif
 
-#endif/*__ASSERTIMPL_H__*/
+#endif/* EMBUNIT_ASSERTIMPL_H_ */
diff --git a/sys/include/embUnit/ColorOutputter.h b/sys/include/embUnit/ColorOutputter.h
index b25bdcbc781702c113f2d0901d40e5a3332e7c24..b1faed4a61b8d5690864390c5b2f123ceeb3fe62 100644
--- a/sys/include/embUnit/ColorOutputter.h
+++ b/sys/include/embUnit/ColorOutputter.h
@@ -13,8 +13,8 @@
  *
  * @author Janos Kutscherauer <noshky@gmail.com>
  */
-#ifndef __COLOROUTPUTTER_H__
-#define __COLOROUTPUTTER_H__
+#ifndef EMBUNIT_COLOROUTPUTTER_H_
+#define EMBUNIT_COLOROUTPUTTER_H_
 
 #include "Outputter.h"
 
@@ -41,5 +41,5 @@ void ColorOutputter_printStatistics(OutputterRef self, TestResultRef result);
 }
 #endif
 
-#endif/*__COLOROUTPUTTER_H__*/
+#endif/* EMBUNIT_COLOROUTPUTTER_H_ */
 /** @} */
diff --git a/sys/include/embUnit/ColorTextOutputter.h b/sys/include/embUnit/ColorTextOutputter.h
index bfa6c3b8d52ac7f771b2421ff6dd3735d3ca0ba1..ccced25ffff52b4503a55f15f5f13845d9d661c8 100644
--- a/sys/include/embUnit/ColorTextOutputter.h
+++ b/sys/include/embUnit/ColorTextOutputter.h
@@ -11,8 +11,8 @@
  *
  * @file    ColorTextOutputter.h
  */
-#ifndef __COLORTEXTOUTPUTTER_H__
-#define __COLORTEXTOUTPUTTER_H__
+#ifndef EMBUNIT_COLORTEXTOUTPUTTER_H_
+#define EMBUNIT_COLORTEXTOUTPUTTER_H_
 
 #include "Outputter.h"
 
@@ -26,5 +26,5 @@ OutputterRef ColorTextOutputter_outputter(void);
 }
 #endif
 
-#endif/*__COLORTEXTOUTPUTTER_H__*/
+#endif/* EMBUNIT_COLORTEXTOUTPUTTER_H_ */
 /** @} */
diff --git a/sys/include/embUnit/CompilerOutputter.h b/sys/include/embUnit/CompilerOutputter.h
index ecc1d417da683afbcabb1f7a124323694fbec1b8..dad11aacca044946b683fd08c94ef285a20710e7 100644
--- a/sys/include/embUnit/CompilerOutputter.h
+++ b/sys/include/embUnit/CompilerOutputter.h
@@ -32,8 +32,8 @@
  *
  * $Id: CompilerOutputter.h,v 1.2 2003/09/06 13:28:27 arms22 Exp $
  */
-#ifndef __COMPILEROUTPUTTER_H__
-#define __COMPILEROUTPUTTER_H__
+#ifndef EMBUNIT_COMPILEROUTPUTTER_H_
+#define EMBUNIT_COMPILEROUTPUTTER_H_
 
 #include "Outputter.h"
 
@@ -47,4 +47,4 @@ OutputterRef CompilerOutputter_outputter(void);
 }
 #endif
 
-#endif/*__COMPILEROUTPUTTER_H__*/
+#endif/* EMBUNIT_COMPILEROUTPUTTER_H_ */
diff --git a/sys/include/embUnit/HelperMacro.h b/sys/include/embUnit/HelperMacro.h
index 2192405e02f2dac1b0881cd2d266c9330d38a0c9..ef244eeaf3de2c6f022f29f029dd37ebbc1f247e 100644
--- a/sys/include/embUnit/HelperMacro.h
+++ b/sys/include/embUnit/HelperMacro.h
@@ -32,8 +32,8 @@
  *
  * $Id: HelperMacro.h,v 1.3 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef __HELPERMACRO_H__
-#define __HELPERMACRO_H__
+#ifndef EMBUNIT_HELPERMACRO_H_
+#define EMBUNIT_HELPERMACRO_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -64,4 +64,4 @@ extern "C" {
 }
 #endif
 
-#endif/*__HELPERMACRO_H__*/
+#endif/* EMBUNIT_HELPERMACRO_H_ */
diff --git a/sys/include/embUnit/Outputter.h b/sys/include/embUnit/Outputter.h
index e5fc8aa8300cf18401c7d5d9e804373ecbf0e0a7..fe7746ff13a8cb96224da8684804a4f74ef7ca56 100644
--- a/sys/include/embUnit/Outputter.h
+++ b/sys/include/embUnit/Outputter.h
@@ -32,8 +32,8 @@
  *
  * $Id: Outputter.h,v 1.2 2003/09/06 13:28:27 arms22 Exp $
  */
-#ifndef __OUTPUTTER_H__
-#define __OUTPUTTER_H__
+#ifndef EMBUNIT_OUTPUTTER_H_
+#define EMBUNIT_OUTPUTTER_H_
 
 #include <embUnit/embUnit.h>
 
@@ -79,4 +79,4 @@ struct __Outputter {
 }
 #endif
 
-#endif/*__OUTPUTTER_H__*/
+#endif/* EMBUNIT_OUTPUTTER_H_ */
diff --git a/sys/include/embUnit/RepeatedTest.h b/sys/include/embUnit/RepeatedTest.h
index 9bc6fd42b9c5e94ce64dc07f2bd144ca68dfe069..b246d81155ed208886fecd40258152d9384fe6cc 100644
--- a/sys/include/embUnit/RepeatedTest.h
+++ b/sys/include/embUnit/RepeatedTest.h
@@ -32,8 +32,8 @@
  *
  * $Id: RepeatedTest.h,v 1.7 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef __REPEATEDTEST_H__
-#define __REPEATEDTEST_H__
+#ifndef EMBUNIT_REPEATEDTEST_H_
+#define EMBUNIT_REPEATEDTEST_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -61,4 +61,4 @@ extern const TestImplement RepeatedTestImplement;
 }
 #endif
 
-#endif/*__REPEATEDTEST_H__*/
+#endif/* EMBUNIT_REPEATEDTEST_H_ */
diff --git a/sys/include/embUnit/Test.h b/sys/include/embUnit/Test.h
index 240d68827de10eb69f7827ca0b13873482c17e2f..596d7dfa9b704e9b92c5a084c419e4ddccee8b3e 100644
--- a/sys/include/embUnit/Test.h
+++ b/sys/include/embUnit/Test.h
@@ -32,8 +32,8 @@
  *
  * $Id: Test.h,v 1.4 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef __TEST_H__
-#define __TEST_H__
+#ifndef EMBUNIT_TEST_H_
+#define EMBUNIT_TEST_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -70,4 +70,4 @@ struct __Test {
 }
 #endif
 
-#endif/*__TEST_H__*/
+#endif/* EMBUNIT_TEST_H_ */
diff --git a/sys/include/embUnit/TestCaller.h b/sys/include/embUnit/TestCaller.h
index 7661bcb23551bc7fab28f404b22b6b03bbf20edd..f67d50822bc86193bc22602de62c8e0621c7fc32 100644
--- a/sys/include/embUnit/TestCaller.h
+++ b/sys/include/embUnit/TestCaller.h
@@ -32,8 +32,8 @@
  *
  * $Id: TestCaller.h,v 1.7 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef __TESTCALLER_H__
-#define __TESTCALLER_H__
+#ifndef EMBUNIT_TESTCALLER_H_
+#define EMBUNIT_TESTCALLER_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -77,4 +77,4 @@ extern const TestImplement TestCallerImplement;
 }
 #endif
 
-#endif/*__TESTCALLER_H__*/
+#endif/* EMBUNIT_TESTCALLER_H_ */
diff --git a/sys/include/embUnit/TestCase.h b/sys/include/embUnit/TestCase.h
index fd1d8ffeb7ce5a08fc9495dad522e21ee3173403..eb65522001ffe31eef2c666e5c2730b8fe50fdd2 100644
--- a/sys/include/embUnit/TestCase.h
+++ b/sys/include/embUnit/TestCase.h
@@ -32,8 +32,8 @@
  *
  * $Id: TestCase.h,v 1.7 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef __TESTCASE_H__
-#define __TESTCASE_H__
+#ifndef EMBUNIT_TESTCASE_H_
+#define EMBUNIT_TESTCASE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -65,4 +65,4 @@ extern const TestImplement TestCaseImplement;
 }
 #endif
 
-#endif/*__TESTCASE_H__*/
+#endif/* EMBUNIT_TESTCASE_H_ */
diff --git a/sys/include/embUnit/TestListener.h b/sys/include/embUnit/TestListener.h
index cb64360ee86b6da628a26de571db1fee14ce83b7..7a9879d68f420eb4062d0a7ac3046910e6b7e700 100644
--- a/sys/include/embUnit/TestListener.h
+++ b/sys/include/embUnit/TestListener.h
@@ -32,8 +32,8 @@
  *
  * $Id: TestListener.h,v 1.4 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef __TESTLISTENER_H__
-#define __TESTLISTENER_H__
+#ifndef EMBUNIT_TESTLISTENER_H_
+#define EMBUNIT_TESTLISTENER_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -67,4 +67,4 @@ struct __TestListner {
 }
 #endif
 
-#endif/*__TESTLISTENER_H__*/
+#endif/* EMBUNIT_TESTLISTENER_H_ */
diff --git a/sys/include/embUnit/TestResult.h b/sys/include/embUnit/TestResult.h
index 23a9b3e9af093680f113cd49bfa853166c06b1ae..5ec20d1dbc422d49466867cc762b9ea495d4a479 100644
--- a/sys/include/embUnit/TestResult.h
+++ b/sys/include/embUnit/TestResult.h
@@ -32,8 +32,8 @@
  *
  * $Id: TestResult.h,v 1.7 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef __TESTRESULT_H__
-#define __TESTRESULT_H__
+#ifndef EMBUNIT_TESTRESULT_H_
+#define EMBUNIT_TESTRESULT_H_
 
 #ifdef  __cplusplus
 extern "C" {
@@ -67,4 +67,4 @@ void TestResult_addFailure(TestResult* self,Test* test,const char* msg,int line,
 }
 #endif
 
-#endif/*__TESTRESULT_H__*/
+#endif/* EMBUNIT_TESTRESULT_H_ */
diff --git a/sys/include/embUnit/TestRunner.h b/sys/include/embUnit/TestRunner.h
index d3da66412f42ee8fadc9081b6b988a3bf176db47..d592c6370df31f0eb6db74bee1deadeabf956408 100644
--- a/sys/include/embUnit/TestRunner.h
+++ b/sys/include/embUnit/TestRunner.h
@@ -32,8 +32,8 @@
  *
  * $Id: TestRunner.h,v 1.6 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef __TESTRUNNER_H__
-#define __TESTRUNNER_H__
+#ifndef EMBUNIT_TESTRUNNER_H_
+#define EMBUNIT_TESTRUNNER_H_
 
 #ifdef  __cplusplus
 extern "C" {
@@ -49,4 +49,4 @@ extern int TestRunnerHadErrors;
 }
 #endif
 
-#endif/*__TESTRUNNER_H__*/
+#endif/* EMBUNIT_TESTRUNNER_H_ */
diff --git a/sys/include/embUnit/TestSuite.h b/sys/include/embUnit/TestSuite.h
index fb63e3c63e5064d9a4191c567587412d740663d8..788d403cd476987da0fe31d426f7c42dcc621d2e 100644
--- a/sys/include/embUnit/TestSuite.h
+++ b/sys/include/embUnit/TestSuite.h
@@ -32,8 +32,8 @@
  *
  * $Id: TestSuite.h,v 1.7 2004/02/10 16:19:29 arms22 Exp $
  */
-#ifndef __TESTSUITE_H__
-#define __TESTSUITE_H__
+#ifndef EMBUNIT_TESTSUITE_H_
+#define EMBUNIT_TESTSUITE_H_
 
 #ifdef  __cplusplus
 extern "C" {
@@ -63,4 +63,4 @@ extern const TestImplement TestSuiteImplement;
 }
 #endif
 
-#endif/*__TESTSUITE_H__*/
+#endif/* EMBUNIT_TESTSUITE_H_ */
diff --git a/sys/include/embUnit/TextOutputter.h b/sys/include/embUnit/TextOutputter.h
index 1a8fd69cf5e3cfc7da637a370b812766fc2baaeb..0ee943285147c50931ddc4ecf817efb149eb4013 100644
--- a/sys/include/embUnit/TextOutputter.h
+++ b/sys/include/embUnit/TextOutputter.h
@@ -32,8 +32,8 @@
  *
  * $Id: TextOutputter.h,v 1.2 2003/09/06 13:28:27 arms22 Exp $
  */
-#ifndef __TEXTOUTPUTTER_H__
-#define __TEXTOUTPUTTER_H__
+#ifndef EMBUNIT_TEXTOUTPUTTER_H_
+#define EMBUNIT_TEXTOUTPUTTER_H_
 
 #include "Outputter.h"
 
@@ -47,4 +47,4 @@ OutputterRef TextOutputter_outputter(void);
 }
 #endif
 
-#endif/*__TEXTOUTPUTTER_H__*/
+#endif/* EMBUNIT_TEXTOUTPUTTER_H_ */
diff --git a/sys/include/embUnit/TextUIRunner.h b/sys/include/embUnit/TextUIRunner.h
index dc100fb4a006fb29c0984309226dd3c44842ad79..7dfc23b51389b90f3d230f0294f1e88cd3fe24aa 100644
--- a/sys/include/embUnit/TextUIRunner.h
+++ b/sys/include/embUnit/TextUIRunner.h
@@ -32,8 +32,8 @@
  *
  * $Id: TextUIRunner.h,v 1.3 2003/09/06 13:28:27 arms22 Exp $
  */
-#ifndef __TEXTUIRUNNER_H__
-#define __TEXTUIRUNNER_H__
+#ifndef EMBUNIT_TEXTUIRUNNER_H_
+#define EMBUNIT_TEXTUIRUNNER_H_
 
 #include "Outputter.h"
 
@@ -53,4 +53,4 @@ void TextUIRunner_end(void);
 }
 #endif
 
-#endif/*__TEXTUIRUNNER_H__*/
+#endif/* EMBUNIT_TEXTUIRUNNER_H_ */
diff --git a/sys/include/embUnit/XMLOutputter.h b/sys/include/embUnit/XMLOutputter.h
index 9f82fff4db4fbf7f8d72f28ba15138a1555a0a04..49e31a71fa08d06ab09f0c27fc52239f21746065 100644
--- a/sys/include/embUnit/XMLOutputter.h
+++ b/sys/include/embUnit/XMLOutputter.h
@@ -32,8 +32,8 @@
  *
  * $Id: XMLOutputter.h,v 1.3 2003/09/06 13:28:27 arms22 Exp $
  */
-#ifndef __XMLOUTPUTTER_H__
-#define __XMLOUTPUTTER_H__
+#ifndef EMBUNIT_XMLOUTPUTTER_H_
+#define EMBUNIT_XMLOUTPUTTER_H_
 
 #include "Outputter.h"
 
@@ -48,4 +48,4 @@ OutputterRef XMLOutputter_outputter(void);
 }
 #endif
 
-#endif/*__XMLOUTPUTTER_H__*/
+#endif/* EMBUNIT_XMLOUTPUTTER_H_ */
diff --git a/sys/include/embUnit/embUnit.h b/sys/include/embUnit/embUnit.h
index 5c8eb6aa2eea2918554c165996a80f9144bdc764..866eb7408d7ffe280045c784705caacd89931036 100644
--- a/sys/include/embUnit/embUnit.h
+++ b/sys/include/embUnit/embUnit.h
@@ -32,8 +32,8 @@
  *
  * $Id: embUnit.h,v 1.4 2004/02/10 16:16:19 arms22 Exp $
  */
-#ifndef __EMBUNIT_H__
-#define __EMBUNIT_H__
+#ifndef EMBUNIT_EMBUNIT_H_
+#define EMBUNIT_EMBUNIT_H_
 
 #include <embUnit/Test.h>
 #include <embUnit/TestCase.h>
@@ -55,4 +55,4 @@ extern "C" {
 }
 #endif
 
-#endif/*__EMBUNIT_H__*/
+#endif/* EMBUNIT_EMBUNIT_H_ */
diff --git a/sys/include/embUnit/embUnit_config.h b/sys/include/embUnit/embUnit_config.h
index d9c3adb4f3cc73c4d220358b7766079c405589e6..469a32a2ef94bb7b7d7fb20fd6b2a894a967a29f 100644
--- a/sys/include/embUnit/embUnit_config.h
+++ b/sys/include/embUnit/embUnit_config.h
@@ -32,8 +32,8 @@
  *
  * $Id: config.h,v 1.7 2004/02/10 16:17:07 arms22 Exp $
  */
-#ifndef __CONFIG_H__
-#define __CONFIG_H__
+#ifndef EMBUNIT_CONFIG_H_
+#define EMBUNIT_CONFIG_H_
 
 #ifdef  __cplusplus
 extern "C" {
@@ -53,4 +53,4 @@ extern "C" {
 }
 #endif
 
-#endif/*__CONFIG_H__*/
+#endif/* EMBUNIT_CONFIG_H_ */
diff --git a/sys/include/embUnit/stdImpl.h b/sys/include/embUnit/stdImpl.h
index 5cc03d977522c86d8c8442bc06eb6cf7f09bcb0d..ac334906fabaa6065bfbf60c388a6a21fa8aee0c 100644
--- a/sys/include/embUnit/stdImpl.h
+++ b/sys/include/embUnit/stdImpl.h
@@ -32,8 +32,8 @@
  *
  * $Id: stdImpl.h,v 1.4 2004/02/10 16:15:25 arms22 Exp $
  */
-#ifndef __STDIMPL_H__
-#define __STDIMPL_H__
+#ifndef EMBUNIT_STDIMPL_H_
+#define EMBUNIT_STDIMPL_H_
 
 #ifdef  __cplusplus
 extern "C" {
@@ -59,4 +59,4 @@ static inline char* stdimpl_itoa(int v,char *string,int r)
 }
 #endif
 
-#endif/*__STDIMPL_H__*/
+#endif/* EMBUNIT_STDIMPL_H_ */