diff --git a/lib/driver/FreeBSD/freebsd.h b/lib/driver/FreeBSD/freebsd.h
index 79be56e7..7f20a463 100644
--- a/lib/driver/FreeBSD/freebsd.h
+++ b/lib/driver/FreeBSD/freebsd.h
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2003, 2004, 2008, 2010 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2003, 2004, 2008, 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
@@ -24,6 +25,10 @@
 # include "config.h"
 #endif
 
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#endif 
+
 #include <cdio/sector.h>
 #include "cdio_assert.h"
 #include "cdio_private.h"
diff --git a/lib/driver/MSWindows/win32.c b/lib/driver/MSWindows/win32.c
index fb6e2d7a..b15afef6 100644
--- a/lib/driver/MSWindows/win32.c
+++ b/lib/driver/MSWindows/win32.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003, 2004, 2005, 2006, 2008, 2010, 2011
+  Copyright (C) 2003, 2004, 2005, 2006, 2008, 2010, 2011, 2012
   Rocky Bernstein <rocky@gnu.org>
 
   This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,11 @@
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
-# define __CDIO_CONFIG_H__ 1
 #endif
 
-static const char _rcsid[] = "$Id: win32.c,v 1.37 2008/04/21 18:30:21 karl Exp $";
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#endif 
 
 #include <cdio/cdio.h>
 #include <cdio/sector.h>
diff --git a/lib/driver/MSWindows/win32.h b/lib/driver/MSWindows/win32.h
index cb605801..6b4f10b6 100644
--- a/lib/driver/MSWindows/win32.h
+++ b/lib/driver/MSWindows/win32.h
@@ -1,6 +1,4 @@
 /*
-  $Id: win32.h,v 1.11 2008/04/21 18:30:21 karl Exp $
-
   Copyright (C) 2004, 2005, 2008 Rocky Bernstein <rocky@gnu.org>
 
   This program is free software: you can redistribute it and/or modify
diff --git a/lib/driver/aix.c b/lib/driver/aix.c
index b23037f7..c7def303 100644
--- a/lib/driver/aix.c
+++ b/lib/driver/aix.c
@@ -20,6 +20,10 @@
 # include "config.h"
 #endif
 
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#endif 
+
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
diff --git a/lib/driver/netbsd.c b/lib/driver/netbsd.c
index dfee81b1..987f5b2e 100644
--- a/lib/driver/netbsd.c
+++ b/lib/driver/netbsd.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2008, 2010, 2011 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2008, 2010, 2011, 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
@@ -43,9 +43,12 @@
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
-# define __CDIO_CONFIG_H__ 1
 #endif
 
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#endif 
+
 #include <cdio/sector.h>
 #include <cdio/util.h>
 #include "cdio_assert.h"
diff --git a/lib/driver/os2.c b/lib/driver/os2.c
index b916f6eb..1c644a89 100644
--- a/lib/driver/os2.c
+++ b/lib/driver/os2.c
@@ -1,5 +1,6 @@
 /*
   Copyright (C) 2009 KO Myung-Hun <komh@chollian.net>
+  Copyright (C) 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
@@ -21,9 +22,12 @@
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
-# define __CDIO_CONFIG_H__ 1
 #endif
 
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#endif 
+
 #include <cdio/cdio.h>
 #include <cdio/sector.h>
 #include <cdio/util.h>