diff --git a/lte/gateway/c/session_manager/AAAClient.cpp b/lte/gateway/c/session_manager/AAAClient.cpp
index 8e49ad900cb33..2430e51f2dcd0 100644
--- a/lte/gateway/c/session_manager/AAAClient.cpp
+++ b/lte/gateway/c/session_manager/AAAClient.cpp
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-#include "lte/gateway/c/session_manager/AAAClient.h"
+#include "lte/gateway/c/session_manager/AAAClient.hpp"
 
 #include <glog/logging.h>
 #include <grpcpp/channel.h>
@@ -26,7 +26,7 @@
 #include <utility>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/SessionState.h"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 #include "orc8r/gateway/c/common/service_registry/includes/ServiceRegistrySingleton.hpp"
 #include "orc8r/gateway/c/common/logging/magma_logging.h"
diff --git a/lte/gateway/c/session_manager/AAAClient.h b/lte/gateway/c/session_manager/AAAClient.hpp
similarity index 95%
rename from lte/gateway/c/session_manager/AAAClient.h
rename to lte/gateway/c/session_manager/AAAClient.hpp
index cca66515796d7..989985391f826 100644
--- a/lte/gateway/c/session_manager/AAAClient.h
+++ b/lte/gateway/c/session_manager/AAAClient.hpp
@@ -19,8 +19,8 @@
 #include <memory>
 #include <string>
 
-#include "lte/gateway/c/session_manager/SessionState.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
 #include "lte/gateway/c/session_manager/StoreClient.h"
 #include "orc8r/gateway/c/common/async_grpc/includes/GRPCReceiver.hpp"
 
diff --git a/lte/gateway/c/session_manager/AmfServiceClient.cpp b/lte/gateway/c/session_manager/AmfServiceClient.cpp
index 7d5d61d049175..a122c2a3479f6 100644
--- a/lte/gateway/c/session_manager/AmfServiceClient.cpp
+++ b/lte/gateway/c/session_manager/AmfServiceClient.cpp
@@ -1,4 +1,4 @@
-#include "lte/gateway/c/session_manager/AmfServiceClient.h"
+#include "lte/gateway/c/session_manager/AmfServiceClient.hpp"
 
 #include <glog/logging.h>
 #include <grpcpp/channel.h>
diff --git a/lte/gateway/c/session_manager/AmfServiceClient.h b/lte/gateway/c/session_manager/AmfServiceClient.hpp
similarity index 100%
rename from lte/gateway/c/session_manager/AmfServiceClient.h
rename to lte/gateway/c/session_manager/AmfServiceClient.hpp
diff --git a/lte/gateway/c/session_manager/BUILD.bazel b/lte/gateway/c/session_manager/BUILD.bazel
index 60ec4006f58d8..3fadf11144ecc 100644
--- a/lte/gateway/c/session_manager/BUILD.bazel
+++ b/lte/gateway/c/session_manager/BUILD.bazel
@@ -16,13 +16,13 @@ package(default_visibility = ["//lte/gateway/c/session_manager/test:__pkg__"])
 cc_library(
     name = "diameter_codes",
     srcs = ["DiameterCodes.cpp"],
-    hdrs = ["DiameterCodes.h"],
+    hdrs = ["DiameterCodes.hpp"],
 )
 
 cc_library(
     name = "grpc_magma_utils",
     srcs = ["GrpcMagmaUtils.cpp"],
-    hdrs = ["GrpcMagmaUtils.h"],
+    hdrs = ["GrpcMagmaUtils.hpp"],
     deps = [
         "//orc8r/gateway/c/common/logging",
         "@com_github_google_glog//:glog",
@@ -33,13 +33,13 @@ cc_library(
 cc_library(
     name = "session_id",
     srcs = ["SessionID.cpp"],
-    hdrs = ["SessionID.h"],
+    hdrs = ["SessionID.hpp"],
 )
 
 cc_library(
     name = "utilities",
     srcs = ["Utilities.cpp"],
-    hdrs = ["Utilities.h"],
+    hdrs = ["Utilities.hpp"],
     deps = ["@com_google_protobuf//:protobuf"],
 )
 
@@ -80,9 +80,9 @@ cc_library(
     ],
     hdrs = [
         "ObjectMap.h",
-        "PolicyLoader.h",
+        "PolicyLoader.hpp",
         "RedisMap.hpp",
-        "Serializers.h",
+        "Serializers.hpp",
     ],
     deps = [
         "//lte/protos:policydb_cpp_proto",
@@ -98,7 +98,7 @@ cc_library(
 cc_library(
     name = "session_reporter",
     srcs = ["SessionReporter.cpp"],
-    hdrs = ["SessionReporter.h"],
+    hdrs = ["SessionReporter.hpp"],
     deps = [
         ":grpc_magma_utils",
         "//lte/protos:session_manager_cpp_grpc",
@@ -112,7 +112,7 @@ cc_library(
 cc_library(
     name = "stored_state",
     srcs = ["StoredState.cpp"],
-    hdrs = ["StoredState.h"],
+    hdrs = ["StoredState.hpp"],
     deps = [
         ":credit_key",
         ":types",
@@ -127,7 +127,7 @@ cc_library(
 cc_library(
     name = "rule_store",
     srcs = ["RuleStore.cpp"],
-    hdrs = ["RuleStore.h"],
+    hdrs = ["RuleStore.hpp"],
     deps = [
         ":credit_key",
         "//lte/protos:pipelined_cpp_grpc",
@@ -145,10 +145,10 @@ cc_library(
         "SessionCredit.cpp",
     ],
     hdrs = [
-        "ChargingGrant.h",
-        "EnumToString.h",
+        "ChargingGrant.hpp",
+        "EnumToString.hpp",
         "Monitor.h",
-        "SessionCredit.h",
+        "SessionCredit.hpp",
     ],
     deps = [
         ":diameter_codes",
@@ -164,13 +164,13 @@ cc_library(
 cc_library(
     name = "shard_tracker",
     srcs = ["ShardTracker.cpp"],
-    hdrs = ["ShardTracker.h"],
+    hdrs = ["ShardTracker.hpp"],
 )
 
 cc_library(
     name = "session_state",
     srcs = ["SessionState.cpp"],
-    hdrs = ["SessionState.h"],
+    hdrs = ["SessionState.hpp"],
     deps = [
         ":rule_store",
         ":session_credit",
@@ -186,7 +186,7 @@ cc_library(
 cc_library(
     name = "metering_reporter",
     srcs = ["MeteringReporter.cpp"],
-    hdrs = ["MeteringReporter.h"],
+    hdrs = ["MeteringReporter.hpp"],
     deps = [
         ":session_credit",
         ":stored_state",
@@ -202,9 +202,9 @@ cc_library(
         "SessionStore.cpp",
     ],
     hdrs = [
-        "MemoryStoreClient.h",
-        "RedisStoreClient.h",
-        "SessionStore.h",
+        "MemoryStoreClient.hpp",
+        "RedisStoreClient.hpp",
+        "SessionStore.hpp",
         "StoreClient.h",
     ],
     deps = [
@@ -219,7 +219,7 @@ cc_library(
 cc_library(
     name = "aaa_client",
     srcs = ["AAAClient.cpp"],
-    hdrs = ["AAAClient.h"],
+    hdrs = ["AAAClient.hpp"],
     deps = [
         ":session_state",
         ":session_store",
@@ -231,7 +231,7 @@ cc_library(
 cc_library(
     name = "directoryd_client",
     srcs = ["DirectorydClient.cpp"],
-    hdrs = ["DirectorydClient.h"],
+    hdrs = ["DirectorydClient.hpp"],
     deps = [
         ":session_state",
         "//orc8r/gateway/c/common/async_grpc:async_grpc_receiver",
@@ -242,7 +242,7 @@ cc_library(
 cc_library(
     name = "mobilityd_client",
     srcs = ["MobilitydClient.cpp"],
-    hdrs = ["MobilitydClient.h"],
+    hdrs = ["MobilitydClient.hpp"],
     deps = [
         ":session_state",
         ":types",
@@ -255,7 +255,7 @@ cc_library(
 cc_library(
     name = "pipelined_client",
     srcs = ["PipelinedClient.cpp"],
-    hdrs = ["PipelinedClient.h"],
+    hdrs = ["PipelinedClient.hpp"],
     deps = [
         ":session_credit",
         ":session_state",
@@ -267,7 +267,7 @@ cc_library(
 cc_library(
     name = "spgw_service_client",
     srcs = ["SpgwServiceClient.cpp"],
-    hdrs = ["SpgwServiceClient.h"],
+    hdrs = ["SpgwServiceClient.hpp"],
     deps = [
         "//lte/protos:spgw_service_cpp_grpc",
         "//orc8r/gateway/c/common/async_grpc:async_grpc_receiver",
@@ -280,7 +280,7 @@ cc_library(
 cc_library(
     name = "amf_service_client",
     srcs = ["AmfServiceClient.cpp"],
-    hdrs = ["AmfServiceClient.h"],
+    hdrs = ["AmfServiceClient.hpp"],
     deps = [
         "//lte/protos:session_manager_cpp_grpc",
         "//orc8r/gateway/c/common/async_grpc:async_grpc_receiver",
@@ -293,7 +293,7 @@ cc_library(
 cc_library(
     name = "session_events",
     srcs = ["SessionEvents.cpp"],
-    hdrs = ["SessionEvents.h"],
+    hdrs = ["SessionEvents.hpp"],
     deps = [
         ":session_credit",
         ":session_state",
@@ -304,7 +304,7 @@ cc_library(
 cc_library(
     name = "local_enforcer",
     srcs = ["LocalEnforcer.cpp"],
-    hdrs = ["LocalEnforcer.h"],
+    hdrs = ["LocalEnforcer.hpp"],
     deps = [
         ":aaa_client",
         ":directoryd_client",
@@ -320,7 +320,7 @@ cc_library(
 cc_library(
     name = "session_state_enforcer",
     srcs = ["SessionStateEnforcer.cpp"],
-    hdrs = ["SessionStateEnforcer.h"],
+    hdrs = ["SessionStateEnforcer.hpp"],
     deps = [
         ":amf_service_client",
         ":pipelined_client",
@@ -337,28 +337,28 @@ cc_library(
 cc_library(
     name = "stats_poller",
     srcs = ["StatsPoller.cpp"],
-    hdrs = ["StatsPoller.h"],
+    hdrs = ["StatsPoller.hpp"],
     deps = [":local_enforcer"],
 )
 
 cc_library(
     name = "operational_states_handler",
     srcs = ["OperationalStatesHandler.cpp"],
-    hdrs = ["OperationalStatesHandler.h"],
+    hdrs = ["OperationalStatesHandler.hpp"],
     deps = [":session_store"],
 )
 
 cc_library(
     name = "restart_handler",
     srcs = ["RestartHandler.cpp"],
-    hdrs = ["RestartHandler.h"],
+    hdrs = ["RestartHandler.hpp"],
     deps = [":local_enforcer"],
 )
 
 cc_library(
     name = "session_proxy_responder_handler",
     srcs = ["SessionProxyResponderHandler.cpp"],
-    hdrs = ["SessionProxyResponderHandler.h"],
+    hdrs = ["SessionProxyResponderHandler.hpp"],
     deps = [
         ":local_enforcer",
         "//lte/protos:abort_session_cpp_grpc",
@@ -369,7 +369,7 @@ cc_library(
 cc_library(
     name = "local_session_manager_handler",
     srcs = ["LocalSessionManagerHandler.cpp"],
-    hdrs = ["LocalSessionManagerHandler.h"],
+    hdrs = ["LocalSessionManagerHandler.hpp"],
     deps = [
         ":local_enforcer",
         ":session_id",
@@ -380,7 +380,7 @@ cc_library(
 cc_library(
     name = "set_message_manager_handler",
     srcs = ["SetMessageManagerHandler.cpp"],
-    hdrs = ["SetMessageManagerHandler.h"],
+    hdrs = ["SetMessageManagerHandler.hpp"],
     deps = [
         ":session_id",
         ":session_state_enforcer",
@@ -393,7 +393,7 @@ cc_library(
 cc_library(
     name = "upf_msg_manage_handler",
     srcs = ["UpfMsgManageHandler.cpp"],
-    hdrs = ["UpfMsgManageHandler.h"],
+    hdrs = ["UpfMsgManageHandler.hpp"],
     deps = [
         ":mobilityd_client",
         ":session_id",
@@ -406,7 +406,7 @@ cc_library(
 cc_library(
     name = "session_manager_server",
     srcs = ["SessionManagerServer.cpp"],
-    hdrs = ["SessionManagerServer.h"],
+    hdrs = ["SessionManagerServer.hpp"],
     deps = [
         ":local_session_manager_handler",
         ":session_proxy_responder_handler",
diff --git a/lte/gateway/c/session_manager/CMakeLists.txt b/lte/gateway/c/session_manager/CMakeLists.txt
index a0808883eea8d..ffcaee73b8971 100644
--- a/lte/gateway/c/session_manager/CMakeLists.txt
+++ b/lte/gateway/c/session_manager/CMakeLists.txt
@@ -119,83 +119,83 @@ link_directories(
 
 add_library(SESSION_MANAGER
     AAAClient.cpp
-    AAAClient.h
+    AAAClient.hpp
     ChargingGrant.cpp
-    ChargingGrant.h
+    ChargingGrant.hpp
     EnumToString.cpp
-    EnumToString.h
+    EnumToString.hpp
     SessionManagerServer.cpp
-    SessionManagerServer.h
+    SessionManagerServer.hpp
     LocalSessionManagerHandler.cpp
-    LocalSessionManagerHandler.h
+    LocalSessionManagerHandler.hpp
     LocalEnforcer.cpp
-    LocalEnforcer.h
+    LocalEnforcer.hpp
     SessionState.cpp
-    SessionState.h
+    SessionState.hpp
     SessionCredit.cpp
-    SessionCredit.h
+    SessionCredit.hpp
     RestartHandler.cpp
-    RestartHandler.h
+    RestartHandler.hpp
     RuleStore.cpp
-    RuleStore.h
+    RuleStore.hpp
     SessionReporter.cpp
-    SessionReporter.h
+    SessionReporter.hpp
     SessionID.cpp
-    SessionID.h
+    SessionID.hpp
     ServiceAction.h
     SpgwServiceClient.cpp
-    SpgwServiceClient.h
+    SpgwServiceClient.hpp
     PipelinedClient.cpp
-    PipelinedClient.h
+    PipelinedClient.hpp
     DirectorydClient.cpp
-    DirectorydClient.h
+    DirectorydClient.hpp
     SessionEvents.cpp
-    SessionEvents.h
+    SessionEvents.hpp
     DiameterCodes.cpp
-    DiameterCodes.h
+    DiameterCodes.hpp
     CreditKey.h
     StatsPoller.cpp
-    StatsPoller.h
+    StatsPoller.hpp
     ShardTracker.cpp
-    ShardTracker.h
+    ShardTracker.hpp
     SessionProxyResponderHandler.cpp
-    SessionProxyResponderHandler.h
+    SessionProxyResponderHandler.hpp
     StoredState.cpp
-    StoredState.h
+    StoredState.hpp
     SessionStore.cpp
-    SessionStore.h
+    SessionStore.hpp
     MemoryStoreClient.cpp
-    MemoryStoreClient.h
+    MemoryStoreClient.hpp
     Monitor.h
     RedisStoreClient.cpp
-    RedisStoreClient.h
+    RedisStoreClient.hpp
     StoreClient.h
     MeteringReporter.cpp
-    MeteringReporter.h
+    MeteringReporter.hpp
     GrpcMagmaUtils.cpp
-    GrpcMagmaUtils.h
-    SetMessageManagerHandler.h
+    GrpcMagmaUtils.hpp
+    SetMessageManagerHandler.hpp
     SetMessageManagerHandler.cpp
-    UpfMsgManageHandler.h
+    UpfMsgManageHandler.hpp
     UpfMsgManageHandler.cpp
-    SessionStateEnforcer.h
+    SessionStateEnforcer.hpp
     SessionStateEnforcer.cpp
-    AmfServiceClient.h
+    AmfServiceClient.hpp
     AmfServiceClient.cpp
     Utilities.cpp
-    Utilities.h
+    Utilities.hpp
     OperationalStatesHandler.cpp
-    OperationalStatesHandler.h
+    OperationalStatesHandler.hpp
     Types.h
     MobilitydClient.cpp
-    MobilitydClient.h
+    MobilitydClient.hpp
     ObjectMap.h
     PolicyLoader.cpp
-    PolicyLoader.h
+    PolicyLoader.hpp
     ObjectMap.h
     RedisMap.hpp
     Serializers.cpp
-    Serializers.h
+    Serializers.hpp
     ${PROTO_SRCS}
     ${PROTO_HDRS})
 
diff --git a/lte/gateway/c/session_manager/ChargingGrant.cpp b/lte/gateway/c/session_manager/ChargingGrant.cpp
index 5dd5f57a7fc4c..10b40e5396c4b 100644
--- a/lte/gateway/c/session_manager/ChargingGrant.cpp
+++ b/lte/gateway/c/session_manager/ChargingGrant.cpp
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-#include "lte/gateway/c/session_manager/ChargingGrant.h"
+#include "lte/gateway/c/session_manager/ChargingGrant.hpp"
 
 #include <glog/logging.h>
 #include <algorithm>
@@ -22,8 +22,8 @@
 #include <vector>
 
 #include "lte/gateway/c/session_manager/CreditKey.h"
-#include "lte/gateway/c/session_manager/DiameterCodes.h"
-#include "lte/gateway/c/session_manager/EnumToString.h"
+#include "lte/gateway/c/session_manager/DiameterCodes.hpp"
+#include "lte/gateway/c/session_manager/EnumToString.hpp"
 #include "orc8r/gateway/c/common/logging/magma_logging.h"
 
 namespace magma {
diff --git a/lte/gateway/c/session_manager/ChargingGrant.h b/lte/gateway/c/session_manager/ChargingGrant.hpp
similarity index 96%
rename from lte/gateway/c/session_manager/ChargingGrant.h
rename to lte/gateway/c/session_manager/ChargingGrant.hpp
index 3dad778100f05..8bd0551811e94 100644
--- a/lte/gateway/c/session_manager/ChargingGrant.h
+++ b/lte/gateway/c/session_manager/ChargingGrant.hpp
@@ -17,10 +17,10 @@
 #include <stdint.h>
 #include <ctime>
 
-#include "lte/gateway/c/session_manager/DiameterCodes.h"
+#include "lte/gateway/c/session_manager/DiameterCodes.hpp"
 #include "lte/gateway/c/session_manager/ServiceAction.h"
-#include "lte/gateway/c/session_manager/SessionCredit.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/SessionCredit.hpp"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 
 namespace magma {
diff --git a/lte/gateway/c/session_manager/DiameterCodes.cpp b/lte/gateway/c/session_manager/DiameterCodes.cpp
index 563cfe833af9b..299a0c03140d8 100644
--- a/lte/gateway/c/session_manager/DiameterCodes.cpp
+++ b/lte/gateway/c/session_manager/DiameterCodes.cpp
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-#include "lte/gateway/c/session_manager/DiameterCodes.h"
+#include "lte/gateway/c/session_manager/DiameterCodes.hpp"
 
 uint32_t terminator_codes[] = {
     magma::DIAMETER_END_USER_SERVICE_DENIED,
diff --git a/lte/gateway/c/session_manager/DiameterCodes.h b/lte/gateway/c/session_manager/DiameterCodes.hpp
similarity index 100%
rename from lte/gateway/c/session_manager/DiameterCodes.h
rename to lte/gateway/c/session_manager/DiameterCodes.hpp
diff --git a/lte/gateway/c/session_manager/DirectorydClient.cpp b/lte/gateway/c/session_manager/DirectorydClient.cpp
index 4691d6c7938d7..935870290a8f2 100644
--- a/lte/gateway/c/session_manager/DirectorydClient.cpp
+++ b/lte/gateway/c/session_manager/DirectorydClient.cpp
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-#include "lte/gateway/c/session_manager/DirectorydClient.h"
+#include "lte/gateway/c/session_manager/DirectorydClient.hpp"
 
 #include <grpcpp/channel.h>
 #include <orc8r/protos/common.pb.h>
diff --git a/lte/gateway/c/session_manager/DirectorydClient.h b/lte/gateway/c/session_manager/DirectorydClient.hpp
similarity index 98%
rename from lte/gateway/c/session_manager/DirectorydClient.h
rename to lte/gateway/c/session_manager/DirectorydClient.hpp
index f078bdb49b606..eee1e32e5ee67 100644
--- a/lte/gateway/c/session_manager/DirectorydClient.h
+++ b/lte/gateway/c/session_manager/DirectorydClient.hpp
@@ -21,7 +21,7 @@
 #include <mutex>
 #include <unordered_map>
 
-#include "lte/gateway/c/session_manager/SessionState.h"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
 #include "orc8r/gateway/c/common/async_grpc/includes/GRPCReceiver.hpp"
 
 namespace grpc {
diff --git a/lte/gateway/c/session_manager/EnumToString.cpp b/lte/gateway/c/session_manager/EnumToString.cpp
index 4fc4f34bb560f..23d9f531846ae 100644
--- a/lte/gateway/c/session_manager/EnumToString.cpp
+++ b/lte/gateway/c/session_manager/EnumToString.cpp
@@ -11,14 +11,14 @@
  * limitations under the License.
  */
 
-#include "lte/gateway/c/session_manager/EnumToString.h"
+#include "lte/gateway/c/session_manager/EnumToString.hpp"
 
 #include <lte/protos/abort_session.pb.h>
 #include <lte/protos/session_manager.pb.h>
 #include <sstream>
 #include <string>
 
-#include "lte/gateway/c/session_manager/ChargingGrant.h"
+#include "lte/gateway/c/session_manager/ChargingGrant.hpp"
 
 namespace magma {
 std::string reauth_state_to_str(ReAuthState state) {
diff --git a/lte/gateway/c/session_manager/EnumToString.h b/lte/gateway/c/session_manager/EnumToString.hpp
similarity index 93%
rename from lte/gateway/c/session_manager/EnumToString.h
rename to lte/gateway/c/session_manager/EnumToString.hpp
index 88ad6d55b8e83..448e79e1a9bb5 100644
--- a/lte/gateway/c/session_manager/EnumToString.h
+++ b/lte/gateway/c/session_manager/EnumToString.hpp
@@ -17,9 +17,9 @@
 #include <lte/protos/session_manager.pb.h>
 #include <string>
 
-#include "lte/gateway/c/session_manager/ChargingGrant.h"
+#include "lte/gateway/c/session_manager/ChargingGrant.hpp"
 #include "lte/gateway/c/session_manager/ServiceAction.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 
 namespace magma {
diff --git a/lte/gateway/c/session_manager/GrpcMagmaUtils.cpp b/lte/gateway/c/session_manager/GrpcMagmaUtils.cpp
index 93cbb90424b63..d3806b91247f2 100644
--- a/lte/gateway/c/session_manager/GrpcMagmaUtils.cpp
+++ b/lte/gateway/c/session_manager/GrpcMagmaUtils.cpp
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-#include "lte/gateway/c/session_manager/GrpcMagmaUtils.h"
+#include "lte/gateway/c/session_manager/GrpcMagmaUtils.hpp"
 
 #include <glog/logging.h>
 #include <google/protobuf/descriptor.h>
diff --git a/lte/gateway/c/session_manager/GrpcMagmaUtils.h b/lte/gateway/c/session_manager/GrpcMagmaUtils.hpp
similarity index 100%
rename from lte/gateway/c/session_manager/GrpcMagmaUtils.h
rename to lte/gateway/c/session_manager/GrpcMagmaUtils.hpp
diff --git a/lte/gateway/c/session_manager/LocalEnforcer.cpp b/lte/gateway/c/session_manager/LocalEnforcer.cpp
index 17eb806d89456..a5baacb907f21 100644
--- a/lte/gateway/c/session_manager/LocalEnforcer.cpp
+++ b/lte/gateway/c/session_manager/LocalEnforcer.cpp
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-#include "lte/gateway/c/session_manager/LocalEnforcer.h"
+#include "lte/gateway/c/session_manager/LocalEnforcer.hpp"
 
 #include <ctype.h>
 #include <cxxabi.h>
@@ -34,20 +34,20 @@
 #include <utility>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/AAAClient.h"
-#include "lte/gateway/c/session_manager/ChargingGrant.h"
-#include "lte/gateway/c/session_manager/DiameterCodes.h"
-#include "lte/gateway/c/session_manager/EnumToString.h"
-#include "lte/gateway/c/session_manager/GrpcMagmaUtils.h"
-#include "lte/gateway/c/session_manager/PipelinedClient.h"
-#include "lte/gateway/c/session_manager/RuleStore.h"
+#include "lte/gateway/c/session_manager/AAAClient.hpp"
+#include "lte/gateway/c/session_manager/ChargingGrant.hpp"
+#include "lte/gateway/c/session_manager/DiameterCodes.hpp"
+#include "lte/gateway/c/session_manager/EnumToString.hpp"
+#include "lte/gateway/c/session_manager/GrpcMagmaUtils.hpp"
+#include "lte/gateway/c/session_manager/PipelinedClient.hpp"
+#include "lte/gateway/c/session_manager/RuleStore.hpp"
 #include "lte/gateway/c/session_manager/ServiceAction.h"
-#include "lte/gateway/c/session_manager/SessionEvents.h"
-#include "lte/gateway/c/session_manager/SessionReporter.h"
-#include "lte/gateway/c/session_manager/ShardTracker.h"
-#include "lte/gateway/c/session_manager/SpgwServiceClient.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
-#include "lte/gateway/c/session_manager/Utilities.h"
+#include "lte/gateway/c/session_manager/SessionEvents.hpp"
+#include "lte/gateway/c/session_manager/SessionReporter.hpp"
+#include "lte/gateway/c/session_manager/ShardTracker.hpp"
+#include "lte/gateway/c/session_manager/SpgwServiceClient.hpp"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
+#include "lte/gateway/c/session_manager/Utilities.hpp"
 #include "orc8r/gateway/c/common/logging/magma_logging.h"
 
 namespace google {
diff --git a/lte/gateway/c/session_manager/LocalEnforcer.h b/lte/gateway/c/session_manager/LocalEnforcer.hpp
similarity index 98%
rename from lte/gateway/c/session_manager/LocalEnforcer.h
rename to lte/gateway/c/session_manager/LocalEnforcer.hpp
index 86518e3300f71..a556cc033215d 100644
--- a/lte/gateway/c/session_manager/LocalEnforcer.h
+++ b/lte/gateway/c/session_manager/LocalEnforcer.hpp
@@ -34,17 +34,17 @@
 #include <utility>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/AAAClient.h"
+#include "lte/gateway/c/session_manager/AAAClient.hpp"
 #include "lte/gateway/c/session_manager/CreditKey.h"
-#include "lte/gateway/c/session_manager/DirectorydClient.h"
-#include "lte/gateway/c/session_manager/PipelinedClient.h"
-#include "lte/gateway/c/session_manager/RuleStore.h"
-#include "lte/gateway/c/session_manager/SessionEvents.h"
-#include "lte/gateway/c/session_manager/SessionReporter.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
-#include "lte/gateway/c/session_manager/ShardTracker.h"
-#include "lte/gateway/c/session_manager/SpgwServiceClient.h"
+#include "lte/gateway/c/session_manager/DirectorydClient.hpp"
+#include "lte/gateway/c/session_manager/PipelinedClient.hpp"
+#include "lte/gateway/c/session_manager/RuleStore.hpp"
+#include "lte/gateway/c/session_manager/SessionEvents.hpp"
+#include "lte/gateway/c/session_manager/SessionReporter.hpp"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
+#include "lte/gateway/c/session_manager/ShardTracker.hpp"
+#include "lte/gateway/c/session_manager/SpgwServiceClient.hpp"
 #include "lte/gateway/c/session_manager/StoreClient.h"
 #include "lte/gateway/c/session_manager/Types.h"
 
diff --git a/lte/gateway/c/session_manager/LocalSessionManagerHandler.cpp b/lte/gateway/c/session_manager/LocalSessionManagerHandler.cpp
index 10e2f38b81912..18808908050e4 100644
--- a/lte/gateway/c/session_manager/LocalSessionManagerHandler.cpp
+++ b/lte/gateway/c/session_manager/LocalSessionManagerHandler.cpp
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "lte/gateway/c/session_manager/LocalSessionManagerHandler.h"
+#include "lte/gateway/c/session_manager/LocalSessionManagerHandler.hpp"
 
 #include <folly/io/async/EventBase.h>
 #include <glog/logging.h>
@@ -29,17 +29,17 @@
 #include <utility>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/DirectorydClient.h"
-#include "lte/gateway/c/session_manager/GrpcMagmaUtils.h"
-#include "lte/gateway/c/session_manager/LocalEnforcer.h"
+#include "lte/gateway/c/session_manager/DirectorydClient.hpp"
+#include "lte/gateway/c/session_manager/GrpcMagmaUtils.hpp"
+#include "lte/gateway/c/session_manager/LocalEnforcer.hpp"
 #include "lte/gateway/c/session_manager/ServiceAction.h"
-#include "lte/gateway/c/session_manager/SessionCredit.h"
-#include "lte/gateway/c/session_manager/SessionEvents.h"
-#include "lte/gateway/c/session_manager/SessionReporter.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/SessionCredit.hpp"
+#include "lte/gateway/c/session_manager/SessionEvents.hpp"
+#include "lte/gateway/c/session_manager/SessionReporter.hpp"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
-#include "lte/gateway/c/session_manager/Utilities.h"
+#include "lte/gateway/c/session_manager/Utilities.hpp"
 #include "orc8r/gateway/c/common/logging/magma_logging.h"
 
 namespace google {
diff --git a/lte/gateway/c/session_manager/LocalSessionManagerHandler.h b/lte/gateway/c/session_manager/LocalSessionManagerHandler.hpp
similarity index 98%
rename from lte/gateway/c/session_manager/LocalSessionManagerHandler.h
rename to lte/gateway/c/session_manager/LocalSessionManagerHandler.hpp
index 2007c4591f75a..96b2fb574d8ba 100644
--- a/lte/gateway/c/session_manager/LocalSessionManagerHandler.h
+++ b/lte/gateway/c/session_manager/LocalSessionManagerHandler.hpp
@@ -23,10 +23,10 @@
 #include <memory>
 #include <string>
 
-#include "lte/gateway/c/session_manager/LocalEnforcer.h"
-#include "lte/gateway/c/session_manager/SessionID.h"
-#include "lte/gateway/c/session_manager/SessionReporter.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
+#include "lte/gateway/c/session_manager/LocalEnforcer.hpp"
+#include "lte/gateway/c/session_manager/SessionID.hpp"
+#include "lte/gateway/c/session_manager/SessionReporter.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
 #include "lte/gateway/c/session_manager/StoreClient.h"
 
 namespace grpc {
diff --git a/lte/gateway/c/session_manager/MemoryStoreClient.cpp b/lte/gateway/c/session_manager/MemoryStoreClient.cpp
index c5bf54d94c8ad..95c1965753407 100644
--- a/lte/gateway/c/session_manager/MemoryStoreClient.cpp
+++ b/lte/gateway/c/session_manager/MemoryStoreClient.cpp
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-#include "lte/gateway/c/session_manager/MemoryStoreClient.h"
+#include "lte/gateway/c/session_manager/MemoryStoreClient.hpp"
 
 #include <algorithm>
 #include <set>
@@ -19,8 +19,8 @@
 #include <utility>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/SessionState.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 
 namespace magma {
 class StaticRuleStore;
diff --git a/lte/gateway/c/session_manager/MemoryStoreClient.h b/lte/gateway/c/session_manager/MemoryStoreClient.hpp
similarity index 96%
rename from lte/gateway/c/session_manager/MemoryStoreClient.h
rename to lte/gateway/c/session_manager/MemoryStoreClient.hpp
index 586664bfd2142..ced3be52474b2 100644
--- a/lte/gateway/c/session_manager/MemoryStoreClient.h
+++ b/lte/gateway/c/session_manager/MemoryStoreClient.hpp
@@ -20,7 +20,7 @@
 #include <vector>
 
 #include "lte/gateway/c/session_manager/StoreClient.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 
 namespace magma {
 class StaticRuleStore;
diff --git a/lte/gateway/c/session_manager/MeteringReporter.cpp b/lte/gateway/c/session_manager/MeteringReporter.cpp
index f2142e5265a6d..fd445c544b586 100644
--- a/lte/gateway/c/session_manager/MeteringReporter.cpp
+++ b/lte/gateway/c/session_manager/MeteringReporter.cpp
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-#include "lte/gateway/c/session_manager/MeteringReporter.h"
+#include "lte/gateway/c/session_manager/MeteringReporter.hpp"
 
 #include <stddef.h>
 #include <cstdint>
@@ -19,7 +19,7 @@
 #include <unordered_map>
 #include <utility>
 
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 #include "orc8r/gateway/c/common/service303/includes/MetricsHelpers.hpp"
 
diff --git a/lte/gateway/c/session_manager/MeteringReporter.h b/lte/gateway/c/session_manager/MeteringReporter.hpp
similarity index 93%
rename from lte/gateway/c/session_manager/MeteringReporter.h
rename to lte/gateway/c/session_manager/MeteringReporter.hpp
index 4423a6b6fefcc..2ebdfcd83115b 100644
--- a/lte/gateway/c/session_manager/MeteringReporter.h
+++ b/lte/gateway/c/session_manager/MeteringReporter.hpp
@@ -14,8 +14,8 @@
 
 #include <string>
 
-#include "lte/gateway/c/session_manager/SessionCredit.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/SessionCredit.hpp"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 
 namespace magma {
 struct SessionStateUpdateCriteria;
diff --git a/lte/gateway/c/session_manager/MobilitydClient.cpp b/lte/gateway/c/session_manager/MobilitydClient.cpp
index f0648f773ba93..c1d53e4e6fa49 100644
--- a/lte/gateway/c/session_manager/MobilitydClient.cpp
+++ b/lte/gateway/c/session_manager/MobilitydClient.cpp
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-#include "lte/gateway/c/session_manager/MobilitydClient.h"
+#include "lte/gateway/c/session_manager/MobilitydClient.hpp"
 
 #include <grpcpp/channel.h>
 #include <lte/protos/mobilityd.grpc.pb.h>
diff --git a/lte/gateway/c/session_manager/MobilitydClient.h b/lte/gateway/c/session_manager/MobilitydClient.hpp
similarity index 97%
rename from lte/gateway/c/session_manager/MobilitydClient.h
rename to lte/gateway/c/session_manager/MobilitydClient.hpp
index 066d6b7226cb8..f365d8d09716e 100644
--- a/lte/gateway/c/session_manager/MobilitydClient.h
+++ b/lte/gateway/c/session_manager/MobilitydClient.hpp
@@ -20,7 +20,7 @@
 #include <mutex>
 #include <unordered_map>
 
-#include "lte/gateway/c/session_manager/SessionState.h"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 #include "orc8r/gateway/c/common/async_grpc/includes/GRPCReceiver.hpp"
 
diff --git a/lte/gateway/c/session_manager/Monitor.h b/lte/gateway/c/session_manager/Monitor.h
index 9967efbb0de2a..27d9fc28184d6 100644
--- a/lte/gateway/c/session_manager/Monitor.h
+++ b/lte/gateway/c/session_manager/Monitor.h
@@ -14,8 +14,8 @@
 
 #include <lte/protos/session_manager.pb.h>
 
-#include "lte/gateway/c/session_manager/SessionCredit.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/SessionCredit.hpp"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 
 namespace magma {
diff --git a/lte/gateway/c/session_manager/OperationalStatesHandler.cpp b/lte/gateway/c/session_manager/OperationalStatesHandler.cpp
index 314afb26f1a4f..2e070b27141c5 100644
--- a/lte/gateway/c/session_manager/OperationalStatesHandler.cpp
+++ b/lte/gateway/c/session_manager/OperationalStatesHandler.cpp
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "lte/gateway/c/session_manager/OperationalStatesHandler.h"
+#include "lte/gateway/c/session_manager/OperationalStatesHandler.hpp"
 
 #include <folly/dynamic.h>
 #include <folly/json.h>
@@ -29,9 +29,9 @@
 #include <utility>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/EnumToString.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
+#include "lte/gateway/c/session_manager/EnumToString.hpp"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 #include "orc8r/gateway/c/common/logging/magma_logging.h"
 
diff --git a/lte/gateway/c/session_manager/OperationalStatesHandler.h b/lte/gateway/c/session_manager/OperationalStatesHandler.hpp
similarity index 96%
rename from lte/gateway/c/session_manager/OperationalStatesHandler.h
rename to lte/gateway/c/session_manager/OperationalStatesHandler.hpp
index 3553f4bb29baa..374f7d2961a91 100644
--- a/lte/gateway/c/session_manager/OperationalStatesHandler.h
+++ b/lte/gateway/c/session_manager/OperationalStatesHandler.hpp
@@ -18,7 +18,7 @@
 #include <memory>
 #include <string>
 
-#include "lte/gateway/c/session_manager/SessionStore.h"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
 
 namespace magma {
 class SessionState;
diff --git a/lte/gateway/c/session_manager/PipelinedClient.cpp b/lte/gateway/c/session_manager/PipelinedClient.cpp
index cc9a76d8d34c0..85bd6e3ad8224 100644
--- a/lte/gateway/c/session_manager/PipelinedClient.cpp
+++ b/lte/gateway/c/session_manager/PipelinedClient.cpp
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-#include "lte/gateway/c/session_manager/PipelinedClient.h"
+#include "lte/gateway/c/session_manager/PipelinedClient.hpp"
 
 #include <glog/logging.h>
 #include <grpcpp/channel.h>
@@ -31,8 +31,8 @@
 #include <utility>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/EnumToString.h"
-#include "lte/gateway/c/session_manager/GrpcMagmaUtils.h"
+#include "lte/gateway/c/session_manager/EnumToString.hpp"
+#include "lte/gateway/c/session_manager/GrpcMagmaUtils.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 #include "orc8r/gateway/c/common/service_registry/includes/ServiceRegistrySingleton.hpp"
 #include "orc8r/gateway/c/common/logging/magma_logging.h"
diff --git a/lte/gateway/c/session_manager/PipelinedClient.h b/lte/gateway/c/session_manager/PipelinedClient.hpp
similarity index 99%
rename from lte/gateway/c/session_manager/PipelinedClient.h
rename to lte/gateway/c/session_manager/PipelinedClient.hpp
index afec9b7fea317..e06dd59dbee20 100644
--- a/lte/gateway/c/session_manager/PipelinedClient.h
+++ b/lte/gateway/c/session_manager/PipelinedClient.hpp
@@ -27,7 +27,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/SessionState.h"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 #include "orc8r/gateway/c/common/async_grpc/includes/GRPCReceiver.hpp"
 
diff --git a/lte/gateway/c/session_manager/PolicyLoader.cpp b/lte/gateway/c/session_manager/PolicyLoader.cpp
index a47aaf5cd0be1..8e8babe6ca4a9 100644
--- a/lte/gateway/c/session_manager/PolicyLoader.cpp
+++ b/lte/gateway/c/session_manager/PolicyLoader.cpp
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "lte/gateway/c/session_manager/PolicyLoader.h"
+#include "lte/gateway/c/session_manager/PolicyLoader.hpp"
 
 #include <cpp_redis/core/client.hpp>
 #include <cpp_redis/misc/error.hpp>
@@ -26,7 +26,7 @@
 
 #include "lte/gateway/c/session_manager/ObjectMap.h"
 #include "RedisMap.hpp"
-#include "lte/gateway/c/session_manager/Serializers.h"
+#include "lte/gateway/c/session_manager/Serializers.hpp"
 #include "orc8r/gateway/c/common/config/includes/ServiceConfigLoader.hpp"
 #include "orc8r/gateway/c/common/logging/magma_logging.h"
 
diff --git a/lte/gateway/c/session_manager/PolicyLoader.h b/lte/gateway/c/session_manager/PolicyLoader.hpp
similarity index 100%
rename from lte/gateway/c/session_manager/PolicyLoader.h
rename to lte/gateway/c/session_manager/PolicyLoader.hpp
diff --git a/lte/gateway/c/session_manager/RedisStoreClient.cpp b/lte/gateway/c/session_manager/RedisStoreClient.cpp
index 61f92f6c8ff08..90d2deb4b86a1 100644
--- a/lte/gateway/c/session_manager/RedisStoreClient.cpp
+++ b/lte/gateway/c/session_manager/RedisStoreClient.cpp
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-#include "lte/gateway/c/session_manager/RedisStoreClient.h"
+#include "lte/gateway/c/session_manager/RedisStoreClient.hpp"
 
 #include <cpp_redis/core/client.hpp>
 #include <cpp_redis/core/reply.hpp>
@@ -29,8 +29,8 @@
 #include <utility>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/SessionState.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "orc8r/gateway/c/common/config/includes/ServiceConfigLoader.hpp"
 #include "orc8r/gateway/c/common/logging/magma_logging.h"
 
diff --git a/lte/gateway/c/session_manager/RedisStoreClient.h b/lte/gateway/c/session_manager/RedisStoreClient.hpp
similarity index 100%
rename from lte/gateway/c/session_manager/RedisStoreClient.h
rename to lte/gateway/c/session_manager/RedisStoreClient.hpp
diff --git a/lte/gateway/c/session_manager/RestartHandler.cpp b/lte/gateway/c/session_manager/RestartHandler.cpp
index 1a3d2d3d743e3..75f56ba1192a4 100644
--- a/lte/gateway/c/session_manager/RestartHandler.cpp
+++ b/lte/gateway/c/session_manager/RestartHandler.cpp
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "lte/gateway/c/session_manager/RestartHandler.h"
+#include "lte/gateway/c/session_manager/RestartHandler.hpp"
 
 #include <cxxabi.h>
 #include <glog/logging.h>
@@ -30,10 +30,10 @@
 #include <utility>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/AAAClient.h"
-#include "lte/gateway/c/session_manager/DirectorydClient.h"
-#include "lte/gateway/c/session_manager/SessionReporter.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
+#include "lte/gateway/c/session_manager/AAAClient.hpp"
+#include "lte/gateway/c/session_manager/DirectorydClient.hpp"
+#include "lte/gateway/c/session_manager/SessionReporter.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
 #include "orc8r/gateway/c/common/logging/magma_logging.h"
 
 namespace magma {
diff --git a/lte/gateway/c/session_manager/RestartHandler.h b/lte/gateway/c/session_manager/RestartHandler.hpp
similarity index 90%
rename from lte/gateway/c/session_manager/RestartHandler.h
rename to lte/gateway/c/session_manager/RestartHandler.hpp
index 95fa3e639bd85..5f2e14ae852ab 100644
--- a/lte/gateway/c/session_manager/RestartHandler.h
+++ b/lte/gateway/c/session_manager/RestartHandler.hpp
@@ -19,10 +19,10 @@
 #include <string>
 #include <unordered_map>
 
-#include "lte/gateway/c/session_manager/AAAClient.h"
-#include "lte/gateway/c/session_manager/DirectorydClient.h"
-#include "lte/gateway/c/session_manager/LocalEnforcer.h"
-#include "lte/gateway/c/session_manager/SessionReporter.h"
+#include "lte/gateway/c/session_manager/AAAClient.hpp"
+#include "lte/gateway/c/session_manager/DirectorydClient.hpp"
+#include "lte/gateway/c/session_manager/LocalEnforcer.hpp"
+#include "lte/gateway/c/session_manager/SessionReporter.hpp"
 
 namespace aaa {
 class AsyncAAAClient;
diff --git a/lte/gateway/c/session_manager/RuleStore.cpp b/lte/gateway/c/session_manager/RuleStore.cpp
index 2499e12a0199a..7259396017175 100644
--- a/lte/gateway/c/session_manager/RuleStore.cpp
+++ b/lte/gateway/c/session_manager/RuleStore.cpp
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "lte/gateway/c/session_manager/RuleStore.h"
+#include "lte/gateway/c/session_manager/RuleStore.hpp"
 
 #include <stddef.h>
 #include <lte/protos/pipelined.pb.h>
diff --git a/lte/gateway/c/session_manager/RuleStore.h b/lte/gateway/c/session_manager/RuleStore.hpp
similarity index 100%
rename from lte/gateway/c/session_manager/RuleStore.h
rename to lte/gateway/c/session_manager/RuleStore.hpp
diff --git a/lte/gateway/c/session_manager/Serializers.cpp b/lte/gateway/c/session_manager/Serializers.cpp
index 9beff291688c8..0b87b85e02580 100644
--- a/lte/gateway/c/session_manager/Serializers.cpp
+++ b/lte/gateway/c/session_manager/Serializers.cpp
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-#include "lte/gateway/c/session_manager/Serializers.h"
+#include "lte/gateway/c/session_manager/Serializers.hpp"
 
 #include <google/protobuf/message.h>
 #include <orc8r/protos/redis.pb.h>
diff --git a/lte/gateway/c/session_manager/Serializers.h b/lte/gateway/c/session_manager/Serializers.hpp
similarity index 100%
rename from lte/gateway/c/session_manager/Serializers.h
rename to lte/gateway/c/session_manager/Serializers.hpp
diff --git a/lte/gateway/c/session_manager/SessionCredit.cpp b/lte/gateway/c/session_manager/SessionCredit.cpp
index b55f50c30d6d4..c0eefdfec9efd 100644
--- a/lte/gateway/c/session_manager/SessionCredit.cpp
+++ b/lte/gateway/c/session_manager/SessionCredit.cpp
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-#include "lte/gateway/c/session_manager/SessionCredit.h"
+#include "lte/gateway/c/session_manager/SessionCredit.hpp"
 
 #include <glog/logging.h>
 #include <stdlib.h>
@@ -21,9 +21,9 @@
 #include <unordered_map>
 #include <utility>
 
-#include "lte/gateway/c/session_manager/DiameterCodes.h"
-#include "lte/gateway/c/session_manager/EnumToString.h"
-#include "lte/gateway/c/session_manager/Utilities.h"
+#include "lte/gateway/c/session_manager/DiameterCodes.hpp"
+#include "lte/gateway/c/session_manager/EnumToString.hpp"
+#include "lte/gateway/c/session_manager/Utilities.hpp"
 #include "orc8r/gateway/c/common/logging/magma_logging.h"
 #include "orc8r/gateway/c/common/logging/magma_logging_init.h"
 
diff --git a/lte/gateway/c/session_manager/SessionCredit.h b/lte/gateway/c/session_manager/SessionCredit.hpp
similarity index 99%
rename from lte/gateway/c/session_manager/SessionCredit.h
rename to lte/gateway/c/session_manager/SessionCredit.hpp
index 86a4eaf8253e7..dd9d18d26727f 100644
--- a/lte/gateway/c/session_manager/SessionCredit.h
+++ b/lte/gateway/c/session_manager/SessionCredit.hpp
@@ -16,7 +16,7 @@
 #include <stdint.h>
 #include <string>
 
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 
 namespace magma {
diff --git a/lte/gateway/c/session_manager/SessionEvents.cpp b/lte/gateway/c/session_manager/SessionEvents.cpp
index a74ad47ffa1bf..05fb0ce4c87a0 100644
--- a/lte/gateway/c/session_manager/SessionEvents.cpp
+++ b/lte/gateway/c/session_manager/SessionEvents.cpp
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-#include "lte/gateway/c/session_manager/SessionEvents.h"
+#include "lte/gateway/c/session_manager/SessionEvents.hpp"
 
 #include <folly/json.h>
 #include <glog/logging.h>
@@ -27,11 +27,11 @@
 #include <vector>
 
 #include "lte/gateway/c/session_manager/CreditKey.h"
-#include "lte/gateway/c/session_manager/EnumToString.h"
-#include "lte/gateway/c/session_manager/SessionCredit.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
+#include "lte/gateway/c/session_manager/EnumToString.hpp"
+#include "lte/gateway/c/session_manager/SessionCredit.hpp"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
-#include "lte/gateway/c/session_manager/Utilities.h"
+#include "lte/gateway/c/session_manager/Utilities.hpp"
 #include "orc8r/gateway/c/common/eventd/includes/EventdClient.hpp"
 #include "orc8r/gateway/c/common/logging/magma_logging.h"
 
diff --git a/lte/gateway/c/session_manager/SessionEvents.h b/lte/gateway/c/session_manager/SessionEvents.hpp
similarity index 98%
rename from lte/gateway/c/session_manager/SessionEvents.h
rename to lte/gateway/c/session_manager/SessionEvents.hpp
index 865a5ff9cd95e..1fed624bb4db7 100644
--- a/lte/gateway/c/session_manager/SessionEvents.h
+++ b/lte/gateway/c/session_manager/SessionEvents.hpp
@@ -20,7 +20,7 @@
 #include <string>
 #include <utility>
 
-#include "lte/gateway/c/session_manager/SessionState.h"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
 #include "orc8r/gateway/c/common/eventd/includes/EventdClient.hpp"
 #include "orc8r/gateway/c/common/logging/magma_logging.h"
 
diff --git a/lte/gateway/c/session_manager/SessionID.cpp b/lte/gateway/c/session_manager/SessionID.cpp
index b8b9731731d8a..6f293c0a335be 100644
--- a/lte/gateway/c/session_manager/SessionID.cpp
+++ b/lte/gateway/c/session_manager/SessionID.cpp
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "lte/gateway/c/session_manager/SessionID.h"
+#include "lte/gateway/c/session_manager/SessionID.hpp"
 
 #include <sstream>
 #include <string>
diff --git a/lte/gateway/c/session_manager/SessionID.h b/lte/gateway/c/session_manager/SessionID.hpp
similarity index 100%
rename from lte/gateway/c/session_manager/SessionID.h
rename to lte/gateway/c/session_manager/SessionID.hpp
diff --git a/lte/gateway/c/session_manager/SessionManagerServer.cpp b/lte/gateway/c/session_manager/SessionManagerServer.cpp
index 348264c405f3d..2faf54fd4bff2 100644
--- a/lte/gateway/c/session_manager/SessionManagerServer.cpp
+++ b/lte/gateway/c/session_manager/SessionManagerServer.cpp
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "lte/gateway/c/session_manager/SessionManagerServer.h"
+#include "lte/gateway/c/session_manager/SessionManagerServer.hpp"
 
 #include <glog/logging.h>
 #include <grpc/impl/codegen/log.h>
diff --git a/lte/gateway/c/session_manager/SessionManagerServer.h b/lte/gateway/c/session_manager/SessionManagerServer.hpp
similarity index 99%
rename from lte/gateway/c/session_manager/SessionManagerServer.h
rename to lte/gateway/c/session_manager/SessionManagerServer.hpp
index 5528702f770f3..80dee1a7aac8f 100644
--- a/lte/gateway/c/session_manager/SessionManagerServer.h
+++ b/lte/gateway/c/session_manager/SessionManagerServer.hpp
@@ -25,10 +25,10 @@
 #include <memory>
 #include <utility>
 
-#include "lte/gateway/c/session_manager/LocalSessionManagerHandler.h"
-#include "lte/gateway/c/session_manager/SessionProxyResponderHandler.h"
-#include "lte/gateway/c/session_manager/SetMessageManagerHandler.h"
-#include "lte/gateway/c/session_manager/UpfMsgManageHandler.h"
+#include "lte/gateway/c/session_manager/LocalSessionManagerHandler.hpp"
+#include "lte/gateway/c/session_manager/SessionProxyResponderHandler.hpp"
+#include "lte/gateway/c/session_manager/SetMessageManagerHandler.hpp"
+#include "lte/gateway/c/session_manager/UpfMsgManageHandler.hpp"
 
 namespace grpc {
 class Status;
diff --git a/lte/gateway/c/session_manager/SessionProxyResponderHandler.cpp b/lte/gateway/c/session_manager/SessionProxyResponderHandler.cpp
index 77493fe3a8f1d..141b62b08d2aa 100644
--- a/lte/gateway/c/session_manager/SessionProxyResponderHandler.cpp
+++ b/lte/gateway/c/session_manager/SessionProxyResponderHandler.cpp
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "lte/gateway/c/session_manager/SessionProxyResponderHandler.h"
+#include "lte/gateway/c/session_manager/SessionProxyResponderHandler.hpp"
 
 #include <folly/io/async/EventBase.h>
 #include <glog/logging.h>
@@ -21,10 +21,10 @@
 #include <ostream>
 #include <string>
 
-#include "lte/gateway/c/session_manager/EnumToString.h"
-#include "lte/gateway/c/session_manager/GrpcMagmaUtils.h"
-#include "lte/gateway/c/session_manager/LocalEnforcer.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
+#include "lte/gateway/c/session_manager/EnumToString.hpp"
+#include "lte/gateway/c/session_manager/GrpcMagmaUtils.hpp"
+#include "lte/gateway/c/session_manager/LocalEnforcer.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
 #include "orc8r/gateway/c/common/logging/magma_logging.h"
 
 namespace google {
diff --git a/lte/gateway/c/session_manager/SessionProxyResponderHandler.h b/lte/gateway/c/session_manager/SessionProxyResponderHandler.hpp
similarity index 96%
rename from lte/gateway/c/session_manager/SessionProxyResponderHandler.h
rename to lte/gateway/c/session_manager/SessionProxyResponderHandler.hpp
index d677d849c7f45..554ee1dc2b8b4 100644
--- a/lte/gateway/c/session_manager/SessionProxyResponderHandler.h
+++ b/lte/gateway/c/session_manager/SessionProxyResponderHandler.hpp
@@ -18,8 +18,8 @@
 #include <functional>
 #include <memory>
 
-#include "lte/gateway/c/session_manager/LocalEnforcer.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
+#include "lte/gateway/c/session_manager/LocalEnforcer.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
 
 namespace grpc {
 class ServerContext;
diff --git a/lte/gateway/c/session_manager/SessionReporter.cpp b/lte/gateway/c/session_manager/SessionReporter.cpp
index 4ce021c898f0c..1700cf03a553a 100644
--- a/lte/gateway/c/session_manager/SessionReporter.cpp
+++ b/lte/gateway/c/session_manager/SessionReporter.cpp
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "lte/gateway/c/session_manager/SessionReporter.h"
+#include "lte/gateway/c/session_manager/SessionReporter.hpp"
 
 #include <glog/logging.h>
 #include <grpcpp/channel.h>
@@ -21,7 +21,7 @@
 #include <string>
 #include <utility>
 
-#include "lte/gateway/c/session_manager/GrpcMagmaUtils.h"
+#include "lte/gateway/c/session_manager/GrpcMagmaUtils.hpp"
 #include "orc8r/gateway/c/common/logging/magma_logging.h"
 
 namespace folly {
diff --git a/lte/gateway/c/session_manager/SessionReporter.h b/lte/gateway/c/session_manager/SessionReporter.hpp
similarity index 100%
rename from lte/gateway/c/session_manager/SessionReporter.h
rename to lte/gateway/c/session_manager/SessionReporter.hpp
diff --git a/lte/gateway/c/session_manager/SessionState.cpp b/lte/gateway/c/session_manager/SessionState.cpp
index e77517bcfd24e..ac5f94845e5c1 100644
--- a/lte/gateway/c/session_manager/SessionState.cpp
+++ b/lte/gateway/c/session_manager/SessionState.cpp
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-#include "lte/gateway/c/session_manager/SessionState.h"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
 
 #include <ext/alloc_traits.h>
 #include <glog/logging.h>
@@ -27,10 +27,10 @@
 #include <vector>
 
 #include "lte/gateway/c/session_manager/CreditKey.h"
-#include "lte/gateway/c/session_manager/EnumToString.h"
-#include "lte/gateway/c/session_manager/RuleStore.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
-#include "lte/gateway/c/session_manager/Utilities.h"
+#include "lte/gateway/c/session_manager/EnumToString.hpp"
+#include "lte/gateway/c/session_manager/RuleStore.hpp"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
+#include "lte/gateway/c/session_manager/Utilities.hpp"
 #include "orc8r/gateway/c/common/service303/includes/MetricsHelpers.hpp"
 #include "orc8r/gateway/c/common/logging/magma_logging.h"
 
diff --git a/lte/gateway/c/session_manager/SessionState.h b/lte/gateway/c/session_manager/SessionState.hpp
similarity index 99%
rename from lte/gateway/c/session_manager/SessionState.h
rename to lte/gateway/c/session_manager/SessionState.hpp
index 50dcf0dab930a..bdc1d31b202ce 100644
--- a/lte/gateway/c/session_manager/SessionState.h
+++ b/lte/gateway/c/session_manager/SessionState.hpp
@@ -33,14 +33,14 @@
 #include <utility>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/ChargingGrant.h"
+#include "lte/gateway/c/session_manager/ChargingGrant.hpp"
 #include "lte/gateway/c/session_manager/CreditKey.h"
 #include "lte/gateway/c/session_manager/Monitor.h"
-#include "lte/gateway/c/session_manager/RuleStore.h"
+#include "lte/gateway/c/session_manager/RuleStore.hpp"
 #include "lte/gateway/c/session_manager/ServiceAction.h"
-#include "lte/gateway/c/session_manager/SessionCredit.h"
-#include "lte/gateway/c/session_manager/SessionReporter.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/SessionCredit.hpp"
+#include "lte/gateway/c/session_manager/SessionReporter.hpp"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 
 namespace magma {
diff --git a/lte/gateway/c/session_manager/SessionStateEnforcer.cpp b/lte/gateway/c/session_manager/SessionStateEnforcer.cpp
index 66e5a2ebbbd27..c847527ba205f 100644
--- a/lte/gateway/c/session_manager/SessionStateEnforcer.cpp
+++ b/lte/gateway/c/session_manager/SessionStateEnforcer.cpp
@@ -20,7 +20,7 @@
   Description 	Objects run in main thread context invoked by folly event
 *****************************************************************************/
 
-#include "lte/gateway/c/session_manager/SessionStateEnforcer.h"
+#include "lte/gateway/c/session_manager/SessionStateEnforcer.hpp"
 
 #include <folly/io/async/EventBase.h>
 #include <glog/logging.h>
@@ -39,13 +39,13 @@
 #include <utility>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/AmfServiceClient.h"
-#include "lte/gateway/c/session_manager/EnumToString.h"
-#include "lte/gateway/c/session_manager/PipelinedClient.h"
-#include "lte/gateway/c/session_manager/SessionEvents.h"
-#include "lte/gateway/c/session_manager/SessionReporter.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/AmfServiceClient.hpp"
+#include "lte/gateway/c/session_manager/EnumToString.hpp"
+#include "lte/gateway/c/session_manager/PipelinedClient.hpp"
+#include "lte/gateway/c/session_manager/SessionEvents.hpp"
+#include "lte/gateway/c/session_manager/SessionReporter.hpp"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "orc8r/gateway/c/common/logging/magma_logging.h"
 
 #define DEFAULT_AMBR_UNITS (1024)
diff --git a/lte/gateway/c/session_manager/SessionStateEnforcer.h b/lte/gateway/c/session_manager/SessionStateEnforcer.hpp
similarity index 94%
rename from lte/gateway/c/session_manager/SessionStateEnforcer.h
rename to lte/gateway/c/session_manager/SessionStateEnforcer.hpp
index 047cadffa6e06..b57e382182335 100644
--- a/lte/gateway/c/session_manager/SessionStateEnforcer.h
+++ b/lte/gateway/c/session_manager/SessionStateEnforcer.hpp
@@ -36,12 +36,12 @@ limitations under the License.
 #include <unordered_set>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/AmfServiceClient.h"
-#include "lte/gateway/c/session_manager/PipelinedClient.h"
-#include "lte/gateway/c/session_manager/RuleStore.h"
-#include "lte/gateway/c/session_manager/SessionEvents.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
+#include "lte/gateway/c/session_manager/AmfServiceClient.hpp"
+#include "lte/gateway/c/session_manager/PipelinedClient.hpp"
+#include "lte/gateway/c/session_manager/RuleStore.hpp"
+#include "lte/gateway/c/session_manager/SessionEvents.hpp"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
 #include "lte/gateway/c/session_manager/StoreClient.h"
 #include "lte/gateway/c/session_manager/Types.h"
 
diff --git a/lte/gateway/c/session_manager/SessionStore.cpp b/lte/gateway/c/session_manager/SessionStore.cpp
index d4a8e3e097ed2..1ef7e1a42c615 100644
--- a/lte/gateway/c/session_manager/SessionStore.cpp
+++ b/lte/gateway/c/session_manager/SessionStore.cpp
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-#include "lte/gateway/c/session_manager/SessionStore.h"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
 
 #include <glog/logging.h>
 #include <lte/protos/session_manager.pb.h>
@@ -21,10 +21,10 @@
 #include <vector>
 
 #include "lte/gateway/c/session_manager/CreditKey.h"
-#include "lte/gateway/c/session_manager/MemoryStoreClient.h"
-#include "lte/gateway/c/session_manager/MeteringReporter.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/MemoryStoreClient.hpp"
+#include "lte/gateway/c/session_manager/MeteringReporter.hpp"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 #include "orc8r/gateway/c/common/logging/magma_logging.h"
 
diff --git a/lte/gateway/c/session_manager/SessionStore.h b/lte/gateway/c/session_manager/SessionStore.hpp
similarity index 95%
rename from lte/gateway/c/session_manager/SessionStore.h
rename to lte/gateway/c/session_manager/SessionStore.hpp
index e06a8fae0cc5c..54af7cef09f49 100644
--- a/lte/gateway/c/session_manager/SessionStore.h
+++ b/lte/gateway/c/session_manager/SessionStore.hpp
@@ -20,13 +20,13 @@
 #include <string>
 #include <unordered_map>
 
-#include "lte/gateway/c/session_manager/MemoryStoreClient.h"
-#include "lte/gateway/c/session_manager/MeteringReporter.h"
-#include "lte/gateway/c/session_manager/RedisStoreClient.h"
-#include "lte/gateway/c/session_manager/RuleStore.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
+#include "lte/gateway/c/session_manager/MemoryStoreClient.hpp"
+#include "lte/gateway/c/session_manager/MeteringReporter.hpp"
+#include "lte/gateway/c/session_manager/RedisStoreClient.hpp"
+#include "lte/gateway/c/session_manager/RuleStore.hpp"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
 #include "lte/gateway/c/session_manager/StoreClient.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 
 namespace magma {
 class StaticRuleStore;
diff --git a/lte/gateway/c/session_manager/SetMessageManagerHandler.cpp b/lte/gateway/c/session_manager/SetMessageManagerHandler.cpp
index 1db5857b0b0a3..4fec6e1ac609c 100644
--- a/lte/gateway/c/session_manager/SetMessageManagerHandler.cpp
+++ b/lte/gateway/c/session_manager/SetMessageManagerHandler.cpp
@@ -17,7 +17,7 @@
   Author/Editor Sanjay Kumar Ojha
   Description 	Acts as 5G Landing object in SessionD & start 5G related flow
 *****************************************************************************/
-#include "lte/gateway/c/session_manager/SetMessageManagerHandler.h"
+#include "lte/gateway/c/session_manager/SetMessageManagerHandler.hpp"
 
 #include <folly/io/async/EventBase.h>
 #include <glog/logging.h>
@@ -32,12 +32,12 @@
 #include <utility>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/GrpcMagmaUtils.h"
-#include "lte/gateway/c/session_manager/SessionEvents.h"
-#include "lte/gateway/c/session_manager/SessionReporter.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
-#include "lte/gateway/c/session_manager/SessionStateEnforcer.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
+#include "lte/gateway/c/session_manager/GrpcMagmaUtils.hpp"
+#include "lte/gateway/c/session_manager/SessionEvents.hpp"
+#include "lte/gateway/c/session_manager/SessionReporter.hpp"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
+#include "lte/gateway/c/session_manager/SessionStateEnforcer.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
 #include "orc8r/gateway/c/common/logging/magma_logging.h"
 
 namespace google {
diff --git a/lte/gateway/c/session_manager/SetMessageManagerHandler.h b/lte/gateway/c/session_manager/SetMessageManagerHandler.hpp
similarity index 95%
rename from lte/gateway/c/session_manager/SetMessageManagerHandler.h
rename to lte/gateway/c/session_manager/SetMessageManagerHandler.hpp
index 5a5829f91a2dd..673b9359ae5e8 100644
--- a/lte/gateway/c/session_manager/SetMessageManagerHandler.h
+++ b/lte/gateway/c/session_manager/SetMessageManagerHandler.hpp
@@ -26,10 +26,10 @@
 #include <memory>
 #include <string>
 
-#include "lte/gateway/c/session_manager/SessionID.h"
-#include "lte/gateway/c/session_manager/SessionReporter.h"
-#include "lte/gateway/c/session_manager/SessionStateEnforcer.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
+#include "lte/gateway/c/session_manager/SessionID.hpp"
+#include "lte/gateway/c/session_manager/SessionReporter.hpp"
+#include "lte/gateway/c/session_manager/SessionStateEnforcer.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
 #include "lte/gateway/c/session_manager/StoreClient.h"
 #include "lte/gateway/c/session_manager/Types.h"
 
diff --git a/lte/gateway/c/session_manager/ShardTracker.cpp b/lte/gateway/c/session_manager/ShardTracker.cpp
index 70af38438895e..e3a06bf251e24 100644
--- a/lte/gateway/c/session_manager/ShardTracker.cpp
+++ b/lte/gateway/c/session_manager/ShardTracker.cpp
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-#include "lte/gateway/c/session_manager/ShardTracker.h"
+#include "lte/gateway/c/session_manager/ShardTracker.hpp"
 
 #include <stddef.h>
 #include <memory>
diff --git a/lte/gateway/c/session_manager/ShardTracker.h b/lte/gateway/c/session_manager/ShardTracker.hpp
similarity index 100%
rename from lte/gateway/c/session_manager/ShardTracker.h
rename to lte/gateway/c/session_manager/ShardTracker.hpp
diff --git a/lte/gateway/c/session_manager/SpgwServiceClient.cpp b/lte/gateway/c/session_manager/SpgwServiceClient.cpp
index 441a69a479665..c900918c22489 100644
--- a/lte/gateway/c/session_manager/SpgwServiceClient.cpp
+++ b/lte/gateway/c/session_manager/SpgwServiceClient.cpp
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-#include "lte/gateway/c/session_manager/SpgwServiceClient.h"
+#include "lte/gateway/c/session_manager/SpgwServiceClient.hpp"
 
 #include <glog/logging.h>
 #include <grpcpp/channel.h>
diff --git a/lte/gateway/c/session_manager/SpgwServiceClient.h b/lte/gateway/c/session_manager/SpgwServiceClient.hpp
similarity index 100%
rename from lte/gateway/c/session_manager/SpgwServiceClient.h
rename to lte/gateway/c/session_manager/SpgwServiceClient.hpp
diff --git a/lte/gateway/c/session_manager/StatsPoller.cpp b/lte/gateway/c/session_manager/StatsPoller.cpp
index dbd81a3770c56..c8d17fefec5e7 100644
--- a/lte/gateway/c/session_manager/StatsPoller.cpp
+++ b/lte/gateway/c/session_manager/StatsPoller.cpp
@@ -10,14 +10,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "lte/gateway/c/session_manager/StatsPoller.h"
+#include "lte/gateway/c/session_manager/StatsPoller.hpp"
 
 #include <stdint.h>
 #include <chrono>
 #include <memory>
 #include <thread>
 
-#include "lte/gateway/c/session_manager/LocalEnforcer.h"
+#include "lte/gateway/c/session_manager/LocalEnforcer.hpp"
 
 #define COOKIE 0
 #define COOKIE_MASK 0
diff --git a/lte/gateway/c/session_manager/StatsPoller.h b/lte/gateway/c/session_manager/StatsPoller.hpp
similarity index 94%
rename from lte/gateway/c/session_manager/StatsPoller.h
rename to lte/gateway/c/session_manager/StatsPoller.hpp
index 485199ccb0dca..747fde6fb92cb 100644
--- a/lte/gateway/c/session_manager/StatsPoller.h
+++ b/lte/gateway/c/session_manager/StatsPoller.hpp
@@ -14,7 +14,7 @@
 #include <atomic>
 #include <memory>
 
-#include "lte/gateway/c/session_manager/LocalEnforcer.h"
+#include "lte/gateway/c/session_manager/LocalEnforcer.hpp"
 
 namespace magma {
 class LocalEnforcer;
diff --git a/lte/gateway/c/session_manager/StoreClient.h b/lte/gateway/c/session_manager/StoreClient.h
index 0352c652f6b38..5332b9ff232df 100644
--- a/lte/gateway/c/session_manager/StoreClient.h
+++ b/lte/gateway/c/session_manager/StoreClient.h
@@ -19,7 +19,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/SessionState.h"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
 
 namespace magma {
 class SessionState;
diff --git a/lte/gateway/c/session_manager/StoredState.cpp b/lte/gateway/c/session_manager/StoredState.cpp
index 9315ed54423b0..1c9c339b9f36d 100644
--- a/lte/gateway/c/session_manager/StoredState.cpp
+++ b/lte/gateway/c/session_manager/StoredState.cpp
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 
 #include <folly/Range.h>
 #include <folly/dynamic.h>
diff --git a/lte/gateway/c/session_manager/StoredState.h b/lte/gateway/c/session_manager/StoredState.hpp
similarity index 100%
rename from lte/gateway/c/session_manager/StoredState.h
rename to lte/gateway/c/session_manager/StoredState.hpp
diff --git a/lte/gateway/c/session_manager/UpfMsgManageHandler.cpp b/lte/gateway/c/session_manager/UpfMsgManageHandler.cpp
index 3dde3e571c90e..7ab9e8d2d99bf 100644
--- a/lte/gateway/c/session_manager/UpfMsgManageHandler.cpp
+++ b/lte/gateway/c/session_manager/UpfMsgManageHandler.cpp
@@ -8,7 +8,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "lte/gateway/c/session_manager/UpfMsgManageHandler.h"
+#include "lte/gateway/c/session_manager/UpfMsgManageHandler.hpp"
 
 #include <arpa/inet.h>
 #include <folly/io/async/EventBase.h>
@@ -25,14 +25,14 @@
 #include <string>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/GrpcMagmaUtils.h"
-#include "lte/gateway/c/session_manager/MobilitydClient.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
-#include "lte/gateway/c/session_manager/SessionStateEnforcer.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
+#include "lte/gateway/c/session_manager/GrpcMagmaUtils.hpp"
+#include "lte/gateway/c/session_manager/MobilitydClient.hpp"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
+#include "lte/gateway/c/session_manager/SessionStateEnforcer.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 #include "orc8r/gateway/c/common/logging/magma_logging.h"
-#include "lte/gateway/c/session_manager/Utilities.h"
+#include "lte/gateway/c/session_manager/Utilities.hpp"
 
 namespace google {
 namespace protobuf {
diff --git a/lte/gateway/c/session_manager/UpfMsgManageHandler.h b/lte/gateway/c/session_manager/UpfMsgManageHandler.hpp
similarity index 92%
rename from lte/gateway/c/session_manager/UpfMsgManageHandler.h
rename to lte/gateway/c/session_manager/UpfMsgManageHandler.hpp
index 38894a79e6775..aec67d57c27f8 100644
--- a/lte/gateway/c/session_manager/UpfMsgManageHandler.h
+++ b/lte/gateway/c/session_manager/UpfMsgManageHandler.hpp
@@ -20,11 +20,11 @@
 #include <memory>
 #include <string>
 
-#include "lte/gateway/c/session_manager/MobilitydClient.h"
-#include "lte/gateway/c/session_manager/SessionID.h"
-#include "lte/gateway/c/session_manager/SessionReporter.h"
-#include "lte/gateway/c/session_manager/SessionStateEnforcer.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
+#include "lte/gateway/c/session_manager/MobilitydClient.hpp"
+#include "lte/gateway/c/session_manager/SessionID.hpp"
+#include "lte/gateway/c/session_manager/SessionReporter.hpp"
+#include "lte/gateway/c/session_manager/SessionStateEnforcer.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
 
 namespace grpc {
 class Server;
diff --git a/lte/gateway/c/session_manager/Utilities.cpp b/lte/gateway/c/session_manager/Utilities.cpp
index ca551aae68a3f..f579201a96f3b 100644
--- a/lte/gateway/c/session_manager/Utilities.cpp
+++ b/lte/gateway/c/session_manager/Utilities.cpp
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "lte/gateway/c/session_manager/Utilities.h"
+#include "lte/gateway/c/session_manager/Utilities.hpp"
 
 #include <google/protobuf/util/time_util.h>
 #include <time.h>
diff --git a/lte/gateway/c/session_manager/Utilities.h b/lte/gateway/c/session_manager/Utilities.hpp
similarity index 100%
rename from lte/gateway/c/session_manager/Utilities.h
rename to lte/gateway/c/session_manager/Utilities.hpp
diff --git a/lte/gateway/c/session_manager/sessiond_main.cpp b/lte/gateway/c/session_manager/sessiond_main.cpp
index 09ce66138cfb7..5cd921ceda1b7 100644
--- a/lte/gateway/c/session_manager/sessiond_main.cpp
+++ b/lte/gateway/c/session_manager/sessiond_main.cpp
@@ -33,32 +33,32 @@
 #include <utility>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/AAAClient.h"
-#include "lte/gateway/c/session_manager/AmfServiceClient.h"
-#include "lte/gateway/c/session_manager/DirectorydClient.h"
-#include "lte/gateway/c/session_manager/GrpcMagmaUtils.h"
-#include "lte/gateway/c/session_manager/LocalEnforcer.h"
-#include "lte/gateway/c/session_manager/LocalSessionManagerHandler.h"
-#include "lte/gateway/c/session_manager/MeteringReporter.h"
-#include "lte/gateway/c/session_manager/MobilitydClient.h"
-#include "lte/gateway/c/session_manager/OperationalStatesHandler.h"
-#include "lte/gateway/c/session_manager/PipelinedClient.h"
-#include "lte/gateway/c/session_manager/PolicyLoader.h"
-#include "lte/gateway/c/session_manager/RedisStoreClient.h"
-#include "lte/gateway/c/session_manager/RestartHandler.h"
-#include "lte/gateway/c/session_manager/RuleStore.h"
-#include "lte/gateway/c/session_manager/SessionCredit.h"
-#include "lte/gateway/c/session_manager/SessionEvents.h"
-#include "lte/gateway/c/session_manager/SessionManagerServer.h"
-#include "lte/gateway/c/session_manager/SessionProxyResponderHandler.h"
-#include "lte/gateway/c/session_manager/SessionReporter.h"
-#include "lte/gateway/c/session_manager/SessionStateEnforcer.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
-#include "lte/gateway/c/session_manager/SetMessageManagerHandler.h"
-#include "lte/gateway/c/session_manager/ShardTracker.h"
-#include "lte/gateway/c/session_manager/SpgwServiceClient.h"
-#include "lte/gateway/c/session_manager/StatsPoller.h"
-#include "lte/gateway/c/session_manager/UpfMsgManageHandler.h"
+#include "lte/gateway/c/session_manager/AAAClient.hpp"
+#include "lte/gateway/c/session_manager/AmfServiceClient.hpp"
+#include "lte/gateway/c/session_manager/DirectorydClient.hpp"
+#include "lte/gateway/c/session_manager/GrpcMagmaUtils.hpp"
+#include "lte/gateway/c/session_manager/LocalEnforcer.hpp"
+#include "lte/gateway/c/session_manager/LocalSessionManagerHandler.hpp"
+#include "lte/gateway/c/session_manager/MeteringReporter.hpp"
+#include "lte/gateway/c/session_manager/MobilitydClient.hpp"
+#include "lte/gateway/c/session_manager/OperationalStatesHandler.hpp"
+#include "lte/gateway/c/session_manager/PipelinedClient.hpp"
+#include "lte/gateway/c/session_manager/PolicyLoader.hpp"
+#include "lte/gateway/c/session_manager/RedisStoreClient.hpp"
+#include "lte/gateway/c/session_manager/RestartHandler.hpp"
+#include "lte/gateway/c/session_manager/RuleStore.hpp"
+#include "lte/gateway/c/session_manager/SessionCredit.hpp"
+#include "lte/gateway/c/session_manager/SessionEvents.hpp"
+#include "lte/gateway/c/session_manager/SessionManagerServer.hpp"
+#include "lte/gateway/c/session_manager/SessionProxyResponderHandler.hpp"
+#include "lte/gateway/c/session_manager/SessionReporter.hpp"
+#include "lte/gateway/c/session_manager/SessionStateEnforcer.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
+#include "lte/gateway/c/session_manager/SetMessageManagerHandler.hpp"
+#include "lte/gateway/c/session_manager/ShardTracker.hpp"
+#include "lte/gateway/c/session_manager/SpgwServiceClient.hpp"
+#include "lte/gateway/c/session_manager/StatsPoller.hpp"
+#include "lte/gateway/c/session_manager/UpfMsgManageHandler.hpp"
 #include "orc8r/gateway/c/common/config/includes/MConfigLoader.hpp"
 #include "orc8r/gateway/c/common/config/includes/ServiceConfigLoader.hpp"
 #include "orc8r/gateway/c/common/eventd/includes/EventdClient.hpp"
diff --git a/lte/gateway/c/session_manager/test/BUILD.bazel b/lte/gateway/c/session_manager/test/BUILD.bazel
index 04b6a9ff737a9..94cebcce9da16 100644
--- a/lte/gateway/c/session_manager/test/BUILD.bazel
+++ b/lte/gateway/c/session_manager/test/BUILD.bazel
@@ -38,7 +38,7 @@ cc_library(
 cc_library(
     name = "protobuf_creators",
     srcs = ["ProtobufCreators.cpp"],
-    hdrs = ["ProtobufCreators.h"],
+    hdrs = ["ProtobufCreators.hpp"],
     deps = [
         ":consts",
         "//lte/gateway/c/session_manager:diameter_codes",
diff --git a/lte/gateway/c/session_manager/test/CMakeLists.txt b/lte/gateway/c/session_manager/test/CMakeLists.txt
index d9d05319b56e6..9612f6123122c 100644
--- a/lte/gateway/c/session_manager/test/CMakeLists.txt
+++ b/lte/gateway/c/session_manager/test/CMakeLists.txt
@@ -22,7 +22,7 @@ add_library(SESSIOND_TEST_LIB
     Consts.h
     Matchers.h
     ProtobufCreators.cpp
-    ProtobufCreators.h
+    ProtobufCreators.hpp
     SessiondMocks.h
     SessionStateTester.h
     SessionStateTester5g.h
diff --git a/lte/gateway/c/session_manager/test/ProtobufCreators.cpp b/lte/gateway/c/session_manager/test/ProtobufCreators.cpp
index ed55bf2bd1c89..3e1324651d66d 100644
--- a/lte/gateway/c/session_manager/test/ProtobufCreators.cpp
+++ b/lte/gateway/c/session_manager/test/ProtobufCreators.cpp
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-#include "lte/gateway/c/session_manager/test/ProtobufCreators.h"
+#include "lte/gateway/c/session_manager/test/ProtobufCreators.hpp"
 
 #include <google/protobuf/timestamp.pb.h>
 #include <gtest/gtest.h>
@@ -22,7 +22,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/SessionState.h"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
 
 namespace magma {
 
diff --git a/lte/gateway/c/session_manager/test/ProtobufCreators.h b/lte/gateway/c/session_manager/test/ProtobufCreators.hpp
similarity index 98%
rename from lte/gateway/c/session_manager/test/ProtobufCreators.h
rename to lte/gateway/c/session_manager/test/ProtobufCreators.hpp
index 85745f306a4d5..c97b88fa0ecfc 100644
--- a/lte/gateway/c/session_manager/test/ProtobufCreators.h
+++ b/lte/gateway/c/session_manager/test/ProtobufCreators.hpp
@@ -24,10 +24,10 @@
 #include <utility>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/DiameterCodes.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
+#include "lte/gateway/c/session_manager/DiameterCodes.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
 #include "lte/gateway/c/session_manager/StoreClient.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 
 namespace magma {
diff --git a/lte/gateway/c/session_manager/test/SessionStateTester.h b/lte/gateway/c/session_manager/test/SessionStateTester.h
index 7ec735ebdcee0..390c8e69ffb62 100644
--- a/lte/gateway/c/session_manager/test/SessionStateTester.h
+++ b/lte/gateway/c/session_manager/test/SessionStateTester.h
@@ -19,9 +19,9 @@
 #include <vector>
 
 #include "lte/gateway/c/session_manager/test/Consts.h"
-#include "lte/gateway/c/session_manager/test/ProtobufCreators.h"
+#include "lte/gateway/c/session_manager/test/ProtobufCreators.hpp"
 #include "lte/gateway/c/session_manager/test/SessiondMocks.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
 
 using ::testing::Test;
 
diff --git a/lte/gateway/c/session_manager/test/SessionStateTester5g.h b/lte/gateway/c/session_manager/test/SessionStateTester5g.h
index cdf00226950e8..9cbce20e14bb6 100644
--- a/lte/gateway/c/session_manager/test/SessionStateTester5g.h
+++ b/lte/gateway/c/session_manager/test/SessionStateTester5g.h
@@ -19,9 +19,9 @@
 #include <vector>
 
 #include "lte/gateway/c/session_manager/test/Consts.h"
-#include "lte/gateway/c/session_manager/test/ProtobufCreators.h"
+#include "lte/gateway/c/session_manager/test/ProtobufCreators.hpp"
 #include "lte/gateway/c/session_manager/test/SessiondMocks.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
 
 using ::testing::Test;
 
diff --git a/lte/gateway/c/session_manager/test/SessiondMocks.h b/lte/gateway/c/session_manager/test/SessiondMocks.h
index 19be1237c50f4..122c86e191b65 100644
--- a/lte/gateway/c/session_manager/test/SessiondMocks.h
+++ b/lte/gateway/c/session_manager/test/SessiondMocks.h
@@ -30,20 +30,20 @@
 #include <unordered_map>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/AAAClient.h"
-#include "lte/gateway/c/session_manager/AmfServiceClient.h"
-#include "lte/gateway/c/session_manager/DirectorydClient.h"
-#include "lte/gateway/c/session_manager/LocalSessionManagerHandler.h"
-#include "lte/gateway/c/session_manager/MobilitydClient.h"
-#include "lte/gateway/c/session_manager/PipelinedClient.h"
-#include "lte/gateway/c/session_manager/RuleStore.h"
-#include "lte/gateway/c/session_manager/SessionEvents.h"
-#include "lte/gateway/c/session_manager/SessionReporter.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
-#include "lte/gateway/c/session_manager/SpgwServiceClient.h"
+#include "lte/gateway/c/session_manager/AAAClient.hpp"
+#include "lte/gateway/c/session_manager/AmfServiceClient.hpp"
+#include "lte/gateway/c/session_manager/DirectorydClient.hpp"
+#include "lte/gateway/c/session_manager/LocalSessionManagerHandler.hpp"
+#include "lte/gateway/c/session_manager/MobilitydClient.hpp"
+#include "lte/gateway/c/session_manager/PipelinedClient.hpp"
+#include "lte/gateway/c/session_manager/RuleStore.hpp"
+#include "lte/gateway/c/session_manager/SessionEvents.hpp"
+#include "lte/gateway/c/session_manager/SessionReporter.hpp"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
+#include "lte/gateway/c/session_manager/SpgwServiceClient.hpp"
 #include "lte/gateway/c/session_manager/StoreClient.h"
 #include "lte/gateway/c/session_manager/Types.h"
-#include "lte/gateway/c/session_manager/UpfMsgManageHandler.h"
+#include "lte/gateway/c/session_manager/UpfMsgManageHandler.hpp"
 #include "orc8r/gateway/c/common/eventd/includes/EventdClient.hpp"
 
 namespace grpc {
diff --git a/lte/gateway/c/session_manager/test/test_async_service.cpp b/lte/gateway/c/session_manager/test/test_async_service.cpp
index e05aeb92a6080..502e1d1b1cd6b 100644
--- a/lte/gateway/c/session_manager/test/test_async_service.cpp
+++ b/lte/gateway/c/session_manager/test/test_async_service.cpp
@@ -20,7 +20,7 @@
 #include "orc8r/gateway/c/common/service303/includes/MagmaService.hpp"
 #include "orc8r/gateway/c/common/service_registry/includes/ServiceRegistrySingleton.hpp"
 #include "lte/gateway/c/session_manager/test/SessiondMocks.h"
-#include "lte/gateway/c/session_manager/SessionManagerServer.h"
+#include "lte/gateway/c/session_manager/SessionManagerServer.hpp"
 
 using grpc::Status;
 using ::testing::Test;
diff --git a/lte/gateway/c/session_manager/test/test_charging_grant.cpp b/lte/gateway/c/session_manager/test/test_charging_grant.cpp
index d81010b7ada7b..6c89040acf84c 100644
--- a/lte/gateway/c/session_manager/test/test_charging_grant.cpp
+++ b/lte/gateway/c/session_manager/test/test_charging_grant.cpp
@@ -20,12 +20,12 @@
 #include <unordered_map>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/ChargingGrant.h"
+#include "lte/gateway/c/session_manager/ChargingGrant.hpp"
 #include "lte/gateway/c/session_manager/ServiceAction.h"
-#include "lte/gateway/c/session_manager/SessionCredit.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/SessionCredit.hpp"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
-#include "lte/gateway/c/session_manager/test/ProtobufCreators.h"
+#include "lte/gateway/c/session_manager/test/ProtobufCreators.hpp"
 
 using ::testing::Test;
 
diff --git a/lte/gateway/c/session_manager/test/test_cloud_reporter.cpp b/lte/gateway/c/session_manager/test/test_cloud_reporter.cpp
index 1aeaae43caa9d..b5381a2a3ea82 100644
--- a/lte/gateway/c/session_manager/test/test_cloud_reporter.cpp
+++ b/lte/gateway/c/session_manager/test/test_cloud_reporter.cpp
@@ -23,7 +23,7 @@
 #include <thread>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/SessionReporter.h"
+#include "lte/gateway/c/session_manager/SessionReporter.hpp"
 #include "lte/gateway/c/session_manager/test/SessiondMocks.h"
 #include "orc8r/gateway/c/common/service303/includes/MagmaService.hpp"
 #include "orc8r/gateway/c/common/service_registry/includes/ServiceRegistrySingleton.hpp"
diff --git a/lte/gateway/c/session_manager/test/test_local_enforcer.cpp b/lte/gateway/c/session_manager/test/test_local_enforcer.cpp
index 8c79d6a77e5f6..b420a358e529b 100644
--- a/lte/gateway/c/session_manager/test/test_local_enforcer.cpp
+++ b/lte/gateway/c/session_manager/test/test_local_enforcer.cpp
@@ -37,20 +37,20 @@
 #include <vector>
 
 #include "lte/gateway/c/session_manager/CreditKey.h"
-#include "lte/gateway/c/session_manager/DiameterCodes.h"
-#include "lte/gateway/c/session_manager/LocalEnforcer.h"
-#include "lte/gateway/c/session_manager/MeteringReporter.h"
-#include "lte/gateway/c/session_manager/RuleStore.h"
+#include "lte/gateway/c/session_manager/DiameterCodes.hpp"
+#include "lte/gateway/c/session_manager/LocalEnforcer.hpp"
+#include "lte/gateway/c/session_manager/MeteringReporter.hpp"
+#include "lte/gateway/c/session_manager/RuleStore.hpp"
 #include "lte/gateway/c/session_manager/ServiceAction.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
-#include "lte/gateway/c/session_manager/ShardTracker.h"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
+#include "lte/gateway/c/session_manager/ShardTracker.hpp"
 #include "lte/gateway/c/session_manager/StoreClient.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 #include "lte/gateway/c/session_manager/test/Consts.h"
 #include "lte/gateway/c/session_manager/test/Matchers.h"
-#include "lte/gateway/c/session_manager/test/ProtobufCreators.h"
+#include "lte/gateway/c/session_manager/test/ProtobufCreators.hpp"
 #include "lte/gateway/c/session_manager/test/SessiondMocks.h"
 
 namespace grpc {
diff --git a/lte/gateway/c/session_manager/test/test_local_enforcer_wallet_exhaust.cpp b/lte/gateway/c/session_manager/test/test_local_enforcer_wallet_exhaust.cpp
index aeb9399aec20a..2c225040941d7 100644
--- a/lte/gateway/c/session_manager/test/test_local_enforcer_wallet_exhaust.cpp
+++ b/lte/gateway/c/session_manager/test/test_local_enforcer_wallet_exhaust.cpp
@@ -29,18 +29,18 @@
 #include <utility>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/LocalEnforcer.h"
-#include "lte/gateway/c/session_manager/MeteringReporter.h"
-#include "lte/gateway/c/session_manager/RuleStore.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
-#include "lte/gateway/c/session_manager/ShardTracker.h"
+#include "lte/gateway/c/session_manager/LocalEnforcer.hpp"
+#include "lte/gateway/c/session_manager/MeteringReporter.hpp"
+#include "lte/gateway/c/session_manager/RuleStore.hpp"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
+#include "lte/gateway/c/session_manager/ShardTracker.hpp"
 #include "lte/gateway/c/session_manager/StoreClient.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 #include "lte/gateway/c/session_manager/test/Consts.h"
 #include "lte/gateway/c/session_manager/test/Matchers.h"
-#include "lte/gateway/c/session_manager/test/ProtobufCreators.h"
+#include "lte/gateway/c/session_manager/test/ProtobufCreators.hpp"
 #include "lte/gateway/c/session_manager/test/SessiondMocks.h"
 
 namespace grpc {
diff --git a/lte/gateway/c/session_manager/test/test_metering_reporter.cpp b/lte/gateway/c/session_manager/test/test_metering_reporter.cpp
index 69ec9be5b65de..2a67cb3f571c2 100644
--- a/lte/gateway/c/session_manager/test/test_metering_reporter.cpp
+++ b/lte/gateway/c/session_manager/test/test_metering_reporter.cpp
@@ -18,8 +18,8 @@
 #include <string>
 #include <unordered_map>
 
-#include "lte/gateway/c/session_manager/MeteringReporter.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/MeteringReporter.hpp"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 #include "orc8r/gateway/c/common/service303/includes/MagmaService.hpp"
 
diff --git a/lte/gateway/c/session_manager/test/test_polling_pipelined.cpp b/lte/gateway/c/session_manager/test/test_polling_pipelined.cpp
index faf7ef962ad7b..52ec623bb2c99 100644
--- a/lte/gateway/c/session_manager/test/test_polling_pipelined.cpp
+++ b/lte/gateway/c/session_manager/test/test_polling_pipelined.cpp
@@ -20,15 +20,15 @@
 #include <unordered_map>
 #include <utility>
 
-#include "lte/gateway/c/session_manager/LocalEnforcer.h"
-#include "lte/gateway/c/session_manager/MeteringReporter.h"
-#include "lte/gateway/c/session_manager/RuleStore.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
-#include "lte/gateway/c/session_manager/ShardTracker.h"
+#include "lte/gateway/c/session_manager/LocalEnforcer.hpp"
+#include "lte/gateway/c/session_manager/MeteringReporter.hpp"
+#include "lte/gateway/c/session_manager/RuleStore.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
+#include "lte/gateway/c/session_manager/ShardTracker.hpp"
 #include "lte/gateway/c/session_manager/StoreClient.h"
 #include "lte/gateway/c/session_manager/Types.h"
 #include "lte/gateway/c/session_manager/test/Consts.h"
-#include "lte/gateway/c/session_manager/test/ProtobufCreators.h"
+#include "lte/gateway/c/session_manager/test/ProtobufCreators.hpp"
 #include "lte/gateway/c/session_manager/test/SessiondMocks.h"
 
 namespace grpc {
diff --git a/lte/gateway/c/session_manager/test/test_proxy_responder_handler.cpp b/lte/gateway/c/session_manager/test/test_proxy_responder_handler.cpp
index 6cfa1faea1e1a..66191a124ae62 100644
--- a/lte/gateway/c/session_manager/test/test_proxy_responder_handler.cpp
+++ b/lte/gateway/c/session_manager/test/test_proxy_responder_handler.cpp
@@ -29,20 +29,20 @@
 #include <utility>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/LocalEnforcer.h"
-#include "lte/gateway/c/session_manager/MeteringReporter.h"
-#include "lte/gateway/c/session_manager/RuleStore.h"
-#include "lte/gateway/c/session_manager/SessionID.h"
-#include "lte/gateway/c/session_manager/SessionProxyResponderHandler.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
-#include "lte/gateway/c/session_manager/ShardTracker.h"
+#include "lte/gateway/c/session_manager/LocalEnforcer.hpp"
+#include "lte/gateway/c/session_manager/MeteringReporter.hpp"
+#include "lte/gateway/c/session_manager/RuleStore.hpp"
+#include "lte/gateway/c/session_manager/SessionID.hpp"
+#include "lte/gateway/c/session_manager/SessionProxyResponderHandler.hpp"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
+#include "lte/gateway/c/session_manager/ShardTracker.hpp"
 #include "lte/gateway/c/session_manager/StoreClient.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 #include "lte/gateway/c/session_manager/test/Consts.h"
 #include "lte/gateway/c/session_manager/test/Matchers.h"
-#include "lte/gateway/c/session_manager/test/ProtobufCreators.h"
+#include "lte/gateway/c/session_manager/test/ProtobufCreators.hpp"
 #include "lte/gateway/c/session_manager/test/SessiondMocks.h"
 
 using ::testing::Test;
diff --git a/lte/gateway/c/session_manager/test/test_session_credit.cpp b/lte/gateway/c/session_manager/test/test_session_credit.cpp
index f72848bdbcf5c..57799b038e529 100644
--- a/lte/gateway/c/session_manager/test/test_session_credit.cpp
+++ b/lte/gateway/c/session_manager/test/test_session_credit.cpp
@@ -18,10 +18,10 @@
 #include <string>
 #include <unordered_map>
 
-#include "lte/gateway/c/session_manager/SessionCredit.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/SessionCredit.hpp"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
-#include "lte/gateway/c/session_manager/test/ProtobufCreators.h"
+#include "lte/gateway/c/session_manager/test/ProtobufCreators.hpp"
 
 using ::testing::Test;
 
diff --git a/lte/gateway/c/session_manager/test/test_session_manager_handler.cpp b/lte/gateway/c/session_manager/test/test_session_manager_handler.cpp
index b76b7611e663e..6eae123658fb7 100644
--- a/lte/gateway/c/session_manager/test/test_session_manager_handler.cpp
+++ b/lte/gateway/c/session_manager/test/test_session_manager_handler.cpp
@@ -32,20 +32,20 @@
 #include <utility>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/LocalEnforcer.h"
-#include "lte/gateway/c/session_manager/LocalSessionManagerHandler.h"
-#include "lte/gateway/c/session_manager/MeteringReporter.h"
-#include "lte/gateway/c/session_manager/RuleStore.h"
-#include "lte/gateway/c/session_manager/SessionCredit.h"
-#include "lte/gateway/c/session_manager/SessionID.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
-#include "lte/gateway/c/session_manager/ShardTracker.h"
+#include "lte/gateway/c/session_manager/LocalEnforcer.hpp"
+#include "lte/gateway/c/session_manager/LocalSessionManagerHandler.hpp"
+#include "lte/gateway/c/session_manager/MeteringReporter.hpp"
+#include "lte/gateway/c/session_manager/RuleStore.hpp"
+#include "lte/gateway/c/session_manager/SessionCredit.hpp"
+#include "lte/gateway/c/session_manager/SessionID.hpp"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
+#include "lte/gateway/c/session_manager/ShardTracker.hpp"
 #include "lte/gateway/c/session_manager/StoreClient.h"
 #include "lte/gateway/c/session_manager/Types.h"
 #include "lte/gateway/c/session_manager/test/Consts.h"
 #include "lte/gateway/c/session_manager/test/Matchers.h"
-#include "lte/gateway/c/session_manager/test/ProtobufCreators.h"
+#include "lte/gateway/c/session_manager/test/ProtobufCreators.hpp"
 #include "lte/gateway/c/session_manager/test/SessiondMocks.h"
 
 using ::testing::Test;
diff --git a/lte/gateway/c/session_manager/test/test_session_state.cpp b/lte/gateway/c/session_manager/test/test_session_state.cpp
index 9913371084295..37d2002c4ff71 100644
--- a/lte/gateway/c/session_manager/test/test_session_state.cpp
+++ b/lte/gateway/c/session_manager/test/test_session_state.cpp
@@ -25,14 +25,14 @@
 #include <vector>
 
 #include "lte/gateway/c/session_manager/CreditKey.h"
-#include "lte/gateway/c/session_manager/RuleStore.h"
+#include "lte/gateway/c/session_manager/RuleStore.hpp"
 #include "lte/gateway/c/session_manager/ServiceAction.h"
-#include "lte/gateway/c/session_manager/SessionCredit.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/SessionCredit.hpp"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 #include "lte/gateway/c/session_manager/test/Consts.h"
-#include "lte/gateway/c/session_manager/test/ProtobufCreators.h"
+#include "lte/gateway/c/session_manager/test/ProtobufCreators.hpp"
 #include "lte/gateway/c/session_manager/test/SessionStateTester.h"
 
 using ::testing::Test;
diff --git a/lte/gateway/c/session_manager/test/test_session_state_5g.cpp b/lte/gateway/c/session_manager/test/test_session_state_5g.cpp
index 93f83fd564b01..130f2d441ba45 100644
--- a/lte/gateway/c/session_manager/test/test_session_state_5g.cpp
+++ b/lte/gateway/c/session_manager/test/test_session_state_5g.cpp
@@ -18,9 +18,9 @@
 
 #include "lte/gateway/c/session_manager/test/Consts.h"
 #include "orc8r/gateway/c/common/logging/magma_logging.h"
-#include "lte/gateway/c/session_manager/test/ProtobufCreators.h"
+#include "lte/gateway/c/session_manager/test/ProtobufCreators.hpp"
 #include "lte/gateway/c/session_manager/test/SessiondMocks.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
 #include "lte/gateway/c/session_manager/test/SessionStateTester5g.h"
 
 using ::testing::Test;
diff --git a/lte/gateway/c/session_manager/test/test_session_store.cpp b/lte/gateway/c/session_manager/test/test_session_store.cpp
index 1440bbb829f02..32c9a248e7368 100644
--- a/lte/gateway/c/session_manager/test/test_session_store.cpp
+++ b/lte/gateway/c/session_manager/test/test_session_store.cpp
@@ -27,17 +27,17 @@
 #include <utility>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/MeteringReporter.h"
+#include "lte/gateway/c/session_manager/MeteringReporter.hpp"
 #include "lte/gateway/c/session_manager/Monitor.h"
-#include "lte/gateway/c/session_manager/RuleStore.h"
-#include "lte/gateway/c/session_manager/SessionID.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
+#include "lte/gateway/c/session_manager/RuleStore.hpp"
+#include "lte/gateway/c/session_manager/SessionID.hpp"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
 #include "lte/gateway/c/session_manager/StoreClient.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 #include "lte/gateway/c/session_manager/test/Consts.h"
-#include "lte/gateway/c/session_manager/test/ProtobufCreators.h"
+#include "lte/gateway/c/session_manager/test/ProtobufCreators.hpp"
 #include "orc8r/gateway/c/common/service303/includes/MagmaService.hpp"
 
 using magma::orc8r::MetricsContainer;
diff --git a/lte/gateway/c/session_manager/test/test_sessiond_integ.cpp b/lte/gateway/c/session_manager/test/test_sessiond_integ.cpp
index 6d0571cb9c52e..1bc738e60938b 100644
--- a/lte/gateway/c/session_manager/test/test_sessiond_integ.cpp
+++ b/lte/gateway/c/session_manager/test/test_sessiond_integ.cpp
@@ -31,20 +31,20 @@
 #include <thread>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/LocalEnforcer.h"
-#include "lte/gateway/c/session_manager/LocalSessionManagerHandler.h"
-#include "lte/gateway/c/session_manager/MeteringReporter.h"
-#include "lte/gateway/c/session_manager/PipelinedClient.h"
-#include "lte/gateway/c/session_manager/RuleStore.h"
-#include "lte/gateway/c/session_manager/SessionManagerServer.h"
-#include "lte/gateway/c/session_manager/SessionProxyResponderHandler.h"
-#include "lte/gateway/c/session_manager/SessionReporter.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
-#include "lte/gateway/c/session_manager/ShardTracker.h"
+#include "lte/gateway/c/session_manager/LocalEnforcer.hpp"
+#include "lte/gateway/c/session_manager/LocalSessionManagerHandler.hpp"
+#include "lte/gateway/c/session_manager/MeteringReporter.hpp"
+#include "lte/gateway/c/session_manager/PipelinedClient.hpp"
+#include "lte/gateway/c/session_manager/RuleStore.hpp"
+#include "lte/gateway/c/session_manager/SessionManagerServer.hpp"
+#include "lte/gateway/c/session_manager/SessionProxyResponderHandler.hpp"
+#include "lte/gateway/c/session_manager/SessionReporter.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
+#include "lte/gateway/c/session_manager/ShardTracker.hpp"
 #include "lte/gateway/c/session_manager/StoreClient.h"
 #include "lte/gateway/c/session_manager/test/Consts.h"
 #include "lte/gateway/c/session_manager/test/Matchers.h"
-#include "lte/gateway/c/session_manager/test/ProtobufCreators.h"
+#include "lte/gateway/c/session_manager/test/ProtobufCreators.hpp"
 #include "lte/gateway/c/session_manager/test/SessiondMocks.h"
 #include "orc8r/gateway/c/common/service303/includes/MagmaService.hpp"
 #include "orc8r/gateway/c/common/service_registry/includes/ServiceRegistrySingleton.hpp"
diff --git a/lte/gateway/c/session_manager/test/test_set_session_manager_handler.cpp b/lte/gateway/c/session_manager/test/test_set_session_manager_handler.cpp
index a5440446e826e..6cb2292798a07 100644
--- a/lte/gateway/c/session_manager/test/test_set_session_manager_handler.cpp
+++ b/lte/gateway/c/session_manager/test/test_set_session_manager_handler.cpp
@@ -32,25 +32,25 @@
 #include <utility>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/LocalEnforcer.h"
-#include "lte/gateway/c/session_manager/MeteringReporter.h"
-#include "lte/gateway/c/session_manager/RuleStore.h"
-#include "lte/gateway/c/session_manager/SessionID.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
-#include "lte/gateway/c/session_manager/SessionStateEnforcer.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
-#include "lte/gateway/c/session_manager/SetMessageManagerHandler.h"
-#include "lte/gateway/c/session_manager/ShardTracker.h"
+#include "lte/gateway/c/session_manager/LocalEnforcer.hpp"
+#include "lte/gateway/c/session_manager/MeteringReporter.hpp"
+#include "lte/gateway/c/session_manager/RuleStore.hpp"
+#include "lte/gateway/c/session_manager/SessionID.hpp"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
+#include "lte/gateway/c/session_manager/SessionStateEnforcer.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
+#include "lte/gateway/c/session_manager/SetMessageManagerHandler.hpp"
+#include "lte/gateway/c/session_manager/ShardTracker.hpp"
 #include "lte/gateway/c/session_manager/StoreClient.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
-#include "lte/gateway/c/session_manager/UpfMsgManageHandler.h"
+#include "lte/gateway/c/session_manager/UpfMsgManageHandler.hpp"
 #include "lte/gateway/c/session_manager/test/Consts.h"
 /* session_manager.grpc.pb.h and SessionStateEnforcer.h
  * included in "SetMessageManagerHandler.h"
  */
 #include "lte/gateway/c/session_manager/test/Matchers.h"
-#include "lte/gateway/c/session_manager/test/ProtobufCreators.h"
+#include "lte/gateway/c/session_manager/test/ProtobufCreators.hpp"
 #include "lte/gateway/c/session_manager/test/SessiondMocks.h"
 
 namespace magma {
diff --git a/lte/gateway/c/session_manager/test/test_store_client.cpp b/lte/gateway/c/session_manager/test/test_store_client.cpp
index f4b07137ade74..2915b3c726b0b 100644
--- a/lte/gateway/c/session_manager/test/test_store_client.cpp
+++ b/lte/gateway/c/session_manager/test/test_store_client.cpp
@@ -20,15 +20,15 @@
 #include <unordered_map>
 #include <utility>
 
-#include "lte/gateway/c/session_manager/MemoryStoreClient.h"
-#include "lte/gateway/c/session_manager/RuleStore.h"
-#include "lte/gateway/c/session_manager/SessionID.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
+#include "lte/gateway/c/session_manager/MemoryStoreClient.hpp"
+#include "lte/gateway/c/session_manager/RuleStore.hpp"
+#include "lte/gateway/c/session_manager/SessionID.hpp"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
 #include "lte/gateway/c/session_manager/StoreClient.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 #include "lte/gateway/c/session_manager/test/Consts.h"
-#include "lte/gateway/c/session_manager/test/ProtobufCreators.h"
+#include "lte/gateway/c/session_manager/test/ProtobufCreators.hpp"
 
 using ::testing::Test;
 
diff --git a/lte/gateway/c/session_manager/test/test_stored_state.cpp b/lte/gateway/c/session_manager/test/test_stored_state.cpp
index 7bac7e999be79..006ef7d577e6a 100644
--- a/lte/gateway/c/session_manager/test/test_stored_state.cpp
+++ b/lte/gateway/c/session_manager/test/test_stored_state.cpp
@@ -22,9 +22,9 @@
 #include <vector>
 
 #include "lte/gateway/c/session_manager/CreditKey.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
-#include "lte/gateway/c/session_manager/test/ProtobufCreators.h"
+#include "lte/gateway/c/session_manager/test/ProtobufCreators.hpp"
 
 using ::testing::Test;
 
diff --git a/lte/gateway/c/session_manager/test/test_upf_node_state.cpp b/lte/gateway/c/session_manager/test/test_upf_node_state.cpp
index b2c6056274adb..f30a59b2c49e5 100644
--- a/lte/gateway/c/session_manager/test/test_upf_node_state.cpp
+++ b/lte/gateway/c/session_manager/test/test_upf_node_state.cpp
@@ -25,13 +25,13 @@
 #include <unordered_map>
 #include <vector>
 
-#include "lte/gateway/c/session_manager/AmfServiceClient.h"
-#include "lte/gateway/c/session_manager/MeteringReporter.h"
-#include "lte/gateway/c/session_manager/PipelinedClient.h"
-#include "lte/gateway/c/session_manager/RuleStore.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
-#include "lte/gateway/c/session_manager/SessionStateEnforcer.h"
-#include "lte/gateway/c/session_manager/SessionStore.h"
+#include "lte/gateway/c/session_manager/AmfServiceClient.hpp"
+#include "lte/gateway/c/session_manager/MeteringReporter.hpp"
+#include "lte/gateway/c/session_manager/PipelinedClient.hpp"
+#include "lte/gateway/c/session_manager/RuleStore.hpp"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
+#include "lte/gateway/c/session_manager/SessionStateEnforcer.hpp"
+#include "lte/gateway/c/session_manager/SessionStore.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 #include "lte/gateway/c/session_manager/test/SessiondMocks.h"
 #include "orc8r/gateway/c/common/config/includes/ServiceConfigLoader.hpp"
diff --git a/lte/gateway/c/session_manager/test/test_usage_monitor.cpp b/lte/gateway/c/session_manager/test/test_usage_monitor.cpp
index f4a927b86c21d..4ea4c8c92f86d 100644
--- a/lte/gateway/c/session_manager/test/test_usage_monitor.cpp
+++ b/lte/gateway/c/session_manager/test/test_usage_monitor.cpp
@@ -21,8 +21,8 @@
 #include <vector>
 
 #include "lte/gateway/c/session_manager/ServiceAction.h"
-#include "lte/gateway/c/session_manager/SessionState.h"
-#include "lte/gateway/c/session_manager/StoredState.h"
+#include "lte/gateway/c/session_manager/SessionState.hpp"
+#include "lte/gateway/c/session_manager/StoredState.hpp"
 #include "lte/gateway/c/session_manager/Types.h"
 #include "lte/gateway/c/session_manager/test/SessionStateTester.h"