diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c
index 2a753f659d..75c946799f 100644
--- a/src/or/hs_circuit.c
+++ b/src/or/hs_circuit.c
@@ -214,8 +214,8 @@ count_opened_desc_intro_point_circuits(const hs_service_t *service,
 
   DIGEST256MAP_FOREACH(desc->intro_points.map, key,
                        const hs_service_intro_point_t *, ip) {
-    circuit_t *circ;
-    origin_circuit_t *ocirc = hs_circ_service_get_intro_circ(ip);
+    const circuit_t *circ;
+    const origin_circuit_t *ocirc = hs_circ_service_get_intro_circ(ip);
     if (ocirc == NULL) {
       continue;
     }
diff --git a/src/or/hs_service.c b/src/or/hs_service.c
index b46fd6329d..592b1f2552 100644
--- a/src/or/hs_service.c
+++ b/src/or/hs_service.c
@@ -2048,8 +2048,8 @@ update_revision_counters_in_state(void)
  *  counter. Else set <b>service_found_out</b> to False. */
 STATIC uint64_t
 check_state_line_for_service_rev_counter(const char *state_line,
-                                         ed25519_public_key_t *blinded_pubkey,
-                                         int *service_found_out)
+                                    const ed25519_public_key_t *blinded_pubkey,
+                                    int *service_found_out)
 {
   smartlist_t *items = NULL;
   int ok;
@@ -2111,7 +2111,7 @@ check_state_line_for_service_rev_counter(const char *state_line,
  *  service with blinded key <b>blinded_pubkey</b>. If no revision counter is
  *  found, return 0. */
 static uint64_t
-get_rev_counter_for_service(ed25519_public_key_t *blinded_pubkey)
+get_rev_counter_for_service(const ed25519_public_key_t *blinded_pubkey)
 {
   or_state_t *state = get_or_state();
   config_line_t *line;
diff --git a/src/or/hs_service.h b/src/or/hs_service.h
index 1ab0c1a4f4..93d2710cdc 100644
--- a/src/or/hs_service.h
+++ b/src/or/hs_service.h
@@ -332,8 +332,8 @@ STATIC void service_descriptor_free(hs_service_descriptor_t *desc);
 
 STATIC uint64_t
 check_state_line_for_service_rev_counter(const char *state_line,
-                                         ed25519_public_key_t *blinded_pubkey,
-                                         int *service_found_out);
+                                    const ed25519_public_key_t *blinded_pubkey,
+                                    int *service_found_out);
 
 #endif /* TOR_UNIT_TESTS */