diff --git a/src/include/log/log.h b/src/include/log/log.h
index 42974ab2..26297dd2 100644
--- a/src/include/log/log.h
+++ b/src/include/log/log.h
@@ -76,7 +76,7 @@ void       sid_log_change_tgt(sid_log_t *log, sid_log_tgt_t new_target);
 void       sid_log_set_pfx(sid_log_t *log, const char *prefix);
 
 __attribute__((format(printf, 3, 4))) void sid_log_output(sid_log_t *log, sid_log_req_t *req, const char *format, ...);
-void sid_log_voutput(sid_log_t *log, sid_log_req_t *req, const char *format, va_list ap);
+void                                       sid_log_voutput(sid_log_t *log, sid_log_req_t *req, const char *format, va_list ap);
 
 #define SID_LOG_PRINT LOG_LOCAL0
 
diff --git a/src/resource/ubridge.c b/src/resource/ubridge.c
index 0bf18fe7..38a93e76 100644
--- a/src/resource/ubridge.c
+++ b/src/resource/ubridge.c
@@ -407,7 +407,7 @@ struct kv_delta {
 };
 
 typedef enum {
-	__KEY_PART_START = 0x0,
+	_KEY_PART_START  = 0x0,
 	KEY_PART_OP      = 0x0,
 	KEY_PART_DOM     = 0x1,
 	KEY_PART_NS      = 0x2,
@@ -660,7 +660,7 @@ static const char *_get_key_part(const char *key, key_part_t req_part, size_t *l
 	key_part_t  part;
 	const char *start = key, *end;
 
-	for (part = __KEY_PART_START; part < req_part; part++) {
+	for (part = _KEY_PART_START; part < req_part; part++) {
 		if (!(start = strstr(start, SID_KVS_KEY_JOIN)))
 			return NULL;
 		start++;