diff --git a/resource/csdk/connectivity/api/cacommon.h b/resource/csdk/connectivity/api/cacommon.h
index e3c29811d85f96f8735ed8cc53cee1c524fa1432..106041063de56ff4f59500318ccc0211bde3f4ed 100644
--- a/resource/csdk/connectivity/api/cacommon.h
+++ b/resource/csdk/connectivity/api/cacommon.h
@@ -337,5 +337,5 @@ typedef struct
 } /* extern "C" */
 #endif
 
-#endif //#ifndef CA_COMMON_H_
+#endif /* CA_COMMON_H_ */
 
diff --git a/resource/csdk/connectivity/api/cainterface.h b/resource/csdk/connectivity/api/cainterface.h
index 91c29c501d1124f204a671bc1c413f6959b9c6f6..7607bfc49d6f93fc3a71b40d0a67059218208ec0 100644
--- a/resource/csdk/connectivity/api/cainterface.h
+++ b/resource/csdk/connectivity/api/cainterface.h
@@ -24,8 +24,8 @@
  * This file contains the APIs for Resource Model to use.
  */
 
-#ifndef __CA_INTERFACE_H_
-#define __CA_INTERFACE_H_
+#ifndef CA_INTERFACE_H_
+#define CA_INTERFACE_H_
 
 /**
  * Connectivity Abstraction Interface APIs.
@@ -278,5 +278,5 @@ CAResult_t CAHandleRequestResponse();
 } /* extern "C" */
 #endif
 
-#endif
+#endif /* CA_INTERFACE_H_ */
 
diff --git a/resource/csdk/connectivity/common/inc/camutex.h b/resource/csdk/connectivity/common/inc/camutex.h
index e138006ca3c3c609a5b5e3897c933625aac8e297..be7b08534ab52553bf08c3be2e66600a819730ad 100644
--- a/resource/csdk/connectivity/common/inc/camutex.h
+++ b/resource/csdk/connectivity/common/inc/camutex.h
@@ -24,8 +24,8 @@
  * This file provides APIs related to mutex and semaphores.
  */
 
-#ifndef _CAMUTEX_H_
-#define _CAMUTEX_H_
+#ifndef CA_MUTEX_H_
+#define CA_MUTEX_H_
 
 #include "cacommon.h"
 
@@ -151,5 +151,5 @@ void ca_cond_free(ca_cond cond);
 } /* extern "C" */
 #endif /* __cplusplus */
 
-#endif /*__UMUTEX_H_ */
+#endif /* CA_MUTEX_H_ */
 
diff --git a/resource/csdk/connectivity/common/inc/cathreadpool.h b/resource/csdk/connectivity/common/inc/cathreadpool.h
index 135d359b6e45f13f64936af4660a49690210403b..9df11e9221fece8cafafe5fd349a57d31345b10b 100644
--- a/resource/csdk/connectivity/common/inc/cathreadpool.h
+++ b/resource/csdk/connectivity/common/inc/cathreadpool.h
@@ -28,8 +28,8 @@
  * a name that best describes the used technology, not the OS.
  */
 
-#ifndef CATHREAD_POOL_H_
-#define CATHREAD_POOL_H_
+#ifndef CA_THREAD_POOL_H_
+#define CA_THREAD_POOL_H_
 
 #include "cacommon.h"
 
@@ -86,5 +86,5 @@ void ca_thread_pool_free(ca_thread_pool_t thread_pool);
 } /* extern "C" */
 #endif /* __cplusplus */
 
-#endif /* CATHREAD_POOL_H_ */
+#endif /* CA_THREAD_POOL_H_ */
 
diff --git a/resource/csdk/connectivity/common/inc/logger.h b/resource/csdk/connectivity/common/inc/logger.h
index 61f363d0ee4d98df6a1980b9b283e6101dee336d..fddc5b706d74662edadd45076e1ba8663c4529a4 100644
--- a/resource/csdk/connectivity/common/inc/logger.h
+++ b/resource/csdk/connectivity/common/inc/logger.h
@@ -18,8 +18,8 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#ifndef _U_LOGGER_H_
-#define _U_LOGGER_H_
+#ifndef U_LOGGER_H_
+#define U_LOGGER_H_
 
 #include <stdint.h>
 #include <stdio.h>
@@ -211,5 +211,5 @@ void OICLogv(LogLevel level, PROGMEM const char *tag, const int16_t lineNum,
 #ifdef __cplusplus
 }
 #endif // __cplusplus
-#endif /* _U_LOGGER_H_ */
+#endif /* U_LOGGER_H_ */
 
diff --git a/resource/csdk/connectivity/common/inc/oic_console_logger.h b/resource/csdk/connectivity/common/inc/oic_console_logger.h
index ac0374d265e64477107c6ddbbbdc3419a67b841a..bb09eb079a62926ccb91e17d088e5c3b72a9e995 100644
--- a/resource/csdk/connectivity/common/inc/oic_console_logger.h
+++ b/resource/csdk/connectivity/common/inc/oic_console_logger.h
@@ -18,8 +18,8 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#ifndef __OIC_CONSOLE_LOGGER_
-#define __OIC_CONSOLE_LOGGER_
+#ifndef OIC_CONSOLE_LOGGER_
+#define OIC_CONSOLE_LOGGER_
 
 #include "oic_logger_types.h"
 
@@ -41,5 +41,5 @@ int oic_console_logger_set_module(oic_log_ctx_t *ctx, const char *module_name);
 } // extern "C"
 #endif
 
-#endif
+#endif /* OIC_CONSOLE_LOGGER_ */
 
diff --git a/resource/csdk/connectivity/common/inc/oic_logger.h b/resource/csdk/connectivity/common/inc/oic_logger.h
index 9e1cbc33246296a0d29349401deb5fa805d0bd93..d1a5b8d47b3172090c1b4a16b9f75fe7b212da65 100644
--- a/resource/csdk/connectivity/common/inc/oic_logger.h
+++ b/resource/csdk/connectivity/common/inc/oic_logger.h
@@ -18,8 +18,8 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#ifndef __OIC_LOGGER_H_
-#define __OIC_LOGGER_H_
+#ifndef OIC_LOGGER_H_
+#define OIC_LOGGER_H_
 
 #include "oic_logger_types.h"
 
@@ -46,5 +46,5 @@ int oic_log_set_module(oic_log_ctx_t *ctx, const char *module_name);
 } // extern "C"
 #endif
 
-#endif
+#endif /* OIC_LOGGER_H_ */
 
diff --git a/resource/csdk/connectivity/common/inc/oic_logger_types.h b/resource/csdk/connectivity/common/inc/oic_logger_types.h
index 8271f1d957c25ee926e09d8cc3387eab505fc0e4..121270bca70f01ca150d6a1d7c5329f86ff52325 100644
--- a/resource/csdk/connectivity/common/inc/oic_logger_types.h
+++ b/resource/csdk/connectivity/common/inc/oic_logger_types.h
@@ -18,8 +18,8 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#ifndef __OIC_LOGGER_TYPES_H_
-#define __OIC_LOGGER_TYPES_H_
+#ifndef OIC_LOGGER_TYPES_H_
+#define OIC_LOGGER_TYPES_H_
 
 #include <stddef.h>
 
@@ -83,5 +83,5 @@ typedef int (*oic_log_try_lock_t)(oic_log_ctx_t *);
 } // extern "C"
 #endif
 
-#endif
+#endif /* OIC_LOGGER_TYPES_H_ */
 
diff --git a/resource/csdk/connectivity/common/inc/oic_malloc.h b/resource/csdk/connectivity/common/inc/oic_malloc.h
index be614afec4206e3b5ba6c93bd1b647e829dcac0a..df0b7b251e3151e0c07f05bd2338378ac10a886c 100644
--- a/resource/csdk/connectivity/common/inc/oic_malloc.h
+++ b/resource/csdk/connectivity/common/inc/oic_malloc.h
@@ -18,8 +18,8 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#ifndef _OIC_MALLOC_H_
-#define _OIC_MALLOC_H_
+#ifndef OIC_MALLOC_H_
+#define OIC_MALLOC_H_
 
 // The purpose of this module is to allow custom dynamic memory allocation
 // code to easily be added to the TB Stack by redefining the OICMalloc and
@@ -94,5 +94,5 @@ void OICFree(void *ptr);
 #ifdef __cplusplus
 }
 #endif // __cplusplus
-#endif /* _OIC_MALLOC_H_ */
+#endif /* OIC_MALLOC_H_ */
 
diff --git a/resource/csdk/connectivity/common/inc/oic_string.h b/resource/csdk/connectivity/common/inc/oic_string.h
index 3f830f216775a44eede958ae5c50088125731371..5c823ba084adca45c20f0598f26fab05082e142d 100644
--- a/resource/csdk/connectivity/common/inc/oic_string.h
+++ b/resource/csdk/connectivity/common/inc/oic_string.h
@@ -17,8 +17,8 @@
  * limitations under the License.
  *
  ******************************************************************/
-#ifndef _OIC_STRING_H_
-#define _OIC_STRING_H_
+#ifndef OIC_STRING_H_
+#define OIC_STRING_H_
 
 #ifdef __cplusplus
 extern "C"
@@ -41,6 +41,4 @@ char *OICStrdup(const char *str);
 #ifdef __cplusplus
 }
 #endif // __cplusplus
-#endif
-/* _OIC_STRING_H_ */
-
+#endif /* OIC_STRING_H_ */
diff --git a/resource/csdk/connectivity/common/inc/uarraylist.h b/resource/csdk/connectivity/common/inc/uarraylist.h
index 245c1950c049083481ce930f0ae673b8e6214936..17edead835f04216e65e7b11c9f460b0de44b880 100644
--- a/resource/csdk/connectivity/common/inc/uarraylist.h
+++ b/resource/csdk/connectivity/common/inc/uarraylist.h
@@ -18,8 +18,8 @@
  *
  ******************************************************************/
 
-#ifndef __U_ARRAYLIST_H_
-#define __U_ARRAYLIST_H_
+#ifndef U_ARRAYLIST_H_
+#define U_ARRAYLIST_H_
 
 #include <stdint.h>
 #include "cacommon.h"
@@ -109,4 +109,4 @@ bool u_arraylist_contains(const u_arraylist_t *list,const void *data);
 }
 #endif
 
-#endif /* _U_ARRAYLIST_H_ */
+#endif /* U_ARRAYLIST_H_ */
diff --git a/resource/csdk/connectivity/common/inc/uqueue.h b/resource/csdk/connectivity/common/inc/uqueue.h
index e8694fab22af7577b20f24df367c0c3575fc9e3e..cc9a8bb2bcd77f08cd4f130fb7dea3d44a539874 100644
--- a/resource/csdk/connectivity/common/inc/uqueue.h
+++ b/resource/csdk/connectivity/common/inc/uqueue.h
@@ -24,8 +24,8 @@
  * This file contains the APIs for queue to be implemented.
  */
 
-#ifndef __U_QUEUE_H_
-#define __U_QUEUE_H_
+#ifndef U_QUEUE_H_
+#define U_QUEUE_H_
 
 #include "cacommon.h"
 
@@ -145,5 +145,5 @@ u_queue_message_t *u_queue_get_head(u_queue_t *queue);
 } /* extern "C" */
 #endif /* __cplusplus */
 
-#endif /* _U_QUEUE_H_ */
+#endif /* U_QUEUE_H_ */
 
diff --git a/resource/csdk/connectivity/inc/caadapterinterface.h b/resource/csdk/connectivity/inc/caadapterinterface.h
index d51c41f24574b7e163a83b29ae12efa0cfdb973c..d0da44758afe4118e1002a80b8c7e8465862ab78 100644
--- a/resource/csdk/connectivity/inc/caadapterinterface.h
+++ b/resource/csdk/connectivity/inc/caadapterinterface.h
@@ -179,5 +179,5 @@ typedef void (*CANetworkChangeCallback)(CALocalConnectivity_t *info, CANetworkSt
 } /* extern "C" */
 #endif
 
-#endif  // CA_ADAPTER_INTERFACE_H_
+#endif  /* CA_ADAPTER_INTERFACE_H_ */
 
diff --git a/resource/csdk/connectivity/inc/caadapternetdtls.h b/resource/csdk/connectivity/inc/caadapternetdtls.h
index 86a7322db038768546146b0159bb829679b4a2ef..debf3d319ce9a8f8fabc345dd7648fc23a914cbc 100644
--- a/resource/csdk/connectivity/inc/caadapternetdtls.h
+++ b/resource/csdk/connectivity/inc/caadapternetdtls.h
@@ -17,8 +17,8 @@
 * limitations under the License.
 *
 ******************************************************************/
-#ifndef _CA_ADAPTER_NET_DTLS_H
-#define _CA_ADAPTER_NET_DTLS_H
+#ifndef CA_ADAPTER_NET_DTLS_H_
+#define CA_ADAPTER_NET_DTLS_H_
 
 #include "dtls.h"
 #include "uarraylist.h"
@@ -225,6 +225,6 @@ CAResult_t CAAdapterNetDtlsDecrypt(const char *remoteAddress,
                                    uint32_t dataLen,
                                    eDtlsAdapterType_t type);
 
-#endif //_CA_ADAPTER_NET_DTLS_H
+#endif /* CA_ADAPTER_NET_DTLS_H_ */
 
 
diff --git a/resource/csdk/connectivity/inc/caadapterutils.h b/resource/csdk/connectivity/inc/caadapterutils.h
index 42873199210b086a38d2f824cb6063be902715fe..f78cebbe4c706d332de1dd4a13699deb150a38fa 100644
--- a/resource/csdk/connectivity/inc/caadapterutils.h
+++ b/resource/csdk/connectivity/inc/caadapterutils.h
@@ -308,5 +308,5 @@ JavaVM *CANativeJNIGetJavaVM();
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
-#endif  // CA_ADAPTER_UTILS_H_
+#endif  /* CA_ADAPTER_UTILS_H_ */
 
diff --git a/resource/csdk/connectivity/inc/caedradapter.h b/resource/csdk/connectivity/inc/caedradapter.h
index 6f67eb2977003f37196a6550b4cd57c71ceb091f..678f8648803ce363c6c21e57c5e7d25b3cc2c50e 100644
--- a/resource/csdk/connectivity/inc/caedradapter.h
+++ b/resource/csdk/connectivity/inc/caedradapter.h
@@ -24,8 +24,8 @@
  * This file contains the APIs for EDR adapters.
  */
 
-#ifndef __CA_EDRADAPTER_H_
-#define __CA_EDRADAPTER_H_
+#ifndef CA_EDRADAPTER_H_
+#define CA_EDRADAPTER_H_
 
 /**
  * EDR Interface AP
@@ -138,5 +138,5 @@ CAResult_t CAAdapterStartQueue();
 } /* extern "C" */
 #endif
 
-#endif  //__CA_EDRADAPTER_H_
+#endif  /* CA_EDRADAPTER_H_ */
 
diff --git a/resource/csdk/connectivity/inc/caedradapter_singlethread.h b/resource/csdk/connectivity/inc/caedradapter_singlethread.h
index 5648726b8a0876aff32fbe2ee268dec31ca0b3d4..a5996d074265998b9281093789e28325d21c1c7a 100644
--- a/resource/csdk/connectivity/inc/caedradapter_singlethread.h
+++ b/resource/csdk/connectivity/inc/caedradapter_singlethread.h
@@ -24,8 +24,8 @@
  * This file contains the APIs for EDR adapters to be implemented.
  */
 
-#ifndef __CA_EDRADAPTER_SINGLETHREAD_H_
-#define __CA_EDRADAPTER_SINGLETHREAD_H_
+#ifndef CA_EDRADAPTER_SINGLETHREAD_H_
+#define CA_EDRADAPTER_SINGLETHREAD_H_
 
 /**
  * EDR Interface AP
@@ -149,5 +149,5 @@ void CATerminateEDR();
 } /* extern "C" */
 #endif
 
-#endif  //__CA_EDRADAPTER_SINGLETHREAD_H_
+#endif  /* CA_EDRADAPTER_SINGLETHREAD_H_ */
 
diff --git a/resource/csdk/connectivity/inc/caedrinterface.h b/resource/csdk/connectivity/inc/caedrinterface.h
index df9e86c10c3576e71837aaa63eb6db7317d26c23..57ac40e0923a1532b8c78da79afe4c815846d80c 100644
--- a/resource/csdk/connectivity/inc/caedrinterface.h
+++ b/resource/csdk/connectivity/inc/caedrinterface.h
@@ -25,8 +25,8 @@
  * modules.
  */
 
-#ifndef __CA_EDR_INTERFACE_H_
-#define __CA_EDR_INTERFACE_H_
+#ifndef CA_EDR_INTERFACE_H_
+#define CA_EDR_INTERFACE_H_
 
 #include "caedradapter.h"
 
@@ -284,5 +284,5 @@ CAResult_t CAEDRGetBondedDeviceList();
 } /* extern "C" */
 #endif
 
-#endif //__CA_EDR_INTERFACE_H_
+#endif /* CA_EDR_INTERFACE_H_ */
 
diff --git a/resource/csdk/connectivity/inc/cainterfacecontroller.h b/resource/csdk/connectivity/inc/cainterfacecontroller.h
index c68310bfbfb0ac6fd57dc9929be5fbb76cb9de84..8aa5940497138ab584e2ec8fe076ffb05c8d4704 100644
--- a/resource/csdk/connectivity/inc/cainterfacecontroller.h
+++ b/resource/csdk/connectivity/inc/cainterfacecontroller.h
@@ -118,5 +118,5 @@ void CATerminateAdapters();
 } /* extern "C" */
 #endif
 
-#endif //#ifndef CA_INTERFACE_CONTROLLER_H_
+#endif /* CA_INTERFACE_CONTROLLER_H_ */
 
diff --git a/resource/csdk/connectivity/inc/cainterfacecontroller_singlethread.h b/resource/csdk/connectivity/inc/cainterfacecontroller_singlethread.h
index a781500c8d346eb59ad442380e70b12821dd736d..70f0759b46b3d687c408cae0e545911043bcbf2c 100644
--- a/resource/csdk/connectivity/inc/cainterfacecontroller_singlethread.h
+++ b/resource/csdk/connectivity/inc/cainterfacecontroller_singlethread.h
@@ -127,5 +127,5 @@ CAResult_t CAReadData();
 } /* extern "C" */
 #endif
 
-#endif //#ifndef __CA_INTERFACE_CONTROLLER_H_
+#endif /* CA_INTERFACE_CONTROLLER_SINGLETHREAD_H_ */
 
diff --git a/resource/csdk/connectivity/inc/caipadapter_singlethread.h b/resource/csdk/connectivity/inc/caipadapter_singlethread.h
index 296987829e518919fb6f65188dfca70bc942c1dd..7625a0428ee016d7c65e1dd8a0189b8148a70ff6 100644
--- a/resource/csdk/connectivity/inc/caipadapter_singlethread.h
+++ b/resource/csdk/connectivity/inc/caipadapter_singlethread.h
@@ -124,5 +124,5 @@ void CATerminateIP();
 } /* extern "C" */
 #endif
 
-#endif  // #ifndef CA_IP_ADAPTER_SINGLETHREAD_H_
+#endif  /* CA_IP_ADAPTER_SINGLETHREAD_H_ */
 
diff --git a/resource/csdk/connectivity/inc/caipinterface.h b/resource/csdk/connectivity/inc/caipinterface.h
index abc7b934fc82d9625208acc993f2abdd96810af5..092a51e4d612884462353c515d84210a3605167a 100644
--- a/resource/csdk/connectivity/inc/caipinterface.h
+++ b/resource/csdk/connectivity/inc/caipinterface.h
@@ -325,4 +325,4 @@ void CAIPSetConnectionStateChangeCallback(CAIPConnectionStateChangeCallback call
 }
 #endif
 
-#endif //CA_IP_INTERFACE_H_
+#endif /* CA_IP_INTERFACE_H_ */
diff --git a/resource/csdk/connectivity/inc/caipinterface_singlethread.h b/resource/csdk/connectivity/inc/caipinterface_singlethread.h
index e0d11a09c13425960c81059310d287369427576b..69133c3618162ccd1f08f8ed1af3bccce345985e 100644
--- a/resource/csdk/connectivity/inc/caipinterface_singlethread.h
+++ b/resource/csdk/connectivity/inc/caipinterface_singlethread.h
@@ -303,5 +303,5 @@ void CAIPSetConnectionStateChangeCallback
 }
 #endif
 
-#endif //CA_IP_INTERFACE_SINGLETHREAD_H_
+#endif /* CA_IP_INTERFACE_SINGLETHREAD_H_ */
 
diff --git a/resource/csdk/connectivity/inc/caleadapter.h b/resource/csdk/connectivity/inc/caleadapter.h
index 29994e28fdc3647bcb46d65cdc132e29cce0a461..ad6e4bb34600bfde3c7596f8d65ef37cfa671f8b 100644
--- a/resource/csdk/connectivity/inc/caleadapter.h
+++ b/resource/csdk/connectivity/inc/caleadapter.h
@@ -24,8 +24,8 @@
  * This file contains the APIs for LE adapters to be implemented.
  */
 
-#ifndef _CA_LEADAPTER_H_
-#define _CA_LEADAPTER_H_
+#ifndef CA_LEADAPTER_H_
+#define CA_LEADAPTER_H_
 
 #include "cacommon.h"
 #include "caadapterinterface.h"
@@ -436,5 +436,5 @@ typedef CAResult_t (*CABLEServerDataReceivedCallback)(const char *remoteAddress,
 } /* extern "C" */
 #endif
 
-#endif //#ifndef _CA_LEADAPTER_H_
+#endif /* CA_LEADAPTER_H_ */
 
diff --git a/resource/csdk/connectivity/inc/caleadapter_singlethread.h b/resource/csdk/connectivity/inc/caleadapter_singlethread.h
index 4ca59c1a6fa94710ed670f8c42b37e2ff55b0edf..c790889f4b6bf92e1147efbacff783f3d828ad46 100644
--- a/resource/csdk/connectivity/inc/caleadapter_singlethread.h
+++ b/resource/csdk/connectivity/inc/caleadapter_singlethread.h
@@ -24,8 +24,8 @@
  * This file contains the APIs for LE adapters to be implemented.
  */
 
-#ifndef _CA_LEADAPTER_SINGLETHREAD_H_
-#define _CA_LEADAPTER_SINGLETHREAD_H_
+#ifndef CA_LEADAPTER_SINGLETHREAD_H_
+#define CA_LEADAPTER_SINGLETHREAD_H_
 
 #include "cacommon.h"
 #include "caadapterinterface.h"
@@ -423,5 +423,5 @@ typedef CAResult_t (*CABLEServerDataReceivedCallback)(const char *remoteAddress,
 } /* extern "C" */
 #endif
 
-#endif //#ifndef _CA_LEADAPTER_SINGLETHREAD_H_
+#endif /* CA_LEADAPTER_SINGLETHREAD_H_ */
 
diff --git a/resource/csdk/connectivity/inc/caleinterface.h b/resource/csdk/connectivity/inc/caleinterface.h
index aae6e86cd260b056da1c4040e609c45d54cedd5a..ff1ab2929b9570896065aae97dbc9d349a5fd700 100644
--- a/resource/csdk/connectivity/inc/caleinterface.h
+++ b/resource/csdk/connectivity/inc/caleinterface.h
@@ -24,8 +24,8 @@
  * This file provides APIs for BLE modules.
  */
 
-#ifndef _CA_LE_INTERFACE_H_
-#define _CA_LE_INTERFACE_H_
+#ifndef CA_LE_INTERFACE_H_
+#define CA_LE_INTERFACE_H_
 
 #include <stdbool.h>
 
@@ -290,5 +290,5 @@ CAResult_t CAUnSetLEAdapterStateChangedCb();
 }
 #endif
 
-#endif //_CA_LE_INTERFACE_H_
+#endif /* CA_LE_INTERFACE_H_ */
 
diff --git a/resource/csdk/connectivity/inc/caleinterface_singlethread.h b/resource/csdk/connectivity/inc/caleinterface_singlethread.h
index 06fe17c75f8ba1d86a723056edea7e4bc79cc80b..6cc639bff9dc5fdaedab1474845f1df69b34b7f0 100644
--- a/resource/csdk/connectivity/inc/caleinterface_singlethread.h
+++ b/resource/csdk/connectivity/inc/caleinterface_singlethread.h
@@ -24,8 +24,8 @@
  * This file provides APIs for BLE modules.
  */
 
-#ifndef _CA_LE_INTERFACE_SINGLETHREAD_H_
-#define _CA_LE_INTERFACE_SINGLETHREAD_H_
+#ifndef CA_LE_INTERFACE_SINGLETHREAD_H_
+#define CA_LE_INTERFACE_SINGLETHREAD_H_
 
 #include <stdbool.h>
 
@@ -212,5 +212,5 @@ void CASetBLEReqRespClientCallback(CABLEClientDataReceivedCallback callback);
 }
 #endif
 
-#endif //_CA_LE_INTERFACE_SINGLETHREAD_H_
+#endif /* CA_LE_INTERFACE_SINGLETHREAD_H_ */
 
diff --git a/resource/csdk/connectivity/inc/camessagehandler.h b/resource/csdk/connectivity/inc/camessagehandler.h
index 93c2e60d0c9d2cc91a88751f14204ede47de8190..e5ee5cb17a98ed4b437441426a0c40173dd35fd1 100644
--- a/resource/csdk/connectivity/inc/camessagehandler.h
+++ b/resource/csdk/connectivity/inc/camessagehandler.h
@@ -23,8 +23,8 @@
  * @brief This file contains message functionality.
  */
 
-#ifndef __CA_MESSAGE_HANDLER_H_
-#define __CA_MESSAGE_HANDLER_H_
+#ifndef CA_MESSAGE_HANDLER_H_
+#define CA_MESSAGE_HANDLER_H_
 
 #include "cacommon.h"
 #include "coap.h"
@@ -133,5 +133,5 @@ void CALogPDUInfo(coap_pdu_t *pdu);
 } /* extern "C" */
 #endif
 
-#endif //#ifndef __CA_MESSAGE_HANDLER_H_
+#endif /* CA_MESSAGE_HANDLER_H_ */
 
diff --git a/resource/csdk/connectivity/inc/camessagehandler_singlethread.h b/resource/csdk/connectivity/inc/camessagehandler_singlethread.h
index 0c68faa9a66781ad039934293c2eb50fb60f8966..469c6ea7655c3e096ef2156b307e13a5b4b7a5e3 100644
--- a/resource/csdk/connectivity/inc/camessagehandler_singlethread.h
+++ b/resource/csdk/connectivity/inc/camessagehandler_singlethread.h
@@ -23,8 +23,8 @@
  * @brief This file contains message functionality.
  */
 
-#ifndef __CA_MESSAGE_HANDLER_SINGLETHREAD_H_
-#define __CA_MESSAGE_HANDLER_SINGLETHREAD_H_
+#ifndef CA_MESSAGE_HANDLER_SINGLETHREAD_H_
+#define CA_MESSAGE_HANDLER_SINGLETHREAD_H_
 
 #include "cacommon.h"
 #include "coap.h"
@@ -133,5 +133,5 @@ void CALogPDUInfo(coap_pdu_t *pdu);
 } /* extern "C" */
 #endif
 
-#endif //#ifndef __CA_MESSAGE_HANDLER_SINGLETHREAD_H_
+#endif /* CA_MESSAGE_HANDLER_SINGLETHREAD_H_ */
 
diff --git a/resource/csdk/connectivity/inc/camsgparser.h b/resource/csdk/connectivity/inc/camsgparser.h
index b932cf0bd535295d53780a0e9f596b17e917d029..e7504bc4879b20134ad8845288b04d237b7ca607 100644
--- a/resource/csdk/connectivity/inc/camsgparser.h
+++ b/resource/csdk/connectivity/inc/camsgparser.h
@@ -25,8 +25,8 @@
  * fragmentation and reassemebly.
  */
 
-#ifndef _CA_MSG_PARSER_H_
-#define _CA_MSG_PARSER_H_
+#ifndef CA_MSG_PARSER_H_
+#define CA_MSG_PARSER_H_
 
 #include "cacommon.h"
 #include "logger.h"
@@ -185,5 +185,5 @@ uint32_t CAParseHeader(const char *header);
 } /* extern "C" */
 #endif
 
-#endif  // _CA_MSG_PARSER_H_
+#endif  /* CA_MSG_PARSER_H_ */
 
diff --git a/resource/csdk/connectivity/inc/canetworkconfigurator.h b/resource/csdk/connectivity/inc/canetworkconfigurator.h
index a407aea5dc79038b18f5c3a7bdc95d0840a3f105..2031ab62235b5deb6f218d160f6ff6f219e60b6e 100644
--- a/resource/csdk/connectivity/inc/canetworkconfigurator.h
+++ b/resource/csdk/connectivity/inc/canetworkconfigurator.h
@@ -74,5 +74,5 @@ CAResult_t CATerminateNetworkType();
 } /* extern "C" */
 #endif
 
-#endif //#ifndef NETWORK_CONFIGURATOR_H_
+#endif /* NETWORK_CONFIGURATOR_H_ */
 
diff --git a/resource/csdk/connectivity/inc/caprotocolmessage.h b/resource/csdk/connectivity/inc/caprotocolmessage.h
index 76b4dd0508b675b9a9d885f6ff1f5638d53ea27f..d96c7a3335bba87f81dde3bade4bc1d8a8bde35a 100644
--- a/resource/csdk/connectivity/inc/caprotocolmessage.h
+++ b/resource/csdk/connectivity/inc/caprotocolmessage.h
@@ -231,4 +231,4 @@ CAResponseResult_t CAGetCodeFromPduBinaryData(const void *pdu, uint32_t size);
 } /* extern "C" */
 #endif
 
-#endif //#ifndef CA_PROTOCOL_MESSAGE_H_
+#endif /* CA_PROTOCOL_MESSAGE_H_ */
diff --git a/resource/csdk/connectivity/inc/caqueueingthread.h b/resource/csdk/connectivity/inc/caqueueingthread.h
index deb729640a1327240df98fa4afe2dc82edce6ddc..b3d282d303525282f077a18fe1a9f900d6953782 100644
--- a/resource/csdk/connectivity/inc/caqueueingthread.h
+++ b/resource/csdk/connectivity/inc/caqueueingthread.h
@@ -24,8 +24,8 @@
  * This file contains common utility function for handling message ques.
  */
 
-#ifndef CA_QUEUEINGTHREAD_H_
-#define CA_QUEUEINGTHREAD_H_
+#ifndef CA_QUEUEING_THREAD_H_
+#define CA_QUEUEING_THREAD_H_
 
 #include <stdint.h>
 
@@ -109,5 +109,5 @@ CAResult_t CAQueueingThreadDestroy(CAQueueingThread_t *thread);
 } /* extern "C" */
 #endif
 
-#endif  // CA_QUEUEINGTHREAD_H_
+#endif  /* CA_QUEUEING_THREAD_H_ */
 
diff --git a/resource/csdk/connectivity/inc/caremotehandler.h b/resource/csdk/connectivity/inc/caremotehandler.h
index 528f7acdaaf951eff0bd8e0620b25d1f8b86b46e..002a6c500586997dc9bcca15542d1ed74328a1b2 100644
--- a/resource/csdk/connectivity/inc/caremotehandler.h
+++ b/resource/csdk/connectivity/inc/caremotehandler.h
@@ -100,5 +100,5 @@ void CADestroyResponseInfoInternal(CAResponseInfo_t *response);
 } /* extern "C" */
 #endif
 
-#endif //#ifndef CA_REMOTE_HANDLER_H_
+#endif /* CA_REMOTE_HANDLER_H_ */
 
diff --git a/resource/csdk/connectivity/inc/caretransmission.h b/resource/csdk/connectivity/inc/caretransmission.h
index 996612e2c00e0d8d06ea035001168b1cf2625ec9..052fa41172b06c46c3fbf5e3fdde7ae676de7dc3 100644
--- a/resource/csdk/connectivity/inc/caretransmission.h
+++ b/resource/csdk/connectivity/inc/caretransmission.h
@@ -163,4 +163,4 @@ CAResult_t CARetransmissionDestroy(CARetransmission_t *context);
 } /* extern "C" */
 #endif
 
-#endif  // CA_RETRANSMISSION_H_
+#endif  /* CA_RETRANSMISSION_H_ */
diff --git a/resource/csdk/connectivity/inc/caretransmission_singlethread.h b/resource/csdk/connectivity/inc/caretransmission_singlethread.h
index f91d8d6c836b333bafd7e97617ee61def523aa26..5e581beb0a7b0dfc186861df9e45b736f4bf273e 100644
--- a/resource/csdk/connectivity/inc/caretransmission_singlethread.h
+++ b/resource/csdk/connectivity/inc/caretransmission_singlethread.h
@@ -151,5 +151,5 @@ void CARetransmissionBaseRoutine(void *threadValue);
 } /* extern "C" */
 #endif
 
-#endif  // CA_RETRANSMISSION_SINGLETHREAD_H_
+#endif  /* CA_RETRANSMISSION_SINGLETHREAD_H_ */
 
diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.h b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.h
index de0cf9917e33ae0c1a1c003e479b7a92a0eab5f3..e655193d18f93f0b7e91f0e2ba3758ad2774ae83 100644
--- a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.h
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.h
@@ -165,5 +165,5 @@ void CAEDRNativeSocketClose(JNIEnv *env, const char *address, uint32_t id);
 } /* extern "C" */
 #endif
 
-#endif
+#endif /* CA_EDR_CLIENT_H_ */
 
diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrnwmonitor.h b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrnwmonitor.h
index 102c507e64db9c79a4c004ca29b088a7cd4a28fb..947d501dc4a0950ee616ae8bebb9aa5c0cffa3ca 100644
--- a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrnwmonitor.h
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrnwmonitor.h
@@ -22,8 +22,8 @@
  * @file
  * @brief This file contains the APIs for BT LE communications.
  */
-#ifndef CA_EDR_NWMONITOR_H_
-#define CA_EDR_NWMONITOR_H_
+#ifndef CA_EDR_NW_MONITOR_H_
+#define CA_EDR_NW_MONITOR_H_
 
 #include "cacommon.h"
 
@@ -48,5 +48,5 @@ void CAEDRNetworkMonitorJniInit();
 } /* extern "C" */
 #endif
 
-#endif
+#endif /* CA_EDR_NW_MONITOR_H_ */
 
diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.h b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.h
index 6e3a58d44042580ead480e2ace36c8e950cbe196..faa4a6afb8848dab89207d23f5d43548f40fe2d4 100644
--- a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.h
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.h
@@ -138,5 +138,5 @@ void CAEDRNatvieCloseServerTask(JNIEnv* env);
 } /* extern "C" */
 #endif
 
-#endif
+#endif /* CA_EDR_SERVER_H_ */
 
diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.h b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.h
index 148ccca4793b02f5ab35be456cb640c0d6506cb6..1348546e0af369b1c20415caac796b4183e1a990 100644
--- a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.h
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.h
@@ -22,8 +22,8 @@
  * @file
  * @brief This file contains the APIs for BT communications.
  */
-#ifndef CA_EDR_UTILES_H_
-#define CA_EDR_UTILES_H_
+#ifndef CA_EDR_UTILS_H_
+#define CA_EDR_UTILS_H_
 
 #include "cacommon.h"
 #include "cathreadpool.h"
@@ -226,5 +226,5 @@ void CAEDRReorderingDeviceSocketList(uint32_t index);
 } /* extern "C" */
 #endif
 
-#endif
+#endif /* CA_EDR_UTILS_H_ */
 
diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrdevicelist.h b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrdevicelist.h
index d42a48b022af26fa100bba7854a9b97d539878e5..eec78cde89e67dad3f239725284e8b2cb7c3a3d9 100644
--- a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrdevicelist.h
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrdevicelist.h
@@ -24,8 +24,8 @@
  * This file provides APIs to manage discovered bluetooth device list.
  */
 
-#ifndef __CA_EDR_DEVICE_LIST_H_
-#define __CA_EDR_DEVICE_LIST_H_
+#ifndef CA_EDR_DEVICE_LIST_H_
+#define CA_EDR_DEVICE_LIST_H_
 
 #include "cacommon.h"
 
@@ -192,6 +192,6 @@ void CADestroyEDRDataList(EDRDataList **dataList);
 } /* extern "C" */
 #endif
 
-#endif //__CA_EDR_DEVICE_LIST_H_
+#endif /* CA_EDR_DEVICE_LIST_H_ */
 
 
diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrendpoint.h b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrendpoint.h
index f01a54778aaa2bcfb6ab41dd52de51e52c558340..3df03f36ac3d14a728f88a9cbaf1719eb6f75c14 100644
--- a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrendpoint.h
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrendpoint.h
@@ -24,8 +24,8 @@
  * This file provides the APIs to send data on established RFCOMM connections.
  */
 
-#ifndef __CA_EDR_ENDPOINT_H_
-#define __CA_EDR_ENDPOINT_H_
+#ifndef CA_EDR_ENDPOINT_H_
+#define CA_EDR_ENDPOINT_H_
 
 #include <bluetooth.h>
 
@@ -56,6 +56,6 @@ CAResult_t CAEDRSendData(int serverFD, const void *data, uint32_t dataLength,
 } /* extern "C" */
 #endif
 
-#endif //__CA_EDR_ENDPOINT_H_
+#endif /* CA_EDR_ENDPOINT_H_ */
 
 
diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrutils.h b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrutils.h
index 91bd9bd037d8c370785efc020a156ba8d6175a0e..466ad636244ec652a3c32594103e1e8c56432c4d 100644
--- a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrutils.h
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrutils.h
@@ -24,8 +24,8 @@
  * This file provides helper functions for EDR adapter.
  */
 
-#ifndef __CA_EDR_UTILS_H_
-#define __CA_EDR_UTILS_H_
+#ifndef CA_EDR_UTILS_H_
+#define CA_EDR_UTILS_H_
 
 #include <stdbool.h>
 #include <string.h>
@@ -63,6 +63,6 @@ bool CAEDRIsServiceSupported(const char **serviceUUID, int32_t serviceCount,
 } /* extern "C" */
 #endif
 
-#endif //__CA_EDR_UTILS_H_
+#endif /* CA_EDR_UTILS_H_ */
 
 
diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.h b/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.h
index 17152be12af2bdb9aa26dc4879dbbc1049d157de..edfec61310d844fef1623f388f37acbd9e3a9d15 100644
--- a/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.h
+++ b/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.h
@@ -594,4 +594,4 @@ void CALEClientSetTheSendRequestFlag(bool flag);
 } /* extern "C" */
 #endif
 
-#endif
+#endif /* CA_LECLIENT_H_ */
diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.h b/resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.h
index ade8d6e83bfea3d5600b4cab56a3a1c463d9add6..c04a0d67ab57b9169c09345891dcacb2ab2b3dd5 100644
--- a/resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.h
+++ b/resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.h
@@ -59,5 +59,5 @@ void CALESetNetStateCallback(CALEDeviceStateChangedCallback callback);
 } /* extern "C" */
 #endif
 
-#endif
+#endif /* CA_LENWMONITOR_H_ */
 
diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/caleutils.h b/resource/csdk/connectivity/src/bt_le_adapter/android/caleutils.h
index 2757b91d8e15cc0cf65ffaaaabef98b83001d5e8..4e255899f16738c576c667bccd4484f0f7939f69 100644
--- a/resource/csdk/connectivity/src/bt_le_adapter/android/caleutils.h
+++ b/resource/csdk/connectivity/src/bt_le_adapter/android/caleutils.h
@@ -22,8 +22,8 @@
  * @file caleutils.h
  * @brief This file contains the APIs for BT LE communications.
  */
-#ifndef CA_LEUTILES_H_
-#define CA_LEUTILES_H_
+#ifndef CA_LE_UTILS_H_
+#define CA_LE_UTILS_H_
 
 #include "cacommon.h"
 #include "cathreadpool.h"
@@ -126,4 +126,4 @@ jstring CALEGetAddressFromBTDevice(JNIEnv *env, jobject bluetoothDevice);
 } /* extern "C" */
 #endif
 
-#endif
+#endif /* CA_LE_UTILS_H_ */
diff --git a/resource/csdk/connectivity/src/bt_le_adapter/arduino/cableserver.h b/resource/csdk/connectivity/src/bt_le_adapter/arduino/cableserver.h
index 1fa94d68724eb770b0eb66ae8e8f31d64e9d150c..60e19b2574b15f803b464f62275934c720f1cd80 100644
--- a/resource/csdk/connectivity/src/bt_le_adapter/arduino/cableserver.h
+++ b/resource/csdk/connectivity/src/bt_le_adapter/arduino/cableserver.h
@@ -27,8 +27,8 @@
  * notifying the change of characteristcs for the request will be done here.
  */
 
-#ifndef _BLE_ADAPTER_ARDUINO_H_
-#define _BLE_ADAPTER_ARDUINO_H_
+#ifndef BLE_ADAPTER_ARDUINO_H_
+#define BLE_ADAPTER_ARDUINO_H_
 
 #include "cacommon.h"
 #include "caadapterinterface.h"
@@ -89,5 +89,5 @@ CAResult_t CABleDoEvents();
 } /* extern "C" */
 #endif
 
-#endif //#ifndef _BLE_ADAPTER_ARDUINO_H_
+#endif /* BLE_ADAPTER_ARDUINO_H_ */
 
diff --git a/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableclient.h b/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableclient.h
index ef5056c22fbb1ff36f17a69bb0df0ecfcf157153..35d40fcb4f96124c8b1a2e83846adb4457e706f4 100644
--- a/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableclient.h
+++ b/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableclient.h
@@ -28,8 +28,8 @@
  * for the request and response will be done here.
  */
 
-#ifndef _BLE_CLIENT_
-#define _BLE_CLIENT_
+#ifndef TZ_BLE_CLIENT_H_
+#define TZ_BLE_CLIENT_H_
 
 #include <bluetooth.h>
 #include <bluetooth_type.h>
@@ -424,5 +424,5 @@ void CABleClientSenderQueueProcessor();
  */
 CAResult_t CALEReadDataFromLEClient();
 
-#endif //#ifndef _BLE_CLIENT_
+#endif /* TZ_BLE_CLIENT_H_ */
 
diff --git a/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableserver.h b/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableserver.h
index 9d98e50827ff0483663ada45320aa6a0f65cd090..fc087aece70db8e4cde2e9024e6015dde8c87819 100644
--- a/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableserver.h
+++ b/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableserver.h
@@ -28,8 +28,8 @@
  * LE adapter will interact with this sub module.
  */
 
-#ifndef __TZ_BLE_SERVER_H_
-#define __TZ_BLE_SERVER_H_
+#ifndef TZ_BLE_SERVER_H_
+#define TZ_BLE_SERVER_H_
 
 #include "caadapterinterface.h"
 #include "logger.h"
@@ -220,5 +220,5 @@ CAResult_t CABleServerSenderQueueEnqueueMessage
  */
 void *CABleServerSenderQueueProcessor();
 
-#endif //#ifndef __TZ_BLE_SERVER_H_
+#endif /* TZ_BLE_SERVER_H_ */
 
diff --git a/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableutil.h b/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableutil.h
index ce19d203bdb05f7de86b7dcbb1eaa3a23c4968d5..dc2882e26e8c56f9258b8d13ad9c6c668ec8fc01 100644
--- a/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableutil.h
+++ b/resource/csdk/connectivity/src/bt_le_adapter/tizen/cableutil.h
@@ -29,8 +29,8 @@
  * is connected.
  */
 
-#ifndef _BLE_UTIL_H_
-#define _BLE_UTIL_H_
+#ifndef TZ_BLE_UTIL_H_
+#define TZ_BLE_UTIL_H_
 
 #include <bluetooth.h>
 
@@ -275,4 +275,4 @@ CAResult_t CAVerifyOICServiceByUUID(const char* serviceUUID);
  */
 const char *CABTGetErrorMsg(bt_error_e err);
 
-#endif //#ifndef _BLE_UTIL_H_
+#endif /* TZ_BLE_UTIL_H_ */
diff --git a/resource/csdk/connectivity/src/ip_adapter/arduino/caipadapterutils_eth.h b/resource/csdk/connectivity/src/ip_adapter/arduino/caipadapterutils_eth.h
index dd02d31f90a96e6e91b31581798cf5d077253149..c6b82130edf3c35a873acb0f1a5772341bbe6873 100644
--- a/resource/csdk/connectivity/src/ip_adapter/arduino/caipadapterutils_eth.h
+++ b/resource/csdk/connectivity/src/ip_adapter/arduino/caipadapterutils_eth.h
@@ -75,6 +75,6 @@ CAResult_t CAArduinoInitMulticastUdpSocket(const char *mcastAddress,
 }
 #endif
 
-#endif //CA_ETHERNET_ADAPTER_UTILS_
+#endif /* CA_ETHERNET_ADAPTER_UTILS_ */