From 8fd114ed79087a0779de2f5c60c5f790bdcfd8f6 Mon Sep 17 00:00:00 2001
From: khizmax <khizmax@gmail.com>
Date: Thu, 22 Jan 2015 15:54:00 +0300
Subject: [PATCH] issue#11: tests/unit: changed .h file guard prefix to
 CDSUNIT_xxx

---
 tests/unit/alloc/random_gen.h                | 6 +++---
 tests/unit/lock/nolock.h                     | 6 +++---
 tests/unit/lock/win32_lock.h                 | 6 +++---
 tests/unit/map2/map_defs.h                   | 6 +++---
 tests/unit/map2/map_types.h                  | 6 +++---
 tests/unit/map2/std_hash_map.h               | 6 +++---
 tests/unit/map2/std_map.h                    | 6 +++---
 tests/unit/nonconcurrent_iterator_sequence.h | 6 +++---
 tests/unit/pqueue/ellen_bintree_pqueue.h     | 6 +++---
 tests/unit/pqueue/pqueue_defs.h              | 6 +++---
 tests/unit/pqueue/pqueue_item.h              | 6 +++---
 tests/unit/pqueue/pqueue_type.h              | 6 +++---
 tests/unit/pqueue/skiplist_pqueue.h          | 6 +++---
 tests/unit/pqueue/std_pqueue.h               | 6 +++---
 tests/unit/print_cuckoo_stat.h               | 6 +++---
 tests/unit/print_ellenbintree_stat.h         | 6 +++---
 tests/unit/print_mspriorityqueue_stat.h      | 6 +++---
 tests/unit/print_segmentedqueue_stat.h       | 6 +++---
 tests/unit/print_skip_list_stat.h            | 6 +++---
 tests/unit/print_split_list_stat.h           | 6 +++---
 tests/unit/queue/intrusive_queue_defs.h      | 6 +++---
 tests/unit/queue/intrusive_queue_type.h      | 6 +++---
 tests/unit/queue/queue_defs.h                | 6 +++---
 tests/unit/queue/queue_type.h                | 6 +++---
 tests/unit/queue/std_queue.h                 | 6 +++---
 tests/unit/set2/set_defs.h                   | 6 +++---
 tests/unit/set2/set_types.h                  | 6 +++---
 tests/unit/set2/std_hash_set.h               | 6 +++---
 tests/unit/set2/std_set.h                    | 6 +++---
 tests/unit/stack/intrusive_stack_defs.h      | 6 +++---
 tests/unit/stack/intrusive_stack_type.h      | 6 +++---
 tests/unit/stack/stack_defs.h                | 6 +++---
 tests/unit/stack/stack_type.h                | 6 +++---
 33 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/tests/unit/alloc/random_gen.h b/tests/unit/alloc/random_gen.h
index 9d6c66c1..743fefe6 100644
--- a/tests/unit/alloc/random_gen.h
+++ b/tests/unit/alloc/random_gen.h
@@ -2,8 +2,8 @@
 
 // Random number geerator
 
-#ifndef __CPPUNIT_MEMORY_RANDOM_GEN_H
-#define __CPPUNIT_MEMORY_RANDOM_GEN_H
+#ifndef CPPUNIT_MEMORY_RANDOM_GEN_H
+#define CPPUNIT_MEMORY_RANDOM_GEN_H
 
 
 #include <boost/random/mersenne_twister.hpp>
@@ -41,4 +41,4 @@ namespace memory {
     };
 }   // namespace memory
 
-#endif // __CPPUNIT_MEMORY_RANDOM_GEN_H
+#endif // CPPUNIT_MEMORY_RANDOM_GEN_H
diff --git a/tests/unit/lock/nolock.h b/tests/unit/lock/nolock.h
index 0fa37703..0d7ae302 100644
--- a/tests/unit/lock/nolock.h
+++ b/tests/unit/lock/nolock.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_LOCK_NOLOCK_H
-#define __UNIT_LOCK_NOLOCK_H
+#ifndef CDSUNIT_LOCK_NOLOCK_H
+#define CDSUNIT_LOCK_NOLOCK_H
 
 namespace lock {
     // Win32 critical section
@@ -13,4 +13,4 @@ namespace lock {
     };
 }
 
-#endif // #ifndef __UNIT_LOCK_NOLOCK_H
+#endif // #ifndef CDSUNIT_LOCK_NOLOCK_H
diff --git a/tests/unit/lock/win32_lock.h b/tests/unit/lock/win32_lock.h
index ff3ddb60..760924b6 100644
--- a/tests/unit/lock/win32_lock.h
+++ b/tests/unit/lock/win32_lock.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_LOCK_WIN32_LOCK_H
-#define __UNIT_LOCK_WIN32_LOCK_H
+#ifndef CDSUNIT_LOCK_WIN32_LOCK_H
+#define CDSUNIT_LOCK_WIN32_LOCK_H
 
 #if defined(_WIN32) || defined(_WIN64)
 #include <windows.h>
@@ -39,4 +39,4 @@ namespace lock {
 }   // namespace lock
 
 #endif  // defined(_WIN32) || defined(_WIN64)
-#endif  // #ifndef __UNIT_LOCK_WIN32_LOCK_H
+#endif  // #ifndef CDSUNIT_LOCK_WIN32_LOCK_H
diff --git a/tests/unit/map2/map_defs.h b/tests/unit/map2/map_defs.h
index 46577d8d..1818e7dd 100644
--- a/tests/unit/map2/map_defs.h
+++ b/tests/unit/map2/map_defs.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDSUNIT_MAP2_MAP_DEFS_H
-#define _CDSUNIT_MAP2_MAP_DEFS_H
+#ifndef CDSUNIT_MAP_DEFS_H
+#define CDSUNIT_MAP_DEFS_H
 
 #define CDSUNIT_DECLARE_StdMap \
     TEST_MAP(StdMap_Spin) \
@@ -577,4 +577,4 @@ TEST_MAP_EXTRACT(SplitList_Lazy_RCU_SHT_st_less_stat)
     CPPUNIT_TEST(CuckooRefinableMap_vector_ord_stat)\
     CPPUNIT_TEST(CuckooRefinableMap_vector_ord_storehash)
 
-#endif // #ifndef _CDSUNIT_MAP2_MAP_DEFS_H
+#endif // #ifndef CDSUNIT_MAP_DEFS_H
diff --git a/tests/unit/map2/map_types.h b/tests/unit/map2/map_types.h
index 837570f6..8a4c99a0 100644
--- a/tests/unit/map2/map_types.h
+++ b/tests/unit/map2/map_types.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDSUNIT_MAP2_MAP_TYPES_H
-#define _CDSUNIT_MAP2_MAP_TYPES_H
+#ifndef CDSUNIT_MAP_TYPES_H
+#define CDSUNIT_MAP_TYPES_H
 
 #include <cds/urcu/general_instant.h>
 #include <cds/urcu/general_buffered.h>
@@ -1808,4 +1808,4 @@ namespace map2 {
     }
 }   // namespace map2
 
-#endif // ifndef _CDSUNIT_MAP2_MAP_TYPES_H
+#endif // ifndef CDSUNIT_MAP_TYPES_H
diff --git a/tests/unit/map2/std_hash_map.h b/tests/unit/map2/std_hash_map.h
index cb9cd407..067e69f8 100644
--- a/tests/unit/map2/std_hash_map.h
+++ b/tests/unit/map2/std_hash_map.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_STD_HASH_MAP_GCC_H
-#define __CDSUNIT_STD_HASH_MAP_GCC_H
+#ifndef CDSUNIT_STD_HASH_MAP_GCC_H
+#define CDSUNIT_STD_HASH_MAP_GCC_H
 
 #include <mutex>    //unique_lock
 #include <unordered_map>
@@ -96,4 +96,4 @@ namespace map2 {
     };
 }   // namespace map2
 
-#endif  // #ifndef __CDSUNIT_STD_HASH_MAP_GCC_H
+#endif  // #ifndef CDSUNIT_STD_HASH_MAP_GCC_H
diff --git a/tests/unit/map2/std_map.h b/tests/unit/map2/std_map.h
index 58508cd6..6923472c 100644
--- a/tests/unit/map2/std_map.h
+++ b/tests/unit/map2/std_map.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_STD_MAP_GCC_H
-#define __CDSUNIT_STD_MAP_GCC_H
+#ifndef CDSUNIT_STD_MAP_GCC_H
+#define CDSUNIT_STD_MAP_GCC_H
 
 #include <map>
 #include <mutex>    //unique_lock
@@ -86,4 +86,4 @@ namespace map2 {
     };
 }   // namespace map
 
-#endif  // #ifndef __CDSUNIT_STD_MAP_GCC_H
+#endif  // #ifndef CDSUNIT_STD_MAP_GCC_H
diff --git a/tests/unit/nonconcurrent_iterator_sequence.h b/tests/unit/nonconcurrent_iterator_sequence.h
index 0d45e43b..9e89e6b1 100644
--- a/tests/unit/nonconcurrent_iterator_sequence.h
+++ b/tests/unit/nonconcurrent_iterator_sequence.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_NONCONCURRENT_ITERATOR_SEQUENCE_H
-#define __UNIT_NONCONCURRENT_ITERATOR_SEQUENCE_H
+#ifndef CDSUNIT_NONCONCURRENT_ITERATOR_SEQUENCE_H
+#define CDSUNIT_NONCONCURRENT_ITERATOR_SEQUENCE_H
 
 #include <cds/details/bounded_array.h>
 #include <cds/atomic.h>
@@ -135,4 +135,4 @@ namespace map { namespace nonconcurrent_iterator {
 
 } } // namespace map::nonconcurrent_iterator
 
-#endif    // #ifndef __UNIT_NONCONCURRENT_ITERATOR_SEQUENCE_H
+#endif    // #ifndef CDSUNIT_NONCONCURRENT_ITERATOR_SEQUENCE_H
diff --git a/tests/unit/pqueue/ellen_bintree_pqueue.h b/tests/unit/pqueue/ellen_bintree_pqueue.h
index 8441e02d..df08a103 100644
--- a/tests/unit/pqueue/ellen_bintree_pqueue.h
+++ b/tests/unit/pqueue/ellen_bintree_pqueue.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_STD_ELLEN_BINTREE_PQUEUE_H
-#define __CDSUNIT_STD_ELLEN_BINTREE_PQUEUE_H
+#ifndef CDSUNIT_STD_ELLEN_BINTREE_PQUEUE_H
+#define CDSUNIT_STD_ELLEN_BINTREE_PQUEUE_H
 
 #include <cds/container/ellen_bintree_set_hp.h>
 #include <cds/container/ellen_bintree_set_dhp.h>
@@ -110,4 +110,4 @@ namespace pqueue {
 } // namespace pqueue
 
 
-#endif // #ifndef __CDSUNIT_STD_ELLEN_BINTREE_PQUEUE_H
+#endif // #ifndef CDSUNIT_STD_ELLEN_BINTREE_PQUEUE_H
diff --git a/tests/unit/pqueue/pqueue_defs.h b/tests/unit/pqueue/pqueue_defs.h
index 4dcf3734..d89f856d 100644
--- a/tests/unit/pqueue/pqueue_defs.h
+++ b/tests/unit/pqueue/pqueue_defs.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDSUNIT_PQUEUE_PQUEUE_DEFS_H
-#define _CDSUNIT_PQUEUE_PQUEUE_DEFS_H
+#ifndef CDSUNIT_PQUEUE_PQUEUE_DEFS_H
+#define CDSUNIT_PQUEUE_PQUEUE_DEFS_H
 
 // MSPriorityQueue
 #define CDSUNIT_DECLARE_MSPriorityQueue \
@@ -179,4 +179,4 @@
     CPPUNIT_TEST(StdPQueue_deque_mutex)
 
 
-#endif // #ifndef _CDSUNIT_PQUEUE_PQUEUE_DEFS_H
+#endif // #ifndef CDSUNIT_PQUEUE_PQUEUE_DEFS_H
diff --git a/tests/unit/pqueue/pqueue_item.h b/tests/unit/pqueue/pqueue_item.h
index 5ce8453f..49b2a422 100644
--- a/tests/unit/pqueue/pqueue_item.h
+++ b/tests/unit/pqueue/pqueue_item.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_PQUEUE_ITEM_H
-#define __CDSUNIT_PQUEUE_ITEM_H
+#ifndef CDSUNIT_PQUEUE_ITEM_H
+#define CDSUNIT_PQUEUE_ITEM_H
 
 namespace pqueue {
     struct SimpleValue {
@@ -72,4 +72,4 @@ namespace std {
 
 } // namespace std
 
-#endif // #ifndef __CDSUNIT_PQUEUE_ITEM_H
+#endif // #ifndef CDSUNIT_PQUEUE_ITEM_H
diff --git a/tests/unit/pqueue/pqueue_type.h b/tests/unit/pqueue/pqueue_type.h
index 2eb0dece..5c906140 100644
--- a/tests/unit/pqueue/pqueue_type.h
+++ b/tests/unit/pqueue/pqueue_type.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_PQUEUE_TYPES_H
-#define __UNIT_PQUEUE_TYPES_H
+#ifndef CDSUNIT_PQUEUE_TYPES_H
+#define CDSUNIT_PQUEUE_TYPES_H
 
 #include <cds/container/mspriority_queue.h>
 #include <cds/container/fcpriority_queue.h>
@@ -327,4 +327,4 @@ namespace std {
 
 } // namespace std
 
-#endif // #ifndef __UNIT_PQUEUE_TYPES_H
+#endif // #ifndef CDSUNIT_PQUEUE_TYPES_H
diff --git a/tests/unit/pqueue/skiplist_pqueue.h b/tests/unit/pqueue/skiplist_pqueue.h
index 0ca4e1b8..89bae9cc 100644
--- a/tests/unit/pqueue/skiplist_pqueue.h
+++ b/tests/unit/pqueue/skiplist_pqueue.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_SKIPLIST_PQUEUE_H
-#define __CDSUNIT_SKIPLIST_PQUEUE_H
+#ifndef CDSUNIT_SKIPLIST_PQUEUE_H
+#define CDSUNIT_SKIPLIST_PQUEUE_H
 
 #include <cds/container/skip_list_set_hp.h>
 #include <cds/container/skip_list_set_dhp.h>
@@ -109,4 +109,4 @@ namespace pqueue {
 
 } // namespace pqueue
 
-#endif // #ifndef __CDSUNIT_SKIPLIST_PQUEUE_H
+#endif // #ifndef CDSUNIT_SKIPLIST_PQUEUE_H
diff --git a/tests/unit/pqueue/std_pqueue.h b/tests/unit/pqueue/std_pqueue.h
index d95a88c4..996c41ef 100644
--- a/tests/unit/pqueue/std_pqueue.h
+++ b/tests/unit/pqueue/std_pqueue.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_STD_PQUEUE_H
-#define __CDSUNIT_STD_PQUEUE_H
+#ifndef CDSUNIT_STD_PQUEUE_H
+#define CDSUNIT_STD_PQUEUE_H
 
 #include <queue>
 #include <mutex>    //unique_lock
@@ -94,4 +94,4 @@ namespace std {
     }
 }
 
-#endif // #ifndef __CDSUNIT_STD_PQUEUE_H
+#endif // #ifndef CDSUNIT_STD_PQUEUE_H
diff --git a/tests/unit/print_cuckoo_stat.h b/tests/unit/print_cuckoo_stat.h
index e94d6618..1d2fc9cf 100644
--- a/tests/unit/print_cuckoo_stat.h
+++ b/tests/unit/print_cuckoo_stat.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_PRINT_CUCKOO_STAT_H
-#define __UNIT_PRINT_CUCKOO_STAT_H
+#ifndef CDSUNIT_PRINT_CUCKOO_STAT_H
+#define CDSUNIT_PRINT_CUCKOO_STAT_H
 
 #include <cds/intrusive/cuckoo_set.h>
 #include <ostream>
@@ -86,4 +86,4 @@ namespace std {
 
 } // namespace std
 
-#endif // #ifndef __UNIT_PRINT_CUCKOO_STAT_H
+#endif // #ifndef CDSUNIT_PRINT_CUCKOO_STAT_H
diff --git a/tests/unit/print_ellenbintree_stat.h b/tests/unit/print_ellenbintree_stat.h
index 47733c86..2070d4ad 100644
--- a/tests/unit/print_ellenbintree_stat.h
+++ b/tests/unit/print_ellenbintree_stat.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_PRINT_ELLENBINTREE_STAT_H
-#define __UNIT_PRINT_ELLENBINTREE_STAT_H
+#ifndef CDSUNIT_PRINT_ELLENBINTREE_STAT_H
+#define CDSUNIT_PRINT_ELLENBINTREE_STAT_H
 
 #include "ellen_bintree_update_desc_pool.h"
 #include <ostream>
@@ -47,4 +47,4 @@ namespace std {
     }
 }
 
-#endif // #ifndef __UNIT_PRINT_ELLENBINTREE_STAT_H
+#endif // #ifndef CDSUNIT_PRINT_ELLENBINTREE_STAT_H
diff --git a/tests/unit/print_mspriorityqueue_stat.h b/tests/unit/print_mspriorityqueue_stat.h
index 39d2595c..0d47f2e6 100644
--- a/tests/unit/print_mspriorityqueue_stat.h
+++ b/tests/unit/print_mspriorityqueue_stat.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_PRINT_MSPRIORITYQUEUE_STAT_H
-#define __UNIT_PRINT_MSPRIORITYQUEUE_STAT_H
+#ifndef CDSUNIT_PRINT_MSPRIORITYQUEUE_STAT_H
+#define CDSUNIT_PRINT_MSPRIORITYQUEUE_STAT_H
 
 #include <cds/container/mspriority_queue.h>
 
@@ -23,4 +23,4 @@ namespace std {
     }
 }
 
-#endif // #ifndef __UNIT_PRINT_MSPRIORITYQUEUE_STAT_H
+#endif // #ifndef CDSUNIT_PRINT_MSPRIORITYQUEUE_STAT_H
diff --git a/tests/unit/print_segmentedqueue_stat.h b/tests/unit/print_segmentedqueue_stat.h
index 834e9212..2dd1aa42 100644
--- a/tests/unit/print_segmentedqueue_stat.h
+++ b/tests/unit/print_segmentedqueue_stat.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_PRINT_SEGMENTEDQUEUE_STAT_H
-#define __UNIT_PRINT_SEGMENTEDQUEUE_STAT_H
+#ifndef CDSUNIT_PRINT_SEGMENTEDQUEUE_STAT_H
+#define CDSUNIT_PRINT_SEGMENTEDQUEUE_STAT_H
 
 #include <ostream>
 
@@ -28,4 +28,4 @@ namespace std {
 
 } // namespace std
 
-#endif // #ifndef __UNIT_PRINT_SEGMENTEDQUEUE_STAT_H
+#endif // #ifndef CDSUNIT_PRINT_SEGMENTEDQUEUE_STAT_H
diff --git a/tests/unit/print_skip_list_stat.h b/tests/unit/print_skip_list_stat.h
index ae7effb2..7633a753 100644
--- a/tests/unit/print_skip_list_stat.h
+++ b/tests/unit/print_skip_list_stat.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_PRINT_SKIP_LIST_STAT_H
-#define __UNIT_PRINT_SKIP_LIST_STAT_H
+#ifndef CDSUNIT_PRINT_SKIP_LIST_STAT_H
+#define CDSUNIT_PRINT_SKIP_LIST_STAT_H
 
 #include <cds/intrusive/details/skip_list_base.h>
 #include <ostream>
@@ -59,4 +59,4 @@ namespace std {
 
 } // namespace std
 
-#endif // #ifndef __UNIT_PRINT_SKIP_LIST_STAT_H
+#endif // #ifndef CDSUNIT_PRINT_SKIP_LIST_STAT_H
diff --git a/tests/unit/print_split_list_stat.h b/tests/unit/print_split_list_stat.h
index 8275d8d6..c6f1ab48 100644
--- a/tests/unit/print_split_list_stat.h
+++ b/tests/unit/print_split_list_stat.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_PRINT_SPLIT_LIST_STAT_H
-#define __UNIT_PRINT_SPLIT_LIST_STAT_H
+#ifndef CDSUNIT_PRINT_SPLIT_LIST_STAT_H
+#define CDSUNIT_PRINT_SPLIT_LIST_STAT_H
 
 #include <cds/intrusive/details/split_list_base.h>
 #include <ostream>
@@ -36,4 +36,4 @@ namespace std {
 
 } // namespace std
 
-#endif // #ifndef __UNIT_PRINT_SKIP_LIST_STAT_H
+#endif // #ifndef CDSUNIT_PRINT_SKIP_LIST_STAT_H
diff --git a/tests/unit/queue/intrusive_queue_defs.h b/tests/unit/queue/intrusive_queue_defs.h
index 4bcffb99..58e010b6 100644
--- a/tests/unit/queue/intrusive_queue_defs.h
+++ b/tests/unit/queue/intrusive_queue_defs.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_INTRUSIVE_QUEUE_DEFS_H
-#define __CDSUNIT_INTRUSIVE_QUEUE_DEFS_H
+#ifndef CDSUNIT_INTRUSIVE_QUEUE_DEFS_H
+#define CDSUNIT_INTRUSIVE_QUEUE_DEFS_H
 
 // MSQueue
 #define CDSUNIT_DECLARE_MSQueue \
@@ -163,4 +163,4 @@
     CPPUNIT_TEST( BoostSList_mutex ) \
     CPPUNIT_TEST( BoostSList_spin )
 
-#endif // #ifndef __CDSUNIT_INTRUSIVE_QUEUE_DEFS_H
+#endif // #ifndef CDSUNIT_INTRUSIVE_QUEUE_DEFS_H
diff --git a/tests/unit/queue/intrusive_queue_type.h b/tests/unit/queue/intrusive_queue_type.h
index 67c30d76..97605ae3 100644
--- a/tests/unit/queue/intrusive_queue_type.h
+++ b/tests/unit/queue/intrusive_queue_type.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_INTRUSIVE_QUEUE_TYPES_H
-#define __CDSUNIT_INTRUSIVE_QUEUE_TYPES_H
+#ifndef CDSUNIT_INTRUSIVE_QUEUE_TYPES_H
+#define CDSUNIT_INTRUSIVE_QUEUE_TYPES_H
 
 #include <cds/intrusive/msqueue.h>
 #include <cds/intrusive/moir_queue.h>
@@ -589,4 +589,4 @@ namespace std {
 
 } // namespace std
 
-#endif // #ifndef __CDSUNIT_INTRUSIVE_QUEUE_TYPES_H
+#endif // #ifndef CDSUNIT_INTRUSIVE_QUEUE_TYPES_H
diff --git a/tests/unit/queue/queue_defs.h b/tests/unit/queue/queue_defs.h
index fa3b951a..37c3e118 100644
--- a/tests/unit/queue/queue_defs.h
+++ b/tests/unit/queue/queue_defs.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_QUEUE_DEFS_H
-#define __CDSUNIT_QUEUE_DEFS_H
+#ifndef CDSUNIT_QUEUE_DEFS_H
+#define CDSUNIT_QUEUE_DEFS_H
 
 // MoirQueue
 #define CDSUNIT_DECLARE_MoirQueue( ITEM_TYPE ) \
@@ -243,4 +243,4 @@
     CPPUNIT_TEST(StdQueue_list_BoostMutex)
 
 
-#endif // #ifndef __CDSUNIT_QUEUE_DEFS_H
+#endif // #ifndef CDSUNIT_QUEUE_DEFS_H
diff --git a/tests/unit/queue/queue_type.h b/tests/unit/queue/queue_type.h
index a1a58ec9..62625516 100644
--- a/tests/unit/queue/queue_type.h
+++ b/tests/unit/queue/queue_type.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_QUEUE_TYPES_H
-#define __CDSUNIT_QUEUE_TYPES_H
+#ifndef CDSUNIT_QUEUE_TYPES_H
+#define CDSUNIT_QUEUE_TYPES_H
 
 #include <cds/container/msqueue.h>
 #include <cds/container/moir_queue.h>
@@ -637,4 +637,4 @@ namespace std {
 
 }
 
-#endif // #ifndef __CDSUNIT_QUEUE_TYPES_H
+#endif // #ifndef CDSUNIT_QUEUE_TYPES_H
diff --git a/tests/unit/queue/std_queue.h b/tests/unit/queue/std_queue.h
index 5c6d33e6..42935e36 100644
--- a/tests/unit/queue/std_queue.h
+++ b/tests/unit/queue/std_queue.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __UNIT_QUEUE_STD_QUEUE_H
-#define __UNIT_QUEUE_STD_QUEUE_H
+#ifndef CDSUNIT_QUEUE_STD_QUEUE_H
+#define CDSUNIT_QUEUE_STD_QUEUE_H
 
 #include <mutex>    //unique_lock
 #include <queue>
@@ -51,4 +51,4 @@ namespace queue {
     {};
 }
 
-#endif // #ifndef __UNIT_QUEUE_STD_QUEUE_H
+#endif // #ifndef CDSUNIT_QUEUE_STD_QUEUE_H
diff --git a/tests/unit/set2/set_defs.h b/tests/unit/set2/set_defs.h
index 5eda5f71..e57384ef 100644
--- a/tests/unit/set2/set_defs.h
+++ b/tests/unit/set2/set_defs.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDSUNIT_SET2_SET_DEFS_H
-#define _CDSUNIT_SET2_SET_DEFS_H
+#ifndef CDSUNIT_SET_DEFS_H
+#define CDSUNIT_SET_DEFS_H
 
 #define CDSUNIT_DECLARE_StdSet \
     TEST_SET(StdSet_Spin) \
@@ -548,4 +548,4 @@
     CDSUNIT_TEST_RefinableSet_boost_container \
     CDSUNIT_TEST_RefinableSet_boost_flat_container
 
-#endif // #ifndef _CDSUNIT_SET2_SET_DEFS_H
+#endif // #ifndef CDSUNIT_SET_DEFS_H
diff --git a/tests/unit/set2/set_types.h b/tests/unit/set2/set_types.h
index 20f54a98..ea0c63cd 100644
--- a/tests/unit/set2/set_types.h
+++ b/tests/unit/set2/set_types.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef _CDSUNIT_SET2_SET_TYPES_H
-#define _CDSUNIT_SET2_SET_TYPES_H
+#ifndef CDSUNIT_SET_TYPES_H
+#define CDSUNIT_SET_TYPES_H
 
 #include <cds/urcu/general_instant.h>
 #include <cds/urcu/general_buffered.h>
@@ -1808,4 +1808,4 @@ namespace set2 {
 
 }   // namespace set2
 
-#endif // ifndef _CDSUNIT_SET2_SET_TYPES_H
+#endif // ifndef CDSUNIT_SET_TYPES_H
diff --git a/tests/unit/set2/std_hash_set.h b/tests/unit/set2/std_hash_set.h
index 2089bb05..5338c13f 100644
--- a/tests/unit/set2/std_hash_set.h
+++ b/tests/unit/set2/std_hash_set.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_STD_HASH_SET_STD_H
-#define __CDSUNIT_STD_HASH_SET_STD_H
+#ifndef CDSUNIT_STD_HASH_SET_H
+#define CDSUNIT_STD_HASH_SET_H
 
 #include <unordered_set>
 #include <mutex>    //unique_lock
@@ -99,4 +99,4 @@ namespace set2 {
     };
 }   // namespace set2
 
-#endif  // #ifndef __CDSUNIT_STD_HASH_SET_STD_H
+#endif  // #ifndef CDSUNIT_STD_HASH_SET_H
diff --git a/tests/unit/set2/std_set.h b/tests/unit/set2/std_set.h
index 09f8fc0f..3ad196e8 100644
--- a/tests/unit/set2/std_set.h
+++ b/tests/unit/set2/std_set.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_STD_SET_VC_H
-#define __CDSUNIT_STD_SET_VC_H
+#ifndef CDSUNIT_STD_SET_H
+#define CDSUNIT_STD_SET_H
 
 #include <set>
 #include <mutex>    //unique_lock
@@ -87,4 +87,4 @@ namespace set2 {
     };
 } // namespace set2
 
-#endif  // #ifndef __CDSUNIT_STD_MAP_VC_H
+#endif  // #ifndef CDSUNIT_STD_MAP_H
diff --git a/tests/unit/stack/intrusive_stack_defs.h b/tests/unit/stack/intrusive_stack_defs.h
index 06e0a2bc..0dd87b3f 100644
--- a/tests/unit/stack/intrusive_stack_defs.h
+++ b/tests/unit/stack/intrusive_stack_defs.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_INTRUSIVE_STACK_DEFS_H
-#define __CDSUNIT_INTRUSIVE_STACK_DEFS_H
+#ifndef CDSUNIT_INTRUSIVE_STACK_DEFS_H
+#define CDSUNIT_INTRUSIVE_STACK_DEFS_H
 
 #define CDSUNIT_DECLARE_TreiberStack \
     TEST_CASE( Treiber_HP, cds::intrusive::treiber_stack::node< cds::gc::HP >        ) \
@@ -138,4 +138,4 @@
     CPPUNIT_TEST( StdStack_List_Mutex   ) \
     CPPUNIT_TEST( StdStack_List_Spin    )
 
-#endif // #ifndef __CDSUNIT_INTRUSIVE_STACK_DEFS_H
+#endif // #ifndef CDSUNIT_INTRUSIVE_STACK_DEFS_H
diff --git a/tests/unit/stack/intrusive_stack_type.h b/tests/unit/stack/intrusive_stack_type.h
index e49fbebf..9898180d 100644
--- a/tests/unit/stack/intrusive_stack_type.h
+++ b/tests/unit/stack/intrusive_stack_type.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_INTRUSIVE_STACK_TYPES_H
-#define __CDSUNIT_INTRUSIVE_STACK_TYPES_H
+#ifndef CDSUNIT_INTRUSIVE_STACK_TYPES_H
+#define CDSUNIT_INTRUSIVE_STACK_TYPES_H
 
 #include <cds/intrusive/treiber_stack.h>
 #include <cds/intrusive/fcstack.h>
@@ -393,4 +393,4 @@ namespace std {
 
 } // namespace std
 
-#endif // #ifndef __CDSUNIT_INTRUSIVE_STACK_TYPES_H
+#endif // #ifndef CDSUNIT_INTRUSIVE_STACK_TYPES_H
diff --git a/tests/unit/stack/stack_defs.h b/tests/unit/stack/stack_defs.h
index cce699e5..3524437c 100644
--- a/tests/unit/stack/stack_defs.h
+++ b/tests/unit/stack/stack_defs.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_STACK_DEFS_H
-#define __CDSUNIT_STACK_DEFS_H
+#ifndef CDSUNIT_STACK_DEFS_H
+#define CDSUNIT_STACK_DEFS_H
 
 #define CDSUNIT_DECLARE_TreiberStack \
     TEST_CASE( Treiber_HP        ) \
@@ -164,4 +164,4 @@
     CPPUNIT_TEST( StdStack_List_Mutex   ) \
     CPPUNIT_TEST( StdStack_List_Spin    )
 
-#endif // #ifndef __CDSUNIT_STACK_DEFS_H
+#endif // #ifndef CDSUNIT_STACK_DEFS_H
diff --git a/tests/unit/stack/stack_type.h b/tests/unit/stack/stack_type.h
index 7fd2fee4..e27622b6 100644
--- a/tests/unit/stack/stack_type.h
+++ b/tests/unit/stack/stack_type.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_STACK_TYPES_H
-#define __CDSUNIT_STACK_TYPES_H
+#ifndef CDSUNIT_STACK_TYPES_H
+#define CDSUNIT_STACK_TYPES_H
 
 #include <cds/container/treiber_stack.h>
 #include <cds/container/fcstack.h>
@@ -470,4 +470,4 @@ namespace std {
 
 } // namespace std
 
-#endif // #ifndef __CDSUNIT_STACK_TYPES_H
+#endif // #ifndef CDSUNIT_STACK_TYPES_H
-- 
2.34.1