diff --git a/src/common/vscp-aes.c b/src/common/vscp-aes.c
index 37f427df4..6c8e3382b 100644
--- a/src/common/vscp-aes.c
+++ b/src/common/vscp-aes.c
@@ -29,8 +29,7 @@ NOTE:   String length must be evenly divisible by 16byte (str_len % 16 == 0)
 
 */
 
-#ifndef ___vscp-aes_H
-#define ___vscp-aes_H
+
 
 
 /*****************************************************************************/
@@ -714,4 +713,4 @@ size_t getRandomIV( uint8_t *buf, size_t len )
 
 #endif // #if defined(CBC) && CBC
 
-#endif
+
diff --git a/src/common/vscp-aes.h b/src/common/vscp-aes.h
index 1e13d2b83..e68a7abae 100644
--- a/src/common/vscp-aes.h
+++ b/src/common/vscp-aes.h
@@ -1,5 +1,5 @@
-#ifndef _AES_H_
-#define _AES_H_
+#ifndef _VSCP__AES__H_
+#define _VSCP__AES__H_
 
 #ifdef __cplusplus
 extern "C" {