Index: branches/azimutz/Chazi/i386/libsaio/stringTable.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/stringTable.c	(revision 489)
+++ branches/azimutz/Chazi/i386/libsaio/stringTable.c	(revision 490)
@@ -28,7 +28,7 @@
 
 #include "boot.h"
 #include "bootstruct.h"
-#include "libsaio.h" //Azi: this is included on boot.h - just a reminder.
+#include "libsaio.h" //Azi: this was included on boot.h - just a reminder.
 #include "xml.h"
 
 extern char *Language;
Index: branches/azimutz/Chazi/i386/boot2/ramdisk.h
===================================================================
--- branches/azimutz/Chazi/i386/boot2/ramdisk.h	(revision 489)
+++ branches/azimutz/Chazi/i386/boot2/ramdisk.h	(revision 490)
@@ -7,8 +7,7 @@
 #ifndef __BOOT_RAMDISK_H
 #define __BOOT_RAMDISK_H
 
-//Azi:includes
-#include "saio_internal.h" // get back to this later
+#include "libsaio.h"
 
 #define RAMDISKCONFIG_FILENAME "rd(0,0)/RAMDisk.plist"
 //#define kPostbootRamdisk
Index: branches/azimutz/Chazi/i386/boot2/resume.c
===================================================================
--- branches/azimutz/Chazi/i386/boot2/resume.c	(revision 489)
+++ branches/azimutz/Chazi/i386/boot2/resume.c	(revision 490)
@@ -7,7 +7,6 @@
  *
  */
 
-#include "saio_internal.h"
 #include "libsa.h"
 #include "IOHibernatePrivate.h"
 #include "memory.h"
Index: branches/azimutz/Chazi/i386/boot2/graphics.c
===================================================================
--- branches/azimutz/Chazi/i386/boot2/graphics.c	(revision 489)
+++ branches/azimutz/Chazi/i386/boot2/graphics.c	(revision 490)
@@ -26,9 +26,6 @@
  * All rights reserved.
  */
 
-//Azi:includes
-//#include "boot.h" - included on graphics.h, which is included on gui.h
-//#include "vbe.h" - same as above (needed if autoresolution is removed!)
 #include "appleClut8.h"
 #include "gui.h"
 #include "IOHibernatePrivate.h"
Index: branches/azimutz/Chazi/i386/boot2/graphics.h
===================================================================
--- branches/azimutz/Chazi/i386/boot2/graphics.h	(revision 489)
+++ branches/azimutz/Chazi/i386/boot2/graphics.h	(revision 490)
@@ -7,13 +7,12 @@
  *
  */
 
-//Azi:includes	
+#include "libsaio.h"
 #include "boot.h" // was included on graphic_utils.h
 #include "bootstruct.h"
 #include "graphic_utils.h"
 #include "vbe.h"
 
-
 #ifndef __BOOT_GRAPHICS_H
 #define __BOOT_GRAPHICS_H
 
Index: branches/azimutz/Chazi/i386/boot2/modules.c
===================================================================
--- branches/azimutz/Chazi/i386/boot2/modules.c	(revision 489)
+++ branches/azimutz/Chazi/i386/boot2/modules.c	(revision 490)
@@ -3,7 +3,8 @@
  *
  */
 
-#include "boot.h"
+#include "libsa.h" // replaced boot.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 489)
+++ branches/azimutz/Chazi/i386/boot2/boot.h	(revision 490)
@@ -29,7 +29,7 @@
 #ifndef __BOOT2_BOOT_H
 #define __BOOT2_BOOT_H
 
-#include "libsaio.h"
+#include "saio_internal.h" //Azi: only one needed by boot.h it self, afaics.
 
 /*
  * Default names
Index: branches/azimutz/Chazi/i386/boot2/bmdecompress.c
===================================================================
--- branches/azimutz/Chazi/i386/boot2/bmdecompress.c	(revision 489)
+++ branches/azimutz/Chazi/i386/boot2/bmdecompress.c	(revision 490)
@@ -19,8 +19,9 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
-#include "boot.h"
 
+#include "libsa.h" // replaced boot.h
+
 typedef uint8_t  UInt8;
 typedef uint16_t UInt16;
 typedef int8_t   SInt8;
Index: branches/azimutz/Chazi/i386/boot2/gui.c
===================================================================
--- branches/azimutz/Chazi/i386/boot2/gui.c	(revision 489)
+++ branches/azimutz/Chazi/i386/boot2/gui.c	(revision 490)
@@ -8,12 +8,9 @@
  *
  */
 
-//Azi:includes
 #include "gui.h"
 #include "appleboot.h"
 #include "vers.h"
-//#include "edid.h" //Azi: needed just for getResolution() call on drawBootGraphics()?? - No!! wtf... check later.
-//#include "autoresolution.h"
 
 #define IMG_REQUIRED -1
 #define THEME_NAME_DEFAULT	"Default"