diff --git a/Makefile b/Makefile
index a2f0cfd..44699e0 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,8 @@ LDFLAGS = --config apple2-asm.cfg
 
 OUTDIR = out
 
+HEADERS = $(wildcard *.inc) $(wildcard inc/*.inc)
+
 TARGETS = \
 	$(OUTDIR)/prodos.mod.BIN \
 	$(OUTDIR)/ns.clock.system.SYS \
@@ -25,15 +27,11 @@ all: $(OUTDIR) $(TARGETS)
 $(OUTDIR):
 	mkdir -p $(OUTDIR)
 
-HEADERS = $(wildcard *.inc) $(wildcard inc/*.inc)
-
 clean:
 	rm -f $(OUTDIR)/*.o
 	rm -f $(OUTDIR)/*.list
 	rm -f $(OUTDIR)/$(TARGETS)
 
-
-
 $(OUTDIR)/%.o: %.s $(HEADERS)
 	ca65 $(CAFLAGS) $(DEFINES) --listing $(basename $@).list -o $@ $<
 
diff --git a/cricket.system.s b/cricket.system.s
index 0913448..520700f 100644
--- a/cricket.system.s
+++ b/cricket.system.s
@@ -97,7 +97,7 @@ init_ssc:
 
 :       jsr     readbyte
         bcs     cricket_not_found ; timeout
-        cmp     #HI(CR)           ; = CR ?
+        cmp     #HI($0D)          ; = CR ?
         beq     cricket_found
 digit:  cmp     #HI('0')          ; < '0' ?
         bcc     cricket_not_found
diff --git a/inc/apple2.inc b/inc/apple2.inc
index a46fe5c..a66c24e 100644
--- a/inc/apple2.inc
+++ b/inc/apple2.inc
@@ -4,20 +4,6 @@
 ;;;
 ;;; ============================================================
 
-;;; ============================================================
-;;; ASCII
-;;; ============================================================
-
-BELL            := $07
-BS              := $08
-CR              := $0D
-
-;;; ============================================================
-;;; Constants
-;;; ============================================================
-
-MAX_DW          := $FFFF
-
 ;;; ============================================================
 ;;; Soft Switches
 ;;; ============================================================
diff --git a/set.date.s b/set.date.s
index e1ec3ce..87a23b3 100644
--- a/set.date.s
+++ b/set.date.s
@@ -39,7 +39,7 @@
 loop:   lda     INPUT_BUFFER,x
         jsr     sendbyte
         inx
-        cmp     #HI(CR)
+        cmp     #HI($0D)        ; = CR
         bne     loop
 
         rts
diff --git a/set.time.s b/set.time.s
index ac99c48..2bade51 100644
--- a/set.time.s
+++ b/set.time.s
@@ -39,7 +39,7 @@
 loop:   lda     INPUT_BUFFER,x
         jsr     sendbyte
         inx
-        cmp     #HI(CR)
+        cmp     #HI($0D)        ; = CR
         bne     loop
 
         rts
diff --git a/test.s b/test.s
index 256be9f..7cbf76b 100644
--- a/test.s
+++ b/test.s
@@ -84,7 +84,7 @@ init_ssc:
 
 :       jsr     readbyte
         bcs     cricket_not_found ; timeout
-        cmp     #HI(CR)           ; = CR ?
+        cmp     #HI($0D)          ; = CR ?
         beq     cricket_found
 digit:  cmp     #HI('0')          ; < '0' ?
         bcc     cricket_not_found