pw_log: Separate shortened macro name headers

Use separate headers rather than requiring a macro to be defined. This
is simpler to work with and avoids potential conflicts with different
macro settings.

Change-Id: I2bc686bd41788b8da912da7b5a7757bae9e22211
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/35961
Pigweed-Auto-Submit: Wyatt Hepler <hepler@google.com>
Reviewed-by: Keir Mierle <keir@google.com>
Commit-Queue: Wyatt Hepler <hepler@google.com>
diff --git a/pw_kvs/key_value_store.cc b/pw_kvs/key_value_store.cc
index d40bb8b..335efd5 100644
--- a/pw_kvs/key_value_store.cc
+++ b/pw_kvs/key_value_store.cc
@@ -14,7 +14,6 @@
 
 #define PW_LOG_MODULE_NAME "KVS"
 #define PW_LOG_LEVEL PW_KVS_LOG_LEVEL
-#define PW_LOG_USE_ULTRA_SHORT_NAMES 1
 
 #include "pw_kvs/key_value_store.h"
 
@@ -25,7 +24,7 @@
 
 #include "pw_assert/assert.h"
 #include "pw_kvs_private/config.h"
-#include "pw_log/log.h"
+#include "pw_log/shorter.h"
 #include "pw_status/try.h"
 
 namespace pw::kvs {