diff --git a/src/systemc/ext/tlm b/src/systemc/ext/tlm
index 1516151..1ba078c 100644
--- a/src/systemc/ext/tlm
+++ b/src/systemc/ext/tlm
@@ -23,12 +23,12 @@
 #include <cstring>
 #include <systemc>    // main SystemC header
 
-#include "tlm_core/2/version.h"
-#include "tlm_core/1/analysis/analysis.h"
-#include "tlm_core/1/req_rsp/req_rsp.h"
-#include "tlm_core/2/interfaces/interfaces.h"
-#include "tlm_core/2/generic_payload/generic_payload.h"
-#include "tlm_core/2/sockets/sockets.h"
-#include "tlm_core/2/quantum/quantum.h"
+#include "tlm_core/2/version.hh"
+#include "tlm_core/1/analysis/analysis.hh"
+#include "tlm_core/1/req_rsp/req_rsp.hh"
+#include "tlm_core/2/interfaces/interfaces.hh"
+#include "tlm_core/2/generic_payload/generic_payload.hh"
+#include "tlm_core/2/sockets/sockets.hh"
+#include "tlm_core/2/quantum/quantum.hh"
 
 #endif /* __SYSTEMC_EXT_TLM__ */
diff --git a/src/systemc/ext/tlm_core/1/analysis/analysis.h b/src/systemc/ext/tlm_core/1/analysis/analysis.hh
similarity index 69%
rename from src/systemc/ext/tlm_core/1/analysis/analysis.h
rename to src/systemc/ext/tlm_core/1/analysis/analysis.hh
index 7e8b7e4..13858ac 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
similarity index 80%
rename from src/systemc/ext/tlm_core/1/analysis/analysis_fifo.h
rename to src/systemc/ext/tlm_core/1/analysis/analysis_fifo.hh
index ce3a27f..33cbc11 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 @@
 
 } // 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
similarity index 83%
rename from src/systemc/ext/tlm_core/1/analysis/analysis_if.h
rename to src/systemc/ext/tlm_core/1/analysis/analysis_if.hh
index 7602c63..880f1c1 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 @@
 
 } // 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
similarity index 89%
rename from src/systemc/ext/tlm_core/1/analysis/analysis_port.h
rename to src/systemc/ext/tlm_core/1/analysis/analysis_port.hh
index 4d9df6d..21ad261 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 @@
 
 } // 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
similarity index 88%
rename from src/systemc/ext/tlm_core/1/analysis/analysis_triple.h
rename to src/systemc/ext/tlm_core/1/analysis/analysis_triple.hh
index 033b738..efdf1ac 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 @@
 
 } // 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
similarity index 88%
rename from src/systemc/ext/tlm_core/1/analysis/write_if.h
rename to src/systemc/ext/tlm_core/1/analysis/write_if.hh
index f4ee68d..0461a3a 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 @@
 
 } // 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
similarity index 91%
rename from src/systemc/ext/tlm_core/1/req_rsp/adapters/adapters.h
rename to src/systemc/ext/tlm_core/1/req_rsp/adapters/adapters.hh
index 4aee66b..0e451aa 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 @@
 
 } // 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
similarity index 95%
rename from src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/circular_buffer.h
rename to src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/circular_buffer.hh
index 7625d71..0badaa5 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 @@
 
 } // 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
similarity index 91%
rename from src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo.h
rename to src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo.hh
index a85c890..d1ce483 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 @@
 
 } // 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
similarity index 91%
rename from src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_peek.h
rename to src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_peek.hh
index c132852..8431205 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 @@
 
 } // 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
similarity index 91%
rename from src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_put_get.h
rename to src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_put_get.hh
index 8d34d2a..ed419b2 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 @@
 
 } // 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
similarity index 90%
rename from src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_resize.h
rename to src/systemc/ext/tlm_core/1/req_rsp/channels/fifo/fifo_resize.hh
index 3f936fb..31175ac 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 @@
 
 } // 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
similarity index 94%
rename from src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/put_get_imp.h
rename to src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/put_get_imp.hh
index e821573..f9821db 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 @@
 } // 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
similarity index 93%
rename from src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.h
rename to src/systemc/ext/tlm_core/1/req_rsp/channels/req_rsp_channels/req_rsp_channels.hh
index 321d947..196a72e 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 @@
 } // 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
similarity index 94%
rename from src/systemc/ext/tlm_core/1/req_rsp/interfaces/core_ifs.h
rename to src/systemc/ext/tlm_core/1/req_rsp/interfaces/core_ifs.hh
index 2a57787..bb05a21 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 @@
 
 } // 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
similarity index 91%
rename from src/systemc/ext/tlm_core/1/req_rsp/interfaces/fifo_ifs.h
rename to src/systemc/ext/tlm_core/1/req_rsp/interfaces/fifo_ifs.hh
index 20d3b7e..b6d06ce 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 @@
 
 } // 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
similarity index 89%
rename from src/systemc/ext/tlm_core/1/req_rsp/interfaces/master_slave_ifs.h
rename to src/systemc/ext/tlm_core/1/req_rsp/interfaces/master_slave_ifs.hh
index a1411c9..04c28ce 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 @@
 
 } // 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
similarity index 84%
rename from src/systemc/ext/tlm_core/1/req_rsp/interfaces/tag.h
rename to src/systemc/ext/tlm_core/1/req_rsp/interfaces/tag.hh
index 7aa7581..19e5f7a 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 @@
 
 }
 
-#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
similarity index 89%
rename from src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.h
rename to src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh
index 61ac886..2e411eb 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 @@
 
 } // 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
similarity index 95%
rename from src/systemc/ext/tlm_core/1/req_rsp/ports/nonblocking_port.h
rename to src/systemc/ext/tlm_core/1/req_rsp/ports/nonblocking_port.hh
index 099d2fe..65964d3 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 @@
 
 } // 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
similarity index 77%
rename from src/systemc/ext/tlm_core/1/req_rsp/req_rsp.h
rename to src/systemc/ext/tlm_core/1/req_rsp/req_rsp.hh
index 746a859..30acf82 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__ */
diff --git a/src/systemc/ext/tlm_core/2/generic_payload/array.h b/src/systemc/ext/tlm_core/2/generic_payload/array.hh
similarity index 93%
rename from src/systemc/ext/tlm_core/2/generic_payload/array.h
rename to src/systemc/ext/tlm_core/2/generic_payload/array.hh
index 1c6c724..8650e68 100644
--- a/src/systemc/ext/tlm_core/2/generic_payload/array.h
+++ b/src/systemc/ext/tlm_core/2/generic_payload/array.hh
@@ -17,8 +17,8 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOADS_ARRAY_H__
-#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOADS_ARRAY_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOADS_ARRAY_HH__
+#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOADS_ARRAY_HH__
 
 #include <vector>
 
@@ -95,4 +95,4 @@
 
 } // namespace tlm
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOADS_ARRAY_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOADS_ARRAY_HH__ */
diff --git a/src/systemc/ext/tlm_core/2/generic_payload/endian_conv.h b/src/systemc/ext/tlm_core/2/generic_payload/endian_conv.hh
similarity index 98%
rename from src/systemc/ext/tlm_core/2/generic_payload/endian_conv.h
rename to src/systemc/ext/tlm_core/2/generic_payload/endian_conv.hh
index 50d5e68..07dcef7 100644
--- a/src/systemc/ext/tlm_core/2/generic_payload/endian_conv.h
+++ b/src/systemc/ext/tlm_core/2/generic_payload/endian_conv.hh
@@ -18,12 +18,12 @@
  *****************************************************************************/
 
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_ENDIAN_CONV_H__
-#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_ENDIAN_CONV_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_ENDIAN_CONV_HH__
+#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_ENDIAN_CONV_HH__
 
 #include <cstring> // std::memset
 
-#include "tlm_core/2/generic_payload/gp.h"
+#include "tlm_core/2/generic_payload/gp.hh"
 
 namespace tlm
 {
@@ -938,4 +938,4 @@
 
 }  // namespace tlm
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_ENDIAN_CONV_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_ENDIAN_CONV_HH__ */
diff --git a/src/systemc/ext/tlm_core/2/generic_payload/generic_payload.h b/src/systemc/ext/tlm_core/2/generic_payload/generic_payload.hh
similarity index 71%
rename from src/systemc/ext/tlm_core/2/generic_payload/generic_payload.h
rename to src/systemc/ext/tlm_core/2/generic_payload/generic_payload.hh
index fb10b88..4e03bb9 100644
--- a/src/systemc/ext/tlm_core/2/generic_payload/generic_payload.h
+++ b/src/systemc/ext/tlm_core/2/generic_payload/generic_payload.hh
@@ -17,12 +17,12 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_GENERIC_PAYLOAD_H__
-#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_GENERIC_PAYLOAD_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_GENERIC_PAYLOAD_HH__
+#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_GENERIC_PAYLOAD_HH__
 
-#include "tlm_core/2/generic_payload/endian_conv.h"
-#include "tlm_core/2/generic_payload/gp.h"
-#include "tlm_core/2/generic_payload/helpers.h"
-#include "tlm_core/2/generic_payload/phase.h"
+#include "tlm_core/2/generic_payload/endian_conv.hh"
+#include "tlm_core/2/generic_payload/gp.hh"
+#include "tlm_core/2/generic_payload/helpers.hh"
+#include "tlm_core/2/generic_payload/phase.hh"
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_GENERIC_PAYLOAD_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_GENERIC_PAYLOAD_HH__ */
diff --git a/src/systemc/ext/tlm_core/2/generic_payload/gp.h b/src/systemc/ext/tlm_core/2/generic_payload/gp.hh
similarity index 98%
rename from src/systemc/ext/tlm_core/2/generic_payload/gp.h
rename to src/systemc/ext/tlm_core/2/generic_payload/gp.hh
index 84bc25a..80ceb6a 100644
--- a/src/systemc/ext/tlm_core/2/generic_payload/gp.h
+++ b/src/systemc/ext/tlm_core/2/generic_payload/gp.hh
@@ -17,13 +17,13 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_GP_H__
-#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_GP_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_GP_HH__
+#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_GP_HH__
 
 #include <systemc>
 #include <typeinfo> // std::type_info
 
-#include "tlm_core/2/generic_payload/array.h"
+#include "tlm_core/2/generic_payload/array.hh"
 
 namespace tlm
 {
@@ -425,4 +425,4 @@
 
 } // namespace tlm
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_GP_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_GP_HH__ */
diff --git a/src/systemc/ext/tlm_core/2/generic_payload/helpers.h b/src/systemc/ext/tlm_core/2/generic_payload/helpers.hh
similarity index 91%
rename from src/systemc/ext/tlm_core/2/generic_payload/helpers.h
rename to src/systemc/ext/tlm_core/2/generic_payload/helpers.hh
index 4ec4fae..ec1582a 100644
--- a/src/systemc/ext/tlm_core/2/generic_payload/helpers.h
+++ b/src/systemc/ext/tlm_core/2/generic_payload/helpers.hh
@@ -17,8 +17,8 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_HELPERS_H__
-#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_HELPERS_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_HELPERS_HH__
+#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_HELPERS_HH__
 
 namespace tlm
 {
@@ -67,4 +67,4 @@
 
 } // namespace tlm
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_HELPERS_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_HELPERS_HH__ */
diff --git a/src/systemc/ext/tlm_core/2/generic_payload/phase.h b/src/systemc/ext/tlm_core/2/generic_payload/phase.hh
similarity index 94%
rename from src/systemc/ext/tlm_core/2/generic_payload/phase.h
rename to src/systemc/ext/tlm_core/2/generic_payload/phase.hh
index ca58b2f..db5866a 100644
--- a/src/systemc/ext/tlm_core/2/generic_payload/phase.h
+++ b/src/systemc/ext/tlm_core/2/generic_payload/phase.hh
@@ -17,8 +17,8 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_PHASE_H__
-#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_PHASE_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_PHASE_HH__
+#define __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_PHASE_HH__
 
 #include <iostream>
 #include <typeinfo>
@@ -114,4 +114,4 @@
 #undef SC_STRINGIFY_HELPER_DEFERRED_
 #undef SC_STRINGIFY_HELPER_MORE_DEFERRED_
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_PHASE_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_PHASE_HH__ */
diff --git a/src/systemc/ext/tlm_core/2/interfaces/dmi.h b/src/systemc/ext/tlm_core/2/interfaces/dmi.hh
similarity index 96%
rename from src/systemc/ext/tlm_core/2/interfaces/dmi.h
rename to src/systemc/ext/tlm_core/2/interfaces/dmi.hh
index 1e019e0..b00f099 100644
--- a/src/systemc/ext/tlm_core/2/interfaces/dmi.h
+++ b/src/systemc/ext/tlm_core/2/interfaces/dmi.hh
@@ -17,8 +17,8 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_DMI_H__
-#define __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_DMI_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_DMI_HH__
+#define __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_DMI_HH__
 
 #include <systemc>
 
@@ -121,4 +121,4 @@
 
 } // namespace tlm
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_DMI_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_DMI_HH__ */
diff --git a/src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.h b/src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.hh
similarity index 96%
rename from src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.h
rename to src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.hh
index 032ca39..7694653 100644
--- a/src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.h
+++ b/src/systemc/ext/tlm_core/2/interfaces/fw_bw_ifs.hh
@@ -17,13 +17,13 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_FW_BW_IFS_H__
-#define __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_FW_BW_IFS_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_FW_BW_IFS_HH__
+#define __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_FW_BW_IFS_HH__
 
 #include <systemc>
 
-#include "tlm_core/2/generic_payload/generic_payload.h"
-#include "tlm_core/2/interfaces/dmi.h"
+#include "tlm_core/2/generic_payload/generic_payload.hh"
+#include "tlm_core/2/interfaces/dmi.hh"
 
 namespace tlm
 {
@@ -219,4 +219,4 @@
 
 } // namespace tlm
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_FW_BW_IFS_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_FW_BW_IFS_HH__ */
diff --git a/src/systemc/ext/tlm_core/2/interfaces/interfaces.h b/src/systemc/ext/tlm_core/2/interfaces/interfaces.h
deleted file mode 100644
index bab1536..0000000
--- a/src/systemc/ext/tlm_core/2/interfaces/interfaces.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*****************************************************************************
-
-  Licensed to Accellera Systems Initiative Inc. (Accellera) under one or
-  more contributor license agreements.  See the NOTICE file distributed
-  with this work for additional information regarding copyright ownership.
-  Accellera licenses this file to you under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with the
-  License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-  implied.  See the License for the specific language governing
-  permissions and limitations under the License.
-
- *****************************************************************************/
-
-#ifndef __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_INTERFACES_H__
-#define __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_INTERFACES_H__
-
-#include "tlm_core/2/interfaces/dmi.h"
-#include "tlm_core/2/interfaces/fw_bw_ifs.h"
-
-#endif /* __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_INTERFACES_H__ */
diff --git a/src/systemc/ext/tlm_core/2/sockets/sockets.h b/src/systemc/ext/tlm_core/2/interfaces/interfaces.hh
similarity index 77%
copy from src/systemc/ext/tlm_core/2/sockets/sockets.h
copy to src/systemc/ext/tlm_core/2/interfaces/interfaces.hh
index 53d1819..8886834 100644
--- a/src/systemc/ext/tlm_core/2/sockets/sockets.h
+++ b/src/systemc/ext/tlm_core/2/interfaces/interfaces.hh
@@ -17,10 +17,10 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_H__
-#define __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_INTERFACES_HH__
+#define __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_INTERFACES_HH__
 
-#include "tlm_core/2/sockets/initiator_socket.h"
-#include "tlm_core/2/sockets/target_socket.h"
+#include "tlm_core/2/interfaces/dmi.hh"
+#include "tlm_core/2/interfaces/fw_bw_ifs.hh"
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_2_INTERFACES_INTERFACES_HH__ */
diff --git a/src/systemc/ext/tlm_core/2/quantum/global_quantum.h b/src/systemc/ext/tlm_core/2/quantum/global_quantum.hh
similarity index 92%
rename from src/systemc/ext/tlm_core/2/quantum/global_quantum.h
rename to src/systemc/ext/tlm_core/2/quantum/global_quantum.hh
index 54fcd5c..5b6e267 100644
--- a/src/systemc/ext/tlm_core/2/quantum/global_quantum.h
+++ b/src/systemc/ext/tlm_core/2/quantum/global_quantum.hh
@@ -17,8 +17,8 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_2_QUANTUM_GLOBAL_QUANTUM_H__
-#define __SYSTEMC_EXT_TLM_CORE_2_QUANTUM_GLOBAL_QUANTUM_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_2_QUANTUM_GLOBAL_QUANTUM_HH__
+#define __SYSTEMC_EXT_TLM_CORE_2_QUANTUM_GLOBAL_QUANTUM_HH__
 
 #include <systemc>
 
@@ -73,4 +73,4 @@
 
 } // namespace tlm
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_2_QUANTUM_GLOBAL_QUANTUM_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_2_QUANTUM_GLOBAL_QUANTUM_HH__ */
diff --git a/src/systemc/ext/tlm_core/2/quantum/quantum.h b/src/systemc/ext/tlm_core/2/quantum/quantum.hh
similarity index 80%
rename from src/systemc/ext/tlm_core/2/quantum/quantum.h
rename to src/systemc/ext/tlm_core/2/quantum/quantum.hh
index 6639d42..b46047e 100644
--- a/src/systemc/ext/tlm_core/2/quantum/quantum.h
+++ b/src/systemc/ext/tlm_core/2/quantum/quantum.hh
@@ -17,9 +17,9 @@
 
  *****************************************************************************/
 
-#ifndef ____SYSTEMC_EXT_TLM_CORE_2_QUANTUM_QUANTUM_H__
-#define ____SYSTEMC_EXT_TLM_CORE_2_QUANTUM_QUANTUM_H__
+#ifndef ____SYSTEMC_EXT_TLM_CORE_2_QUANTUM_QUANTUM_HH__
+#define ____SYSTEMC_EXT_TLM_CORE_2_QUANTUM_QUANTUM_HH__
 
-#include "tlm_core/2/quantum/global_quantum.h"
+#include "tlm_core/2/quantum/global_quantum.hh"
 
-#endif /* ____SYSTEMC_EXT_TLM_CORE_2_QUANTUM_QUANTUM_H__ */
+#endif /* ____SYSTEMC_EXT_TLM_CORE_2_QUANTUM_QUANTUM_HH__ */
diff --git a/src/systemc/ext/tlm_core/2/sockets/base_socket_if.h b/src/systemc/ext/tlm_core/2/sockets/base_socket_if.hh
similarity index 100%
rename from src/systemc/ext/tlm_core/2/sockets/base_socket_if.h
rename to src/systemc/ext/tlm_core/2/sockets/base_socket_if.hh
diff --git a/src/systemc/ext/tlm_core/2/sockets/initiator_socket.h b/src/systemc/ext/tlm_core/2/sockets/initiator_socket.hh
similarity index 95%
rename from src/systemc/ext/tlm_core/2/sockets/initiator_socket.h
rename to src/systemc/ext/tlm_core/2/sockets/initiator_socket.hh
index 686f930..91c147b 100644
--- a/src/systemc/ext/tlm_core/2/sockets/initiator_socket.h
+++ b/src/systemc/ext/tlm_core/2/sockets/initiator_socket.hh
@@ -17,11 +17,11 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_INITIATOR_SOCKET_H__
-#define __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_INITIATOR_SOCKET_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_INITIATOR_SOCKET_HH__
+#define __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_INITIATOR_SOCKET_HH__
 
-#include "tlm_core/2/interfaces/fw_bw_ifs.h"
-#include "tlm_core/2/sockets/base_socket_if.h"
+#include "tlm_core/2/interfaces/fw_bw_ifs.hh"
+#include "tlm_core/2/sockets/base_socket_if.hh"
 
 namespace tlm
 {
@@ -201,4 +201,4 @@
 
 } // namespace tlm
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_INITIATOR_SOCKET_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_INITIATOR_SOCKET_HH__ */
diff --git a/src/systemc/ext/tlm_core/2/sockets/sockets.h b/src/systemc/ext/tlm_core/2/sockets/sockets.hh
similarity index 78%
rename from src/systemc/ext/tlm_core/2/sockets/sockets.h
rename to src/systemc/ext/tlm_core/2/sockets/sockets.hh
index 53d1819..781c51a 100644
--- a/src/systemc/ext/tlm_core/2/sockets/sockets.h
+++ b/src/systemc/ext/tlm_core/2/sockets/sockets.hh
@@ -17,10 +17,10 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_H__
-#define __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_HH__
+#define __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_HH__
 
-#include "tlm_core/2/sockets/initiator_socket.h"
-#include "tlm_core/2/sockets/target_socket.h"
+#include "tlm_core/2/sockets/initiator_socket.hh"
+#include "tlm_core/2/sockets/target_socket.hh"
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_SOCKETS_HH__ */
diff --git a/src/systemc/ext/tlm_core/2/sockets/target_socket.h b/src/systemc/ext/tlm_core/2/sockets/target_socket.hh
similarity index 95%
rename from src/systemc/ext/tlm_core/2/sockets/target_socket.h
rename to src/systemc/ext/tlm_core/2/sockets/target_socket.hh
index 7493c97..b412a7d 100644
--- a/src/systemc/ext/tlm_core/2/sockets/target_socket.h
+++ b/src/systemc/ext/tlm_core/2/sockets/target_socket.hh
@@ -17,11 +17,11 @@
 
  *****************************************************************************/
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_TARGET_SOCKET_H__
-#define __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_TARGET_SOCKET_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_TARGET_SOCKET_HH__
+#define __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_TARGET_SOCKET_HH__
 
-#include "tlm_core/2/interfaces/fw_bw_ifs.h"
-#include "tlm_core/2/sockets/base_socket_if.h"
+#include "tlm_core/2/interfaces/fw_bw_ifs.hh"
+#include "tlm_core/2/sockets/base_socket_if.hh"
 
 namespace tlm
 {
@@ -220,4 +220,4 @@
 
 } // namespace tlm
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_TARGET_SOCKET_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_2_SOCKETS_TARGET_SOCKET_HH__ */
diff --git a/src/systemc/ext/tlm_core/2/version.h b/src/systemc/ext/tlm_core/2/version.hh
similarity index 97%
rename from src/systemc/ext/tlm_core/2/version.h
rename to src/systemc/ext/tlm_core/2/version.hh
index b7bca36..2c52c34 100644
--- a/src/systemc/ext/tlm_core/2/version.h
+++ b/src/systemc/ext/tlm_core/2/version.hh
@@ -52,8 +52,8 @@
                  inline const char* tlm_copyright (void)
 --------------------------------------------------------------------------- */
 
-#ifndef __SYSTEMC_EXT_TLM_CORE_2_VERSION_H__
-#define __SYSTEMC_EXT_TLM_CORE_2_VERSION_H__
+#ifndef __SYSTEMC_EXT_TLM_CORE_2_VERSION_HH__
+#define __SYSTEMC_EXT_TLM_CORE_2_VERSION_HH__
 
 namespace tlm
 {
@@ -152,4 +152,4 @@
 
 } // namespace tlm
 
-#endif /* __SYSTEMC_EXT_TLM_CORE_2_VERSION_H__ */
+#endif /* __SYSTEMC_EXT_TLM_CORE_2_VERSION_HH__ */