diff --git a/src/bin/pkgman/command_add_repo.cpp b/src/bin/pkgman/command_add_repo.cpp
index f8c15e2b45..536af6265b 100644
--- a/src/bin/pkgman/command_add_repo.cpp
+++ b/src/bin/pkgman/command_add_repo.cpp
@@ -40,7 +40,7 @@ static const char* const kLongUsage =
 
 
 DEFINE_COMMAND(AddRepoCommand, "add-repo", kShortUsage, kLongUsage,
-	kCommandCategoryRepositories)
+	COMMAND_CATEGORY_REPOSITORIES)
 
 
 int
diff --git a/src/bin/pkgman/command_drop_repo.cpp b/src/bin/pkgman/command_drop_repo.cpp
index 358322545a..deec25f99a 100644
--- a/src/bin/pkgman/command_drop_repo.cpp
+++ b/src/bin/pkgman/command_drop_repo.cpp
@@ -37,7 +37,7 @@ static const char* const kLongUsage =
 
 
 DEFINE_COMMAND(DropRepoCommand, "drop-repo", kShortUsage, kLongUsage,
-	kCommandCategoryRepositories)
+	COMMAND_CATEGORY_REPOSITORIES)
 
 
 int
diff --git a/src/bin/pkgman/command_full_sync.cpp b/src/bin/pkgman/command_full_sync.cpp
index 79f1160c4a..7e3deff968 100644
--- a/src/bin/pkgman/command_full_sync.cpp
+++ b/src/bin/pkgman/command_full_sync.cpp
@@ -47,7 +47,7 @@ static const char* const kLongUsage =
 
 
 DEFINE_COMMAND(FullSyncCommand, "full-sync", kShortUsage, kLongUsage,
-	kCommandCategoryPackages)
+	COMMAND_CATEGORY_PACKAGES)
 
 
 int
diff --git a/src/bin/pkgman/command_install.cpp b/src/bin/pkgman/command_install.cpp
index 8a49fada12..4b7f0dd954 100644
--- a/src/bin/pkgman/command_install.cpp
+++ b/src/bin/pkgman/command_install.cpp
@@ -53,7 +53,7 @@ static const char* const kLongUsage =
 
 
 DEFINE_COMMAND(InstallCommand, "install", kShortUsage, kLongUsage,
-	kCommandCategoryPackages)
+	COMMAND_CATEGORY_PACKAGES)
 
 
 int
diff --git a/src/bin/pkgman/command_list_repos.cpp b/src/bin/pkgman/command_list_repos.cpp
index cc97b888cb..56a10aeeb5 100644
--- a/src/bin/pkgman/command_list_repos.cpp
+++ b/src/bin/pkgman/command_list_repos.cpp
@@ -43,7 +43,7 @@ static const char* const kLongUsage =
 
 
 DEFINE_COMMAND(ListReposCommand, "list-repos", kShortUsage, kLongUsage,
-	kCommandCategoryRepositories)
+	COMMAND_CATEGORY_REPOSITORIES)
 
 
 int
diff --git a/src/bin/pkgman/command_refresh.cpp b/src/bin/pkgman/command_refresh.cpp
index 20fbb13639..131578d7b5 100644
--- a/src/bin/pkgman/command_refresh.cpp
+++ b/src/bin/pkgman/command_refresh.cpp
@@ -38,7 +38,7 @@ static const char* const kLongUsage =
 
 
 DEFINE_COMMAND(RefreshCommand, "refresh", kShortUsage, kLongUsage,
-	kCommandCategoryRepositories)
+	COMMAND_CATEGORY_REPOSITORIES)
 
 
 int
diff --git a/src/bin/pkgman/command_resolve_dependencies.cpp b/src/bin/pkgman/command_resolve_dependencies.cpp
index 8ef44474ea..a90eb6f59c 100644
--- a/src/bin/pkgman/command_resolve_dependencies.cpp
+++ b/src/bin/pkgman/command_resolve_dependencies.cpp
@@ -62,7 +62,7 @@ static const char* const kLongUsage =
 
 
 DEFINE_COMMAND(ResolveDependenciesCommand, "resolve-dependencies", kShortUsage,
-	kLongUsage, kCommandCategoryOther)
+	kLongUsage, COMMAND_CATEGORY_OTHER)
 
 
 static void
diff --git a/src/bin/pkgman/command_search.cpp b/src/bin/pkgman/command_search.cpp
index 5d07da9677..5e2940fbd0 100644
--- a/src/bin/pkgman/command_search.cpp
+++ b/src/bin/pkgman/command_search.cpp
@@ -66,7 +66,7 @@ static const char* const kLongUsage =
 
 
 DEFINE_COMMAND(SearchCommand, "search", kShortUsage, kLongUsage,
-	kCommandCategoryPackages)
+	COMMAND_CATEGORY_PACKAGES)
 
 
 static int
diff --git a/src/bin/pkgman/command_uninstall.cpp b/src/bin/pkgman/command_uninstall.cpp
index 1d33668a00..add305bd13 100644
--- a/src/bin/pkgman/command_uninstall.cpp
+++ b/src/bin/pkgman/command_uninstall.cpp
@@ -45,7 +45,7 @@ static const char* const kLongUsage =
 
 
 DEFINE_COMMAND(UninstallCommand, "uninstall", kShortUsage, kLongUsage,
-	kCommandCategoryPackages)
+	COMMAND_CATEGORY_PACKAGES)
 
 
 int
diff --git a/src/bin/pkgman/command_update.cpp b/src/bin/pkgman/command_update.cpp
index a58a40eea8..0e3c6e87d5 100644
--- a/src/bin/pkgman/command_update.cpp
+++ b/src/bin/pkgman/command_update.cpp
@@ -49,7 +49,7 @@ static const char* const kLongUsage =
 
 
 DEFINE_COMMAND(UpdateCommand, "update", kShortUsage, kLongUsage,
-	kCommandCategoryPackages)
+	COMMAND_CATEGORY_PACKAGES)
 
 
 int
diff --git a/src/bin/pkgman/pkgman.cpp b/src/bin/pkgman/pkgman.cpp
index 52562b780d..75f1bd227d 100644
--- a/src/bin/pkgman/pkgman.cpp
+++ b/src/bin/pkgman/pkgman.cpp
@@ -23,11 +23,6 @@ extern const char* __progname;
 const char* kProgramName = __progname;
 
 
-const BString kCommandCategoryPackages("packages");
-const BString kCommandCategoryRepositories("repositories");
-const BString kCommandCategoryOther("other");
-
-
 static const char* const kUsage =
 	"Usage: %s <command> <command args>\n"
 	"Manages packages and package repositories.\n"
@@ -59,11 +54,11 @@ void
 print_usage_and_exit(bool error)
 {
 	BString packageCommandsUsage
-		= get_commands_usage_for_category(kCommandCategoryPackages);
+		= get_commands_usage_for_category(COMMAND_CATEGORY_PACKAGES);
 	BString repositoryCommandsUsage
-		= get_commands_usage_for_category(kCommandCategoryRepositories);
+		= get_commands_usage_for_category(COMMAND_CATEGORY_REPOSITORIES);
 	BString otherCommandsUsage
-		= get_commands_usage_for_category(kCommandCategoryOther);
+		= get_commands_usage_for_category(COMMAND_CATEGORY_OTHER);
 
     fprintf(error ? stderr : stdout, kUsage, kProgramName,
     	packageCommandsUsage.String(), repositoryCommandsUsage.String(),
diff --git a/src/bin/pkgman/pkgman.h b/src/bin/pkgman/pkgman.h
index c061fd9d39..1019a187f8 100644
--- a/src/bin/pkgman/pkgman.h
+++ b/src/bin/pkgman/pkgman.h
@@ -38,9 +38,9 @@ do {																\
 void	print_usage_and_exit(bool error);
 
 
-extern const BString kCommandCategoryPackages;
-extern const BString kCommandCategoryRepositories;
-extern const BString kCommandCategoryOther;
+#define COMMAND_CATEGORY_PACKAGES		"packages"
+#define COMMAND_CATEGORY_REPOSITORIES	"repositories"
+#define COMMAND_CATEGORY_OTHER			"other"
 
 
 #endif	// PKGMAN_H