diff --git a/lib/signature.c b/lib/signature.c
index 7d50db7a5..030eb8ceb 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -25,6 +25,11 @@
 char ** environ = NULL;
 #endif
 
+/* Solaris <= 2.6 limits getpass return to only 8 chars */
+#if HAVE_GETPASSPHRASE
+#define getpass getpassphrase
+#endif
+
 static int sighdrPut(Header h, rpmSigTag tag, rpmTagType type,
                      rpm_data_t p, rpm_count_t c)
 {
diff --git a/system.h b/system.h
index d796fbe72..15c7eed75 100644
--- a/system.h
+++ b/system.h
@@ -343,11 +343,6 @@ extern void unsetenv(const char *name);
 #endif
 #endif
 
-/* Solaris <= 2.6 limits getpass return to only 8 chars */
-#if HAVE_GETPASSPHRASE
-#define	getpass	getpassphrase
-#endif
-
 #if ! HAVE_LCHOWN
 #define lchown chown
 #endif