21 files changed, 95 insertions, 93 deletions
diff --git a/src/systemc/ext/tlm_core/1/analysis/analysis.h b/src/systemc/ext/tlm_core/1/analysis/analysis.hh
index 7e8b7e4b4..13858aca3 100644
--- a/src/systemc/ext/tlm_core/1/analysis/analysis.h
+++ b/src/systemc/ext/tlm_core/1/analysis/analysis.hh
@@ -17,13 +17,13 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_H__
-#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_HH__
+#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_HH__
 
-#include "tlm_core/1/analysis/analysis_fifo.h"
-#include "tlm_core/1/analysis/analysis_if.h"
-#include "tlm_core/1/analysis/analysis_port.h"
-#include "tlm_core/1/analysis/analysis_triple.h"
-#include "tlm_core/1/analysis/write_if.h"
+#include "tlm_core/1/analysis/analysis_fifo.hh"
+#include "tlm_core/1/analysis/analysis_if.hh"
+#include "tlm_core/1/analysis/analysis_port.hh"
+#include "tlm_core/1/analysis/analysis_triple.hh"
+#include "tlm_core/1/analysis/write_if.hh"
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_HH__ */
diff --git a/src/systemc/ext/tlm_core/1/analysis/analysis_fifo.h b/src/systemc/ext/tlm_core/1/analysis/analysis_fifo.hh
index ce3a27f84..33cbc1179 100644
--- a/src/systemc/ext/tlm_core/1/analysis/analysis_fifo.h
+++ b/src/systemc/ext/tlm_core/1/analysis/analysis_fifo.hh
@@ -17,12 +17,12 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_FIFO_H__
-#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_FIFO_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_FIFO_HH__
+#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_FIFO_HH__
 
-#include "tlm_core/1/analysis/analysis_if.h"
-#include "tlm_core/1/analysis/analysis_triple.h"
-#include "tlm_core/1/req_rsp/channels/fifo/fifo.h"
+#include "tlm_core/1/analysis/analysis_if.hh"
+#include "tlm_core/1/analysis/analysis_triple.hh"
+#include "tlm_core/1/req_rsp/channels/fifo/fifo.hh"
 
 namespace tlm
 {
@@ -43,4 +43,4 @@ class tlm_analysis_fifo : public tlm_fifo<T>,
 
 } // namespace tlm
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_FIFO_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_FIFO_HH__ */
diff --git a/src/systemc/ext/tlm_core/1/analysis/analysis_if.h b/src/systemc/ext/tlm_core/1/analysis/analysis_if.hh
index 7602c6350..880f1c186 100644
--- a/src/systemc/ext/tlm_core/1/analysis/analysis_if.h
+++ b/src/systemc/ext/tlm_core/1/analysis/analysis_if.hh
@@ -17,10 +17,10 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_IF_H__
-#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_IF_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_IF_HH__
+#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_IF_HH__
 
-#include "tlm_core/1/analysis/write_if.h"
+#include "tlm_core/1/analysis/write_if.hh"
 
 namespace tlm
 {
@@ -35,4 +35,4 @@ class tlm_delayed_analysis_if : public virtual tlm_delayed_write_if<T>
 
 } // namespace tlm
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_IF_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_IF_HH__ */
diff --git a/src/systemc/ext/tlm_core/1/analysis/analysis_port.h b/src/systemc/ext/tlm_core/1/analysis/analysis_port.hh
index 4d9df6d9c..21ad261fa 100644
--- a/src/systemc/ext/tlm_core/1/analysis/analysis_port.h
+++ b/src/systemc/ext/tlm_core/1/analysis/analysis_port.hh
@@ -17,13 +17,13 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_PORT_H__
-#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_PORT_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_PORT_HH__
+#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_PORT_HH__
 
 #include <algorithm>
 #include <deque>
 
-#include "tlm_core/1/analysis/analysis_if.h"
+#include "tlm_core/1/analysis/analysis_if.hh"
 
 namespace tlm
 {
@@ -75,4 +75,4 @@ class tlm_analysis_port : public sc_core::sc_object,
 
 } // namespace tlm
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_PORT_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_PORT_HH__ */
diff --git a/src/systemc/ext/tlm_core/1/analysis/analysis_triple.h b/src/systemc/ext/tlm_core/1/analysis/analysis_triple.hh
index 033b738b2..efdf1acbb 100644
--- a/src/systemc/ext/tlm_core/1/analysis/analysis_triple.h
+++ b/src/systemc/ext/tlm_core/1/analysis/analysis_triple.hh
@@ -17,8 +17,8 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_TRIPLE_H__
-#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_TRIPLE_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_TRIPLE_HH__
+#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_TRIPLE_HH__
 
 namespace tlm
 {
@@ -50,4 +50,4 @@ struct tlm_analysis_triple
 
 } // namespace tlm
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_TRIPLE_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_ANALYSIS_TRIPLE_HH__ */
diff --git a/src/systemc/ext/tlm_core/1/analysis/write_if.h b/src/systemc/ext/tlm_core/1/analysis/write_if.hh
index f4ee68d5b..0461a3a2b 100644
--- a/src/systemc/ext/tlm_core/1/analysis/write_if.h
+++ b/src/systemc/ext/tlm_core/1/analysis/write_if.hh
@@ -17,8 +17,8 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_WRITE_IF_H__
-#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_WRITE_IF_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_WRITE_IF_HH__
+#define __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_WRITE_IF_HH__
 
 #include <systemc>
 
@@ -41,4 +41,4 @@ class tlm_delayed_write_if : public virtual sc_core::sc_interface
 
 } // namespace tlm
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_WRITE_IF_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_1_ANALYSIS_WRITE_IF_HH__ */
diff --git a/src/systemc/ext/tlm_core/1/req_rsp/adapters/adapters.h b/src/systemc/ext/tlm_core/1/req_rsp/adapters/adapters.hh
index 4aee66bea..0e451aac8 100644
--- a/src/systemc/ext/tlm_core/1/req_rsp/adapters/adapters.h
+++ b/src/systemc/ext/tlm_core/1/req_rsp/adapters/adapters.hh
@@ -17,10 +17,10 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_ADAPTERS_H__
-#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_ADAPTERS_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_ADAPTERS_HH__
+#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_ADAPTERS_HH__
 
-#include "tlm_core/1/req_rsp/interfaces/master_slave_ifs.h"
+#include "tlm_core/1/req_rsp/interfaces/master_slave_ifs.hh"
 
 namespace tlm
 {
@@ -97,4 +97,4 @@ class tlm_slave_to_transport : public sc_core::sc_module
 
 } // namespace tlm
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_ADAPTERS_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_ADAPTERS_HH__ */
diff --git a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/circular_buffer.h b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/circular_buffer.hh
index 7625d712c..0badaa56f 100644
--- a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/circular_buffer.h
+++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/circular_buffer.hh
@@ -17,8 +17,8 @@
 
  *****************************************************************************/
 
-#ifndef __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_CIRCULAR_BUFFER_H__
-#define __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_CIRCULAR_BUFFER_H__
+#ifndef __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_CIRCULAR_BUFFER_HH__
+#define __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_CIRCULAR_BUFFER_HH__
 
 #include <iostream>
 
@@ -249,4 +249,4 @@ circular_buffer<T>::buf_clear(void *buf, int n)
 
 } // namespace tlm
 
-#endif /* __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_CIRCULAR_BUFFER_H__ */
+#endif /* __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_CIRCULAR_BUFFER_HH__ */
diff --git a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo.h b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo.hh
index a85c89045..d1ce4835b 100644
--- a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo.h
+++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo.hh
@@ -17,8 +17,8 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_H__
-#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_HH__
+#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_HH__
 
 //
 // This implements put, get and peek
@@ -34,8 +34,8 @@
 // actual physical buffer.
 //
 
-#include "tlm_core/1/req_rsp/channels/fifo/circular_buffer.h"
-#include "tlm_core/1/req_rsp/interfaces/fifo_ifs.h"
+#include "tlm_core/1/req_rsp/channels/fifo/circular_buffer.hh"
+#include "tlm_core/1/req_rsp/interfaces/fifo_ifs.hh"
 
 namespace tlm
 {
@@ -223,8 +223,8 @@ tlm_fifo<T>::update()
 
 } // namespace tlm
 
-#include "tlm_core/1/req_rsp/channels/fifo/fifo_peek.h"
-#include "tlm_core/1/req_rsp/channels/fifo/fifo_put_get.h"
-#include "tlm_core/1/req_rsp/channels/fifo/fifo_resize.h"
+#include "tlm_core/1/req_rsp/channels/fifo/fifo_peek.hh"
+#include "tlm_core/1/req_rsp/channels/fifo/fifo_put_get.hh"
+#include "tlm_core/1/req_rsp/channels/fifo/fifo_resize.hh"
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_HH__ */
diff --git a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_peek.h b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_peek.hh
index c132852f9..843120512 100644
--- a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_peek.h
+++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_peek.hh
@@ -17,8 +17,8 @@
 
  *****************************************************************************/
 
-#ifndef __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PEEK_H__
-#define __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PEEK_H__
+#ifndef __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PEEK_HH__
+#define __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PEEK_HH__
 
 namespace tlm
 {
@@ -84,4 +84,4 @@ tlm_fifo<T>::nb_poke(const T &t, int n)
 
 } // namespace tlm
 
-#endif /* __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PEEK_H__ */
+#endif /* __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PEEK_HH__ */
diff --git a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_put_get.h b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_put_get.hh
index 8d34d2a56..ed419b2c7 100644
--- a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_put_get.h
+++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_put_get.hh
@@ -17,8 +17,8 @@
 
  *****************************************************************************/
 
-#ifndef __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PUT_GET_H__
-#define __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PUT_GET_H__
+#ifndef __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PUT_GET_HH__
+#define __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PUT_GET_HH__
 
 namespace tlm
 {
@@ -110,4 +110,4 @@ tlm_fifo<T>::nb_can_put(tlm_tag<T> *) const
 
 } // namespace tlm
 
-#endif /* __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PUT_GET_H__ */
+#endif /* __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_PUT_GET_HH__ */
diff --git a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_resize.h b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_resize.hh
index 3f936fb9c..31175ac41 100644
--- a/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_resize.h
+++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_resize.hh
@@ -17,8 +17,8 @@
 
  *****************************************************************************/
 
-#ifndef __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_RESIZE_H__
-#define __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_RESIZE_H__
+#ifndef __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_RESIZE_HH__
+#define __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_RESIZE_HH__
 
 // Resize interface.
 namespace tlm
@@ -77,4 +77,4 @@ tlm_fifo<T>::nb_bound(unsigned int new_size)
 
 } // namespace tlm
 
-#endif /* __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_RESIZE_H__ */
+#endif /* __TLM_CORE_1_REQ_RSP_CHANNELS_FIFO_FIFO_RESIZE_HH__ */
diff --git a/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/put_get_imp.h b/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/put_get_imp.hh
index e821573b9..f9821dbef 100644
--- a/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/put_get_imp.h
+++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/put_get_imp.hh
@@ -18,11 +18,11 @@
  *****************************************************************************/
 
 #ifndef \
-    __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_PUT_GET_IMP_H__
+    __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_PUT_GET_IMP_HH__
 #define \
-    __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_PUT_GET_IMP_H__
+    __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_PUT_GET_IMP_HH__
 
-#include "tlm_core/1/req_rsp/interfaces/master_slave_ifs.h"
+#include "tlm_core/1/req_rsp/interfaces/master_slave_ifs.hh"
 
 namespace tlm
 {
@@ -112,4 +112,4 @@ class tlm_slave_imp : private tlm_put_get_imp<RSP, REQ>,
 } // namespace tlm
 
 #endif
-/* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_PUT_GET_IMP_H__*/
+/*__SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_PUT_GET_IMP_HH__*/
diff --git a/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.h b/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.hh
index 321d947ea..196a72e7d 100644
--- a/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.h
+++ b/src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.hh
@@ -17,12 +17,14 @@
 
  *****************************************************************************/
 
-#ifndef __EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_H__
-#define __EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_H__
+#ifndef \
+    __EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_HH__
+#define \
+    __EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_HH__
 
-#include "tlm_core/1/req_rsp/adapters/adapters.h"
-#include "tlm_core/1/req_rsp/channels/fifo/fifo.h"
-#include "tlm_core/1/req_rsp/channels/req_rsp_channels/put_get_imp.h"
+#include "tlm_core/1/req_rsp/adapters/adapters.hh"
+#include "tlm_core/1/req_rsp/channels/fifo/fifo.hh"
+#include "tlm_core/1/req_rsp/channels/req_rsp_channels/put_get_imp.hh"
 
 namespace tlm
 {
@@ -135,4 +137,4 @@ class tlm_transport_channel : public sc_core::sc_module
 } // namespace tlm
 
 #endif
-/* __EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_H__ */
+/* __EXT_TLM_CORE_1_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_REQ_RSP_CHANNELS_HH__ */
diff --git a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/core_ifs.h b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/core_ifs.hh
index 2a5778784..bb05a2101 100644
--- a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/core_ifs.h
+++ b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/core_ifs.hh
@@ -17,10 +17,10 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_CORE_IFS_H__
-#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_CORE_IFS_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_CORE_IFS_HH__
+#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_CORE_IFS_HH__
 
-#include "tlm_core/1/req_rsp/interfaces/tag.h"
+#include "tlm_core/1/req_rsp/interfaces/tag.hh"
 
 namespace tlm
 {
@@ -132,4 +132,4 @@ class tlm_get_peek_if : public virtual tlm_get_if<T>,
 
 } // namespace tlm
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_CORE_IFS_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_CORE_IFS_HH__ */
diff --git a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/fifo_ifs.h b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/fifo_ifs.hh
index 20d3b7e08..b6d06cef8 100644
--- a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/fifo_ifs.h
+++ b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/fifo_ifs.hh
@@ -17,10 +17,10 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_FIFO_IFS_H__
-#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_FIFO_IFS_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_FIFO_IFS_HH__
+#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_FIFO_IFS_HH__
 
-#include "tlm_core/1/req_rsp/interfaces/core_ifs.h"
+#include "tlm_core/1/req_rsp/interfaces/core_ifs.hh"
 
 namespace tlm
 {
@@ -76,4 +76,4 @@ class tlm_fifo_config_size_if : public virtual sc_core::sc_interface
 
 } // namespace tlm
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_FIFO_IFS_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_FIFO_IFS_HH__ */
diff --git a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/master_slave_ifs.h b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/master_slave_ifs.hh
index a1411c9ee..04c28ce60 100644
--- a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/master_slave_ifs.h
+++ b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/master_slave_ifs.hh
@@ -17,10 +17,10 @@
 
  *****************************************************************************/
 
-#ifndef __TLM_CORE_1_REQ_RSP_INTERFACES_MASTER_SLAVE_IFS_H__
-#define __TLM_CORE_1_REQ_RSP_INTERFACES_MASTER_SLAVE_IFS_H__
+#ifndef __TLM_CORE_1_REQ_RSP_INTERFACES_MASTER_SLAVE_IFS_HH__
+#define __TLM_CORE_1_REQ_RSP_INTERFACES_MASTER_SLAVE_IFS_HH__
 
-#include "tlm_core/1/req_rsp/interfaces/core_ifs.h"
+#include "tlm_core/1/req_rsp/interfaces/core_ifs.hh"
 
 namespace tlm
 {
@@ -72,4 +72,4 @@ class tlm_slave_if : public virtual tlm_put_if<RSP>,
 
 } // namespace tlm
 
-#endif /* __TLM_CORE_1_REQ_RSP_INTERFACES_MASTER_SLAVE_IFS_H__ */
+#endif /* __TLM_CORE_1_REQ_RSP_INTERFACES_MASTER_SLAVE_IFS_HH__ */
diff --git a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/tag.h b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/tag.hh
index 7aa7581c8..19e5f7a70 100644
--- a/src/systemc/ext/tlm_core/1/req_rsp/interfaces/tag.h
+++ b/src/systemc/ext/tlm_core/1/req_rsp/interfaces/tag.hh
@@ -17,8 +17,8 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_TAG_H__
-#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_TAG_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_TAG_HH__
+#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_TAG_HH__
 
 namespace tlm
 {
@@ -29,4 +29,4 @@ class tlm_tag
 
 }
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_TAG_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_INTERFACES_TAG_HH__ */
diff --git a/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.h b/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh
index 61ac88664..2e411ebad 100644
--- a/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.h
+++ b/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh
@@ -17,10 +17,10 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_EVENT_FINDER_H__
-#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_EVENT_FINDER_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_EVENT_FINDER_HH__
+#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_EVENT_FINDER_HH__
 
-#include "tlm_core/1/req_rsp/interfaces/tag.h"
+#include "tlm_core/1/req_rsp/interfaces/tag.hh"
 
 namespace tlm
 {
@@ -65,4 +65,4 @@ tlm_event_finder_t<IF, T>::find_event(sc_core::sc_interface *if_p) const
 
 } // namespace tlm
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_EVENT_FINDER_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_EVENT_FINDER_HH__ */
diff --git a/src/systemc/ext/tlm_core/1/req_rsp/ports/nonblocking_port.h b/src/systemc/ext/tlm_core/1/req_rsp/ports/nonblocking_port.hh
index 099d2fe7c..65964d3d2 100644
--- a/src/systemc/ext/tlm_core/1/req_rsp/ports/nonblocking_port.h
+++ b/src/systemc/ext/tlm_core/1/req_rsp/ports/nonblocking_port.hh
@@ -17,11 +17,11 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_NONBLOCKING_PORT_H__
-#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_NONBLOCKING_PORT_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_NONBLOCKING_PORT_HH__
+#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_NONBLOCKING_PORT_HH__
 
-#include "tlm_core/1/req_rsp/interfaces/core_ifs.h"
-#include "tlm_core/1/req_rsp/ports/event_finder.h"
+#include "tlm_core/1/req_rsp/interfaces/core_ifs.hh"
+#include "tlm_core/1/req_rsp/ports/event_finder.hh"
 
 namespace tlm
 {
@@ -85,4 +85,4 @@ class tlm_nonblocking_put_port :
 
 } // namespace tlm
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_NONBLOCKING_PORT_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_PORTS_NONBLOCKING_PORT_HH__ */
diff --git a/src/systemc/ext/tlm_core/1/req_rsp/req_rsp.h b/src/systemc/ext/tlm_core/1/req_rsp/req_rsp.hh
index 746a8598a..30acf829b 100644
--- a/src/systemc/ext/tlm_core/1/req_rsp/req_rsp.h
+++ b/src/systemc/ext/tlm_core/1/req_rsp/req_rsp.hh
@@ -17,20 +17,20 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_REQ_RSP_H__
-#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_REQ_RSP_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_REQ_RSP_HH__
+#define __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_REQ_RSP_HH__
 
 // The unannotated TLM interfaces.
 
-#include "tlm_core/1/req_rsp/interfaces/core_ifs.h"
-#include "tlm_core/1/req_rsp/interfaces/master_slave_ifs.h"
+#include "tlm_core/1/req_rsp/interfaces/core_ifs.hh"
+#include "tlm_core/1/req_rsp/interfaces/master_slave_ifs.hh"
 
 // The channels : tlm_fifo, tlm_transport_channel and tlm_req_rsp_channel.
 
-#include "tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.h"
+#include "tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.hh"
 
 // Some non blocking ports to provide static sensitivity.
 
-#include "tlm_core/1/req_rsp/ports/nonblocking_port.h"
+#include "tlm_core/1/req_rsp/ports/nonblocking_port.hh"
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_REQ_RSP_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_1_REQ_RSP_REQ_RSP_HH__ */