diff --git a/src/cd-info.c b/src/cd-info.c
index d705204c..cbe57068 100644
--- a/src/cd-info.c
+++ b/src/cd-info.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003, 2004, 2005, 2007, 2008, 2011 
+  Copyright (C) 2003, 2004, 2005, 2007, 2008, 2011, 2012
   Rocky Bernstein <rocky@gnu.org>
   Copyright (C) 1996, 1997, 1998  Gerd Knorr <kraxel@bytesex.org>
          and Heiko Eißfeldt <heiko@hexco.de>
@@ -24,8 +24,10 @@
 
 #include "util.h"
 #include "getopt.h"
-#include <stdarg.h>
 
+#ifdef HAVE_STDARG_H
+#include <stdarg.h>
+#endif
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
@@ -51,7 +53,9 @@
 
 #include "cdio_assert.h"
 
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
 #ifdef __linux__
 # include <linux/version.h>
 # include <linux/cdrom.h>
@@ -59,8 +63,10 @@
 #  include <linux/ucdrom.h>
 # endif
 #endif
- 
+
+#ifdef HAVE_ERRNO_H 
 #include <errno.h>
+#endif
 
 #define STRONG "__________________________________\n"
 #define NORMAL ""
@@ -1107,7 +1113,7 @@ main(int argc, char *argv[])
     if (i_read_cap & CDIO_DRIVE_CAP_READ_ISRC) {
       driver_return_code_t status;
       for (i = 1; i <= i_tracks; i++) {
-        bzero(&isrc, sizeof(isrc));
+        memset (&isrc, 0, sizeof(isrc));
         status = mmc_isrc_track_read_subchannel (p_cdio, i, isrc);
         if (status == DRIVER_OP_SUCCESS && isrc[0] != '\0') {
           report(stdout, "TRACK %2d ISRC: %s\n", i, isrc); fflush(stdout);