From fd686439c8acfbdb1680e226e0ece0055619f5b8 Mon Sep 17 00:00:00 2001
From: khizmax <khizmax@gmail.com>
Date: Thu, 22 Jan 2015 19:43:43 +0300
Subject: [PATCH] issue#11: tests/test-hdr: changed .h file guard prefix to
 CDSTEST_xxx

---
 tests/test-hdr/map/hdr_cuckoo_map.h                       | 6 +++---
 tests/test-hdr/map/hdr_map.h                              | 6 +++---
 tests/test-hdr/map/hdr_skiplist_map.h                     | 6 +++---
 tests/test-hdr/map/hdr_skiplist_map_rcu.h                 | 6 +++---
 tests/test-hdr/map/hdr_striped_map.h                      | 6 +++---
 tests/test-hdr/map/print_skiplist_stat.h                  | 6 +++---
 tests/test-hdr/ordered_list/hdr_intrusive_lazy.h          | 5 +++++
 tests/test-hdr/ordered_list/hdr_intrusive_michael.h       | 5 +++++
 tests/test-hdr/ordered_list/hdr_lazy.h                    | 5 +++++
 tests/test-hdr/ordered_list/hdr_lazy_kv.h                 | 5 +++++
 tests/test-hdr/ordered_list/hdr_michael.h                 | 5 +++++
 tests/test-hdr/ordered_list/hdr_michael_kv.h              | 5 +++++
 tests/test-hdr/priority_queue/hdr_intrusive_pqueue.h      | 6 +++---
 tests/test-hdr/priority_queue/hdr_pqueue.h                | 6 +++---
 tests/test-hdr/queue/hdr_fcqueue.h                        | 6 +++---
 tests/test-hdr/queue/hdr_intrusive_msqueue.h              | 5 +++++
 tests/test-hdr/queue/hdr_intrusive_segmented_queue.h      | 6 +++---
 tests/test-hdr/queue/hdr_queue.h                          | 6 +++---
 tests/test-hdr/queue/hdr_segmented_queue.h                | 8 ++++----
 tests/test-hdr/set/hdr_cuckoo_set.h                       | 6 +++---
 tests/test-hdr/set/hdr_intrusive_cuckoo_set.h             | 5 +++++
 tests/test-hdr/set/hdr_intrusive_set.h                    | 5 +++++
 tests/test-hdr/set/hdr_intrusive_skiplist_set.h           | 5 +++++
 tests/test-hdr/set/hdr_intrusive_skiplist_set_rcu.h       | 5 +++++
 tests/test-hdr/set/hdr_intrusive_striped_set.h            | 5 +++++
 tests/test-hdr/set/hdr_set.h                              | 6 +++---
 tests/test-hdr/set/hdr_skiplist_set.h                     | 5 +++++
 tests/test-hdr/set/hdr_skiplist_set_rcu.h                 | 5 +++++
 tests/test-hdr/set/hdr_striped_set.h                      | 6 +++---
 tests/test-hdr/set/intrusive_cuckoo_set_common.h          | 5 +++++
 tests/test-hdr/size_check.h                               | 6 +++---
 tests/test-hdr/stack/hdr_intrusive_treiber_stack.h        | 5 +++++
 tests/test-hdr/stack/hdr_treiber_stack.h                  | 4 ++++
 tests/test-hdr/tree/hdr_ellenbintree_map.h                | 6 +++---
 tests/test-hdr/tree/hdr_ellenbintree_set.h                | 6 +++---
 tests/test-hdr/tree/hdr_intrusive_bintree.h               | 6 +++---
 .../test-hdr/tree/hdr_intrusive_ellen_bintree_pool_dhp.h  | 6 +++---
 tests/test-hdr/tree/hdr_intrusive_ellen_bintree_pool_hp.h | 6 +++---
 .../test-hdr/tree/hdr_intrusive_ellen_bintree_pool_rcu.h  | 6 +++---
 39 files changed, 151 insertions(+), 67 deletions(-)

diff --git a/tests/test-hdr/map/hdr_cuckoo_map.h b/tests/test-hdr/map/hdr_cuckoo_map.h
index 92065c08..aef80094 100644
--- a/tests/test-hdr/map/hdr_cuckoo_map.h
+++ b/tests/test-hdr/map/hdr_cuckoo_map.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSTEST_HDR_CUCKOO_MAP_H
-#define __CDSTEST_HDR_CUCKOO_MAP_H
+#ifndef CDSTEST_HDR_CUCKOO_MAP_H
+#define CDSTEST_HDR_CUCKOO_MAP_H
 #include "size_check.h"
 
 #include "cppunit/cppunit_proxy.h"
@@ -387,4 +387,4 @@ namespace map {
     };
 }   // namespace map
 
-#endif // #ifndef __CDSTEST_HDR_CUCKOO_MAP_H
+#endif // #ifndef CDSTEST_HDR_CUCKOO_MAP_H
diff --git a/tests/test-hdr/map/hdr_map.h b/tests/test-hdr/map/hdr_map.h
index ec6ed42c..611533ad 100644
--- a/tests/test-hdr/map/hdr_map.h
+++ b/tests/test-hdr/map/hdr_map.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSTEST_HDR_MAP_H
-#define __CDSTEST_HDR_MAP_H
+#ifndef CDSTEST_HDR_MAP_H
+#define CDSTEST_HDR_MAP_H
 #include "size_check.h"
 
 #include "cppunit/cppunit_proxy.h"
@@ -983,4 +983,4 @@ namespace map {
     };
 }   // namespace map
 
-#endif // #ifndef __CDSTEST_HDR_MAP_H
+#endif // #ifndef CDSTEST_HDR_MAP_H
diff --git a/tests/test-hdr/map/hdr_skiplist_map.h b/tests/test-hdr/map/hdr_skiplist_map.h
index ef474f75..d919a1d2 100644
--- a/tests/test-hdr/map/hdr_skiplist_map.h
+++ b/tests/test-hdr/map/hdr_skiplist_map.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSTEST_HDR_SKIPLIST_MAP_H
-#define __CDSTEST_HDR_SKIPLIST_MAP_H
+#ifndef CDSTEST_HDR_SKIPLIST_MAP_H
+#define CDSTEST_HDR_SKIPLIST_MAP_H
 
 #include "map/hdr_map.h"
 
@@ -536,4 +536,4 @@ namespace map {
 
 } // namespace map
 
-#endif // #ifndef __CDSTEST_HDR_SKIPLIST_MAP_H
+#endif // #ifndef CDSTEST_HDR_SKIPLIST_MAP_H
diff --git a/tests/test-hdr/map/hdr_skiplist_map_rcu.h b/tests/test-hdr/map/hdr_skiplist_map_rcu.h
index adff9d5f..6526e2c6 100644
--- a/tests/test-hdr/map/hdr_skiplist_map_rcu.h
+++ b/tests/test-hdr/map/hdr_skiplist_map_rcu.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSTEST_HDR_SKIPLIST_MAP_RCU_H
-#define __CDSTEST_HDR_SKIPLIST_MAP_RCU_H
+#ifndef CDSTEST_HDR_SKIPLIST_MAP_RCU_H
+#define CDSTEST_HDR_SKIPLIST_MAP_RCU_H
 
 #include "map/hdr_map.h"
 
@@ -512,4 +512,4 @@ namespace map {
 
 } // namespace map
 
-#endif // #ifndef __CDSTEST_HDR_SKIPLIST_MAP_RCU_H
+#endif // #ifndef CDSTEST_HDR_SKIPLIST_MAP_RCU_H
diff --git a/tests/test-hdr/map/hdr_striped_map.h b/tests/test-hdr/map/hdr_striped_map.h
index 06b3c87f..edaade8c 100644
--- a/tests/test-hdr/map/hdr_striped_map.h
+++ b/tests/test-hdr/map/hdr_striped_map.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSTEST_HDR_STRIPED_MAP_H
-#define __CDSTEST_HDR_STRIPED_MAP_H
+#ifndef CDSTEST_HDR_STRIPED_MAP_H
+#define CDSTEST_HDR_STRIPED_MAP_H
 #include "size_check.h"
 
 #include "cppunit/cppunit_proxy.h"
@@ -576,4 +576,4 @@ namespace map {
     };
 }   // namespace map
 
-#endif // #ifndef __CDSTEST_HDR_STRIPED_MAP_H
+#endif // #ifndef CDSTEST_HDR_STRIPED_MAP_H
diff --git a/tests/test-hdr/map/print_skiplist_stat.h b/tests/test-hdr/map/print_skiplist_stat.h
index 1f70455c..bea9d90e 100644
--- a/tests/test-hdr/map/print_skiplist_stat.h
+++ b/tests/test-hdr/map/print_skiplist_stat.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_TESTHDR_MAP_PRINT_SKIPLIST_STAT_H
-#define __CDS_TESTHDR_MAP_PRINT_SKIPLIST_STAT_H
+#ifndef CDSTEST_HDR_MAP_PRINT_SKIPLIST_STAT_H
+#define CDSTEST_HDR_MAP_PRINT_SKIPLIST_STAT_H
 
 #include "unit/print_skip_list_stat.h"
 
@@ -41,4 +41,4 @@ namespace misc {
 
 }   // namespace misc
 
-#endif // #ifndef __CDS_TESTHDR_MAP_PRINT_SKIPLIST_STAT_H
+#endif // #ifndef CDSTEST_HDR_MAP_PRINT_SKIPLIST_STAT_H
diff --git a/tests/test-hdr/ordered_list/hdr_intrusive_lazy.h b/tests/test-hdr/ordered_list/hdr_intrusive_lazy.h
index 8402f732..c8a7e1d0 100644
--- a/tests/test-hdr/ordered_list/hdr_intrusive_lazy.h
+++ b/tests/test-hdr/ordered_list/hdr_intrusive_lazy.h
@@ -1,5 +1,8 @@
 //$$CDS-header$$
 
+#ifndef CDSTEST_HDR_INTRUSIVE_LAZY_H
+#define CDSTEST_HDR_INTRUSIVE_LAZY_H
+
 #include "cppunit/cppunit_proxy.h"
 #include <cds/intrusive/details/lazy_list_base.h>
 
@@ -890,3 +893,5 @@ namespace ordlist {
         CPPUNIT_TEST_SUITE_END()
     };
 }   // namespace ordlist
+
+#endif // #ifndef CDSTEST_HDR_INTRUSIVE_LAZY_H
diff --git a/tests/test-hdr/ordered_list/hdr_intrusive_michael.h b/tests/test-hdr/ordered_list/hdr_intrusive_michael.h
index 52c71735..05248f66 100644
--- a/tests/test-hdr/ordered_list/hdr_intrusive_michael.h
+++ b/tests/test-hdr/ordered_list/hdr_intrusive_michael.h
@@ -1,5 +1,8 @@
 //$$CDS-header$$
 
+#ifndef CDSTEST_HDR_INTRUSIVE_MICHAEL_H
+#define CDSTEST_HDR_INTRUSIVE_MICHAEL_H
+
 #include "cppunit/cppunit_proxy.h"
 #include <cds/intrusive/details/michael_list_base.h>
 
@@ -904,3 +907,5 @@ namespace ordlist {
         CPPUNIT_TEST_SUITE_END()
     };
 }   // namespace ordlist
+
+#endif // CDSTEST_HDR_INTRUSIVE_MICHAEL_H
diff --git a/tests/test-hdr/ordered_list/hdr_lazy.h b/tests/test-hdr/ordered_list/hdr_lazy.h
index 28c38887..7945d06e 100644
--- a/tests/test-hdr/ordered_list/hdr_lazy.h
+++ b/tests/test-hdr/ordered_list/hdr_lazy.h
@@ -1,5 +1,8 @@
 //$$CDS-header$$
 
+#ifndef CDSTEST_HDR_LAZY_H
+#define CDSTEST_HDR_LAZY_H
+
 #include "cppunit/cppunit_proxy.h"
 #include <cds/container/details/lazy_list_base.h>
 
@@ -811,3 +814,5 @@ namespace ordlist {
     };
 
 }   // namespace ordlist
+
+#endif // #ifndef CDSTEST_HDR_LAZY_H
\ No newline at end of file
diff --git a/tests/test-hdr/ordered_list/hdr_lazy_kv.h b/tests/test-hdr/ordered_list/hdr_lazy_kv.h
index e62dcf3b..653c2f7a 100644
--- a/tests/test-hdr/ordered_list/hdr_lazy_kv.h
+++ b/tests/test-hdr/ordered_list/hdr_lazy_kv.h
@@ -1,5 +1,8 @@
 //$$CDS-header$$
 
+#ifndef CDSTEST_HDR_LAZY_KV_H
+#define CDSTEST_HDR_LAZY_KV_H
+
 #include "cppunit/cppunit_proxy.h"
 #include <cds/container/details/lazy_list_base.h>
 
@@ -722,3 +725,5 @@ namespace ordlist {
     };
 
 }   // namespace ordlist
+
+#endif // #ifndef CDSTEST_HDR_LAZY_KV_H
\ No newline at end of file
diff --git a/tests/test-hdr/ordered_list/hdr_michael.h b/tests/test-hdr/ordered_list/hdr_michael.h
index 4672e971..c37eaa8e 100644
--- a/tests/test-hdr/ordered_list/hdr_michael.h
+++ b/tests/test-hdr/ordered_list/hdr_michael.h
@@ -1,5 +1,8 @@
 //$$CDS-header$$
 
+#ifndef CDSTEST_HDR_MICHAEL_H
+#define CDSTEST_HDR_MICHAEL_H
+
 #include "cppunit/cppunit_proxy.h"
 #include <cds/container/details/michael_list_base.h>
 
@@ -813,3 +816,5 @@ namespace ordlist {
     };
 
 }   // namespace ordlist
+
+#endif // #ifndef CDSTEST_HDR_MICHAEL_H
diff --git a/tests/test-hdr/ordered_list/hdr_michael_kv.h b/tests/test-hdr/ordered_list/hdr_michael_kv.h
index d51a08f8..4f467b31 100644
--- a/tests/test-hdr/ordered_list/hdr_michael_kv.h
+++ b/tests/test-hdr/ordered_list/hdr_michael_kv.h
@@ -1,5 +1,8 @@
 //$$CDS-header$$
 
+#ifndef CDSTEST_HDR_MICHAEL_KV_H
+#define CDSTEST_HDR_MICHAEL_KV_H
+
 #include "cppunit/cppunit_proxy.h"
 #include <cds/container/details/michael_list_base.h>
 
@@ -736,3 +739,5 @@ namespace ordlist {
     };
 
 }   // namespace ordlist
+
+#endif // #ifndef CDSTEST_HDR_MICHAEL_KV_H
diff --git a/tests/test-hdr/priority_queue/hdr_intrusive_pqueue.h b/tests/test-hdr/priority_queue/hdr_intrusive_pqueue.h
index aafa82c5..268f1c13 100644
--- a/tests/test-hdr/priority_queue/hdr_intrusive_pqueue.h
+++ b/tests/test-hdr/priority_queue/hdr_intrusive_pqueue.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef CDSHDRTEST_INTRUSIVE_PQUEUE_H
-#define CDSHDRTEST_INTRUSIVE_PQUEUE_H
+#ifndef CDSTEST_HDR_INTRUSIVE_PQUEUE_H
+#define CDSTEST_HDR_INTRUSIVE_PQUEUE_H
 
 #include "cppunit/cppunit_proxy.h"
 #include "size_check.h"
@@ -211,4 +211,4 @@ namespace priority_queue {
 
 } // namespace priority_queue
 
-#endif // #ifndef CDSHDRTEST_INTRUSIVE_PQUEUE_H
+#endif // #ifndef CDSTEST_HDR_INTRUSIVE_PQUEUE_H
diff --git a/tests/test-hdr/priority_queue/hdr_pqueue.h b/tests/test-hdr/priority_queue/hdr_pqueue.h
index 5a03d54a..eadbc7e2 100644
--- a/tests/test-hdr/priority_queue/hdr_pqueue.h
+++ b/tests/test-hdr/priority_queue/hdr_pqueue.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef CDSHDRTEST_PQUEUE_H
-#define CDSHDRTEST_PQUEUE_H
+#ifndef CDSTEST_HDR_PQUEUE_H
+#define CDSTEST_HDR_PQUEUE_H
 
 #include "cppunit/cppunit_proxy.h"
 #include "size_check.h"
@@ -365,4 +365,4 @@ namespace std {
     };
 }
 
-#endif // #ifndef CDSHDRTEST_PQUEUE_H
+#endif // #ifndef CDSTEST_HDR_PQUEUE_H
diff --git a/tests/test-hdr/queue/hdr_fcqueue.h b/tests/test-hdr/queue/hdr_fcqueue.h
index 411bf9da..606c21a3 100644
--- a/tests/test-hdr/queue/hdr_fcqueue.h
+++ b/tests/test-hdr/queue/hdr_fcqueue.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_HDR_FCQUEUE_H
-#define __CDSUNIT_HDR_FCQUEUE_H
+#ifndef CDSTEST_HDR_FCQUEUE_H
+#define CDSTEST_HDR_FCQUEUE_H
 
 #include "cppunit/cppunit_proxy.h"
 #include <cds/details/defs.h>
@@ -162,4 +162,4 @@ namespace queue {
     };
 } // namespace queue
 
-#endif // #ifndef __CDSUNIT_HDR_FCQUEUE_H
+#endif // #ifndef CDSTEST_HDR_FCQUEUE_H
diff --git a/tests/test-hdr/queue/hdr_intrusive_msqueue.h b/tests/test-hdr/queue/hdr_intrusive_msqueue.h
index 61624b65..238b1079 100644
--- a/tests/test-hdr/queue/hdr_intrusive_msqueue.h
+++ b/tests/test-hdr/queue/hdr_intrusive_msqueue.h
@@ -1,5 +1,8 @@
 //$$CDS-header$$
 
+#ifndef CDSTEST_HDR_INTRSUSIVE_MSQUEUE_H
+#define CDSTEST_HDR_INTRSUSIVE_MSQUEUE_H
+
 #include "cppunit/cppunit_proxy.h"
 #include <cds/intrusive/details/base.h>
 
@@ -516,3 +519,5 @@ namespace queue {
         CPPUNIT_TEST_SUITE_END()
     };
 }   // namespace queue
+
+#endif // #ifndef CDSTEST_HDR_INTRSUSIVE_MSQUEUE_H
diff --git a/tests/test-hdr/queue/hdr_intrusive_segmented_queue.h b/tests/test-hdr/queue/hdr_intrusive_segmented_queue.h
index b3578ca4..4f2ba09d 100644
--- a/tests/test-hdr/queue/hdr_intrusive_segmented_queue.h
+++ b/tests/test-hdr/queue/hdr_intrusive_segmented_queue.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSHDR_QUEUE_INTRUSIVE_SEGMENTED_QUEUE_H
-#define __CDSHDR_QUEUE_INTRUSIVE_SEGMENTED_QUEUE_H
+#ifndef CDSTEST_HDR_INTRUSIVE_SEGMENTED_QUEUE_H
+#define CDSTEST_HDR_INTRUSIVE_SEGMENTED_QUEUE_H
 
 #include "cppunit/cppunit_proxy.h"
 #include <cds/intrusive/details/base.h>
@@ -265,4 +265,4 @@ namespace queue {
 
 } // namespace queue
 
-#endif // __CDSHDR_QUEUE_INTRUSIVE_SEGMENTED_QUEUE_H
+#endif // CDSTEST_HDR_INTRUSIVE_SEGMENTED_QUEUE_H
diff --git a/tests/test-hdr/queue/hdr_queue.h b/tests/test-hdr/queue/hdr_queue.h
index 68e99904..c5d19e48 100644
--- a/tests/test-hdr/queue/hdr_queue.h
+++ b/tests/test-hdr/queue/hdr_queue.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSUNIT_QUEUE_HDR_H
-#define __CDSUNIT_QUEUE_HDR_H
+#ifndef CDSTEST_HDR_QUEUE_H
+#define CDSTEST_HDR_QUEUE_H
 
 #include "cppunit/cppunit_proxy.h"
 #include <cds/details/defs.h>
@@ -458,4 +458,4 @@ namespace queue {
     };
 } // namespace queue
 
-#endif // #ifndef __CDSUNIT_QUEUE_HDR_H
+#endif // #ifndef CDSTEST_HDR_QUEUE_H
diff --git a/tests/test-hdr/queue/hdr_segmented_queue.h b/tests/test-hdr/queue/hdr_segmented_queue.h
index cc53cbb5..a6aa9762 100644
--- a/tests/test-hdr/queue/hdr_segmented_queue.h
+++ b/tests/test-hdr/queue/hdr_segmented_queue.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSHDR_QUEUE_SEGMENTED_QUEUE_H
-#define __CDSHDR_QUEUE_SEGMENTED_QUEUE_H
+#ifndef CDSTEST_HDR_QUEUE_SEGMENTED_QUEUE_H
+#define CDSTEST_HDR_QUEUE_SEGMENTED_QUEUE_H
 
 #include "cppunit/cppunit_proxy.h"
 #include <cds/intrusive/details/base.h>
@@ -226,9 +226,9 @@ namespace queue {
             CPPUNIT_TEST( SegmQueue_DHP_mutex_cacheline_padding )
             CPPUNIT_TEST( SegmQueue_DHP_shuffle_cacheline_padding )
             CPPUNIT_TEST( SegmQueue_DHP_stat_cacheline_padding )
-            CPPUNIT_TEST_SUITE_END()
+        CPPUNIT_TEST_SUITE_END()
 
     };
 } // namespace queue
 
-#endif //#ifndef __CDSHDR_QUEUE_SEGMENTED_QUEUE_H
+#endif //#ifndef CDSTEST_HDR_QUEUE_SEGMENTED_QUEUE_H
diff --git a/tests/test-hdr/set/hdr_cuckoo_set.h b/tests/test-hdr/set/hdr_cuckoo_set.h
index ce7d5fba..8c808653 100644
--- a/tests/test-hdr/set/hdr_cuckoo_set.h
+++ b/tests/test-hdr/set/hdr_cuckoo_set.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSTEST_HDR_CUCKOO_SET_H
-#define __CDSTEST_HDR_CUCKOO_SET_H
+#ifndef CDSTEST_HDR_CUCKOO_SET_H
+#define CDSTEST_HDR_CUCKOO_SET_H
 
 #include "cppunit/cppunit_proxy.h"
 #include "size_check.h"
@@ -603,4 +603,4 @@ namespace set {
 
 } // namespace set
 
-#endif // #ifndef __CDSTEST_HDR_CUCKOO_SET_H
+#endif // #ifndef CDSTEST_HDR_CUCKOO_SET_H
diff --git a/tests/test-hdr/set/hdr_intrusive_cuckoo_set.h b/tests/test-hdr/set/hdr_intrusive_cuckoo_set.h
index 1738ae21..db09fd5e 100644
--- a/tests/test-hdr/set/hdr_intrusive_cuckoo_set.h
+++ b/tests/test-hdr/set/hdr_intrusive_cuckoo_set.h
@@ -1,5 +1,8 @@
 //$$CDS-header$$
 
+#ifndef CDSTEST_HDR_INTRUSIVE_CUCKOO_SET_H
+#define CDSTEST_HDR_INTRUSIVE_CUCKOO_SET_H
+
 #include "cppunit/cppunit_proxy.h"
 #include <cds/opt/hash.h>
 
@@ -649,3 +652,5 @@ namespace set {
         CPPUNIT_TEST_SUITE_END()
     };
 } // namespace set
+
+#endif // #ifndef CDSTEST_HDR_INTRUSIVE_CUCKOO_SET_H
diff --git a/tests/test-hdr/set/hdr_intrusive_set.h b/tests/test-hdr/set/hdr_intrusive_set.h
index 65d78ce0..48ed8c98 100644
--- a/tests/test-hdr/set/hdr_intrusive_set.h
+++ b/tests/test-hdr/set/hdr_intrusive_set.h
@@ -1,5 +1,8 @@
 //$$CDS-header$$
 
+#ifndef CDSTEST_HDR_INTRUSIVE_SET_H
+#define CDSTEST_HDR_INTRUSIVE_SET_H
+
 #include "cppunit/cppunit_proxy.h"
 #include "size_check.h"
 
@@ -1866,3 +1869,5 @@ namespace set {
     };
 
 }   // namespace set
+
+#endif // #ifndef CDSTEST_HDR_INTRUSIVE_SET_H
\ No newline at end of file
diff --git a/tests/test-hdr/set/hdr_intrusive_skiplist_set.h b/tests/test-hdr/set/hdr_intrusive_skiplist_set.h
index 87395540..60549192 100644
--- a/tests/test-hdr/set/hdr_intrusive_skiplist_set.h
+++ b/tests/test-hdr/set/hdr_intrusive_skiplist_set.h
@@ -1,5 +1,8 @@
 //$$CDS-header$$
 
+#ifndef CDSTEST_HDR_INTRUSIVE_SKIPLIST_SET_H
+#define CDSTEST_HDR_INTRUSIVE_SKIPLIST_SET_H
+
 #include "set/hdr_intrusive_set.h"
 
 namespace set {
@@ -756,3 +759,5 @@ namespace set {
         CPPUNIT_TEST_SUITE_END()
     };
 } // namespace set
+
+#endif // #ifndef CDSTEST_HDR_INTRUSIVE_SKIPLIST_SET_H
diff --git a/tests/test-hdr/set/hdr_intrusive_skiplist_set_rcu.h b/tests/test-hdr/set/hdr_intrusive_skiplist_set_rcu.h
index 1b4fd925..68574753 100644
--- a/tests/test-hdr/set/hdr_intrusive_skiplist_set_rcu.h
+++ b/tests/test-hdr/set/hdr_intrusive_skiplist_set_rcu.h
@@ -1,5 +1,8 @@
 //$$CDS-header$$
 
+#ifndef CDSTEST_HDR_INTRUSIVE_SKIPLIST_SET_RCU_H
+#define CDSTEST_HDR_INTRUSIVE_SKIPLIST_SET_RCU_H
+
 #include "set/hdr_intrusive_set.h"
 
 namespace set {
@@ -786,3 +789,5 @@ namespace set {
         CPPUNIT_TEST_SUITE_END()
     };
 } // namespace set
+
+#endif // #ifndef CDSTEST_HDR_INTRUSIVE_SKIPLIST_SET_RCU_H
diff --git a/tests/test-hdr/set/hdr_intrusive_striped_set.h b/tests/test-hdr/set/hdr_intrusive_striped_set.h
index 42abe4fa..36243a65 100644
--- a/tests/test-hdr/set/hdr_intrusive_striped_set.h
+++ b/tests/test-hdr/set/hdr_intrusive_striped_set.h
@@ -1,5 +1,8 @@
 //$$CDS-header$$
 
+#ifndef CDSTEST_HDR_INTRUSIVE_STRIPED_SET_H
+#define CDSTEST_HDR_INTRUSIVE_STRIPED_SET_H
+
 #include "cppunit/cppunit_proxy.h"
 #include <cds/opt/hash.h>
 
@@ -732,3 +735,5 @@ namespace set {
         CPPUNIT_TEST_SUITE_END()
     };
 } // namespace set
+
+#endif // #ifndef CDSTEST_HDR_INTRUSIVE_STRIPED_SET_H
diff --git a/tests/test-hdr/set/hdr_set.h b/tests/test-hdr/set/hdr_set.h
index 4e2281e7..61dc034c 100644
--- a/tests/test-hdr/set/hdr_set.h
+++ b/tests/test-hdr/set/hdr_set.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSTEST_HDR_SET_H
-#define __CDSTEST_HDR_SET_H
+#ifndef CDSTEST_HDR_SET_H
+#define CDSTEST_HDR_SET_H
 
 #include "cppunit/cppunit_proxy.h"
 #include "size_check.h"
@@ -1156,4 +1156,4 @@ namespace set {
 
 } // namespace set
 
-#endif // __CDSTEST_HDR_SET_H
+#endif // CDSTEST_HDR_SET_H
diff --git a/tests/test-hdr/set/hdr_skiplist_set.h b/tests/test-hdr/set/hdr_skiplist_set.h
index da528d3b..73317055 100644
--- a/tests/test-hdr/set/hdr_skiplist_set.h
+++ b/tests/test-hdr/set/hdr_skiplist_set.h
@@ -1,5 +1,8 @@
 //$$CDS-header$$
 
+#ifndef CDSTEST_HDR_SKIPLIST_SET_H
+#define CDSTEST_HDR_SKIPLIST_SET_H
+
 #include "set/hdr_set.h"
 
 namespace set {
@@ -574,3 +577,5 @@ namespace set {
 
     };
 }
+
+#endif // #ifndef CDSTEST_HDR_SKIPLIST_SET_H
diff --git a/tests/test-hdr/set/hdr_skiplist_set_rcu.h b/tests/test-hdr/set/hdr_skiplist_set_rcu.h
index 027ee0a5..0f8305cb 100644
--- a/tests/test-hdr/set/hdr_skiplist_set_rcu.h
+++ b/tests/test-hdr/set/hdr_skiplist_set_rcu.h
@@ -1,5 +1,8 @@
 //$$CDS-header$$
 
+#ifndef CDSTEST_HDR_SKIPLIST_SET_RCU_H
+#define CDSTEST_HDR_SKIPLIST_SET_RCU_H
+
 #include "set/hdr_set.h"
 
 namespace set {
@@ -507,3 +510,5 @@ namespace set {
 
     };
 }
+
+#endif // #ifndef CDSTEST_HDR_SKIPLIST_SET_RCU_H
diff --git a/tests/test-hdr/set/hdr_striped_set.h b/tests/test-hdr/set/hdr_striped_set.h
index e0b5a86f..e9b0e5aa 100644
--- a/tests/test-hdr/set/hdr_striped_set.h
+++ b/tests/test-hdr/set/hdr_striped_set.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSTEST_HDR_STRIPED_SET_H
-#define __CDSTEST_HDR_STRIPED_SET_H
+#ifndef CDSTEST_HDR_STRIPED_SET_H
+#define CDSTEST_HDR_STRIPED_SET_H
 
 #include "cppunit/cppunit_proxy.h"
 #include "size_check.h"
@@ -750,4 +750,4 @@ namespace set {
     };
 } // namespace set
 
-#endif // #ifndef __CDSTEST_HDR_STRIPED_SET_H
+#endif // #ifndef CDSTEST_HDR_STRIPED_SET_H
diff --git a/tests/test-hdr/set/intrusive_cuckoo_set_common.h b/tests/test-hdr/set/intrusive_cuckoo_set_common.h
index 967f2ff2..cd77555b 100644
--- a/tests/test-hdr/set/intrusive_cuckoo_set_common.h
+++ b/tests/test-hdr/set/intrusive_cuckoo_set_common.h
@@ -1,5 +1,8 @@
 //$$CDS-header$$
 
+#ifndef CDSTEST_HDR_INTRUSIVE_CUCKOO_SET_COMMON_H
+#define CDSTEST_HDR_INTRUSIVE_CUCKOO_SET_COMMON_H
+
 namespace set {
     namespace {
 
@@ -49,3 +52,5 @@ namespace set {
 
     }
 } // namespace set
+
+#endif // #ifndef CDSTEST_HDR_INTRUSIVE_CUCKOO_SET_COMMON_H
diff --git a/tests/test-hdr/size_check.h b/tests/test-hdr/size_check.h
index 8b507bf2..7f2ff85d 100644
--- a/tests/test-hdr/size_check.h
+++ b/tests/test-hdr/size_check.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDSTEST_SIZE_CHECK_H
-#define __CDSTEST_SIZE_CHECK_H
+#ifndef CDSTEST_SIZE_CHECK_H
+#define CDSTEST_SIZE_CHECK_H
 
 #include <cds/algo/atomic.h>
 
@@ -33,4 +33,4 @@ namespace misc {
 
 } // namespace misc
 
-#endif // #ifndef __CDSTEST_SIZE_CHECK_H
+#endif // #ifndef CDSTEST_SIZE_CHECK_H
diff --git a/tests/test-hdr/stack/hdr_intrusive_treiber_stack.h b/tests/test-hdr/stack/hdr_intrusive_treiber_stack.h
index 1370d152..7cc7239e 100644
--- a/tests/test-hdr/stack/hdr_intrusive_treiber_stack.h
+++ b/tests/test-hdr/stack/hdr_intrusive_treiber_stack.h
@@ -1,5 +1,8 @@
 //$$CDS-header$$
 
+#ifndef CDSTEST_HDR_INTRUSIVE_TREIBER_STACK_H
+#define CDSTEST_HDR_INTRUSIVE_TREIBER_STACK_H
+
 #include "cppunit/cppunit_proxy.h"
 #include <cds/intrusive/details/single_link_struct.h>
 
@@ -200,3 +203,5 @@ namespace stack {
     };
 
 } // namespace stack
+
+#endif // #ifndef CDSTEST_HDR_INTRUSIVE_TREIBER_STACK_H
diff --git a/tests/test-hdr/stack/hdr_treiber_stack.h b/tests/test-hdr/stack/hdr_treiber_stack.h
index 2110ae00..1a6c79f2 100644
--- a/tests/test-hdr/stack/hdr_treiber_stack.h
+++ b/tests/test-hdr/stack/hdr_treiber_stack.h
@@ -1,5 +1,8 @@
 //$$CDS-header$$
 
+#ifndef CDSTEST_HDR_TREIBER_STACK_H
+#define CDSTEST_HDR_TREIBER_STACK_H
+
 #include "cppunit/cppunit_proxy.h"
 
 namespace stack {
@@ -130,3 +133,4 @@ namespace stack {
     };
 }   // namespace stack
 
+#endif // #ifndef CDSTEST_HDR_TREIBER_STACK_H
diff --git a/tests/test-hdr/tree/hdr_ellenbintree_map.h b/tests/test-hdr/tree/hdr_ellenbintree_map.h
index d2c90519..0053187d 100644
--- a/tests/test-hdr/tree/hdr_ellenbintree_map.h
+++ b/tests/test-hdr/tree/hdr_ellenbintree_map.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef CDSHDRTEST_ELLENBINTREE_MAP_H
-#define CDSHDRTEST_ELLENBINTREE_MAP_H
+#ifndef CDSTEST_HDR_ELLENBINTREE_MAP_H
+#define CDSTEST_HDR_ELLENBINTREE_MAP_H
 
 #include "cppunit/cppunit_proxy.h"
 #include "size_check.h"
@@ -723,4 +723,4 @@ namespace tree {
     };
 } // namespace tree
 
-#endif // #ifndef CDSHDRTEST_ELLENBINTREE_MAP_H
+#endif // #ifndef CDSTEST_HDR_ELLENBINTREE_MAP_H
diff --git a/tests/test-hdr/tree/hdr_ellenbintree_set.h b/tests/test-hdr/tree/hdr_ellenbintree_set.h
index 0e3363f0..5d3b2aef 100644
--- a/tests/test-hdr/tree/hdr_ellenbintree_set.h
+++ b/tests/test-hdr/tree/hdr_ellenbintree_set.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef CDSHDRTEST_ELLENBINTREE_SET_H
-#define CDSHDRTEST_ELLENBINTREE_SET_H
+#ifndef CDSTEST_HDR_ELLENBINTREE_SET_H
+#define CDSTEST_HDR_ELLENBINTREE_SET_H
 
 #include "cppunit/cppunit_proxy.h"
 #include "size_check.h"
@@ -822,4 +822,4 @@ namespace tree {
     };
 } // namespace tree
 
-#endif // #ifndef CDSHDRTEST_ELLENBINTREE_SET_H
+#endif // #ifndef CDSTEST_HDR_ELLENBINTREE_SET_H
diff --git a/tests/test-hdr/tree/hdr_intrusive_bintree.h b/tests/test-hdr/tree/hdr_intrusive_bintree.h
index cf9a5ec8..af2fb8ac 100644
--- a/tests/test-hdr/tree/hdr_intrusive_bintree.h
+++ b/tests/test-hdr/tree/hdr_intrusive_bintree.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef CDSHDRTEST_INTRUSIVE_BINTREE_H
-#define CDSHDRTEST_INTRUSIVE_BINTREE_H
+#ifndef CDSTEST_HDR_INTRUSIVE_BINTREE_H
+#define CDSTEST_HDR_INTRUSIVE_BINTREE_H
 
 #include "cppunit/cppunit_proxy.h"
 #include "size_check.h"
@@ -1246,4 +1246,4 @@ namespace tree {
     };
 } // namespace tree
 
-#endif // #ifndef CDSHDRTEST_INTRUSIVE_BINTREE_H
+#endif // #ifndef CDSTEST_HDR_INTRUSIVE_BINTREE_H
diff --git a/tests/test-hdr/tree/hdr_intrusive_ellen_bintree_pool_dhp.h b/tests/test-hdr/tree/hdr_intrusive_ellen_bintree_pool_dhp.h
index 9cbef057..db752295 100644
--- a/tests/test-hdr/tree/hdr_intrusive_ellen_bintree_pool_dhp.h
+++ b/tests/test-hdr/tree/hdr_intrusive_ellen_bintree_pool_dhp.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef CDSHDRTEST_INTRUSIVE_ELLEN_BINTREE_POOL_DHP_H
-#define CDSHDRTEST_INTRUSIVE_ELLEN_BINTREE_POOL_DHP_H
+#ifndef CDSTEST_HDR_INTRUSIVE_ELLEN_BINTREE_POOL_DHP_H
+#define CDSTEST_HDR_INTRUSIVE_ELLEN_BINTREE_POOL_DHP_H
 
 #include "tree/hdr_intrusive_bintree.h"
 #include <cds/intrusive/ellen_bintree_dhp.h>
@@ -57,4 +57,4 @@ namespace tree {
 
 } // namespace tree
 
-#endif // #ifndef CDSHDRTEST_INTRUSIVE_ELLEN_BINTREE_POOL_DHP_H
+#endif // #ifndef CDSTEST_HDR_INTRUSIVE_ELLEN_BINTREE_POOL_DHP_H
diff --git a/tests/test-hdr/tree/hdr_intrusive_ellen_bintree_pool_hp.h b/tests/test-hdr/tree/hdr_intrusive_ellen_bintree_pool_hp.h
index f18a0689..47ab2828 100644
--- a/tests/test-hdr/tree/hdr_intrusive_ellen_bintree_pool_hp.h
+++ b/tests/test-hdr/tree/hdr_intrusive_ellen_bintree_pool_hp.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef CDSHDRTEST_INTRUSIVE_ELLEN_BINTREE_POOL_HP_H
-#define CDSHDRTEST_INTRUSIVE_ELLEN_BINTREE_POOL_HP_H
+#ifndef CDSTEST_HDR_INTRUSIVE_ELLEN_BINTREE_POOL_HP_H
+#define CDSTEST_HDR_INTRUSIVE_ELLEN_BINTREE_POOL_HP_H
 
 #include "tree/hdr_intrusive_bintree.h"
 #include <cds/intrusive/ellen_bintree_hp.h>
@@ -56,4 +56,4 @@ namespace tree {
 
 } // namespace tree
 
-#endif // #ifndef CDSHDRTEST_INTRUSIVE_ELLEN_BINTREE_POOL_HP_H
+#endif // #ifndef CDSTEST_HDR_INTRUSIVE_ELLEN_BINTREE_POOL_HP_H
diff --git a/tests/test-hdr/tree/hdr_intrusive_ellen_bintree_pool_rcu.h b/tests/test-hdr/tree/hdr_intrusive_ellen_bintree_pool_rcu.h
index ee2cf627..d6bb3672 100644
--- a/tests/test-hdr/tree/hdr_intrusive_ellen_bintree_pool_rcu.h
+++ b/tests/test-hdr/tree/hdr_intrusive_ellen_bintree_pool_rcu.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef CDSHDRTEST_INTRUSIVE_ELLEN_BINTREE_POOL_RCU_H
-#define CDSHDRTEST_INTRUSIVE_ELLEN_BINTREE_POOL_RCU_H
+#ifndef CDSTEST_HDR_INTRUSIVE_ELLEN_BINTREE_POOL_RCU_H
+#define CDSTEST_HDR_INTRUSIVE_ELLEN_BINTREE_POOL_RCU_H
 
 #include "tree/hdr_intrusive_bintree.h"
 #include <cds/urcu/general_instant.h>
@@ -60,4 +60,4 @@ namespace tree {
 
 } // namespace tree
 
-#endif // #ifndef CDSHDRTEST_INTRUSIVE_ELLEN_BINTREE_POOL_RCU_H
+#endif // #ifndef CDSTEST_HDR_INTRUSIVE_ELLEN_BINTREE_POOL_RCU_H
-- 
2.34.1