diff --git a/man/texinfo2man.c b/man/texinfo2man.c
index e301761..c95266f 100644
--- a/man/texinfo2man.c
+++ b/man/texinfo2man.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 
diff --git a/src/indent.h b/src/indent.h
index 76a8a39..e09dde1 100644
--- a/src/indent.h
+++ b/src/indent.h
@@ -96,10 +96,6 @@ extern char *cur_line;
 /* Size of the input program, not including the ' \n\0' we add at the end */
 extern unsigned long in_prog_size;
 
-/* The output file. */
-extern FILE *output;
-
-
 
 extern char *labbuf;            /* buffer for label */
 extern char *s_lab;             /* start ... */
diff --git a/src/output.c b/src/output.c
index f9a8464..4faa69b 100644
--- a/src/output.c
+++ b/src/output.c
@@ -12,6 +12,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/types.h>
 #include <utime.h>
 #include <sys/stat.h>
@@ -737,11 +738,11 @@ extern void dump_line (
                     
                     if (s[0] == '/' && (s[1] == '*' || s[1] == '/'))
                     {
-                        fprintf (output, "%.*s", e_lab - s, s);
+		      fprintf (output, "%.*s", (int)(e_lab - s), s);
                     }
                     else
                     {
-                        fprintf (output, "/* %.*s */", e_lab - s, s);
+                        fprintf (output, "/* %.*s */", (int)(e_lab - s), s);
                     }
                     
                     /* no need to update cur_col: the very next thing will