diff --git a/src/util.h b/src/util.h
index a8c902a0..c554c3b7 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003, 2004, 2005, 2008, 2011 
+  Copyright (C) 2003, 2004, 2005, 2008, 2011, 2012
   Rocky Bernstein <rocky@gnu.org>
   
   This program is free software: you can redistribute it and/or modify
@@ -25,11 +25,15 @@
 # define __CDIO_CONFIG_H__ 1
 #endif
 
-#include <stdio.h>
-#include <sys/types.h>
 #include <cdio/cdio.h>
 #include <cdio/logging.h>
 #include <cdio/iso9660.h>
+#ifdef HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
diff --git a/test/driver/freebsd.c b/test/driver/freebsd.c
index 47911319..40d1e38a 100644
--- a/test/driver/freebsd.c
+++ b/test/driver/freebsd.c
@@ -1,5 +1,5 @@
 /* -*- C -*-
-  Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2010, 2012 Rocky Bernstein <rocky@gnu.org>
   
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -22,19 +22,22 @@
 # include "config.h"
 # define __CDIO_CONFIG_H__ 1
 #endif
-#include <cdio/cdio.h>
-#include <cdio/logging.h>
 
 #ifdef HAVE_STDIO_H
-#include <stdio.h>
+# include <stdio.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
+# include <sys/types.h>
 #endif
 #ifdef HAVE_STDLIB_H
-#include <stdlib.h>
+# include <stdlib.h>
 #endif
-#include <string.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+
+#include <cdio/cdio.h>
+#include <cdio/logging.h>
 
 int
 main(int argc, const char *argv[])
diff --git a/test/driver/gnu_linux.c b/test/driver/gnu_linux.c
index 4f68fb88..a16de72c 100644
--- a/test/driver/gnu_linux.c
+++ b/test/driver/gnu_linux.c
@@ -22,8 +22,6 @@
 # include "config.h"
 # define __CDIO_CONFIG_H__ 1
 #endif
-#include <cdio/cdio.h>
-#include <cdio/logging.h>
 
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
@@ -38,6 +36,8 @@
 #include <string.h>
 #endif
 
+#include <cdio/cdio.h>
+#include <cdio/logging.h>
 #include "helper.h"
 
 int