diff --git a/argp/argp-help.c b/argp/argp-help.c
index f39ce2a74f..1365abcea6 100644
--- a/argp/argp-help.c
+++ b/argp/argp-help.c
@@ -87,7 +87,7 @@ char *strerror (int errnum);
 
 #ifndef SIZE_MAX
 # define SIZE_MAX ((size_t) -1)
-#endif 
+#endif
 
 /* User-selectable (using an environment variable) formatting parameters.
 
@@ -1696,25 +1696,25 @@ char *__argp_basename (char *name)
   char *short_name = strrchr (name, '/');
   return short_name ? short_name + 1 : name;
 }
-#endif
 
 char *
 __argp_short_program_name (void)
 {
-#if defined _LIBC || HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
+# if HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
   return program_invocation_short_name;
-#elif HAVE_DECL_PROGRAM_INVOCATION_NAME
+# elif HAVE_DECL_PROGRAM_INVOCATION_NAME
   return __argp_basename (program_invocation_name);
-#else
+# else
   /* FIXME: What now? Miles suggests that it is better to use NULL,
      but currently the value is passed on directly to fputs_unlocked,
      so that requires more changes. */
-#if __GNUC__
-# warning No reasonable value to return
-#endif /* __GNUC__ */
+# if __GNUC__
+#  warning No reasonable value to return
+# endif /* __GNUC__ */
   return "";
-#endif
+# endif
 }
+#endif
 
 /* Output, if appropriate, a usage message for STATE to STREAM.  FLAGS are
    from the set ARGP_HELP_*.  */
diff --git a/argp/argp-namefrob.h b/argp/argp-namefrob.h
index 395d9b6dd8..26e285bfba 100644
--- a/argp/argp-namefrob.h
+++ b/argp/argp-namefrob.h
@@ -1,5 +1,5 @@
 /* Name frobnication for compiling argp outside of glibc
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Miles Bader <miles@gnu.ai.mit.edu>.
 
@@ -138,10 +138,15 @@
 # endif
 
 extern char *__argp_basename (char *name);
-extern char *__argp_short_program_name (void);
 
 #endif /* !_LIBC */
 
 #ifndef __set_errno
 #define __set_errno(e) (errno = (e))
 #endif
+
+#if defined _LIBC || HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
+# define __argp_short_program_name()	(program_invocation_short_name)
+#else
+extern char *__argp_short_program_name (void);
+#endif