diff --git a/include/logging/logging.h b/include/logging/logging_t.h
similarity index 100%
rename from include/logging/logging.h
rename to include/logging/logging_t.h
diff --git a/src/common/Makefile b/src/common/Makefile
index fddb99a..d1eb327 100644
--- a/src/common/Makefile
+++ b/src/common/Makefile
@@ -12,7 +12,7 @@ COMMON_CFLAGS := $(COMMON_CFLAGS)
 
 C_Files := crypto/shamir_secret_sharing/verifiable_secret_sharing.c crypto/paillier/paillier.c crypto/paillier/paillier_zkp.c crypto/GFp_curve_algebra/GFp_curve_algebra.c \
 				crypto/commitments/commitments.c crypto/zero_knowledge_proof/schnorr.c crypto/zero_knowledge_proof/range_proofs.c crypto/zero_knowledge_proof/diffie_hellman_log.c \
-				crypto/commitments/ring_pedersen.c crypto/ed25519_algebra/ed25519_algebra.c crypto/drng/drng.c crypto/keccak1600/keccak1600.c logging/logging.c
+				crypto/commitments/ring_pedersen.c crypto/ed25519_algebra/ed25519_algebra.c crypto/drng/drng.c crypto/keccak1600/keccak1600.c logging/logging_t.c
 
 C_Objects := $(C_Files:.c=.o)
 
diff --git a/src/common/cosigner/asymmetric_eddsa_cosigner.cpp b/src/common/cosigner/asymmetric_eddsa_cosigner.cpp
index 09f6203..1a72722 100644
--- a/src/common/cosigner/asymmetric_eddsa_cosigner.cpp
+++ b/src/common/cosigner/asymmetric_eddsa_cosigner.cpp
@@ -2,7 +2,7 @@
 #include "cosigner/cmp_key_persistency.h"
 #include "cosigner/cosigner_exception.h"
 #include "cosigner/platform_service.h"
-#include "logging/logging.h"
+#include "logging/logging_t.h"
 
 #include <openssl/sha.h>
 
diff --git a/src/common/cosigner/asymmetric_eddsa_cosigner_client.cpp b/src/common/cosigner/asymmetric_eddsa_cosigner_client.cpp
index d824ad4..ea01267 100644
--- a/src/common/cosigner/asymmetric_eddsa_cosigner_client.cpp
+++ b/src/common/cosigner/asymmetric_eddsa_cosigner_client.cpp
@@ -3,7 +3,7 @@
 #include "cosigner/cosigner_exception.h"
 #include "cosigner/platform_service.h"
 #include "cosigner/mpc_globals.h"
-#include "logging/logging.h"
+#include "logging/logging_t.h"
 #include "utils.h"
 
 #include <openssl/sha.h>
diff --git a/src/common/cosigner/asymmetric_eddsa_cosigner_server.cpp b/src/common/cosigner/asymmetric_eddsa_cosigner_server.cpp
index dc30d6e..362cad9 100644
--- a/src/common/cosigner/asymmetric_eddsa_cosigner_server.cpp
+++ b/src/common/cosigner/asymmetric_eddsa_cosigner_server.cpp
@@ -4,7 +4,7 @@
 #include "cosigner/platform_service.h"
 #include "cosigner/mpc_globals.h"
 #include "utils.h"
-#include "logging/logging.h"
+#include "logging/logging_t.h"
 
 #include <openssl/sha.h>
 
diff --git a/src/common/cosigner/cmp_ecdsa_offline_signing_service.cpp b/src/common/cosigner/cmp_ecdsa_offline_signing_service.cpp
index 0bedf6e..0109a86 100644
--- a/src/common/cosigner/cmp_ecdsa_offline_signing_service.cpp
+++ b/src/common/cosigner/cmp_ecdsa_offline_signing_service.cpp
@@ -6,7 +6,7 @@
 #include "utils.h"
 #include "crypto/GFp_curve_algebra/GFp_curve_algebra.h"
 #include "crypto/zero_knowledge_proof/range_proofs.h"
-#include "logging/logging.h"
+#include "logging/logging_t.h"
 
 namespace fireblocks
 {
diff --git a/src/common/cosigner/cmp_ecdsa_online_signing_service.cpp b/src/common/cosigner/cmp_ecdsa_online_signing_service.cpp
index 899ab52..21bb43a 100644
--- a/src/common/cosigner/cmp_ecdsa_online_signing_service.cpp
+++ b/src/common/cosigner/cmp_ecdsa_online_signing_service.cpp
@@ -6,7 +6,7 @@
 #include "crypto/GFp_curve_algebra/GFp_curve_algebra.h"
 #include "crypto/zero_knowledge_proof/range_proofs.h"
 #include "utils.h"
-#include "logging/logging.h"
+#include "logging/logging_t.h"
 
 namespace fireblocks
 {
diff --git a/src/common/cosigner/cmp_ecdsa_signing_service.cpp b/src/common/cosigner/cmp_ecdsa_signing_service.cpp
index 1a9d158..7278a82 100644
--- a/src/common/cosigner/cmp_ecdsa_signing_service.cpp
+++ b/src/common/cosigner/cmp_ecdsa_signing_service.cpp
@@ -4,7 +4,7 @@
 #include "crypto/GFp_curve_algebra/GFp_curve_algebra.h"
 #include "crypto/zero_knowledge_proof/diffie_hellman_log.h"
 #include "crypto/zero_knowledge_proof/range_proofs.h"
-#include "logging/logging.h"
+#include "logging/logging_t.h"
 
 #include <openssl/sha.h>
 
diff --git a/src/common/cosigner/cmp_offline_refresh_service.cpp b/src/common/cosigner/cmp_offline_refresh_service.cpp
index b752e67..7e5c5b9 100644
--- a/src/common/cosigner/cmp_offline_refresh_service.cpp
+++ b/src/common/cosigner/cmp_offline_refresh_service.cpp
@@ -6,7 +6,7 @@
 #include "cosigner/platform_service.h"
 #include "cosigner/prf.h"
 #include "crypto/elliptic_curve_algebra/elliptic_curve256_algebra.h"
-#include "logging/logging.h"
+#include "logging/logging_t.h"
 
 namespace fireblocks
 {
diff --git a/src/common/cosigner/cmp_setup_service.cpp b/src/common/cosigner/cmp_setup_service.cpp
index 0594b17..8bf373d 100644
--- a/src/common/cosigner/cmp_setup_service.cpp
+++ b/src/common/cosigner/cmp_setup_service.cpp
@@ -2,7 +2,7 @@
 #include "cosigner/cosigner_exception.h"
 #include "utils.h"
 #include "crypto/zero_knowledge_proof/schnorr.h"
-#include "logging/logging.h"
+#include "logging/logging_t.h"
 
 #include <openssl/sha.h>
 
diff --git a/src/common/cosigner/cosigner_exception.cpp b/src/common/cosigner/cosigner_exception.cpp
index 6fc99f2..32b9f15 100644
--- a/src/common/cosigner/cosigner_exception.cpp
+++ b/src/common/cosigner/cosigner_exception.cpp
@@ -1,6 +1,6 @@
 #include "cosigner/cosigner_exception.h"
 #include "crypto/paillier/paillier.h"
-#include "logging/logging.h"
+#include "logging/logging_t.h"
 
 namespace fireblocks
 {
diff --git a/src/common/cosigner/eddsa_online_signing_service.cpp b/src/common/cosigner/eddsa_online_signing_service.cpp
index 4aaa8aa..8bb4f91 100644
--- a/src/common/cosigner/eddsa_online_signing_service.cpp
+++ b/src/common/cosigner/eddsa_online_signing_service.cpp
@@ -4,7 +4,7 @@
 #include "cosigner/mpc_globals.h"
 #include "cosigner/platform_service.h"
 #include "utils.h"
-#include "logging/logging.h"
+#include "logging/logging_t.h"
 
 extern "C" int gettimeofday(struct timeval *tv, struct timezone *tz);
 
diff --git a/src/common/cosigner/mta.cpp b/src/common/cosigner/mta.cpp
index 0b078c0..3d3a088 100644
--- a/src/common/cosigner/mta.cpp
+++ b/src/common/cosigner/mta.cpp
@@ -6,7 +6,7 @@
 #include "../crypto/paillier/paillier_internal.h"
 
 #ifndef TEST_ONLY
-#include "logging/logging.h"
+#include "logging/logging_t.h"
 #else
 #define LOG_ERROR(message, ...) printf((message), ##__VA_ARGS__);putchar('\n')
 #endif
diff --git a/src/common/cosigner/utils.cpp b/src/common/cosigner/utils.cpp
index 50d735b..e9b220b 100644
--- a/src/common/cosigner/utils.cpp
+++ b/src/common/cosigner/utils.cpp
@@ -2,7 +2,7 @@
 #include "cosigner/cmp_key_persistency.h"
 #include "cosigner/cosigner_exception.h"
 #include "cosigner/platform_service.h"
-#include "logging/logging.h"
+#include "logging/logging_t.h"
 
 namespace fireblocks
 {
diff --git a/src/common/logging/logging.c b/src/common/logging/logging_t.c
similarity index 97%
rename from src/common/logging/logging.c
rename to src/common/logging/logging_t.c
index 0c08ca0..ec1da77 100644
--- a/src/common/logging/logging.c
+++ b/src/common/logging/logging_t.c
@@ -1,4 +1,4 @@
-#include "logging/logging.h"
+#include "logging/logging_t.h"
 
 #include <stdarg.h>
 #include <stdio.h>