Index: branches/azimutz/Chazi/i386/libsaio/xml.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/xml.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/xml.c	(revision 495)
@@ -22,8 +22,8 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 
+//#include "libsaio.h"
 #include "bootstruct.h"
-#include "libsaio.h"
 #include "sl.h"
 #include "xml.h"
 
Index: branches/azimutz/Chazi/i386/libsaio/console.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/console.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/console.c	(revision 495)
@@ -44,8 +44,8 @@
  * All rights reserved.
  */
 
-#include "libsaio.h"
-#include "bootstruct.h"
+//#include "libsaio.h"
+#include "bootstruct.h" - most libsaio.h stuff is included here now.
 
 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 494)
+++ branches/azimutz/Chazi/i386/libsaio/ati_resolution.h	(revision 495)
@@ -10,7 +10,10 @@
 #ifndef _ATI_RESOLUTION_H_
 #define _ATI_RESOLUTION_H_
 
-#include "libsaio.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/bootstruct.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/bootstruct.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/bootstruct.c	(revision 495)
@@ -26,7 +26,7 @@
  * All rights reserved.
  */
 
-#include "libsaio.h"
+//#include "libsaio.h" - moved to bootstruck.h
 #include "bootstruct.h"
 
 /*==========================================================================
Index: branches/azimutz/Chazi/i386/libsaio/ext2fs.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/ext2fs.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/ext2fs.c	(revision 495)
@@ -7,7 +7,7 @@
  *
  */
 
-#include "libsaio.h"
+//#include "libsaio.h"
 #include "sl.h"
 #include "ext2fs.h"
 
Index: branches/azimutz/Chazi/i386/libsaio/vbe.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/vbe.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/vbe.c	(revision 495)
@@ -26,7 +26,11 @@
  * All rights reserved.
  */
 
-#include "libsaio.h"
+//#include "libsaio.h"
+#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 494)
+++ branches/azimutz/Chazi/i386/libsaio/bootstruct.h	(revision 495)
@@ -26,7 +26,13 @@
 #define __BOOTSTRUCT_H
 
 #include <pexpert/i386/boot.h>
+
+//Azi: this is acting now as a mini libsaio.h :P
+//#include "libsaio.h"
+#include "libsa.h"
 #include "saio_types.h"
+#include "saio_internal.h" // "external" to verbose function
+//---
 #include "bios.h"
 #include "device_tree.h"
 
Index: branches/azimutz/Chazi/i386/libsaio/device_tree.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/device_tree.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/device_tree.c	(revision 495)
@@ -34,7 +34,10 @@
 typedef char DTEntryNameBuf[32];
 #endif
 
-#include "libsaio.h"
+//Azi: check location.
+//#include "libsaio.h"
+#include "libsa.h"
+//---
 #include "device_tree.h"
 
 #if DEBUG
Index: branches/azimutz/Chazi/i386/libsaio/acpi_patcher.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/acpi_patcher.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/acpi_patcher.c	(revision 495)
@@ -2,7 +2,7 @@
  * Copyright 2008 mackerintel
  */
 
-#include "libsaio.h"
+//#include "libsaio.h"
 #include "boot.h"
 #include "bootstruct.h"
 #include "acpi.h"
Index: branches/azimutz/Chazi/i386/libsaio/spd.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/spd.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/spd.c	(revision 495)
@@ -6,7 +6,7 @@
  * System profiler fix and other fixes by Mozodojo.
  */
 
-#include "libsaio.h"
+//#include "libsaio.h" - included on the header.
 #include "pci.h"
 #include "platform.h"
 #include "spd.h"
Index: branches/azimutz/Chazi/i386/libsaio/acpi_patcher.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/acpi_patcher.h	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/acpi_patcher.h	(revision 495)
@@ -5,7 +5,7 @@
 #ifndef __LIBSAIO_ACPI_PATCHER_H
 #define __LIBSAIO_ACPI_PATCHER_H
 
-#include "libsaio.h"
+//#include "libsaio.h"
 
 uint64_t acpi10_p;
 uint64_t acpi20_p;
Index: branches/azimutz/Chazi/i386/libsaio/spd.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/spd.h	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/spd.h	(revision 495)
@@ -7,8 +7,9 @@
 #ifndef __LIBSAIO_SPD_H
 #define __LIBSAIO_SPD_H
 
-#include "platform.h"
-#include "libsaio.h"
+#include "platform.h" // already suplies most of the dependencies.
+//#include "libsaio.h"
+#include "io_inline.h"
 
 void scan_spd(PlatformInfo_t *p);
 
Index: branches/azimutz/Chazi/i386/libsaio/smbios_patcher.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/smbios_patcher.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/smbios_patcher.c	(revision 495)
@@ -2,7 +2,7 @@
  * Copyright 2008 mackerintel
  */
 
-#include "libsaio.h"
+//#include "libsaio.h" - included on the hearder.
 #include "boot.h"
 #include "bootstruct.h"
 #include "acpi.h"
Index: branches/azimutz/Chazi/i386/libsaio/gma.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/gma.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/gma.c	(revision 495)
@@ -1,7 +1,8 @@
 /*
 Original patch by nawcom -> http://forum.voodooprojects.org/index.php/topic,1029.msg4427.html#msg4427
 */
-#include "libsaio.h"
+
+//#include "libsaio.h"
 #include "bootstruct.h"
 #include "pci.h"
 #include "platform.h"
Index: branches/azimutz/Chazi/i386/libsaio/smbios_patcher.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/smbios_patcher.h	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/smbios_patcher.h	(revision 495)
@@ -8,7 +8,7 @@
 #ifndef __LIBSAIO_SMBIOS_PATCHER_H
 #define __LIBSAIO_SMBIOS_PATCHER_H
 
-#include "libsaio.h"
+//#include "libsaio.h" - not needed??
 #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 494)
+++ branches/azimutz/Chazi/i386/libsaio/pci_root.c	(revision 495)
@@ -2,7 +2,7 @@
  * Copyright 2009 netkas
  */
 
-#include "libsaio.h"
+//#include "libsaio.h"
 #include "boot.h"
 #include "bootstruct.h"
 
Index: branches/azimutz/Chazi/i386/libsaio/mem.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/mem.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/mem.c	(revision 495)
@@ -4,7 +4,7 @@
  * mem.c - obtain system memory information
  */
 
-#include "libsaio.h"
+//#include "libsaio.h" - included on pci.h for now.
 #include "pci.h"
 #include "platform.h"
 #include "cpu.h"
Index: branches/azimutz/Chazi/i386/libsaio/pci_root.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/pci_root.h	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/pci_root.h	(revision 495)
@@ -5,9 +5,9 @@
 #ifndef __LIBSAIO_PCI_ROOT_H
 #define __LIBSAIO_PCI_ROOT_H
 
-#include "libsaio.h"
+//#include "libsaio.h"
+#include "io_inline.h"
 
-
 extern int getPciRootUID(void);
 
 #endif /* !__LIBSAIO_DSDT_PATCHER_H */
Index: branches/azimutz/Chazi/i386/libsaio/aml_generator.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/aml_generator.h	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/aml_generator.h	(revision 495)
@@ -10,7 +10,9 @@
 #ifndef __LIBSAIO_AML_GENERATOR_H
 #define __LIBSAIO_AML_GENERATOR_H
 
-#include "libsaio.h"
+//#include "libsaio.h"
+#include "libsa.h"
+#include "saio_internal.h"
 
 #define	AML_CHUNK_NONE		0xff
 #define	AML_CHUNK_ZERO		0x00
Index: branches/azimutz/Chazi/i386/libsaio/usb.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/usb.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/usb.c	(revision 495)
@@ -7,7 +7,9 @@
  *
  */
 
-#include "libsaio.h"
+//#include "libsaio.h"
+#include "io_inline.h"
+//---
 #include "boot.h"
 #include "bootstruct.h"
 #include "pci.h"
Index: branches/azimutz/Chazi/i386/libsaio/device_inject.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/device_inject.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/device_inject.c	(revision 495)
@@ -5,7 +5,7 @@
  *	Cleaned and merged by iNDi
  */
 
-#include "libsaio.h"
+//#include "libsaio.h"
 #include "boot.h"
 #include "bootstruct.h"
 #include "pci.h"
Index: branches/azimutz/Chazi/i386/libsaio/autoresolution.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/autoresolution.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/autoresolution.c	(revision 495)
@@ -14,8 +14,10 @@
  * This source code is into the public domain.
  */
 
-#include "libsaio.h"
-#include "autoresolution.h"
+//#include "libsaio.h"
+#include "saio_internal.h"
+//---
+//#include "autoresolution.h" - included on ati_resolution.h
 #include "nvidia_resolution.h"
 #include "ati_resolution.h"
 #include "gma_resolution.h"
Index: branches/azimutz/Chazi/i386/libsaio/dram_controllers.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/dram_controllers.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/dram_controllers.c	(revision 495)
@@ -13,7 +13,7 @@
  * http://www.canardpc.com - http://www.memtest.org
  */
 
-#include "libsaio.h"
+//#include "libsaio.h" - included on the header.
 #include "bootstruct.h"
 #include "pci.h"
 #include "platform.h"
Index: branches/azimutz/Chazi/i386/libsaio/nvidia.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/nvidia.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/nvidia.c	(revision 495)
@@ -48,7 +48,7 @@
  * SOFTWARE.
  */
 
-#include "libsaio.h"
+//#include "libsaio.h"
 #include "boot.h"
 #include "bootstruct.h"
 #include "pci.h"
Index: branches/azimutz/Chazi/i386/libsaio/ntfs.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/ntfs.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/ntfs.c	(revision 495)
@@ -23,7 +23,7 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 
-#include "libsaio.h"
+//#include "libsaio.h" - included on sl.h
 #include "sl.h"
 
 #define BYTE_ORDER_MARK	0xFEFF
Index: branches/azimutz/Chazi/i386/libsaio/ufs_byteorder.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/ufs_byteorder.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/ufs_byteorder.c	(revision 495)
@@ -32,7 +32,7 @@
 #include <ufs/ufs/dir.h>
 #include <libkern/OSByteOrder.h>
 #include "ufs_byteorder.h"
-#include "libsaio.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 494)
+++ branches/azimutz/Chazi/i386/libsaio/ati.c	(revision 495)
@@ -21,7 +21,8 @@
  */
  
  
-#include "libsaio.h"
+//#include "libsaio.h"
+//---
 #include "boot.h"
 #include "bootstruct.h"
 #include "pci.h"
Index: branches/azimutz/Chazi/i386/libsaio/sys.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/sys.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/sys.c	(revision 495)
@@ -60,7 +60,7 @@
 
 #include <AvailabilityMacros.h>
 
-#include "libsaio.h"
+//#include "libsaio.h"
 #include "boot.h"
 #include "bootstruct.h"
 #include "disk.h"
Index: branches/azimutz/Chazi/i386/libsaio/dram_controllers.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/dram_controllers.h	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/dram_controllers.h	(revision 495)
@@ -16,7 +16,7 @@
 #ifndef __LIBSAIO_DRAM_CONTROLLERS_H
 #define __LIBSAIO_DRAM_CONTROLLERS_H
 
-#include "libsaio.h"
+//#include "libsaio.h"
 
 void scan_dram_controller();
 
Index: branches/azimutz/Chazi/i386/libsaio/nbp.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/nbp.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/nbp.c	(revision 495)
@@ -22,7 +22,8 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 
-#include "libsaio.h"
+//#include "libsaio.h"
+#include "saio_types.h"
 
 /*  This NBP code is pretty useless because it just blindly calls INT 2B.
     Presumably INT 2B was implemented by some first-stage bootloader that
Index: branches/azimutz/Chazi/i386/libsaio/sl.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/sl.h	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/sl.h	(revision 495)
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/vnode.h>
-#include "libsaio.h"
+#include "libsaio.h" - check later; sl.h is included in many files!
 
 #define SWAP_BE16(x)  OSSwapBigToHostInt16(x)
 #define SWAP_LE16(x)  OSSwapLittleToHostInt16(x)
Index: branches/azimutz/Chazi/i386/libsaio/platform.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/platform.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/platform.c	(revision 495)
@@ -4,7 +4,7 @@
  * AsereBLN: cleanup
  */
 
-#include "libsaio.h"
+//#include "libsaio.h" - both bootstruct.h, platform.h, pci.h can resolve dependencies.
 #include "boot.h"
 #include "bootstruct.h"
 #include "pci.h"
Index: branches/azimutz/Chazi/i386/libsaio/cpu.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/cpu.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/cpu.c	(revision 495)
@@ -3,7 +3,7 @@
  * AsereBLN: 2009: cleanup and bugfix
  */
 
-#include "libsaio.h"
+//#include "libsaio.h" - was included on both of the remaining; platform.h resolves dependencies.
 #include "platform.h"
 #include "cpu.h"
 
Index: branches/azimutz/Chazi/i386/libsaio/platform.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/platform.h	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/platform.h	(revision 495)
@@ -7,7 +7,11 @@
 #ifndef __LIBSAIO_PLATFORM_H
 #define __LIBSAIO_PLATFORM_H
 
-#include "libsaio.h"
+//Azi: this was already acting as a mini libsaio.h :P see bootstruct.h.
+//#include "libsaio.h"
+#include "libsa.h"
+#include "saio_types.h"
+#include "saio_internal.h"
 
 extern bool platformCPUFeature(uint32_t);
 extern void scan_platform(void);
Index: branches/azimutz/Chazi/i386/libsaio/disk.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/disk.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/disk.c	(revision 495)
@@ -55,7 +55,9 @@
 #define UFS_SUPPORT 0
 #endif
 
-#include "libsaio.h"
+//#include "libsaio.h"
+#include "memory.h"
+//---
 #include "boot.h"
 #include "bootstruct.h"
 #include "fdisk.h"
Index: branches/azimutz/Chazi/i386/libsaio/pci_setup.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/pci_setup.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/pci_setup.c	(revision 495)
@@ -1,4 +1,5 @@
-#include "libsaio.h"
+
+//#include "libsaio.h"
 #include "boot.h"
 #include "bootstruct.h"
 #include "pci.h"
Index: branches/azimutz/Chazi/i386/libsaio/cpu.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/cpu.h	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/cpu.h	(revision 495)
@@ -6,7 +6,7 @@
 #ifndef __LIBSAIO_CPU_H
 #define __LIBSAIO_CPU_H
 
-#include "libsaio.h"
+//#include "libsaio.h"
 
 extern void scan_cpu(PlatformInfo_t *);
 
Index: branches/azimutz/Chazi/i386/libsaio/hpet.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/hpet.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/hpet.c	(revision 495)
@@ -2,7 +2,7 @@
  * 
  */
 
-#include "libsaio.h"
+//#include "libsaio.h" - was included on hpet.h; included on pci.h for now.
 #include "pci.h"
 #include "hpet.h"
 
Index: branches/azimutz/Chazi/i386/libsaio/nvidia_resolution.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/nvidia_resolution.h	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/nvidia_resolution.h	(revision 495)
@@ -10,7 +10,7 @@
 #ifndef _NVDA_RESOLUTION_HEADER_
 #define _NVDA_RESOLUTION_HEADER_
 
-#include "libsaio.h"
+#include "libsaio.h" // not worth it; 4 out of 5 are needed.
 #include "autoresolution.h"
 
 #define NVIDIA_SIGNATURE "NVIDIA Corp"
Index: branches/azimutz/Chazi/i386/libsaio/hpet.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/hpet.h	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/hpet.h	(revision 495)
@@ -5,7 +5,7 @@
 #ifndef __LIBSAIO_HPET_H
 #define __LIBSAIO_HPET_H
 
-#include "libsaio.h"
+//#include "libsaio.h" // check pci.h/hpet.c
 
 #define REG32(base, reg)  ((volatile uint32_t *)base)[(reg) >> 2]
 
Index: branches/azimutz/Chazi/i386/libsaio/edid.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/edid.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/edid.c	(revision 495)
@@ -8,8 +8,8 @@
  */
 
 
-#include "libsaio.h"
-#include "bootstruct.h"
+//#include "libsaio.h" --> bootstruct.h
+//#include "bootstruct.h" - included on graphics.h
 #include "graphics.h"
 #include "boot.h"
 
Index: branches/azimutz/Chazi/i386/libsaio/pci.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/pci.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/pci.c	(revision 495)
@@ -4,7 +4,7 @@
  *
  */
 
-#include "libsaio.h"
+//#include "libsaio.h" - included on pci.h now. Don't forget bootstruct.h!!
 #include "bootstruct.h"
 #include "pci.h"
 #include "pci_root.h"
Index: branches/azimutz/Chazi/i386/libsaio/stringTable.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/stringTable.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/stringTable.c	(revision 495)
@@ -26,9 +26,9 @@
  * All rights reserved.
  */
 
+//#include "libsaio.h"
 #include "boot.h"
 #include "bootstruct.h"
-#include "libsaio.h" //Azi: this was included on boot.h - just a reminder.
 #include "xml.h"
 
 extern char *Language;
Index: branches/azimutz/Chazi/i386/libsaio/biosfn.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/biosfn.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/biosfn.c	(revision 495)
@@ -39,8 +39,12 @@
     2007-12-29 dfe
     - Added ebiosEjectMedia
  */
+
 #include "bootstruct.h"
-#include "libsaio.h"
+//#include "libsaio.h"
+#include "memory.h"
+#include "libsa.h"
+#include "saio_internal.h"
 
 #define MAX_DRIVES 8
 
Index: branches/azimutz/Chazi/i386/libsaio/pci.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/pci.h	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/pci.h	(revision 495)
@@ -7,6 +7,11 @@
 #ifndef __LIBSAIO_PCI_H
 #define __LIBSAIO_PCI_H
 
+//#include "libsaio.h" // moved from hpet.c/h; also remember mem.c.
+#include "libsa.h"
+#include "saio_internal.h"
+#include "saio_types.h"
+
 typedef struct {
 	uint32_t		:2;
 	uint32_t	reg	:6;
Index: branches/azimutz/Chazi/i386/libsaio/msdos.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/msdos.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/msdos.c	(revision 495)
@@ -46,13 +46,13 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define tolower(c)     (((c)>='A' && c<='Z')?((c) | 0x20):(c))
-#include "libsaio.h"
+//#include "libsaio.h"
 #include "sl.h"
-
 #include "msdos_private.h"
 #include "msdos.h"
 
+#define tolower(c)     (((c)>='A' && c<='Z')?((c) | 0x20):(c))
+
 #define LABEL_LENGTH		11
 #define MSDOS_CACHE_BLOCKSIZE BPS
 
Index: branches/azimutz/Chazi/i386/libsaio/convert.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/convert.h	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/convert.h	(revision 495)
@@ -6,7 +6,11 @@
 
 #ifndef __CONVERT_H
 #define __CONVERT_H
-#include "libsaio.h"
+
+//#include "libsaio.h"
+#include "libsa.h"
+#include "saio_internal.h" // "external" to verbose function
+//---
 #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 494)
+++ branches/azimutz/Chazi/i386/libsaio/fake_efi.c	(revision 495)
@@ -3,7 +3,7 @@
  * Copyright 2007 David F. Elliott.  All rights reserved.
  */
 
-#include "libsaio.h"
+//#include "libsaio.h"
 #include "boot.h"
 #include "bootstruct.h"
 #include "efi.h"
Index: branches/azimutz/Chazi/i386/libsaio/misc.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/misc.c	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/misc.c	(revision 495)
@@ -44,7 +44,10 @@
  * All rights reserved.
  */
 
-#include "libsaio.h"
+//#include "libsaio.h"
+#include "libsa.h"
+#include "saio_internal.h"
+#include "io_inline.h"
 
 /*
  * keyboard controller (8042) I/O port addresses
Index: branches/azimutz/Chazi/i386/libsaio/gma_resolution.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/gma_resolution.h	(revision 494)
+++ branches/azimutz/Chazi/i386/libsaio/gma_resolution.h	(revision 495)
@@ -10,7 +10,9 @@
 #ifndef _GMA_RESOLUTION_H_
 #define _GMA_RESOLTUION_H_
 
-#include "libsaio.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 494)
+++ branches/azimutz/Chazi/i386/boot2/ramdisk.h	(revision 495)
@@ -7,7 +7,10 @@
 #ifndef __BOOT_RAMDISK_H
 #define __BOOT_RAMDISK_H
 
-#include "libsaio.h"
+//#include "libsaio.h"
+#include "libsa.h"
+#include "saio_types.h"
+#include "memory.h"
 
 #define RAMDISKCONFIG_FILENAME "rd(0,0)/RAMDisk.plist"
 //#define kPostbootRamdisk
Index: branches/azimutz/Chazi/i386/boot2/graphics.h
===================================================================
--- branches/azimutz/Chazi/i386/boot2/graphics.h	(revision 494)
+++ branches/azimutz/Chazi/i386/boot2/graphics.h	(revision 495)
@@ -7,7 +7,9 @@
  *
  */
 
-#include "libsaio.h"
+//#include "libsaio.h"
+#include "libsa.h"
+//---
 #include "boot.h" // was included on graphic_utils.h
 #include "bootstruct.h"
 #include "graphic_utils.h"
Index: branches/azimutz/Chazi/i386/boot2/boot.h
===================================================================
--- branches/azimutz/Chazi/i386/boot2/boot.h	(revision 494)
+++ branches/azimutz/Chazi/i386/boot2/boot.h	(revision 495)
@@ -29,8 +29,12 @@
 #ifndef __BOOT2_BOOT_H
 #define __BOOT2_BOOT_H
 
-#include "saio_internal.h" //Azi: only one needed by boot.h it self, afaics.
+//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?!
 
+#include "saio_internal.h" // the only one needed by boot.h it self, afaics.
+
 /*
  * Default names
  */
Index: branches/azimutz/Chazi/i386/boot2/mboot.c
===================================================================
--- branches/azimutz/Chazi/i386/boot2/mboot.c	(revision 494)
+++ branches/azimutz/Chazi/i386/boot2/mboot.c	(revision 495)
@@ -2,10 +2,12 @@
     File added by David F. Elliott <dfe@cox.net> on 2007/06/26
 */
 
-#include "libsaio.h"
+//#include "libsaio.h"
+#include "libsa.h"
+#include "memory.h"
+//---
 #include "boot.h"
 #include "bootstruct.h"
-
 #include "mboot.h"
 
 int multiboot_timeout=0;
Index: branches/azimutz/Chazi/i386/modules/KernelPatcher/kernel_patcher.c
===================================================================
--- branches/azimutz/Chazi/i386/modules/KernelPatcher/kernel_patcher.c	(revision 494)
+++ branches/azimutz/Chazi/i386/modules/KernelPatcher/kernel_patcher.c	(revision 495)
@@ -1,12 +1,15 @@
-	/*
+/*
  * Copyright (c) 2009-2010 Evan Lojewski. All rights reserved.
  *
  */
 
-#include "libsaio.h"
+//#include "libsaio.h"
+#include "saio_types.h"
+//---
 #include "kernel_patcher.h"
 #include "platform.h"
 #include "modules.h"
+
 extern PlatformInfo_t    Platform;
 
 patchRoutine_t* patches = NULL;
Index: branches/azimutz/Chazi/i386/modules/HelloWorld/HelloWorld.c
===================================================================
--- branches/azimutz/Chazi/i386/modules/HelloWorld/HelloWorld.c	(revision 494)
+++ branches/azimutz/Chazi/i386/modules/HelloWorld/HelloWorld.c	(revision 495)
@@ -3,14 +3,17 @@
  *
  */
 
-#include "libsaio.h"
-#include "modules.h" //Azi:warning
+//#include "libsaio.h"
+#include "saio_internal.h"
+#include "saio_types.h"
+//---
+#include "modules.h"
 
 
 void helloWorld(void* binary, void* arg2, void* arg3, void* arg4)
 {
 	printf("Hello world from ExecKernel hook. Binary located at 0x%X\n", binary);
-	//getc();
+	getc();
 	
 }