diff --git a/lib/cdda_interface/cooked_interface.c b/lib/cdda_interface/cooked_interface.c
index 9c431b6f..bb729d9f 100644
--- a/lib/cdda_interface/cooked_interface.c
+++ b/lib/cdda_interface/cooked_interface.c
@@ -1,5 +1,5 @@
 /*
-  $Id: cooked_interface.c,v 1.8 2005/01/09 00:47:07 rocky Exp $
+  $Id: cooked_interface.c,v 1.9 2005/01/09 01:50:56 rocky Exp $
 
   Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
   Original interface.c Copyright (C) 1994-1997 
@@ -246,6 +246,14 @@ cooked_init_drive (cdrom_drive_t *d){
   default:
     d->nsectors=25;  /* The max for SCSI MMC2 */
   }
+#else
+  { 	 
+    char buffer[256]; 	 
+    d->nsectors = 8; 	 
+    sprintf(buffer,"\tSetting read block size at %d sectors (%ld bytes).\n", 	 
+	    d->nsectors,(long)d->nsectors*CDIO_CD_FRAMESIZE_RAW); 	 
+    cdmessage(d,buffer); 	 
+  } 	 
 #endif /*HAVE_LINUX_MAJOR_H*/
 
   d->enable_cdda = Dummy;
diff --git a/lib/cdda_interface/drive_exceptions.h b/lib/cdda_interface/drive_exceptions.h
index 85ff2e1d..d20660b8 100644
--- a/lib/cdda_interface/drive_exceptions.h
+++ b/lib/cdda_interface/drive_exceptions.h
@@ -1,5 +1,5 @@
 /*
-  $Id: drive_exceptions.h,v 1.3 2005/01/08 20:39:40 rocky Exp $
+  $Id: drive_exceptions.h,v 1.4 2005/01/09 01:50:56 rocky Exp $
 
   Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
   Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -44,6 +44,7 @@ extern long scsi_read_mmc2(cdrom_drive_t *d, void *,long,long);
 #define scsi_read_mmc2 NULL
 #endif
 
+#if HAVE_LINUX_MAJOR_H
 /* list of drives that affect autosensing in ATAPI specific portions of code 
    (force drives to detect as ATAPI or SCSI, force ATAPI read command */
 
@@ -53,6 +54,7 @@ static exception_t atapi_list[]={
   {"SONY CD-ROM CDU-561",            0,   0,         Dummy,          NULL,0},
   {"Chinon CD-ROM CDS-525",          0,   0,         Dummy,          NULL,0},
   {NULL,0,0,NULL,NULL,0}};
+#endif /*HAVE_LINUX_MAJOR_H*/
 
 /* list of drives that affect MMC default settings */
 
diff --git a/lib/cdda_interface/scan_devices.c b/lib/cdda_interface/scan_devices.c
index fc307d6d..0c128448 100644
--- a/lib/cdda_interface/scan_devices.c
+++ b/lib/cdda_interface/scan_devices.c
@@ -1,5 +1,5 @@
 /*
-  $Id: scan_devices.c,v 1.8 2005/01/08 20:47:03 rocky Exp $
+  $Id: scan_devices.c,v 1.9 2005/01/09 01:50:56 rocky Exp $
 
   Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
   Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -156,11 +156,13 @@ cdda_identify_cooked(const char *dev, int messagedest, char **messages)
 {
 
   cdrom_drive_t *d=NULL;
-  struct stat st;
   int drive_type = 0;
   char *description=NULL;
   char *device = NULL;
   CdIo_t *p_cdio = NULL;
+#ifdef HAVE_LINUX_MAJOR_H
+  struct stat st;
+#endif
 
   if (dev) {
     device = test_resolve_symlink(dev,messagedest,messages);
@@ -239,7 +241,7 @@ cdda_identify_cooked(const char *dev, int messagedest, char **messages)
       }
     }
   }
-#endif /* HAVE_LINUX_MAJOR_H */
+#endif /*HAVE_LINUX_MAJOR_H*/
 
   /* Minimum init */
   
diff --git a/lib/driver/_cdio_sunos.c b/lib/driver/_cdio_sunos.c
index 90be0070..05dac16f 100644
--- a/lib/driver/_cdio_sunos.c
+++ b/lib/driver/_cdio_sunos.c
@@ -1,8 +1,8 @@
 /*
-    $Id: _cdio_sunos.c,v 1.4 2005/01/09 00:47:07 rocky Exp $
+    $Id: _cdio_sunos.c,v 1.5 2005/01/09 01:50:56 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
-    Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
+    Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
 
     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
@@ -38,7 +38,7 @@
 
 #ifdef HAVE_SOLARIS_CDROM
 
-static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.4 2005/01/09 00:47:07 rocky Exp $";
+static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.5 2005/01/09 01:50:56 rocky Exp $";
 
 #ifdef HAVE_GLOB_H
 #include <glob.h>
@@ -179,7 +179,7 @@ run_scsi_cmd_solaris( const void *p_user_data, unsigned int i_timeout_ms,
 
 static int
 _read_audio_sectors_solaris (void *p_user_data, void *data, lsn_t lsn, 
-			  unsigned int nblocks)
+			     unsigned int i_blocks)
 {
   struct cdrom_msf solaris_msf;
   msf_t _msf;
@@ -206,20 +206,20 @@ _read_audio_sectors_solaris (void *p_user_data, void *data, lsn_t lsn,
   
   p_env->gen.ioctls_debugged++;
 
-  if (nblocks > 60) {
+  if (i_blocks > 60) {
     cdio_warn("%s:\n", 
 	      "we can't handle reading more than 60 blocks. Reset to 60");
   }
 
   cdda.cdda_addr    = lsn;
-  cdda.cdda_length  = nblocks;
+  cdda.cdda_length  = i_blocks;
   cdda.cdda_data    = (caddr_t) data;
   cdda.cdda_subcode = CDROM_DA_NO_SUBCODE;
   
   if (ioctl (p_env->gen.fd, CDROMCDDA, &cdda) == -1) {
     perror ("ioctl(..,CDROMCDDA,..)");
-	return 1;
-	/* exit (EXIT_FAILURE); */
+    return 1;
+    /* exit (EXIT_FAILURE); */
   }
   
   return 0;
@@ -230,32 +230,32 @@ _read_audio_sectors_solaris (void *p_user_data, void *data, lsn_t lsn,
    from lsn. Returns 0 if no error. 
  */
 static int
-_read_mode1_sector_solaris (void *env, void *data, lsn_t lsn, 
+_read_mode1_sector_solaris (void *p_env, void *data, lsn_t lsn, 
 			    bool b_form2)
 {
 
 #if FIXED
   do something here. 
 #else
-  return cdio_generic_read_form1_sector(env, data, lsn);
+  return cdio_generic_read_form1_sector(p_env, data, lsn);
 #endif
 }
 
 /*!
-   Reads nblocks of mode2 sectors from cd device into data starting
+   Reads i_blocks of mode2 sectors from cd device into data starting
    from lsn.
    Returns 0 if no error. 
  */
 static int
 _read_mode1_sectors_solaris (void *p_user_data, void *p_data, lsn_t lsn, 
-			     bool b_form2, unsigned int nblocks)
+			     bool b_form2, unsigned int i_blocks)
 {
   _img_private_t *p_env = p_user_data;
   unsigned int i;
   int retval;
   unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
 
-  for (i = 0; i < nblocks; i++) {
+  for (i = 0; i < i_blocks; i++) {
     if ( (retval = _read_mode1_sector_solaris (p_env, 
 					    ((char *)p_data) + (blocksize * i),
 					       lsn + i, b_form2)) )
@@ -324,21 +324,21 @@ _read_mode2_sector_solaris (void *p_user_data, void *p_data, lsn_t lsn,
 }
 
 /*!
-   Reads nblocks of mode2 sectors from cd device into data starting
+   Reads i_blocks of mode2 sectors from cd device into data starting
    from lsn.
    Returns 0 if no error. 
  */
 static int
 _read_mode2_sectors_solaris (void *p_user_data, void *data, lsn_t lsn, 
-			     bool b_form2, unsigned int nblocks)
+			     bool b_form2, unsigned int i_blocks)
 {
-  _img_private_t *env = p_user_data;
+  _img_private_t *p_env = p_user_data;
   unsigned int i;
   int retval;
   unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
 
-  for (i = 0; i < nblocks; i++) {
-    if ( (retval = _read_mode2_sector_solaris (env, 
+  for (i = 0; i < i_blocks; i++) {
+    if ( (retval = _read_mode2_sector_solaris (p_env, 
 					    ((char *)data) + (blocksize * i),
 					       lsn + i, b_form2)) )
       return retval;
@@ -353,14 +353,14 @@ _read_mode2_sectors_solaris (void *p_user_data, void *data, lsn_t lsn,
 static uint32_t 
 _cdio_stat_size (void *p_user_data)
 {
-  _img_private_t *env = p_user_data;
+  _img_private_t *p_env = p_user_data;
 
   struct cdrom_tocentry tocent;
   uint32_t size;
 
   tocent.cdte_track  = CDIO_CDROM_LEADOUT_TRACK;
   tocent.cdte_format = CDIO_CDROM_LBA;
-  if (ioctl (env->gen.fd, CDROMREADTOCENTRY, &tocent) == -1)
+  if (ioctl (p_env->gen.fd, CDROMREADTOCENTRY, &tocent) == -1)
     {
       perror ("ioctl(CDROMREADTOCENTRY)");
       exit (EXIT_FAILURE);
@@ -382,20 +382,20 @@ _cdio_stat_size (void *p_user_data)
 static int
 _set_arg_solaris (void *p_user_data, const char key[], const char value[])
 {
-  _img_private_t *env = p_user_data;
+  _img_private_t *p_env = p_user_data;
 
   if (!strcmp (key, "source"))
     {
       if (!value)
 	return -2;
 
-      free (env->gen.source_name);
+      free (p_env->gen.source_name);
       
-      env->gen.source_name = strdup (value);
+      p_env->gen.source_name = strdup (value);
     }
   else if (!strcmp (key, "access-mode"))
     {
-      env->access_mode = str_to_access_mode_sunos(key);
+      p_env->access_mode = str_to_access_mode_sunos(key);
     }
   else 
     return -1;
@@ -463,14 +463,14 @@ read_toc_solaris (void *p_user_data)
 static int 
 eject_media_solaris (void *p_user_data) {
 
-  _img_private_t *env = p_user_data;
+  _img_private_t *p_env = p_user_data;
   int ret;
 
-  close(env->gen.fd);
-  env->gen.fd = -1;
-  if (env->gen.fd > -1) {
-    if ((ret = ioctl(env->gen.fd, CDROMEJECT)) != 0) {
-      cdio_generic_free((void *) env);
+  close(p_env->gen.fd);
+  p_env->gen.fd = -1;
+  if (p_env->gen.fd > -1) {
+    if ((ret = ioctl(p_env->gen.fd, CDROMEJECT)) != 0) {
+      cdio_generic_free((void *) p_env);
       cdio_warn ("CDROMEJECT failed: %s\n", strerror(errno));
       return 1;
     } else {
@@ -502,12 +502,12 @@ _cdio_malloc_and_zero(size_t size) {
 static const char *
 get_arg_solaris (void *p_user_data, const char key[])
 {
-  _img_private_t *env = p_user_data;
+  _img_private_t *p_env = p_user_data;
 
   if (!strcmp (key, "source")) {
-    return env->gen.source_name;
+    return p_env->gen.source_name;
   } else if (!strcmp (key, "access-mode")) {
-    switch (env->access_mode) {
+    switch (p_env->access_mode) {
     case _AM_SUN_CTRL_ATAPI:
       return "ATAPI";
     case _AM_SUN_CTRL_SCSI: