diff --git a/bzr/bzr_input.c b/bzr/bzr_input.c
index 53ab85d..50eceb5 100644
--- a/bzr/bzr_input.c
+++ b/bzr/bzr_input.c
@@ -67,8 +67,7 @@ extern boolean
 bzr_open_input_file (string filename)
 {
   if (bzr_input_file != NULL)
-    FATAL2 ("bzr_open_input_file: Attempt to open `%s', but `%s' is
-already open", filename, bzr_input_filename);
+    FATAL2 ("bzr_open_input_file: Attempt to open `%s', but `%s' is already open", filename, bzr_input_filename);
 
   bzr_input_filename = filename;
   bzr_input_file = fopen (filename, "r");
diff --git a/gf/gf_input.c b/gf/gf_input.c
index 57c81ff..912a325 100644
--- a/gf/gf_input.c
+++ b/gf/gf_input.c
@@ -94,8 +94,7 @@ boolean
 gf_open_input_file (string filename)
 {
   if (gf_input_file != NULL)
-    FATAL2 ("gf_open_input_file: Attempt to open `%s', but `%s' is
-already open", filename, gf_input_filename);
+    FATAL2 ("gf_open_input_file: Attempt to open `%s', but `%s' is already open", filename, gf_input_filename);
 
   gf_input_filename = filename;
   gf_input_file = fopen (filename, "r");
diff --git a/include/cmdline.h b/include/cmdline.h
index 3d221a2..5c69180 100644
--- a/include/cmdline.h
+++ b/include/cmdline.h
@@ -114,10 +114,10 @@ it's a percentage", temp);						 \
   while (0)
 
 #define GETOPT_USAGE \
-"  You can use `--' or `-' to start an option.
-  You can use any unambiguous abbreviation for an option name.
-  You can separate option names and values with `=' or ` '.
-"
+"  You can use `--' or `-' to start an option."\
+" You can use any unambiguous abbreviation for an option name."\
+" You can separate option names and values with `=' or ` '."
+
 
 /* What to pass to `strtok' to separate different arguments to an
    option, as in `-option=arg1,arg2,arg3'.  It is useful to allow
diff --git a/pbm/libpbm1.c b/pbm/libpbm1.c
index 46651b2..f044f94 100644
--- a/pbm/libpbm1.c
+++ b/pbm/libpbm1.c
@@ -14,7 +14,7 @@
 
 #include "pbm.h"
 #include "libpbm.h"
-#include <varargs.h>
+#include <stdarg.h>
 
 #if 0 /* karl */
 extern char *malloc ();
diff --git a/tfm/tfm_header.c b/tfm/tfm_header.c
index f677af7..5db8b0d 100644
--- a/tfm/tfm_header.c
+++ b/tfm/tfm_header.c
@@ -73,8 +73,7 @@ tfm_set_header (string s, tfm_global_info_type *tfm_info)
             	    value_string);
         
           if (length > TFM_MAX_CODINGSCHEME_LENGTH)
-            WARNING3 ("Your coding scheme `%s' of length %d will be \
-truncated to %d", value_string, length, TFM_MAX_CODINGSCHEME_LENGTH);
+            WARNING3 ("Your coding scheme `%s' of length %d will be truncated to %d", value_string, length, TFM_MAX_CODINGSCHEME_LENGTH);
 	  
 	  TFM_CODING_SCHEME (*tfm_info) = xstrdup (value_string);
         }
diff --git a/tfm/tfm_input.c b/tfm/tfm_input.c
index a4f875a..ee5d451 100644
--- a/tfm/tfm_input.c
+++ b/tfm/tfm_input.c
@@ -81,8 +81,7 @@ boolean
 tfm_open_input_file (string filename)
 {
   if (tfm_input_file != NULL)
-    FATAL2 ("tfm_open_input_file: Attempt to open `%s', but `%s' is
-already open", filename, tfm_input_name);
+    FATAL2 ("tfm_open_input_file: Attempt to open `%s', but `%s' is already open", filename, tfm_input_name);
 
   tfm_input_name = filename;
   tfm_input_file = fopen (filename, "r");
@@ -264,8 +263,7 @@ get_tfm_params ()
      than we can deal with.  */
   if (tfm_header.param_word_count > TFM_MAX_FONTDIMENS)
     {
-      WARNING3 ("%s: TFM file has %u parameters, which is more than the
-%u I can handle",
+      WARNING3 ("%s: TFM file has %u parameters, which is more than the %u I can handle",
                 tfm_input_name, tfm_header.param_word_count,
                 TFM_MAX_FONTDIMENS);
       tfm_header.param_word_count = TFM_MAX_FONTDIMENS;