More source headers harmonization

* fix missing #ifdefs
* remove spaces and page feeds
* follow same set of rules everywhere, with cdio includes coming
  after standard C includes.

lib/driver/cdio.c

@@ -23,8 +23,12 @@
 # define __CDIO_CONFIG_H__ 1
 #endif
 
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

lib/driver/image/bincue.c

@@ -23,16 +23,7 @@
    residing inside a disk file (*.bin) and its associated cue sheet.
    (*.cue).
 */
-
-#include "image.h"
-#include "cdio_assert.h"
-#include "cdio_private.h"
-#include "_cdio_stdio.h"
-
-#include <cdio/logging.h>
-#include <cdio/util.h>
-#include <cdio/utf8.h>
-#include <cdio/version.h>
+#include "portable.h"
 
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
@@ -60,7 +51,16 @@
 
 #include <ctype.h>
 
-#include "portable.h"
+#include <cdio/logging.h>
+#include <cdio/util.h>
+#include <cdio/utf8.h>
+#include <cdio/version.h>
+
+#include "image.h"
+#include "cdio_assert.h"
+#include "cdio_private.h"
+#include "_cdio_stdio.h"
+
 /* reader */
 
 #define DEFAULT_CDIO_DEVICE "videocd.bin"

lib/driver/image/cdrdao.c

@@ -22,17 +22,7 @@
    residing inside a disk file (*.bin) and its associated cue sheet.
    (*.cue).
 */
-
-
-#include "image.h"
-#include "cdio_assert.h"
-#include "_cdio_stdio.h"
-
-#include <cdio/logging.h>
-#include <cdio/sector.h>
-#include <cdio/util.h>
-#include <cdio/utf8.h>
-#include <cdio/version.h>
+#include "portable.h"
 
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
@@ -63,7 +53,16 @@
 
 #include <ctype.h>
 
-#include "portable.h"
+#include <cdio/logging.h>
+#include <cdio/sector.h>
+#include <cdio/util.h>
+#include <stdio.h>
+#include <cdio/utf8.h>
+#include <cdio/version.h>
+
+#include "image.h"
+#include "cdio_assert.h"
+#include "_cdio_stdio.h"
 
 /* reader */
 

lib/driver/realpath.c

@@ -40,7 +40,9 @@
 # include <stdlib.h>
 #endif
 
-#include <stdio.h>
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
+#endif
 
 #ifdef HAVE_STRING_H
 # include <string.h>
@@ -50,7 +52,6 @@
 # include <unistd.h>
 #endif
 
-
 #ifdef HAVE_INTTYPES_H
 # include "inttypes.h"
 #endif