Index: branches/azimutz/Chazi/i386/libsaio/console.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/console.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/console.c	(revision 515)
@@ -45,7 +45,7 @@
  */
 
 //#include "libsaio.h"
-#include "bootstruct.h" - most libsaio.h stuff is included here now.
+#include "bootstruct.h"
 
 extern int	vprf(const char * fmt, va_list ap);
 
Index: branches/azimutz/Chazi/i386/libsaio/ati_resolution.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/ati_resolution.h	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/ati_resolution.h	(revision 515)
@@ -11,9 +11,6 @@
 #define _ATI_RESOLUTION_H_
 
 //#include "libsaio.h"
-#include "libsa.h"
-#include "saio_internal.h"
-//---
 #include "autoresolution.h"
 
 #define ATI_SIGNATURE1 "ATI MOBILITY RADEON"
Index: branches/azimutz/Chazi/i386/libsaio/vbe.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/vbe.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/vbe.c	(revision 515)
@@ -30,7 +30,6 @@
 #include "io_inline.h"
 #include "saio_types.h"
 #include "saio_internal.h"
-//--- hum, check again; getting the feeling that the headers feed on the included here!?
 #include "vbe.h"
 
 /* 
Index: branches/azimutz/Chazi/i386/libsaio/bootstruct.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/bootstruct.h	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/bootstruct.h	(revision 515)
@@ -29,11 +29,10 @@
 
 //Azi: this is acting now as a mini libsaio.h :P
 //#include "libsaio.h"
+//#include "bios.h"
 #include "libsa.h"
 #include "saio_types.h"
-#include "saio_internal.h" // "external" to verbose function
-//---
-#include "bios.h"
+#include "saio_internal.h"
 #include "device_tree.h"
 
 /*!
Index: branches/azimutz/Chazi/i386/libsaio/device_tree.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/device_tree.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/device_tree.c	(revision 515)
@@ -37,7 +37,6 @@
 //Azi: check location.
 //#include "libsaio.h"
 #include "libsa.h"
-//---
 #include "device_tree.h"
 
 #if DEBUG
Index: branches/azimutz/Chazi/i386/libsaio/hfs.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/hfs.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/hfs.c	(revision 515)
@@ -27,7 +27,8 @@
  *  DRI: Josh de Cesare
  */
 
-#include <sl.h>
+//#include <sl.h>
+#include "sl.h" //Azi:???
 #include <hfs/hfs_format.h>
 
 #include "hfs.h"
Index: branches/azimutz/Chazi/i386/libsaio/vbe.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/vbe.h	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/vbe.h	(revision 515)
@@ -35,7 +35,7 @@
 #ifndef __LIBSAIO_VBE_H
 #define __LIBSAIO_VBE_H
 
-#include "edid.h"			//Azi:autoresolution
+//#include "edid.h"			//Azi:autoresolution <-- included in
 #include "autoresolution.h"
 
 #define MIN_VESA_VERSION    0x200
Index: branches/azimutz/Chazi/i386/libsaio/acpi_patcher.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/acpi_patcher.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/acpi_patcher.c	(revision 515)
@@ -3,8 +3,8 @@
  */
 
 //#include "libsaio.h"
+//#include "bootstruct.h"
 #include "boot.h"
-#include "bootstruct.h"
 #include "acpi.h"
 #include "efi_tables.h"
 #include "fake_efi.h"
Index: branches/azimutz/Chazi/i386/libsaio/allocate.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/allocate.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/allocate.c	(revision 515)
@@ -22,10 +22,10 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 
+//#include "saio_internal.h"
+//#include "device_tree.h" - included on bootstruct.h
+#include "bootstruct.h"
 #include "sl.h"
-#include "saio_internal.h"
-#include "bootstruct.h"
-#include "device_tree.h"
 
 static long  gImageLastKernelAddr;
 
Index: branches/azimutz/Chazi/i386/libsaio/hfs_compare.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/hfs_compare.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/hfs_compare.c	(revision 515)
@@ -27,7 +27,8 @@
  *  DRI: Josh de Cesare
  */
 
-#include <sl.h>
+//#include <sl.h>
+#include "sl.h" //Azi:???
 #include "hfs_CaseTables.h"
 
 #if ! UNCOMPRESSED
Index: branches/azimutz/Chazi/i386/libsaio/spd.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/spd.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/spd.c	(revision 515)
@@ -7,11 +7,11 @@
  */
 
 //#include "libsaio.h" - included on the header.
+//#include "saio_internal.h" - included on bootstruct.h
+#include "bootstruct.h"
 #include "pci.h"
 #include "platform.h"
 #include "spd.h"
-#include "saio_internal.h"
-#include "bootstruct.h"
 #include "memvendors.h"
 
 #ifndef DEBUG_SPD
Index: branches/azimutz/Chazi/i386/libsaio/libsaio.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/libsaio.h	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/libsaio.h	(revision 515)
@@ -26,6 +26,7 @@
 #ifndef __LIBSAIO_LIBSAIO_H
 #define __LIBSAIO_LIBSAIO_H
 
+//Azi: not used atm.
 #include "libsa.h"
 #include "memory.h"
 #include "io_inline.h"
Index: branches/azimutz/Chazi/i386/libsaio/spd.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/spd.h	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/spd.h	(revision 515)
@@ -7,8 +7,8 @@
 #ifndef __LIBSAIO_SPD_H
 #define __LIBSAIO_SPD_H
 
-#include "platform.h" // already suplies most of the dependencies.
 //#include "libsaio.h"
+#include "platform.h"
 #include "io_inline.h"
 
 void scan_spd(PlatformInfo_t *p);
Index: branches/azimutz/Chazi/i386/libsaio/ufs.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/ufs.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/ufs.c	(revision 515)
@@ -27,7 +27,8 @@
  *  DRI: Josh de Cesare
  */
 
-#include <sl.h>
+//#include <sl.h>
+#include "sl.h" //Azi:???
 
 #include "ufs.h"
 #include "ufs_byteorder.h"
Index: branches/azimutz/Chazi/i386/libsaio/smbios_patcher.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/smbios_patcher.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/smbios_patcher.c	(revision 515)
@@ -3,8 +3,8 @@
  */
 
 //#include "libsaio.h" - included on the hearder.
+//#include "bootstruct.h"
 #include "boot.h"
-#include "bootstruct.h"
 #include "acpi.h"
 #include "efi_tables.h"
 #include "fake_efi.h"
Index: branches/azimutz/Chazi/i386/libsaio/smbios_patcher.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/smbios_patcher.h	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/smbios_patcher.h	(revision 515)
@@ -8,7 +8,7 @@
 #ifndef __LIBSAIO_SMBIOS_PATCHER_H
 #define __LIBSAIO_SMBIOS_PATCHER_H
 
-//#include "libsaio.h" - not needed??
+//#include "libsaio.h"
 #include "SMBIOS.h"
 
 /* From Foundation/Efi/Guid/Smbios/SmBios.h */
Index: branches/azimutz/Chazi/i386/libsaio/pci_root.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/pci_root.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/pci_root.c	(revision 515)
@@ -3,8 +3,8 @@
  */
 
 //#include "libsaio.h"
+//#include "bootstruct.h"
 #include "boot.h"
-#include "bootstruct.h"
 
 #ifndef DEBUG_PCIROOT
 #define DEBUG_PCIROOT 1
Index: branches/azimutz/Chazi/i386/libsaio/usb.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/usb.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/usb.c	(revision 515)
@@ -8,10 +8,9 @@
  */
 
 //#include "libsaio.h"
-#include "io_inline.h"
-//---
+//#include "bootstruct.h"
 #include "boot.h"
-#include "bootstruct.h"
+#include "io_inline.h"
 #include "pci.h"
 
 #ifndef DEBUG_USB
Index: branches/azimutz/Chazi/i386/libsaio/device_inject.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/device_inject.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/device_inject.c	(revision 515)
@@ -6,8 +6,8 @@
  */
 
 //#include "libsaio.h"
+//#include "bootstruct.h"
 #include "boot.h"
-#include "bootstruct.h"
 #include "pci.h"
 #include "pci_root.h"
 #include "device_inject.h"
Index: branches/azimutz/Chazi/i386/libsaio/autoresolution.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/autoresolution.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/autoresolution.c	(revision 515)
@@ -1,4 +1,3 @@
-
 /* Copied from 915 resolution created by steve tomljenovic
  *
  * This code is based on the techniques used in :
@@ -15,13 +14,11 @@
  */
 
 //#include "libsaio.h"
-#include "saio_internal.h"
-//---
-//#include "autoresolution.h" - included on ati_resolution.h
+//#include "autoresolution.h" - included on *_resolution.h
 #include "nvidia_resolution.h"
 #include "ati_resolution.h"
 #include "gma_resolution.h"
-#include "../boot2/graphics.h"
+#include "../boot2/graphics.h" //Azi:reminder
 
 char * chipsetTypeNames[] = {
 	"UNKNOWN", "830",  "845G", "855GM", "865G", "915G", "915GM", "945G", "945GM", "945GME",
Index: branches/azimutz/Chazi/i386/libsaio/autoresolution.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/autoresolution.h	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/autoresolution.h	(revision 515)
@@ -18,6 +18,8 @@
 
 //#define AUTORES_DEBUG 1 // enable AutoResolution debug - review!
 
+#include "libsa.h"
+#include "saio_internal.h"
 #include "edid.h"
 
 #if DEBUG
Index: branches/azimutz/Chazi/i386/libsaio/nvidia.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/nvidia.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/nvidia.c	(revision 515)
@@ -49,8 +49,8 @@
  */
 
 //#include "libsaio.h"
+//#include "bootstruct.h"
 #include "boot.h"
-#include "bootstruct.h"
 #include "pci.h"
 #include "platform.h"
 #include "device_inject.h"
Index: branches/azimutz/Chazi/i386/libsaio/ntfs.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/ntfs.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/ntfs.c	(revision 515)
@@ -23,13 +23,12 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 
-//#include "libsaio.h" - included on sl.h
+//#include "libsaio.h"
 #include "sl.h"
+#include "ntfs_private.h"
 
 #define BYTE_ORDER_MARK	0xFEFF
 
-#include "ntfs_private.h"
-
 #define FS_TYPE			"ntfs"
 #define FS_NAME_FILE		"NTFS"
 
Index: branches/azimutz/Chazi/i386/libsaio/ufs_byteorder.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/ufs_byteorder.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/ufs_byteorder.c	(revision 515)
@@ -31,8 +31,9 @@
 #include <sys/vnode.h>
 #include <ufs/ufs/dir.h>
 #include <libkern/OSByteOrder.h>
+
+//#include "libsaio.h" // ufs support reminder (check disk.c)
 #include "ufs_byteorder.h"
-#include "libsaio.h" // probably needed if ufs support is enabled.
 
 #define	swapBigLongToHost(thing) ((thing) = OSSwapBigToHostInt32(thing))
 #define	swapBigShortToHost(thing) ((thing) = OSSwapBigToHostInt16(thing))
Index: branches/azimutz/Chazi/i386/libsaio/ati.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/ati.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/ati.c	(revision 515)
@@ -22,9 +22,8 @@
  
  
 //#include "libsaio.h"
-//---
+//#include "bootstruct.h"
 #include "boot.h"
-#include "bootstruct.h"
 #include "pci.h"
 #include "platform.h"
 #include "device_inject.h"
Index: branches/azimutz/Chazi/i386/libsaio/sys.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/sys.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/sys.c	(revision 515)
@@ -54,25 +54,29 @@
  *	@(#)sys.c	7.1 (Berkeley) 6/5/86
  */
 
-/*  Copyright 2007 VMware Inc.
-    "Preboot" ramdisk support added by David Elliott
+/*
+ * Copyright 2007 VMware Inc.
+ * "Preboot" ramdisk support added by David Elliott
  */
 
 #include <AvailabilityMacros.h>
+#include <uuid/uuid.h>
 
 //#include "libsaio.h"
+//#include "bootstruct.h"
 #include "boot.h"
-#include "bootstruct.h"
 #include "disk.h"
 #include "ramdisk.h"
 #include "xml.h"
+
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
 # include <Kernel/libkern/crypto/md5.h>
 #else
 # include <sys/md5.h>
 #endif
-#include <uuid/uuid.h>
-#if 0 /* No OS X release has ever included this. */
+
+/* No OS X release has ever included this. */
+#if 0
 #include <Kernel/uuid/namespace.h>
 #else
 /* copied from uuid/namespace.h, just like BootX's fs.c does. */
Index: branches/azimutz/Chazi/i386/libsaio/load.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/load.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/load.c	(revision 515)
@@ -30,7 +30,8 @@
 #include <mach-o/loader.h>
 #include <mach/machine/thread_status.h>
 
-#include <sl.h>
+//#include <sl.h>
+#include "sl.h" //Azi:???
 
 static long DecodeSegment(long cmdBase, unsigned int*load_addr, unsigned int *load_size);
 static long DecodeUnixThread(long cmdBase, unsigned int *entry);
Index: branches/azimutz/Chazi/i386/libsaio/sl.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/sl.h	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/sl.h	(revision 515)
@@ -28,8 +28,12 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/vnode.h>
-#include "libsaio.h" - check later; sl.h is included in many files!
 
+//#include "libsaio.h"
+#include "libsa.h"
+#include "memory.h"
+#include "saio_internal.h"
+
 #define SWAP_BE16(x)  OSSwapBigToHostInt16(x)
 #define SWAP_LE16(x)  OSSwapLittleToHostInt16(x)
 #define SWAP_BE32(x)  OSSwapBigToHostInt32(x)
Index: branches/azimutz/Chazi/i386/libsaio/platform.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/platform.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/platform.c	(revision 515)
@@ -4,9 +4,9 @@
  * AsereBLN: cleanup
  */
 
-//#include "libsaio.h" - both bootstruct.h, platform.h, pci.h can resolve dependencies.
+//#include "libsaio.h"
+//#include "bootstruct.h"
 #include "boot.h"
-#include "bootstruct.h"
 #include "pci.h"
 #include "platform.h"
 #include "cpu.h"
Index: branches/azimutz/Chazi/i386/libsaio/cpu.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/cpu.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/cpu.c	(revision 515)
@@ -3,7 +3,7 @@
  * AsereBLN: 2009: cleanup and bugfix
  */
 
-//#include "libsaio.h" - was included on both of the remaining; platform.h resolves dependencies.
+//#include "libsaio.h"
 #include "platform.h"
 #include "cpu.h"
 
Index: branches/azimutz/Chazi/i386/libsaio/disk.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/disk.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/disk.c	(revision 515)
@@ -44,11 +44,18 @@
  * All rights reserved.
  */
 
-/*  Copyright 2007 VMware Inc.
-    "Preboot" ramdisk support added by David Elliott
-    GPT support added by David Elliott.  Based on IOGUIDPartitionScheme.cpp.
+/*
+ * Copyright 2007 VMware Inc.
+ * "Preboot" ramdisk support added by David Elliott
+ * GPT support added by David Elliott.  Based on IOGUIDPartitionScheme.cpp.
  */
 
+//#define UFS_SUPPORT 1 //Azi: error: duplicate case value
+
+#include <limits.h>
+#include <IOKit/storage/IOApplePartitionScheme.h>
+#include <IOKit/storage/IOGUIDPartitionScheme.h>
+
 // Allow UFS_SUPPORT to be overridden with preprocessor option.
 #ifndef UFS_SUPPORT
 // zef: Disabled UFS support
@@ -56,32 +63,28 @@
 #endif
 
 //#include "libsaio.h"
+//#include "bootstruct.h"
+#include "boot.h"
 #include "memory.h"
-//---
-#include "boot.h"
-#include "bootstruct.h"
 #include "fdisk.h"
+
 #if UFS_SUPPORT
 #include "ufs.h"
 #endif
+
 #include "hfs.h"
 #include "ntfs.h"
 #include "msdos.h"
 #include "ext2fs.h"
-
 #include "xml.h"
 #include "disk.h"
+// For EFI_GUID
+#include "efi.h"
+#include "efi_tables.h"
 
-#include <limits.h>
-#include <IOKit/storage/IOApplePartitionScheme.h>
-#include <IOKit/storage/IOGUIDPartitionScheme.h>
 typedef struct gpt_hdr gpt_hdr;
 typedef struct gpt_ent gpt_ent;
 
-// For EFI_GUID
-#include "efi.h"
-#include "efi_tables.h"
-
 #define PROBEFS_SIZE     BPS * 4 /* buffer size for filesystem probe */
 #define CD_BPS           2048    /* CD-ROM block size */
 #define N_CACHE_SECS     (BIOS_LEN / BPS)  /* Must be a multiple of 4 for CD-ROMs */
Index: branches/azimutz/Chazi/i386/libsaio/pci_setup.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/pci_setup.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/pci_setup.c	(revision 515)
@@ -1,7 +1,7 @@
 
 //#include "libsaio.h"
+//#include "bootstruct.h"
 #include "boot.h"
-#include "bootstruct.h"
 #include "pci.h"
 #include "nvidia.h"
 #include "ati.h"
Index: branches/azimutz/Chazi/i386/libsaio/nvidia_resolution.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/nvidia_resolution.h	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/nvidia_resolution.h	(revision 515)
@@ -1,5 +1,5 @@
 /*
- *  nviviaresolution.h
+ *  nvidia_resolution.h
  *  
  *
  *  Created by Le Bidou on 19/03/10.
@@ -7,10 +7,11 @@
  *
  */
 
-#ifndef _NVDA_RESOLUTION_HEADER_
-#define _NVDA_RESOLUTION_HEADER_
+#ifndef _NVIDIA_RESOLUTION_HEADER_
+#define _NVIDIA_RESOLUTION_HEADER_
 
-#include "libsaio.h" // not worth it; 4 out of 5 are needed.
+//#include "libsaio.h"
+#include "io_inline.h"
 #include "autoresolution.h"
 
 #define NVIDIA_SIGNATURE "NVIDIA Corp"
Index: branches/azimutz/Chazi/i386/libsaio/cache.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/cache.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/cache.c	(revision 515)
@@ -27,8 +27,9 @@
  *  DRI: Josh de Cesare
  */
 
-#include <sl.h>
-// #include <fs.h>
+//#include <sl.h>
+#include "sl.h" //Azi:???
+//#include <fs.h>
 
 struct CacheEntry {
   CICell    ih;
Index: branches/azimutz/Chazi/i386/libsaio/edid.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/edid.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/edid.c	(revision 515)
@@ -8,10 +8,10 @@
  */
 
 
-//#include "libsaio.h" --> bootstruct.h
-//#include "bootstruct.h" - included on graphics.h
+//#include "libsaio.h"
+//#include "bootstruct.h"
+#include "boot.h"
 #include "graphics.h"
-#include "boot.h"
 
 
 //static biosBuf_t bb;
Index: branches/azimutz/Chazi/i386/libsaio/stringTable.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/stringTable.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/stringTable.c	(revision 515)
@@ -27,8 +27,8 @@
  */
 
 //#include "libsaio.h"
+//#include "bootstruct.h"
 #include "boot.h"
-#include "bootstruct.h"
 #include "xml.h"
 
 extern char *Language;
Index: branches/azimutz/Chazi/i386/libsaio/biosfn.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/biosfn.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/biosfn.c	(revision 515)
@@ -40,11 +40,11 @@
     - Added ebiosEjectMedia
  */
 
+//#include "libsaio.h"
+//#include "libsa.h"
+//#include "saio_internal.h"
 #include "bootstruct.h"
-//#include "libsaio.h"
 #include "memory.h"
-#include "libsa.h"
-#include "saio_internal.h"
 
 #define MAX_DRIVES 8
 
Index: branches/azimutz/Chazi/i386/libsaio/convert.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/convert.h	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/convert.h	(revision 515)
@@ -9,8 +9,7 @@
 
 //#include "libsaio.h"
 #include "libsa.h"
-#include "saio_internal.h" // "external" to verbose function
-//---
+#include "saio_internal.h"
 #include "efi.h"
 
 #define UUID_LEN	16
Index: branches/azimutz/Chazi/i386/libsaio/fake_efi.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/fake_efi.c	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/fake_efi.c	(revision 515)
@@ -4,8 +4,8 @@
  */
 
 //#include "libsaio.h"
+//#include "bootstruct.h"
 #include "boot.h"
-#include "bootstruct.h"
 #include "efi.h"
 #include "acpi.h"
 #include "fake_efi.h"
Index: branches/azimutz/Chazi/i386/libsaio/gma_resolution.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/gma_resolution.h	(revision 514)
+++ branches/azimutz/Chazi/i386/libsaio/gma_resolution.h	(revision 515)
@@ -11,8 +11,6 @@
 #define _GMA_RESOLTUION_H_
 
 //#include "libsaio.h"
-#include "saio_internal.h"
-//---
 #include "autoresolution.h"
 
 #define MODE_TABLE_OFFSET_845G 617
Index: branches/azimutz/Chazi/i386/boot2/ramdisk.h
===================================================================
--- branches/azimutz/Chazi/i386/boot2/ramdisk.h	(revision 514)
+++ branches/azimutz/Chazi/i386/boot2/ramdisk.h	(revision 515)
@@ -7,9 +7,6 @@
 #ifndef __BOOT_RAMDISK_H
 #define __BOOT_RAMDISK_H
 
-//#include "libsaio.h"
-#include "libsa.h"
-#include "saio_types.h"
 #include "memory.h"
 
 #define RAMDISKCONFIG_FILENAME "rd(0,0)/RAMDisk.plist"
Index: branches/azimutz/Chazi/i386/boot2/resume.c
===================================================================
--- branches/azimutz/Chazi/i386/boot2/resume.c	(revision 514)
+++ branches/azimutz/Chazi/i386/boot2/resume.c	(revision 515)
@@ -7,11 +7,11 @@
  *
  */
 
-#include "libsa.h"
+//#include "libsa.h"
+//#include "bootstruct.h"
+#include "boot.h"
 #include "IOHibernatePrivate.h"
 #include "memory.h"
-#include "bootstruct.h"
-#include "boot.h"
 #include "pci.h"
 
 extern int previewTotalSectors;
Index: branches/azimutz/Chazi/i386/boot2/graphics.c
===================================================================
--- branches/azimutz/Chazi/i386/boot2/graphics.c	(revision 514)
+++ branches/azimutz/Chazi/i386/boot2/graphics.c	(revision 515)
@@ -26,6 +26,7 @@
  * All rights reserved.
  */
 
+#include "boot.h"
 #include "appleClut8.h"
 #include "gui.h"
 #include "IOHibernatePrivate.h"
Index: branches/azimutz/Chazi/i386/boot2/boot.c
===================================================================
--- branches/azimutz/Chazi/i386/boot2/boot.c	(revision 514)
+++ branches/azimutz/Chazi/i386/boot2/boot.c	(revision 515)
@@ -49,16 +49,15 @@
  * Reworked again by Curtis Galloway (galloway@NeXT.com)
  */
 
-
+//#include "bootstruct.h"
+//#include "libsa.h"
 #include "boot.h"
-#include "bootstruct.h"
-#include "fake_efi.h"
-#include "sl.h"
-#include "libsa.h"
-#include "ramdisk.h"
+#include "ramdisk.h" // bootstruct.h: memory.h instead of saio_internal.h
 #include "gui.h"
-#include "platform.h"
 #include "modules.h"
+#include "fake_efi.h"
+#include "platform.h" // bootstruct.h - device_tree.h
+#include "sl.h" // bootstruct.h: memory.h instead of saio_types.h
 
 long gBootMode; /* defaults to 0 == kBootModeNormal */
 bool gOverrideKernel;
Index: branches/azimutz/Chazi/i386/boot2/graphics.h
===================================================================
--- branches/azimutz/Chazi/i386/boot2/graphics.h	(revision 514)
+++ branches/azimutz/Chazi/i386/boot2/graphics.h	(revision 515)
@@ -7,17 +7,16 @@
  *
  */
 
+#ifndef __BOOT_GRAPHICS_H
+#define __BOOT_GRAPHICS_H
+
 //#include "libsaio.h"
-#include "libsa.h"
-//---
-#include "boot.h" // was included on graphic_utils.h
-#include "bootstruct.h"
+//#include "bootstruct.h"
+//#include "boot.h"
+#include "saio_types.h"
 #include "graphic_utils.h"
 #include "vbe.h"
 
-#ifndef __BOOT_GRAPHICS_H
-#define __BOOT_GRAPHICS_H
-
 #define DEFAULT_SCREEN_WIDTH 1024
 #define DEFAULT_SCREEN_HEIGHT 768
 
Index: branches/azimutz/Chazi/i386/boot2/modules.c
===================================================================
--- branches/azimutz/Chazi/i386/boot2/modules.c	(revision 514)
+++ branches/azimutz/Chazi/i386/boot2/modules.c	(revision 515)
@@ -4,9 +4,8 @@
  */
 
 //#include "boot.h"
-#include "libsa.h"
-#include "saio_internal.h"
-//---
+//#include "libsa.h"
+//#include "saio_internal.h"
 #include "bootstruct.h"
 #include "multiboot.h"
 #include "modules.h"
Index: branches/azimutz/Chazi/i386/boot2/boot.h
===================================================================
--- branches/azimutz/Chazi/i386/boot2/boot.h	(revision 514)
+++ branches/azimutz/Chazi/i386/boot2/boot.h	(revision 515)
@@ -30,11 +30,13 @@
 #define __BOOT2_BOOT_H
 
 //Azi: keep it minimal for now.
-// Todo: check bootstruct.h, sl.h, platform.h, next; include bootstruct here??
-// don't include headers like libsaio.h on other headers?!
+// Todo: don't include headers like boot.h on other headers, unless...!
 // move keys to the headers of the files they're in, if they have it!?
-#include "saio_internal.h" // the only one needed by boot.h it self, afaics.
+// check header wrappers...
 
+//#include "saio_internal.h" // the only one needed by boot.h it self, afaics.
+#include "bootstruct.h"
+
 /*
  * Default names - these end with "Name" (easier to sort them).
  */
Index: branches/azimutz/Chazi/i386/boot2/modules.h
===================================================================
--- branches/azimutz/Chazi/i386/boot2/modules.h	(revision 514)
+++ branches/azimutz/Chazi/i386/boot2/modules.h	(revision 515)
@@ -4,12 +4,12 @@
  *
  */
 
+#ifndef __BOOT_MODULES_H
+#define __BOOT_MODULES_H
+
 #include <mach-o/loader.h>
 #include <mach-o/nlist.h>
 
-#ifndef __BOOT_MODULES_H
-#define __BOOT_MODULES_H
-
 extern unsigned long long textAddress;
 extern unsigned long long textSection;
 
Index: branches/azimutz/Chazi/i386/boot2/drivers.c
===================================================================
--- branches/azimutz/Chazi/i386/boot2/drivers.c	(revision 514)
+++ branches/azimutz/Chazi/i386/boot2/drivers.c	(revision 515)
@@ -33,11 +33,11 @@
 #include <libkern/OSByteOrder.h>
 #include <mach/machine.h>
 
+//#include "bootstruct.h"
+//#include "ramdisk.h"
+#include "boot.h"
 #include "sl.h"
-#include "boot.h"
-#include "bootstruct.h"
 #include "xml.h"
-//#include "ramdisk.h"
 
 struct Module {  
   struct Module *nextModule;
Index: branches/azimutz/Chazi/i386/boot2/mboot.c
===================================================================
--- branches/azimutz/Chazi/i386/boot2/mboot.c	(revision 514)
+++ branches/azimutz/Chazi/i386/boot2/mboot.c	(revision 515)
@@ -3,11 +3,9 @@
 */
 
 //#include "libsaio.h"
-#include "libsa.h"
-#include "memory.h"
-//---
+//#include "bootstruct.h"
 #include "boot.h"
-#include "bootstruct.h"
+#include "memory.h"
 #include "mboot.h"
 
 int multiboot_timeout=0;
@@ -354,6 +352,7 @@
     kASCIIKeyMask  = 0x7f
 };
 
+//Azi:reminder
 // This is the meat of our implementation.  It grabs the boot device from
 // the multiboot_info and returns it as is.  If it fails it returns
 // BAD_BOOT_DEVICE.  We can call an awful lot of libsa and libsaio but
Index: branches/azimutz/Chazi/i386/boot2/gui.c
===================================================================
--- branches/azimutz/Chazi/i386/boot2/gui.c	(revision 514)
+++ branches/azimutz/Chazi/i386/boot2/gui.c	(revision 515)
@@ -8,6 +8,7 @@
  *
  */
 
+#include "boot.h"
 #include "gui.h"
 #include "appleboot.h"
 #include "vers.h"
Index: branches/azimutz/Chazi/i386/boot2/gui.h
===================================================================
--- branches/azimutz/Chazi/i386/boot2/gui.h	(revision 514)
+++ branches/azimutz/Chazi/i386/boot2/gui.h	(revision 515)
@@ -8,12 +8,12 @@
  *
  */
 
+#ifndef __BOOT2_GUI_H
+#define __BOOT2_GUI_H
+
 #include "graphics.h"
 #include "picopng.h"
 
-#ifndef __BOOT2_GUI_H
-#define __BOOT2_GUI_H
-
 #define CHARACTERS_COUNT	223
 
 #define BOOT_NORMAL		0
Index: branches/azimutz/Chazi/i386/boot2/ramdisk.c
===================================================================
--- branches/azimutz/Chazi/i386/boot2/ramdisk.c	(revision 514)
+++ branches/azimutz/Chazi/i386/boot2/ramdisk.c	(revision 515)
@@ -4,8 +4,8 @@
  *
  */
 
+//#include "bootstruct.h"
 #include "boot.h"
-#include "bootstruct.h"
 #include "multiboot.h"
 #include "ramdisk.h"
 
Index: branches/azimutz/Chazi/i386/boot2/lzss.c
===================================================================
--- branches/azimutz/Chazi/i386/boot2/lzss.c	(revision 514)
+++ branches/azimutz/Chazi/i386/boot2/lzss.c	(revision 515)
@@ -40,7 +40,8 @@
  *  DRI: Josh de Cesare
  */
 
-#include <sl.h>
+//#include <sl.h> // can't find this guy on the system; maybe we should stop looking for it there first!?
+#include "sl.h" //Azi:???
 
 #define N         4096  /* size of ring buffer - must be power of 2 */
 #define F         18    /* upper limit for match_length */
Index: branches/azimutz/Chazi/i386/boot2/options.c
===================================================================
--- branches/azimutz/Chazi/i386/boot2/options.c	(revision 514)
+++ branches/azimutz/Chazi/i386/boot2/options.c	(revision 515)
@@ -22,6 +22,7 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 
+#include "boot.h"
 #include "fdisk.h"
 #include "ramdisk.h"
 #include "gui.h"
Index: branches/azimutz/Chazi/i386/modules/KernelPatcher/kernel_patcher.c
===================================================================
--- branches/azimutz/Chazi/i386/modules/KernelPatcher/kernel_patcher.c	(revision 514)
+++ branches/azimutz/Chazi/i386/modules/KernelPatcher/kernel_patcher.c	(revision 515)
@@ -3,9 +3,8 @@
  *
  */
 
-#include "boot.h"
-#include "bootstruct.h" // replaces libsaio.h.
 //#include "libsaio.h"
+#include "boot.h"
 #include "kernel_patcher.h"
 #include "platform.h"
 #include "modules.h"
@@ -285,7 +284,7 @@
 	
 	
 	
-	UInt32 jumpLocation = 0;
+//	UInt32 jumpLocation = 0; unused for now
 	
 	
 	if(symbol == 0 || symbol->addr == 0)
Index: branches/azimutz/Chazi/i386/modules/KernelPatcher/kernel_patcher.h
===================================================================
--- branches/azimutz/Chazi/i386/modules/KernelPatcher/kernel_patcher.h	(revision 514)
+++ branches/azimutz/Chazi/i386/modules/KernelPatcher/kernel_patcher.h	(revision 515)
@@ -3,12 +3,12 @@
  *
  */
 
+#ifndef __BOOT2_KERNEL_PATCHER_H
+#define __BOOT2_KERNEL_PATCHER_H
+
 #include <mach-o/loader.h>
 #include <mach-o/nlist.h>
 
-#ifndef __BOOT2_KERNEL_PATCHER_H
-#define __BOOT2_KERNEL_PATCHER_H
-
 #define CPUID_MODEL_ANY		0x00
 #define CPUID_MODEL_UNKNOWN	0x01
 
Index: branches/azimutz/Chazi/i386/modules/HelloWorld/HelloWorld.c
===================================================================
--- branches/azimutz/Chazi/i386/modules/HelloWorld/HelloWorld.c	(revision 514)
+++ branches/azimutz/Chazi/i386/modules/HelloWorld/HelloWorld.c	(revision 515)
@@ -6,7 +6,6 @@
 //#include "libsaio.h"
 #include "saio_internal.h"
 #include "saio_types.h"
-//---
 #include "modules.h"