diff --git a/inc/rfc3161.h b/inc/rfc3161.h
index aa7db08..bcb7810 100644
--- a/inc/rfc3161.h
+++ b/inc/rfc3161.h
@@ -3,6 +3,7 @@
 #include <openssl/bn.h>
 #include <openssl/err.h>
 #include <openssl/opensslconf.h>
+#include <openssl/opensslv.h>
 #include <openssl/pem.h>
 #include <openssl/rand.h>
 #include <openssl/ts.h>
@@ -11,12 +12,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/syslog.h>
-#include <openssl/opensslv.h>
 
 #if OPENSSL_VERSION_NUMBER < 0x10000000L
 #error OpenSSL version too old
 #endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000L && OPENSSL_VERSION_NUMBER >= 0x10000000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L &&                                    \
+    OPENSSL_VERSION_NUMBER >= 0x10000000L
 #define OPENSSL_API_1_0
 #endif
 #if OPENSSL_VERSION_NUMBER >= 0x10100000L
diff --git a/src/lib/rfc3161.c b/src/lib/rfc3161.c
index 24afef0..7912216 100644
--- a/src/lib/rfc3161.c
+++ b/src/lib/rfc3161.c
@@ -306,8 +306,8 @@ end:
     uts_logger(ct, LOG_DEBUG, "Request[%s], TimeStamp OpenSSL status: |%s",
                *serial_id, bptr->data);
 
-    // emit logs according the return value
-    // and set the return code
+// emit logs according the return value
+// and set the return code
 #ifdef OPENSSL_API_1_1
     long status = ASN1_INTEGER_get(
         TS_STATUS_INFO_get0_status(TS_RESP_get_status_info(ts_response)));