Index: trunk/Assembly_Library/Inc/Display.inc
===================================================================
--- trunk/Assembly_Library/Inc/Display.inc	(revision 369)
+++ trunk/Assembly_Library/Inc/Display.inc	(revision 370)
@@ -50,5 +50,7 @@
 	.SetCursorShapeFromAX							resb	2
 	.SetCursorCoordinatesFromAX						resb	2
+%ifndef EXCLUDE_FROM_XTIDECFG
 	.SetNewPageFromAL								resb	2
+%endif
 	.SynchronizeDisplayContextToHardware			resb	2
 
Index: trunk/Assembly_Library/Inc/Menu.inc
===================================================================
--- trunk/Assembly_Library/Inc/Menu.inc	(revision 369)
+++ trunk/Assembly_Library/Inc/Menu.inc	(revision 370)
@@ -80,5 +80,7 @@
 	.RefreshInformation							resb	2
 
+%ifndef EXCLUDE_FROM_XTIDECFG
 	.StartSelectionTimeoutWithTicksInAX			resb	2
+%endif
 
 %ifdef INCLUDE_MENU_DIALOGS
Index: trunk/Assembly_Library/Src/AssemblyLibrary.asm
===================================================================
--- trunk/Assembly_Library/Src/AssemblyLibrary.asm	(revision 369)
+++ trunk/Assembly_Library/Src/AssemblyLibrary.asm	(revision 370)
@@ -16,9 +16,9 @@
 	%include "DisplayCursor.asm"
 	%include "DisplayPage.asm"
-	%include "DisplayPrint.asm"					; must come before DisplayFormat/DisplayFormatCompressed			
+	%include "DisplayPrint.asm"					; must come before DisplayFormat/DisplayFormatCompressed
 %ifdef MODULE_STRINGS_COMPRESSED
 	%include "DisplayFormatCompressed.asm"
 %else
-	%include "DisplayFormat.asm"		
+	%include "DisplayFormat.asm"
 %endif
 %endif
@@ -34,5 +34,5 @@
   %ifndef KEYBOARD_JUMP_ALIGN
 	%define KEYBOARD_JUMP_ALIGN 1
-  %endif		
+  %endif
 	%include "Keyboard.asm"
 %endif
@@ -41,5 +41,5 @@
   %ifndef MENU_JUMP_ALIGN
 	%define MENU_JUMP_ALIGN 1
-  %endif				
+  %endif
 	%include "CharOutLineSplitter.asm"
 	%include "Menu.asm"
@@ -72,5 +72,5 @@
   %ifndef STRING_JUMP_ALIGN
 	%define STRING_JUMP_ALIGN 1
-  %endif				
+  %endif
 	%include "Char.asm"
 	%ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
@@ -82,15 +82,17 @@
 %ifdef INCLUDE_SERIAL_LIBRARY
 	%include "Serial.inc"
-%endif		
+%endif
 %ifdef INCLUDE_SERIALSERVER_LIBRARY
 	%include "SerialServer.asm"
 	%include "SerialServerScan.asm"
 	%define INCLUDE_TIME_LIBRARY
-%endif		
+%endif
 
 %ifdef INCLUDE_TIME_LIBRARY
 	%ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
 		%include "Delay.asm"
-		%include "SystemTimer.asm"
+		%ifndef EXCLUDE_FROM_XTIDECFG
+			%include "SystemTimer.asm"
+		%endif
 	%endif
 	%include "TimerTicks.asm"
@@ -100,5 +102,5 @@
   %ifndef UTIL_SIZE_JUMP_ALIGN
 	%define UTIL_SIZE_JUMP_ALIGN 1
-  %endif		
+  %endif
 	%ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
 		%include "Bit.asm"
Index: trunk/Assembly_Library/Src/Display/Display.asm
===================================================================
--- trunk/Assembly_Library/Src/Display/Display.asm	(revision 369)
+++ trunk/Assembly_Library/Src/Display/Display.asm	(revision 370)
@@ -68,5 +68,7 @@
 	%define SetCursorShapeFromAX							DisplayCursor_SetShapeFromAX
 	%define SetCursorCoordinatesFromAX						DisplayCursor_SetCoordinatesFromAX
+%ifndef EXCLUDE_FROM_XTIDECFG
 	%define SetNewPageFromAL								DisplayPage_SetFromAL
+%endif
 	%define SynchronizeDisplayContextToHardware				DisplayContext_SynchronizeToHardware
 
Index: trunk/Assembly_Library/Src/Display/DisplayPage.asm
===================================================================
--- trunk/Assembly_Library/Src/Display/DisplayPage.asm	(revision 369)
+++ trunk/Assembly_Library/Src/Display/DisplayPage.asm	(revision 370)
@@ -15,5 +15,5 @@
 ;		AX, DX
 ;--------------------------------------------------------------------
-%ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
+%ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS OR EXCLUDE_FROM_XTIDECFG
 ALIGN DISPLAY_JUMP_ALIGN
 DisplayPage_SetFromAL:
Index: trunk/Assembly_Library/Src/Menu/Menu.asm
===================================================================
--- trunk/Assembly_Library/Src/Menu/Menu.asm	(revision 369)
+++ trunk/Assembly_Library/Src/Menu/Menu.asm	(revision 370)
@@ -50,5 +50,7 @@
 	%define RefreshInformation								MenuText_RefreshInformation
 
+%ifndef EXCLUDE_FROM_XTIDECFG
 	%define StartSelectionTimeoutWithTicksInAX				MenuTime_StartSelectionTimeoutWithTicksInAX
+%endif
 
 %ifdef INCLUDE_MENU_DIALOGS
Index: trunk/Assembly_Library/Src/Menu/MenuTime.asm
===================================================================
--- trunk/Assembly_Library/Src/Menu/MenuTime.asm	(revision 369)
+++ trunk/Assembly_Library/Src/Menu/MenuTime.asm	(revision 370)
@@ -15,4 +15,5 @@
 ;		AX, BX
 ;--------------------------------------------------------------------
+%ifndef EXCLUDE_FROM_XTIDECFG
 ALIGN MENU_JUMP_ALIGN
 MenuTime_StartSelectionTimeoutWithTicksInAX:
@@ -23,4 +24,5 @@
 	pop		ds
 	ret
+%endif
 
 
Index: trunk/Assembly_Library/Src/Time/TimerTicks.asm
===================================================================
--- trunk/Assembly_Library/Src/Time/TimerTicks.asm	(revision 369)
+++ trunk/Assembly_Library/Src/Time/TimerTicks.asm	(revision 370)
@@ -24,4 +24,5 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
+%ifndef EXCLUDE_FROM_XTIDECFG
 ALIGN JUMP_ALIGN
 TimerTicks_GetHoursToAXfromTicksInDXAX:
@@ -29,4 +30,5 @@
 	div		cx		; Divide DX:AX by CX, Hours to AX, remainder ticks to DX
 	ret
+%endif ; EXCLUDE_FROM_XTIDECFG
 
 ALIGN JUMP_ALIGN
@@ -37,5 +39,5 @@
 	div		cx		; Divide DX:AX by CX, Minutes to AX, remainder ticks to DX
 	ret
-%endif
+%endif ; EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
 
 ALIGN JUMP_ALIGN
Index: trunk/Assembly_Library/Src/Util/Registers.asm
===================================================================
--- trunk/Assembly_Library/Src/Util/Registers.asm	(revision 369)
+++ trunk/Assembly_Library/Src/Util/Registers.asm	(revision 370)
@@ -69,10 +69,10 @@
 ;	Corrupts registers:
 ;		AX, CX
-; 
-; Inline of NORMALIZE_FAR_POINTER so that we can share the last 2/3 of the 
+;
+; Inline of NORMALIZE_FAR_POINTER so that we can share the last 2/3 of the
 ; routine with Registers_NormalizeFinish.
-; 
+;
 ;--------------------------------------------------------------------
-%ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
+%ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS OR EXCLUDE_FROM_XTIDECFG
 ALIGN JUMP_ALIGN
 Registers_NormalizeESSI:
@@ -87,6 +87,6 @@
 ;;; fall-through
 
-ALIGN JUMP_ALIGN		
-Registers_NormalizeFinish:		
+ALIGN JUMP_ALIGN
+Registers_NormalizeFinish:
 	eSHR_IM		cx, 4
 	mov			ax, es
