7 files changed, 32 insertions, 30 deletions
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__ */