From 4648165f865f4742dfe2f82a89e5a4d432898a69 Mon Sep 17 00:00:00 2001
From: jespergravgaard <jesper@balmangravgaard.dk>
Date: Thu, 4 Feb 2021 09:18:27 +0100
Subject: [PATCH] Added "c64-" prefix on all C64-only libraries.

---
 .../kc/include/{basic-floats.h => c64-basic-floats.h}     | 0
 src/main/kc/include/{keyboard.h => c64-keyboard.h}        | 0
 src/main/kc/include/{multiplexer.h => c64-multiplexer.h}  | 0
 src/main/kc/include/{print.h => c64-print.h}              | 3 ++-
 src/main/kc/include/{time.h => c64-time.h}                | 0
 src/main/kc/include/{tod.h => c64-tod.h}                  | 0
 src/main/kc/lib/{basic-floats.c => c64-basic-floats.c}    | 2 +-
 src/main/kc/lib/{keyboard.c => c64-keyboard.c}            | 2 +-
 src/main/kc/lib/{multiplexer.c => c64-multiplexer.c}      | 2 +-
 src/main/kc/lib/{print.c => c64-print.c}                  | 0
 src/main/kc/lib/{time.c => c64-time.c}                    | 2 +-
 src/main/kc/lib/{tod.c => c64-tod.c}                      | 2 +-
 src/test/kc/bitmap-plot-3.c                               | 2 +-
 src/test/kc/c-types.c                                     | 2 +-
 src/test/kc/c64dtv-gfxexplorer.c                          | 4 ++--
 src/test/kc/c64dtv-gfxmodes.c                             | 4 ++--
 src/test/kc/cia-timer-cyclecount.c                        | 4 ++--
 src/test/kc/cia-timer-simple.c                            | 4 ++--
 src/test/kc/constants.c                                   | 2 +-
 src/test/kc/cordic-atan2-16-ref.c                         | 2 +-
 src/test/kc/euclid-3.c                                    | 2 +-
 src/test/kc/examples/c64/3d/3d.c                          | 2 +-
 src/test/kc/examples/c64/3d/perspective.c                 | 2 +-
 src/test/kc/examples/c64/chargen/chargen-analysis.c       | 2 +-
 src/test/kc/examples/c64/fastmultiply/fastmultiply8.c     | 2 +-
 src/test/kc/examples/c64/multiplexer/simple-multiplexer.c | 2 +-
 src/test/kc/examples/c64/plasma/plasma-unroll.c           | 2 +-
 src/test/kc/examples/c64/plasma/plasma.c                  | 2 +-
 src/test/kc/examples/c64/rotate/rotate.c                  | 4 ++--
 src/test/kc/examples/c64/sinsprites/sinus-sprites.c       | 4 ++--
 src/test/kc/fastmultiply-127.c                            | 2 +-
 src/test/kc/incrementinarray.c                            | 2 +-
 src/test/kc/keyboard-glitch.c                             | 2 +-
 src/test/kc/linegen.c                                     | 2 +-
 src/test/kc/millfork-benchmarks/benchcommon.c             | 4 ++--
 src/test/kc/millfork-benchmarks/romsum-kc.c               | 2 +-
 src/test/kc/millfork-benchmarks/sieve-kc.c                | 2 +-
 src/test/kc/min-fmul-16.c                                 | 2 +-
 src/test/kc/multiplexer-irq/simple-multiplexer-irq.c      | 2 +-
 src/test/kc/multiply-16bit-const.c                        | 2 +-
 src/test/kc/plasma-center.c                               | 2 +-
 src/test/kc/primes-1000-2.c                               | 2 +-
 src/test/kc/primes-1000.c                                 | 2 +-
 src/test/kc/printf-speed.c                                | 2 +-
 src/test/kc/printmsg.c                                    | 2 +-
 src/test/kc/processor-port-test-writethrough.c            | 2 +-
 src/test/kc/processor-port-test.c                         | 2 +-
 src/test/kc/scan-desire-problem.c                         | 2 +-
 src/test/kc/screen-center-angle.c                         | 4 ++--
 src/test/kc/screen-center-distance.c                      | 4 ++--
 src/test/kc/semi-struct-1.c                               | 2 +-
 src/test/kc/semi-struct-2.c                               | 4 ++--
 src/test/kc/sieve-min.c                                   | 4 ++--
 src/test/kc/sieve.c                                       | 4 ++--
 src/test/kc/signed-indexed-subtract.c                     | 2 +-
 src/test/kc/sinus-basic.c                                 | 4 ++--
 src/test/kc/sinusgen16.c                                  | 2 +-
 src/test/kc/sinusgen16b.c                                 | 2 +-
 src/test/kc/sinusgen8.c                                   | 2 +-
 src/test/kc/sinusgen8b.c                                  | 2 +-
 src/test/kc/sinusgenscale8.c                              | 2 +-
 src/test/kc/struct-ptr-22.c                               | 2 +-
 src/test/kc/struct-ptr-26.c                               | 2 +-
 src/test/kc/test-comparisons-sword.c                      | 2 +-
 src/test/kc/test-comparisons-word.c                       | 2 +-
 src/test/kc/test-comparisons.c                            | 2 +-
 src/test/kc/test-division.c                               | 2 +-
 src/test/kc/test-keyboard-space.c                         | 2 +-
 src/test/kc/test-keyboard.c                               | 2 +-
 src/test/kc/test-lowhigh.c                                | 2 +-
 src/test/kc/test-multiply-16bit.c                         | 2 +-
 src/test/kc/test-multiply-8bit.c                          | 2 +-
 src/test/kc/test-signed-word-minus-byte.c                 | 2 +-
 src/test/kc/test-utoa.c                                   | 2 +-
 src/test/kc/tod-1.c                                       | 2 +-
 src/test/kc/travis1.c                                     | 2 +-
 src/test/kc/type-signed.c                                 | 2 +-
 src/test/kc/wfragment1.c                                  | 2 +-
 src/test/ref/constants.asm                                | 4 ++--
 src/test/ref/constants.log                                | 8 ++++----
 src/test/ref/incrementinarray.asm                         | 4 ++--
 src/test/ref/incrementinarray.log                         | 8 ++++----
 src/test/ref/millfork-benchmarks/linkedlist-kc.asm        | 4 ++--
 src/test/ref/millfork-benchmarks/linkedlist-kc.log        | 8 ++++----
 src/test/ref/millfork-benchmarks/plasma-kc.asm            | 4 ++--
 src/test/ref/millfork-benchmarks/plasma-kc.log            | 8 ++++----
 src/test/ref/millfork-benchmarks/romsum-kc.asm            | 4 ++--
 src/test/ref/millfork-benchmarks/romsum-kc.log            | 8 ++++----
 src/test/ref/millfork-benchmarks/sieve-kc.asm             | 4 ++--
 src/test/ref/millfork-benchmarks/sieve-kc.log             | 8 ++++----
 src/test/ref/min-fmul-16.asm                              | 4 ++--
 src/test/ref/min-fmul-16.log                              | 8 ++++----
 src/test/ref/multiply-16bit-const.asm                     | 4 ++--
 src/test/ref/multiply-16bit-const.log                     | 8 ++++----
 src/test/ref/printmsg.asm                                 | 4 ++--
 src/test/ref/printmsg.log                                 | 8 ++++----
 src/test/ref/sinus-basic.asm                              | 4 ++--
 src/test/ref/sinus-basic.log                              | 8 ++++----
 src/test/ref/struct-ptr-26.asm                            | 4 ++--
 src/test/ref/struct-ptr-26.log                            | 8 ++++----
 src/test/ref/test-comparisons.asm                         | 4 ++--
 src/test/ref/test-comparisons.log                         | 8 ++++----
 src/test/ref/test-division.asm                            | 2 ++
 src/test/ref/test-division.log                            | 4 ++++
 src/test/ref/test-lowhigh.asm                             | 4 ++--
 src/test/ref/test-lowhigh.log                             | 8 ++++----
 src/test/ref/test-multiply-16bit.asm                      | 2 ++
 src/test/ref/test-multiply-16bit.log                      | 8 ++++++--
 src/test/ref/test-multiply-8bit.asm                       | 2 ++
 src/test/ref/test-multiply-8bit.log                       | 4 ++++
 110 files changed, 184 insertions(+), 165 deletions(-)
 rename src/main/kc/include/{basic-floats.h => c64-basic-floats.h} (100%)
 rename src/main/kc/include/{keyboard.h => c64-keyboard.h} (100%)
 rename src/main/kc/include/{multiplexer.h => c64-multiplexer.h} (100%)
 rename src/main/kc/include/{print.h => c64-print.h} (94%)
 rename src/main/kc/include/{time.h => c64-time.h} (100%)
 rename src/main/kc/include/{tod.h => c64-tod.h} (100%)
 rename src/main/kc/lib/{basic-floats.c => c64-basic-floats.c} (99%)
 rename src/main/kc/lib/{keyboard.c => c64-keyboard.c} (99%)
 rename src/main/kc/lib/{multiplexer.c => c64-multiplexer.c} (99%)
 rename src/main/kc/lib/{print.c => c64-print.c} (100%)
 rename src/main/kc/lib/{time.c => c64-time.c} (98%)
 rename src/main/kc/lib/{tod.c => c64-tod.c} (98%)

diff --git a/src/main/kc/include/basic-floats.h b/src/main/kc/include/c64-basic-floats.h
similarity index 100%
rename from src/main/kc/include/basic-floats.h
rename to src/main/kc/include/c64-basic-floats.h
diff --git a/src/main/kc/include/keyboard.h b/src/main/kc/include/c64-keyboard.h
similarity index 100%
rename from src/main/kc/include/keyboard.h
rename to src/main/kc/include/c64-keyboard.h
diff --git a/src/main/kc/include/multiplexer.h b/src/main/kc/include/c64-multiplexer.h
similarity index 100%
rename from src/main/kc/include/multiplexer.h
rename to src/main/kc/include/c64-multiplexer.h
diff --git a/src/main/kc/include/print.h b/src/main/kc/include/c64-print.h
similarity index 94%
rename from src/main/kc/include/print.h
rename to src/main/kc/include/c64-print.h
index eac8dc631..95f0d588b 100644
--- a/src/main/kc/include/print.h
+++ b/src/main/kc/include/c64-print.h
@@ -1,4 +1,5 @@
-#include <print.h>
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
 
 // Print a number of zero-terminated strings, each followed by a newline.
 // The sequence of lines is terminated by another zero.
diff --git a/src/main/kc/include/time.h b/src/main/kc/include/c64-time.h
similarity index 100%
rename from src/main/kc/include/time.h
rename to src/main/kc/include/c64-time.h
diff --git a/src/main/kc/include/tod.h b/src/main/kc/include/c64-tod.h
similarity index 100%
rename from src/main/kc/include/tod.h
rename to src/main/kc/include/c64-tod.h
diff --git a/src/main/kc/lib/basic-floats.c b/src/main/kc/lib/c64-basic-floats.c
similarity index 99%
rename from src/main/kc/lib/basic-floats.c
rename to src/main/kc/lib/c64-basic-floats.c
index 5bd0f3d1a..c7d4341e5 100644
--- a/src/main/kc/lib/basic-floats.c
+++ b/src/main/kc/lib/c64-basic-floats.c
@@ -2,7 +2,7 @@
 // See https://www.c64-wiki.com/wiki/Floating_point_arithmetic
 // See http://www.pagetable.com/c64rom/c64rom_sc.html
 
-#include <basic-floats.h>
+#include <c64-basic-floats.h>
 
 // Zeropage addresses used to hold lo/hi-bytes of addresses of float numbers in MEM
 char* const memLo = 0xfe;
diff --git a/src/main/kc/lib/keyboard.c b/src/main/kc/lib/c64-keyboard.c
similarity index 99%
rename from src/main/kc/lib/keyboard.c
rename to src/main/kc/lib/c64-keyboard.c
index d488cb127..8d9b98af2 100644
--- a/src/main/kc/lib/keyboard.c
+++ b/src/main/kc/lib/c64-keyboard.c
@@ -16,8 +16,8 @@
 // |7.  | #%01111111 (127/$7f) | STOP  ($  )|   q   ($11)|COMMODR($  )| SPACE ($20)|   2   ($32)|CONTROL($  )|  <-   ($1f)|   1   ($31)|
 // +----+----------------------+------------+------------+------------+------------+------------+------------+------------+------------+
 
-#include <keyboard.h>
 #include <c64.h>
+#include <c64-keyboard.h>
 
 // Keycodes for each screen code character from $00-$3f.
 // Chars that do not have an unmodified keycode return $3f (representing RUN/STOP).
diff --git a/src/main/kc/lib/multiplexer.c b/src/main/kc/lib/c64-multiplexer.c
similarity index 99%
rename from src/main/kc/lib/multiplexer.c
rename to src/main/kc/lib/c64-multiplexer.c
index 33e9136c9..b659fe8f5 100644
--- a/src/main/kc/lib/multiplexer.c
+++ b/src/main/kc/lib/c64-multiplexer.c
@@ -12,7 +12,7 @@
 // In practice a good method is to wait until the raster is beyond plexFreeNextYpos() and then call plexShowSprite(). Repeat until all 32 sprites have been shown.
 // TODO: Let the caller specify the number of sprites to use (or add PLEX_ENABLE[PLEX_COUNT])
 
-#include <multiplexer.h>
+#include <c64-multiplexer.h>
 #include <c64.h>
 
 // The number of sprites in the multiplexer
diff --git a/src/main/kc/lib/print.c b/src/main/kc/lib/c64-print.c
similarity index 100%
rename from src/main/kc/lib/print.c
rename to src/main/kc/lib/c64-print.c
diff --git a/src/main/kc/lib/time.c b/src/main/kc/lib/c64-time.c
similarity index 98%
rename from src/main/kc/lib/time.c
rename to src/main/kc/lib/c64-time.c
index 71bb3f7a4..9e4b44484 100644
--- a/src/main/kc/lib/time.c
+++ b/src/main/kc/lib/c64-time.c
@@ -1,7 +1,7 @@
 // C standard library time.h
 //  Functions to get and manipulate date and time information.
-#include <time.h>
 #include <c64.h>
+#include <c64-time.h>
 
 
 // Returns the processor clock time used since the beginning of an implementation defined era (normally the beginning of the program).
diff --git a/src/main/kc/lib/tod.c b/src/main/kc/lib/c64-tod.c
similarity index 98%
rename from src/main/kc/lib/tod.c
rename to src/main/kc/lib/c64-tod.c
index d931a8a58..d2d2187b4 100644
--- a/src/main/kc/lib/tod.c
+++ b/src/main/kc/lib/c64-tod.c
@@ -1,6 +1,6 @@
 // Time-of-day helper
 // Uses the MOS6526 CIA#1 on Commodore 64
-#include <tod.h>
+#include <c64-tod.h>
 #include <c64.h>
 
 // Initialize time-of-day clock
diff --git a/src/test/kc/bitmap-plot-3.c b/src/test/kc/bitmap-plot-3.c
index 120b4a2cb..c62f57565 100644
--- a/src/test/kc/bitmap-plot-3.c
+++ b/src/test/kc/bitmap-plot-3.c
@@ -2,7 +2,7 @@
 // Plots a few lines using the bresenham line algorithm
 #include <c64.h>
 #include <c64-bitmap.h>
-#include <print.h>
+#include <c64-print.h>
 
 byte* BITMAP = 0x2000;
 byte* SCREEN = 0x0400;
diff --git a/src/test/kc/c-types.c b/src/test/kc/c-types.c
index 4f4a4044c..9b35875ce 100644
--- a/src/test/kc/c-types.c
+++ b/src/test/kc/c-types.c
@@ -1,6 +1,6 @@
 // Tests the different standard C types
 
-#include <print.h>
+#include <c64-print.h>
 
 void main() {
     print_cls();
diff --git a/src/test/kc/c64dtv-gfxexplorer.c b/src/test/kc/c64dtv-gfxexplorer.c
index 95f83f0f9..c617c8ea2 100644
--- a/src/test/kc/c64dtv-gfxexplorer.c
+++ b/src/test/kc/c64dtv-gfxexplorer.c
@@ -1,7 +1,7 @@
 // Interactive Explorer for C64DTV Screen Modes
 #include <c64dtv.h>
-#include <print.h>
-#include <keyboard.h>
+#include <c64-print.h>
+#include <c64-keyboard.h>
 #include <c64-bitmap.h>
 
 void main() {
diff --git a/src/test/kc/c64dtv-gfxmodes.c b/src/test/kc/c64dtv-gfxmodes.c
index f4d58983a..2cd67848a 100644
--- a/src/test/kc/c64dtv-gfxmodes.c
+++ b/src/test/kc/c64dtv-gfxmodes.c
@@ -1,7 +1,7 @@
 // Exploring C64DTV Screen Modes
 #include <c64dtv.h>
-#include <print.h>
-#include <keyboard.h>
+#include <c64-print.h>
+#include <c64-keyboard.h>
 #include <c64-bitmap.h>
 
 void main() {
diff --git a/src/test/kc/cia-timer-cyclecount.c b/src/test/kc/cia-timer-cyclecount.c
index d9ef44c64..7188027e8 100644
--- a/src/test/kc/cia-timer-cyclecount.c
+++ b/src/test/kc/cia-timer-cyclecount.c
@@ -1,8 +1,8 @@
 // Counting cycles using a CIA timer
 
 #include <c64.h>
-#include <time.h>
-#include <print.h>
+#include <c64-time.h>
+#include <c64-print.h>
 
 byte* const SCREEN = 0x0400;
 
diff --git a/src/test/kc/cia-timer-simple.c b/src/test/kc/cia-timer-simple.c
index 00ddf1348..4c1dfd676 100644
--- a/src/test/kc/cia-timer-simple.c
+++ b/src/test/kc/cia-timer-simple.c
@@ -1,8 +1,8 @@
 // Setup and run a simple CIA-timer
 
 #include <c64.h>
-#include <time.h>
-#include <print.h>
+#include <c64-time.h>
+#include <c64-print.h>
 
 byte* const SCREEN = 0x0400;
 
diff --git a/src/test/kc/constants.c b/src/test/kc/constants.c
index 01d4fb2b7..b31d803b3 100644
--- a/src/test/kc/constants.c
+++ b/src/test/kc/constants.c
@@ -1,4 +1,4 @@
-#include <print.h>
+#include <c64-print.h>
 byte* const BG_COLOR = $d021;
 const byte GREEN = 5;
 const byte RED = 2 ;
diff --git a/src/test/kc/cordic-atan2-16-ref.c b/src/test/kc/cordic-atan2-16-ref.c
index d07147a7b..c74a098ed 100644
--- a/src/test/kc/cordic-atan2-16-ref.c
+++ b/src/test/kc/cordic-atan2-16-ref.c
@@ -4,7 +4,7 @@
 #include "font-hex.c"
 #include <atan2.h>
 #include <c64.h>
-#include <print.h>
+#include <c64-print.h>
 
 byte* const CHARSET = 0x2000;
 byte* const SCREEN = 0x2800;
diff --git a/src/test/kc/euclid-3.c b/src/test/kc/euclid-3.c
index 8017e2471..a31e851a5 100644
--- a/src/test/kc/euclid-3.c
+++ b/src/test/kc/euclid-3.c
@@ -4,7 +4,7 @@
  * Based on facebook post from
  */
 
-#include <print.h>
+#include <c64-print.h>
 
 void main () {
     print_cls();
diff --git a/src/test/kc/examples/c64/3d/3d.c b/src/test/kc/examples/c64/3d/3d.c
index f74b86cfb..3eb6dd560 100644
--- a/src/test/kc/examples/c64/3d/3d.c
+++ b/src/test/kc/examples/c64/3d/3d.c
@@ -3,7 +3,7 @@
 // - C= Hacking Magazine Issue 8. http://www.ffd2.com/fridge/chacking/c=hacking8.txt
 // - Codebase64 Article http://codebase64.org/doku.php?id=base:3d_rotation  
 #include <c64.h>
-#include <print.h>
+#include <c64-print.h>
 
 // The rotated point - updated by calling rotate_matrix()
 signed char xr;
diff --git a/src/test/kc/examples/c64/3d/perspective.c b/src/test/kc/examples/c64/3d/perspective.c
index 3abbb404b..3f4075b15 100644
--- a/src/test/kc/examples/c64/3d/perspective.c
+++ b/src/test/kc/examples/c64/3d/perspective.c
@@ -3,7 +3,7 @@
 // - C= Hacking Magazine Issue 8. http://www.ffd2.com/fridge/chacking/c=hacking8.txt
 // - Codebase64 Article http://codebase64.org/doku.php?id=base:3d_rotation  
 #include <c64.h>
-#include <print.h>
+#include <c64-print.h>
 
 // The rotated point - updated by calling rotate()
 signed char xr;
diff --git a/src/test/kc/examples/c64/chargen/chargen-analysis.c b/src/test/kc/examples/c64/chargen/chargen-analysis.c
index 02172c06c..98bc05581 100644
--- a/src/test/kc/examples/c64/chargen/chargen-analysis.c
+++ b/src/test/kc/examples/c64/chargen/chargen-analysis.c
@@ -1,6 +1,6 @@
 // Allows analysis of the CHARGEN ROM font
 #include <c64.h>
-#include <keyboard.h>
+#include <c64-keyboard.h>
 
 char* SCREEN = $400;
 
diff --git a/src/test/kc/examples/c64/fastmultiply/fastmultiply8.c b/src/test/kc/examples/c64/fastmultiply/fastmultiply8.c
index 9832f4dca..850ae8568 100644
--- a/src/test/kc/examples/c64/fastmultiply/fastmultiply8.c
+++ b/src/test/kc/examples/c64/fastmultiply/fastmultiply8.c
@@ -6,7 +6,7 @@
 // - http://codebase64.org/doku.php?id=base:seriously_fast_multiplication 
 // - http://codebase64.org/doku.php?id=magazines:chacking16
 
-#include <print.h>
+#include <c64-print.h>
 
 signed char vals[] = {-95, -64, -32, -16, 0, 16, 32, 64, 95};
 
diff --git a/src/test/kc/examples/c64/multiplexer/simple-multiplexer.c b/src/test/kc/examples/c64/multiplexer/simple-multiplexer.c
index 1725e4528..e15eec1a6 100644
--- a/src/test/kc/examples/c64/multiplexer/simple-multiplexer.c
+++ b/src/test/kc/examples/c64/multiplexer/simple-multiplexer.c
@@ -1,6 +1,6 @@
 // A simple usage of the flexible sprite multiplexer routine
 #include <c64.h>
-#include <multiplexer.h>
+#include <c64-multiplexer.h>
 
 // Location of screen & sprites
 char* SCREEN = $400;
diff --git a/src/test/kc/examples/c64/plasma/plasma-unroll.c b/src/test/kc/examples/c64/plasma/plasma-unroll.c
index ddb099762..01e7737f1 100644
--- a/src/test/kc/examples/c64/plasma/plasma-unroll.c
+++ b/src/test/kc/examples/c64/plasma/plasma-unroll.c
@@ -7,7 +7,7 @@
 // Original source https://github.com/cc65/cc65/blob/master/samples/plasma.c
 
 #include <c64.h>
-#include <print.h>
+#include <c64-print.h>
 
 unsigned char* const SCREEN1 = $2800;
 unsigned char* const CHARSET = $2000;
diff --git a/src/test/kc/examples/c64/plasma/plasma.c b/src/test/kc/examples/c64/plasma/plasma.c
index 3b7b13765..7cbbe2427 100644
--- a/src/test/kc/examples/c64/plasma/plasma.c
+++ b/src/test/kc/examples/c64/plasma/plasma.c
@@ -5,7 +5,7 @@
 // Original source https://github.com/cc65/cc65/blob/master/samples/plasma.c
 
 #include <c64.h>
-#include <print.h>
+#include <c64-print.h>
 
 char* const SCREEN1 = 0x2800;
 char* const SCREEN2 = 0x2c00;
diff --git a/src/test/kc/examples/c64/rotate/rotate.c b/src/test/kc/examples/c64/rotate/rotate.c
index c12ce33d0..231c3f9e7 100644
--- a/src/test/kc/examples/c64/rotate/rotate.c
+++ b/src/test/kc/examples/c64/rotate/rotate.c
@@ -2,8 +2,8 @@
 
 #include <c64.h>
 #include <fastmultiply.h>
-#include <time.h>
-#include <print.h>
+#include <c64-time.h>
+#include <c64-print.h>
 
 char* SCREEN = $0400;
 
diff --git a/src/test/kc/examples/c64/sinsprites/sinus-sprites.c b/src/test/kc/examples/c64/sinsprites/sinus-sprites.c
index 481d4cf3a..541aa711f 100644
--- a/src/test/kc/examples/c64/sinsprites/sinus-sprites.c
+++ b/src/test/kc/examples/c64/sinsprites/sinus-sprites.c
@@ -1,6 +1,6 @@
 #include <c64.h>
-#include <basic-floats.h>
-#include <print.h>
+#include <c64-basic-floats.h>
+#include <c64-print.h>
 
 const char sinlen_x = 221;
 const char sintab_x[221];
diff --git a/src/test/kc/fastmultiply-127.c b/src/test/kc/fastmultiply-127.c
index e4e7a5561..1b2c73462 100644
--- a/src/test/kc/fastmultiply-127.c
+++ b/src/test/kc/fastmultiply-127.c
@@ -4,7 +4,7 @@
 // Uses principles from C=Hacking #16 https://codebase64.org/doku.php?id=magazines:chacking16
 // Utilizes the fact that a*b = ((a+b)/2)^2 - ((a-b)/2)^2
 
-#include <print.h>
+#include <c64-print.h>
 
 void main() {
     print_cls();
diff --git a/src/test/kc/incrementinarray.c b/src/test/kc/incrementinarray.c
index ddd3d4922..9a3a556e5 100644
--- a/src/test/kc/incrementinarray.c
+++ b/src/test/kc/incrementinarray.c
@@ -1,4 +1,4 @@
-#include <print.h>
+#include <c64-print.h>
 
 byte txt[] = "camelot";
 
diff --git a/src/test/kc/keyboard-glitch.c b/src/test/kc/keyboard-glitch.c
index 7288e8189..49d6eef99 100644
--- a/src/test/kc/keyboard-glitch.c
+++ b/src/test/kc/keyboard-glitch.c
@@ -5,7 +5,7 @@
 // Press "C" to enter pressed state (increaded BG_COLOR) - and "SPACE" to leave presssed state again.
 // Holding SPACE will sometimes trigger the pressed state when normal interrupts are enabled (green border)
 // but never when they are disabled (red border)
-#include <keyboard.h>
+#include <c64-keyboard.h>
 #include <c64.h>
 
 void main() {
diff --git a/src/test/kc/linegen.c b/src/test/kc/linegen.c
index 6c206fc07..4e6c0475f 100644
--- a/src/test/kc/linegen.c
+++ b/src/test/kc/linegen.c
@@ -1,7 +1,7 @@
 // Linear table generator
 // Work in progress towards a sine generator
 #include <division.h>
-#include <print.h>
+#include <c64-print.h>
 
 void main() {
     word lintab1[20];
diff --git a/src/test/kc/millfork-benchmarks/benchcommon.c b/src/test/kc/millfork-benchmarks/benchcommon.c
index 4ff4edc56..90957b7c3 100644
--- a/src/test/kc/millfork-benchmarks/benchcommon.c
+++ b/src/test/kc/millfork-benchmarks/benchcommon.c
@@ -1,5 +1,5 @@
-#include <print.h>
-#include <time.h>
+#include <c64-print.h>
+#include <c64-time.h>
 
 
 unsigned int last_time;
diff --git a/src/test/kc/millfork-benchmarks/romsum-kc.c b/src/test/kc/millfork-benchmarks/romsum-kc.c
index fb3db5852..33d36d252 100644
--- a/src/test/kc/millfork-benchmarks/romsum-kc.c
+++ b/src/test/kc/millfork-benchmarks/romsum-kc.c
@@ -1,5 +1,5 @@
 #include "benchcommon.c"
-#include <print.h>
+#include <c64-print.h>
 
 byte* const rom = (byte*)0xe000;
 
diff --git a/src/test/kc/millfork-benchmarks/sieve-kc.c b/src/test/kc/millfork-benchmarks/sieve-kc.c
index 5169ed44e..e98ab4eee 100644
--- a/src/test/kc/millfork-benchmarks/sieve-kc.c
+++ b/src/test/kc/millfork-benchmarks/sieve-kc.c
@@ -1,4 +1,4 @@
-#include <print.h>
+#include <c64-print.h>
 #include "benchcommon.c"
 
 const unsigned int COUNT = 16384;
diff --git a/src/test/kc/min-fmul-16.c b/src/test/kc/min-fmul-16.c
index 18187995a..9c092320f 100644
--- a/src/test/kc/min-fmul-16.c
+++ b/src/test/kc/min-fmul-16.c
@@ -1,4 +1,4 @@
-#include <print.h>
+#include <c64-print.h>
 
 byte* RASTER = $d012;
 byte* BORDER_COLOR = $d020;
diff --git a/src/test/kc/multiplexer-irq/simple-multiplexer-irq.c b/src/test/kc/multiplexer-irq/simple-multiplexer-irq.c
index 8947a6115..64f403784 100644
--- a/src/test/kc/multiplexer-irq/simple-multiplexer-irq.c
+++ b/src/test/kc/multiplexer-irq/simple-multiplexer-irq.c
@@ -1,6 +1,6 @@
 // A simple usage of the flexible sprite multiplexer routine
 #include <c64.h>
-#include <multiplexer.h>
+#include <c64-multiplexer.h>
 // Location of screen & sprites
 char* SCREEN = 0x0400;
 
diff --git a/src/test/kc/multiply-16bit-const.c b/src/test/kc/multiply-16bit-const.c
index 9ed5164db..4905fe841 100644
--- a/src/test/kc/multiply-16bit-const.c
+++ b/src/test/kc/multiply-16bit-const.c
@@ -1,4 +1,4 @@
-#include <print.h>
+#include <c64-print.h>
 
 void main() {
 	print_cls();
diff --git a/src/test/kc/plasma-center.c b/src/test/kc/plasma-center.c
index dba8f64d7..ed7a8f127 100644
--- a/src/test/kc/plasma-center.c
+++ b/src/test/kc/plasma-center.c
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <sqr.h>
 #include <atan2.h>
-#include <print.h>
+#include <c64-print.h>
 
 const char __align(0x100) SINTABLE[0x200] = kickasm {{
     .for(var i=0;i<$200;i++)
diff --git a/src/test/kc/primes-1000-2.c b/src/test/kc/primes-1000-2.c
index 01dd415cd..d75246db8 100644
--- a/src/test/kc/primes-1000-2.c
+++ b/src/test/kc/primes-1000-2.c
@@ -2,7 +2,7 @@
 // From A Comparison of Language Speed, The Transactor, March 1987, Volume 7, Issue 5
 // http://csbruce.com/cbm/transactor/pdfs/trans_v7_i05.pdf
 
-#include <print.h>
+#include <c64-print.h>
 #include <multiply.h>
 #include <division.h>
 
diff --git a/src/test/kc/primes-1000.c b/src/test/kc/primes-1000.c
index d8c08fc71..9deeaf18c 100644
--- a/src/test/kc/primes-1000.c
+++ b/src/test/kc/primes-1000.c
@@ -2,7 +2,7 @@
 // From A Comparison of Language Speed, The Transactor, March 1987, Volume 7, Issue 5
 // http://csbruce.com/cbm/transactor/pdfs/trans_v7_i05.pdf
 
-#include <print.h>
+#include <c64-print.h>
 #include <multiply.h>
 #include <division.h>
 
diff --git a/src/test/kc/printf-speed.c b/src/test/kc/printf-speed.c
index 633f18b69..a9a2b4c53 100644
--- a/src/test/kc/printf-speed.c
+++ b/src/test/kc/printf-speed.c
@@ -1,6 +1,6 @@
 // Tests the speed of printf()
 #include <stdio.h>
-#include <tod.h>
+#include <c64-tod.h>
 
 void main() {
   tod_init(TOD_ZERO);
diff --git a/src/test/kc/printmsg.c b/src/test/kc/printmsg.c
index 95cee02b6..b5896f6e7 100644
--- a/src/test/kc/printmsg.c
+++ b/src/test/kc/printmsg.c
@@ -1,4 +1,4 @@
-#include <print.h>
+#include <c64-print.h>
 
 byte msg[] = "hello world! ";
 byte msg2[] = "hello c64! ";
diff --git a/src/test/kc/processor-port-test-writethrough.c b/src/test/kc/processor-port-test-writethrough.c
index af5db9ed8..0a571f2ce 100644
--- a/src/test/kc/processor-port-test-writethrough.c
+++ b/src/test/kc/processor-port-test-writethrough.c
@@ -1,7 +1,7 @@
 // Test the write through to RAM when writing to VIC/CIA/colorram
 
 #include <c64.h>
-#include <print.h>
+#include <c64-print.h>
 
 void main() {
     // Avoid interrupts
diff --git a/src/test/kc/processor-port-test.c b/src/test/kc/processor-port-test.c
index 6d888f893..07f41e190 100644
--- a/src/test/kc/processor-port-test.c
+++ b/src/test/kc/processor-port-test.c
@@ -2,7 +2,7 @@
 // Tests by setting the value of the processor port - and then printing out values of $00/$01/$a000/$d000/$e000
 
 #include <c64.h>
-#include <print.h>
+#include <c64-print.h>
 
 char* const BASIC_ROM = $a000;
 char* const KERNAL_ROM = $e000;
diff --git a/src/test/kc/scan-desire-problem.c b/src/test/kc/scan-desire-problem.c
index da3cd84c7..7d24c9cf9 100644
--- a/src/test/kc/scan-desire-problem.c
+++ b/src/test/kc/scan-desire-problem.c
@@ -1,6 +1,6 @@
 // Illustrates a problem with a missing fragment - pbuc1_derefidx_vwuz1=vbuz2
 #include <c64.h>
-#include <keyboard.h>
+#include <c64-keyboard.h>
 #include <string.h>
 #include <multiply.h>
 
diff --git a/src/test/kc/screen-center-angle.c b/src/test/kc/screen-center-angle.c
index c50e96a4d..7816e1212 100644
--- a/src/test/kc/screen-center-angle.c
+++ b/src/test/kc/screen-center-angle.c
@@ -4,8 +4,8 @@
 #include <c64.h>
 #include "font-hex.c"
 #include <atan2.h>
-#include <time.h>
-#include <print.h>
+#include <c64-time.h>
+#include <c64-print.h>
 
 byte* const CHARSET = 0x2000;
 byte* const SCREEN = 0x2800;
diff --git a/src/test/kc/screen-center-distance.c b/src/test/kc/screen-center-distance.c
index 0e13eb0f1..e85a22d2a 100644
--- a/src/test/kc/screen-center-distance.c
+++ b/src/test/kc/screen-center-distance.c
@@ -4,8 +4,8 @@
 #include <sqr.h>
 #include <c64.h>
 #include "font-hex.c"
-#include <time.h>
-#include <print.h>
+#include <c64-time.h>
+#include <c64-print.h>
 
 #pragma zp_reserve(08)
 
diff --git a/src/test/kc/semi-struct-1.c b/src/test/kc/semi-struct-1.c
index e7444bb6d..885df2a45 100644
--- a/src/test/kc/semi-struct-1.c
+++ b/src/test/kc/semi-struct-1.c
@@ -6,7 +6,7 @@
 // };
 // Point points[NUM_POINTS];
 
-#include <print.h>
+#include <c64-print.h>
 
 // The size of a point
 const byte SIZEOF_POINT = 2;
diff --git a/src/test/kc/semi-struct-2.c b/src/test/kc/semi-struct-2.c
index 5c8a33651..e5a84f2b7 100644
--- a/src/test/kc/semi-struct-2.c
+++ b/src/test/kc/semi-struct-2.c
@@ -19,8 +19,8 @@
 //    ENTRY files[MAX_FILES];
 
 #include <multiply.h>
-#include <print.h>
-#include <keyboard.h>
+#include <c64-print.h>
+#include <c64-keyboard.h>
 
 // The size of a file ENTRY
 const byte SIZEOF_ENTRY = 18;
diff --git a/src/test/kc/sieve-min.c b/src/test/kc/sieve-min.c
index 7bfdd84eb..2c173b844 100644
--- a/src/test/kc/sieve-min.c
+++ b/src/test/kc/sieve-min.c
@@ -1,7 +1,7 @@
 #include <string.h>
-#include <time.h>
+#include <c64-time.h>
 #include <stdint.h>
-#include <print.h>
+#include <c64-print.h>
 
 
 char* const SCREEN = 0x0400;
diff --git a/src/test/kc/sieve.c b/src/test/kc/sieve.c
index e9cb6fce4..6ab366932 100644
--- a/src/test/kc/sieve.c
+++ b/src/test/kc/sieve.c
@@ -1,9 +1,9 @@
 #include <string.h>
-#include <time.h>
+#include <c64-time.h>
 #include <stdint.h>
 #include <division.h>
 #include <c64.h>
-#include <print.h>
+#include <c64-print.h>
 
 
 char* const SCREEN = 0x0400;
diff --git a/src/test/kc/signed-indexed-subtract.c b/src/test/kc/signed-indexed-subtract.c
index 697779d4c..a557f7e84 100644
--- a/src/test/kc/signed-indexed-subtract.c
+++ b/src/test/kc/signed-indexed-subtract.c
@@ -1,6 +1,6 @@
 // Tests that signed indexed subtract works as intended
 
-#include <print.h>
+#include <c64-print.h>
 
 signed word words[] = {-$6000, -$600, -$60, -6, 0, 6, $60, $600, $6000};
 
diff --git a/src/test/kc/sinus-basic.c b/src/test/kc/sinus-basic.c
index dc9e5387b..61c6a744b 100644
--- a/src/test/kc/sinus-basic.c
+++ b/src/test/kc/sinus-basic.c
@@ -1,5 +1,5 @@
-#include <print.h>
-#include <basic-floats.h>
+#include <c64-print.h>
+#include <c64-basic-floats.h>
 
 void main() {
     byte f_i[] = {0, 0, 0, 0, 0};
diff --git a/src/test/kc/sinusgen16.c b/src/test/kc/sinusgen16.c
index a26408c91..14f557e5e 100644
--- a/src/test/kc/sinusgen16.c
+++ b/src/test/kc/sinusgen16.c
@@ -1,6 +1,6 @@
 // Generates a 16-bit signed sine
 #include <sine.h>
-#include <print.h>
+#include <c64-print.h>
 
 void main() {
     word wavelength = 120;
diff --git a/src/test/kc/sinusgen16b.c b/src/test/kc/sinusgen16b.c
index 12388b974..903285167 100644
--- a/src/test/kc/sinusgen16b.c
+++ b/src/test/kc/sinusgen16b.c
@@ -1,7 +1,7 @@
 // Generates a 16-bit signed sine
 #include <sine.h>
 #include "sineb.c"
-#include <print.h>
+#include <c64-print.h>
 
 void main() {
     word wavelength = 120;
diff --git a/src/test/kc/sinusgen8.c b/src/test/kc/sinusgen8.c
index 08f755c6e..bb2066707 100644
--- a/src/test/kc/sinusgen8.c
+++ b/src/test/kc/sinusgen8.c
@@ -1,5 +1,5 @@
 #include <sine.h>
-#include <print.h>
+#include <c64-print.h>
 
 word wavelength = 192;
 signed byte sintab2[192];
diff --git a/src/test/kc/sinusgen8b.c b/src/test/kc/sinusgen8b.c
index 61a3245f3..5587ae7f3 100644
--- a/src/test/kc/sinusgen8b.c
+++ b/src/test/kc/sinusgen8b.c
@@ -1,5 +1,5 @@
 #include <sine.h>
-#include <print.h>
+#include <c64-print.h>
 
 void main() {
     word wavelength = 192;
diff --git a/src/test/kc/sinusgenscale8.c b/src/test/kc/sinusgenscale8.c
index 7febb5610..632e0b764 100644
--- a/src/test/kc/sinusgenscale8.c
+++ b/src/test/kc/sinusgenscale8.c
@@ -1,6 +1,6 @@
 #include <sine.h>
 #include <multiply.h>
-#include <print.h>
+#include <c64-print.h>
 
 void main() {
     word tabsize = 20;
diff --git a/src/test/kc/struct-ptr-22.c b/src/test/kc/struct-ptr-22.c
index 583284144..6cbe332b9 100644
--- a/src/test/kc/struct-ptr-22.c
+++ b/src/test/kc/struct-ptr-22.c
@@ -2,7 +2,7 @@
 // https://gitlab.com/camelot/kickc/issues/270
 
 
-#include <print.h>
+#include <c64-print.h>
 
 struct fileentry {
     char *bufEdit;
diff --git a/src/test/kc/struct-ptr-26.c b/src/test/kc/struct-ptr-26.c
index 907fe5370..ed4492c79 100644
--- a/src/test/kc/struct-ptr-26.c
+++ b/src/test/kc/struct-ptr-26.c
@@ -1,4 +1,4 @@
-#include <print.h>
+#include <c64-print.h>
 typedef unsigned char BYTE;
 typedef unsigned short WORD;
 struct fileentry {
diff --git a/src/test/kc/test-comparisons-sword.c b/src/test/kc/test-comparisons-sword.c
index 873d6b0e4..b47bcafa1 100644
--- a/src/test/kc/test-comparisons-sword.c
+++ b/src/test/kc/test-comparisons-sword.c
@@ -1,7 +1,7 @@
 // Test signed word comparisons
 
 #include <c64.h>
-#include <print.h>
+#include <c64-print.h>
 
 signed word swords[] = { -$6fed, $0012, $7fed };
 
diff --git a/src/test/kc/test-comparisons-word.c b/src/test/kc/test-comparisons-word.c
index cc0ad6f10..d5b9e04fe 100644
--- a/src/test/kc/test-comparisons-word.c
+++ b/src/test/kc/test-comparisons-word.c
@@ -1,5 +1,5 @@
 #include <c64.h>
-#include <print.h>
+#include <c64-print.h>
 
 word words[] = { $0012, $3f34, $cfed };
 
diff --git a/src/test/kc/test-comparisons.c b/src/test/kc/test-comparisons.c
index 2ad25c4b2..750109ba4 100644
--- a/src/test/kc/test-comparisons.c
+++ b/src/test/kc/test-comparisons.c
@@ -1,4 +1,4 @@
-#include <print.h>
+#include <c64-print.h>
 
 void main() {
     print_cls();
diff --git a/src/test/kc/test-division.c b/src/test/kc/test-division.c
index d22168269..88731b094 100644
--- a/src/test/kc/test-division.c
+++ b/src/test/kc/test-division.c
@@ -1,5 +1,5 @@
 // Test the binary division library
-#include <print.h>
+#include <c64-print.h>
 #include <division.h>
 
 void main() {
diff --git a/src/test/kc/test-keyboard-space.c b/src/test/kc/test-keyboard-space.c
index aca998d7a..673b681f3 100644
--- a/src/test/kc/test-keyboard-space.c
+++ b/src/test/kc/test-keyboard-space.c
@@ -1,5 +1,5 @@
 // Test keyboard input - test the space bar
-#include <keyboard.h>
+#include <c64-keyboard.h>
 
 void main() {
     keyboard_init();
diff --git a/src/test/kc/test-keyboard.c b/src/test/kc/test-keyboard.c
index 4dd7660c0..1abb5e5cf 100644
--- a/src/test/kc/test-keyboard.c
+++ b/src/test/kc/test-keyboard.c
@@ -1,6 +1,6 @@
 // Test keyboard input - in the keyboard matrix and mapping screen codes to key codes
 
-#include <keyboard.h>
+#include <c64-keyboard.h>
 
 void main() {
     // Clear screen
diff --git a/src/test/kc/test-lowhigh.c b/src/test/kc/test-lowhigh.c
index b30b78a1e..37fefad29 100644
--- a/src/test/kc/test-lowhigh.c
+++ b/src/test/kc/test-lowhigh.c
@@ -1,4 +1,4 @@
-#include <print.h>
+#include <c64-print.h>
 
 void main() {
     print_cls();
diff --git a/src/test/kc/test-multiply-16bit.c b/src/test/kc/test-multiply-16bit.c
index 9b584ec57..4bf84ea23 100644
--- a/src/test/kc/test-multiply-16bit.c
+++ b/src/test/kc/test-multiply-16bit.c
@@ -1,5 +1,5 @@
 // Test the fast multiplication library
-#include <print.h>
+#include <c64-print.h>
 #include <multiply.h>
 #include <fastmultiply.h>
 
diff --git a/src/test/kc/test-multiply-8bit.c b/src/test/kc/test-multiply-8bit.c
index fef7f0214..dc3e6c5a0 100644
--- a/src/test/kc/test-multiply-8bit.c
+++ b/src/test/kc/test-multiply-8bit.c
@@ -1,5 +1,5 @@
 // Test the fast multiplication library
-#include <print.h>
+#include <c64-print.h>
 #include <multiply.h>
 #include <fastmultiply.h>
 
diff --git a/src/test/kc/test-signed-word-minus-byte.c b/src/test/kc/test-signed-word-minus-byte.c
index 6ac8694fe..3b76050d0 100644
--- a/src/test/kc/test-signed-word-minus-byte.c
+++ b/src/test/kc/test-signed-word-minus-byte.c
@@ -1,6 +1,6 @@
 // Tests subtracting bytes from signed words
 
-#include <print.h>
+#include <c64-print.h>
 
 void main() {
     signed word w1 = 1234;
diff --git a/src/test/kc/test-utoa.c b/src/test/kc/test-utoa.c
index 80f6f7062..2f861e24b 100644
--- a/src/test/kc/test-utoa.c
+++ b/src/test/kc/test-utoa.c
@@ -1,6 +1,6 @@
 // Tests the utoa10() function that converts unsigned int to DECIMAL string
 #include <stdlib.h>
-#include <print.h>
+#include <c64-print.h>
 
 // buffer for number
 char buf[17];
diff --git a/src/test/kc/tod-1.c b/src/test/kc/tod-1.c
index d00c49bf7..d9718725a 100644
--- a/src/test/kc/tod-1.c
+++ b/src/test/kc/tod-1.c
@@ -1,6 +1,6 @@
 // Time of Day / RTOS test using the 6526 CIA on C64
 #include <conio.h>
-#include <tod.h>
+#include <c64-tod.h>
 
 void main() {
     tod_init(TOD_ZERO);
diff --git a/src/test/kc/travis1.c b/src/test/kc/travis1.c
index 594dd7152..18057cdf0 100644
--- a/src/test/kc/travis1.c
+++ b/src/test/kc/travis1.c
@@ -1,6 +1,6 @@
 // Adding a missing word-fragment for Travis Fisher
 
-#include <print.h>
+#include <c64-print.h>
 
 byte action_count = 0;
 const byte READY_FRAMES = 5;
diff --git a/src/test/kc/type-signed.c b/src/test/kc/type-signed.c
index 9485c1a6e..eba3942f9 100644
--- a/src/test/kc/type-signed.c
+++ b/src/test/kc/type-signed.c
@@ -1,6 +1,6 @@
 // Tests the special "signed" / "unsigned" without a simple type name
 
-#include <print.h>
+#include <c64-print.h>
 
 void main() {
     signed a = -1023;
diff --git a/src/test/kc/wfragment1.c b/src/test/kc/wfragment1.c
index 6675bb388..e74c0a5bf 100644
--- a/src/test/kc/wfragment1.c
+++ b/src/test/kc/wfragment1.c
@@ -1,6 +1,6 @@
 // Adding a missing word-fragment for Travis Fisher
 
-#include <print.h>
+#include <c64-print.h>
 
 const byte MAX_OBJECTS = 16;
 word OBJ_WORLD_X[MAX_OBJECTS];
diff --git a/src/test/ref/constants.asm b/src/test/ref/constants.asm
index 621a8ea0c..10dc10f18 100644
--- a/src/test/ref/constants.asm
+++ b/src/test/ref/constants.asm
@@ -1,5 +1,5 @@
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Commodore 64 PRG executable file
 .file [name="constants.prg", type="prg", segments="Program"]
 .segmentdef Program [segments="Basic, Code, Data"]
diff --git a/src/test/ref/constants.log b/src/test/ref/constants.log
index 4dfbb1d18..f57a656c5 100644
--- a/src/test/ref/constants.log
+++ b/src/test/ref/constants.log
@@ -1636,8 +1636,8 @@ Allocated (was zp[2]:16) zp[2]:7 [ print_line_cursor#25 print_line_cursor#49 pri
 
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="constants.prg", type="prg", segments="Program"]
@@ -2423,8 +2423,8 @@ FINAL ASSEMBLER
 Score: 1783
 
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="constants.prg", type="prg", segments="Program"]
diff --git a/src/test/ref/incrementinarray.asm b/src/test/ref/incrementinarray.asm
index 408ab0db0..260842625 100644
--- a/src/test/ref/incrementinarray.asm
+++ b/src/test/ref/incrementinarray.asm
@@ -1,5 +1,5 @@
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Commodore 64 PRG executable file
 .file [name="incrementinarray.prg", type="prg", segments="Program"]
 .segmentdef Program [segments="Basic, Code, Data"]
diff --git a/src/test/ref/incrementinarray.log b/src/test/ref/incrementinarray.log
index 3184c030f..2215022f6 100644
--- a/src/test/ref/incrementinarray.log
+++ b/src/test/ref/incrementinarray.log
@@ -738,8 +738,8 @@ Allocated (was zp[2]:9) zp[2]:6 [ memset::dst#2 memset::dst#1 print_str::str#2 p
 
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="incrementinarray.prg", type="prg", segments="Program"]
@@ -1078,8 +1078,8 @@ FINAL ASSEMBLER
 Score: 9880
 
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="incrementinarray.prg", type="prg", segments="Program"]
diff --git a/src/test/ref/millfork-benchmarks/linkedlist-kc.asm b/src/test/ref/millfork-benchmarks/linkedlist-kc.asm
index 9dd6c64ee..bf4956cd0 100644
--- a/src/test/ref/millfork-benchmarks/linkedlist-kc.asm
+++ b/src/test/ref/millfork-benchmarks/linkedlist-kc.asm
@@ -1,5 +1,5 @@
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Commodore 64 PRG executable file
 .file [name="linkedlist-kc.prg", type="prg", segments="Program"]
 .segmentdef Program [segments="Basic, Code, Data"]
diff --git a/src/test/ref/millfork-benchmarks/linkedlist-kc.log b/src/test/ref/millfork-benchmarks/linkedlist-kc.log
index 00fddf266..eaabf5870 100644
--- a/src/test/ref/millfork-benchmarks/linkedlist-kc.log
+++ b/src/test/ref/millfork-benchmarks/linkedlist-kc.log
@@ -1491,8 +1491,8 @@ Allocated (was zp[2]:33) zp[2]:14 [ Ticks#1 print_uint::w#0 ]
 
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="linkedlist-kc.prg", type="prg", segments="Program"]
@@ -2148,8 +2148,8 @@ FINAL ASSEMBLER
 Score: 14167
 
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="linkedlist-kc.prg", type="prg", segments="Program"]
diff --git a/src/test/ref/millfork-benchmarks/plasma-kc.asm b/src/test/ref/millfork-benchmarks/plasma-kc.asm
index 6c7186559..97120f408 100644
--- a/src/test/ref/millfork-benchmarks/plasma-kc.asm
+++ b/src/test/ref/millfork-benchmarks/plasma-kc.asm
@@ -1,5 +1,5 @@
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Commodore 64 PRG executable file
 .file [name="plasma-kc.prg", type="prg", segments="Program"]
 .segmentdef Program [segments="Basic, Code, Data"]
diff --git a/src/test/ref/millfork-benchmarks/plasma-kc.log b/src/test/ref/millfork-benchmarks/plasma-kc.log
index 8b66345bf..ba0c93341 100644
--- a/src/test/ref/millfork-benchmarks/plasma-kc.log
+++ b/src/test/ref/millfork-benchmarks/plasma-kc.log
@@ -2266,8 +2266,8 @@ Allocated (was zp[2]:62) zp[2]:24 [ rand::$2 ]
 
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="plasma-kc.prg", type="prg", segments="Program"]
@@ -3311,8 +3311,8 @@ FINAL ASSEMBLER
 Score: 102109
 
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="plasma-kc.prg", type="prg", segments="Program"]
diff --git a/src/test/ref/millfork-benchmarks/romsum-kc.asm b/src/test/ref/millfork-benchmarks/romsum-kc.asm
index b16afced6..cb2142d9e 100644
--- a/src/test/ref/millfork-benchmarks/romsum-kc.asm
+++ b/src/test/ref/millfork-benchmarks/romsum-kc.asm
@@ -1,5 +1,5 @@
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Commodore 64 PRG executable file
 .file [name="romsum-kc.prg", type="prg", segments="Program"]
 .segmentdef Program [segments="Basic, Code, Data"]
diff --git a/src/test/ref/millfork-benchmarks/romsum-kc.log b/src/test/ref/millfork-benchmarks/romsum-kc.log
index b80187666..6d1c55399 100644
--- a/src/test/ref/millfork-benchmarks/romsum-kc.log
+++ b/src/test/ref/millfork-benchmarks/romsum-kc.log
@@ -2045,8 +2045,8 @@ Allocated (was zp[2]:44) zp[2]:15 [ utoa::digit_value#0 utoa_append::sub#0 print
 
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="romsum-kc.prg", type="prg", segments="Program"]
@@ -2977,8 +2977,8 @@ FINAL ASSEMBLER
 Score: 99336
 
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="romsum-kc.prg", type="prg", segments="Program"]
diff --git a/src/test/ref/millfork-benchmarks/sieve-kc.asm b/src/test/ref/millfork-benchmarks/sieve-kc.asm
index cd99ded1a..8ec648c1b 100644
--- a/src/test/ref/millfork-benchmarks/sieve-kc.asm
+++ b/src/test/ref/millfork-benchmarks/sieve-kc.asm
@@ -1,5 +1,5 @@
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Commodore 64 PRG executable file
 .file [name="sieve-kc.prg", type="prg", segments="Program"]
 .segmentdef Program [segments="Basic, Code, Data"]
diff --git a/src/test/ref/millfork-benchmarks/sieve-kc.log b/src/test/ref/millfork-benchmarks/sieve-kc.log
index 2f4d75249..c9b56b09f 100644
--- a/src/test/ref/millfork-benchmarks/sieve-kc.log
+++ b/src/test/ref/millfork-benchmarks/sieve-kc.log
@@ -1123,8 +1123,8 @@ Allocated (was zp[2]:18) zp[2]:10 [ Ticks#1 print_uint::w#0 ]
 
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="sieve-kc.prg", type="prg", segments="Program"]
@@ -1766,8 +1766,8 @@ FINAL ASSEMBLER
 Score: 6485
 
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="sieve-kc.prg", type="prg", segments="Program"]
diff --git a/src/test/ref/min-fmul-16.asm b/src/test/ref/min-fmul-16.asm
index 996eaf48d..eeaf422bc 100644
--- a/src/test/ref/min-fmul-16.asm
+++ b/src/test/ref/min-fmul-16.asm
@@ -1,5 +1,5 @@
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Commodore 64 PRG executable file
 .file [name="min-fmul-16.prg", type="prg", segments="Program"]
 .segmentdef Program [segments="Basic, Code, Data"]
diff --git a/src/test/ref/min-fmul-16.log b/src/test/ref/min-fmul-16.log
index 7031421e6..58cf5f3d1 100644
--- a/src/test/ref/min-fmul-16.log
+++ b/src/test/ref/min-fmul-16.log
@@ -1281,8 +1281,8 @@ Allocated (was zp[4]:22) zp[4]:14 [ mulf16u::return#0 main::r#0 mulf16u::return#
 
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="min-fmul-16.prg", type="prg", segments="Program"]
@@ -2012,8 +2012,8 @@ FINAL ASSEMBLER
 Score: 4335
 
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="min-fmul-16.prg", type="prg", segments="Program"]
diff --git a/src/test/ref/multiply-16bit-const.asm b/src/test/ref/multiply-16bit-const.asm
index 14a01de80..ee3cac085 100644
--- a/src/test/ref/multiply-16bit-const.asm
+++ b/src/test/ref/multiply-16bit-const.asm
@@ -1,5 +1,5 @@
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Commodore 64 PRG executable file
 .file [name="multiply-16bit-const.prg", type="prg", segments="Program"]
 .segmentdef Program [segments="Basic, Code, Data"]
diff --git a/src/test/ref/multiply-16bit-const.log b/src/test/ref/multiply-16bit-const.log
index 3324b89c4..80e50b4cc 100644
--- a/src/test/ref/multiply-16bit-const.log
+++ b/src/test/ref/multiply-16bit-const.log
@@ -1611,8 +1611,8 @@ Allocated (was zp[4]:65) zp[4]:19 [ ultoa::digit_value#0 ultoa_append::sub#0 ]
 
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="multiply-16bit-const.prg", type="prg", segments="Program"]
@@ -2442,8 +2442,8 @@ FINAL ASSEMBLER
 Score: 115473
 
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="multiply-16bit-const.prg", type="prg", segments="Program"]
diff --git a/src/test/ref/printmsg.asm b/src/test/ref/printmsg.asm
index 94af783ec..ba17519f5 100644
--- a/src/test/ref/printmsg.asm
+++ b/src/test/ref/printmsg.asm
@@ -1,5 +1,5 @@
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Commodore 64 PRG executable file
 .file [name="printmsg.prg", type="prg", segments="Program"]
 .segmentdef Program [segments="Basic, Code, Data"]
diff --git a/src/test/ref/printmsg.log b/src/test/ref/printmsg.log
index d44871b67..09dfdbd33 100644
--- a/src/test/ref/printmsg.log
+++ b/src/test/ref/printmsg.log
@@ -500,8 +500,8 @@ Uplifting [main] best 1105 combination
 
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="printmsg.prg", type="prg", segments="Program"]
@@ -792,8 +792,8 @@ FINAL ASSEMBLER
 Score: 934
 
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="printmsg.prg", type="prg", segments="Program"]
diff --git a/src/test/ref/sinus-basic.asm b/src/test/ref/sinus-basic.asm
index e24fa012d..d5632bf45 100644
--- a/src/test/ref/sinus-basic.asm
+++ b/src/test/ref/sinus-basic.asm
@@ -1,5 +1,5 @@
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Commodore 64 PRG executable file
 .file [name="sinus-basic.prg", type="prg", segments="Program"]
 .segmentdef Program [segments="Basic, Code, Data"]
diff --git a/src/test/ref/sinus-basic.log b/src/test/ref/sinus-basic.log
index 60d7520d8..d9b8a8125 100644
--- a/src/test/ref/sinus-basic.log
+++ b/src/test/ref/sinus-basic.log
@@ -1276,8 +1276,8 @@ Allocated (was zp[2]:15) zp[2]:7 [ getFAC::return#2 print_uint::w#0 getFAC::retu
 
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="sinus-basic.prg", type="prg", segments="Program"]
@@ -2031,8 +2031,8 @@ FINAL ASSEMBLER
 Score: 4961
 
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="sinus-basic.prg", type="prg", segments="Program"]
diff --git a/src/test/ref/struct-ptr-26.asm b/src/test/ref/struct-ptr-26.asm
index 55281f695..ebad8a1b3 100644
--- a/src/test/ref/struct-ptr-26.asm
+++ b/src/test/ref/struct-ptr-26.asm
@@ -1,5 +1,5 @@
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Commodore 64 PRG executable file
 .file [name="struct-ptr-26.prg", type="prg", segments="Program"]
 .segmentdef Program [segments="Basic, Code, Data"]
diff --git a/src/test/ref/struct-ptr-26.log b/src/test/ref/struct-ptr-26.log
index 29ba5e25b..8b939c61b 100644
--- a/src/test/ref/struct-ptr-26.log
+++ b/src/test/ref/struct-ptr-26.log
@@ -466,8 +466,8 @@ Allocated (was zp[2]:6) zp[2]:4 [ main::uSize#1 print_uint::w#0 ]
 
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="struct-ptr-26.prg", type="prg", segments="Program"]
@@ -673,8 +673,8 @@ FINAL ASSEMBLER
 Score: 161
 
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="struct-ptr-26.prg", type="prg", segments="Program"]
diff --git a/src/test/ref/test-comparisons.asm b/src/test/ref/test-comparisons.asm
index b50f0f7fb..37eedf013 100644
--- a/src/test/ref/test-comparisons.asm
+++ b/src/test/ref/test-comparisons.asm
@@ -1,5 +1,5 @@
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Commodore 64 PRG executable file
 .file [name="test-comparisons.prg", type="prg", segments="Program"]
 .segmentdef Program [segments="Basic, Code, Data"]
diff --git a/src/test/ref/test-comparisons.log b/src/test/ref/test-comparisons.log
index 883ee9b03..1f6e2de28 100644
--- a/src/test/ref/test-comparisons.log
+++ b/src/test/ref/test-comparisons.log
@@ -3537,8 +3537,8 @@ Allocated (was zp[1]:39) zp[1]:12 [ main::b#0 ]
 
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="test-comparisons.prg", type="prg", segments="Program"]
@@ -5323,8 +5323,8 @@ FINAL ASSEMBLER
 Score: 15209
 
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="test-comparisons.prg", type="prg", segments="Program"]
diff --git a/src/test/ref/test-division.asm b/src/test/ref/test-division.asm
index dfcff4c6f..4c0b89105 100644
--- a/src/test/ref/test-division.asm
+++ b/src/test/ref/test-division.asm
@@ -1,4 +1,6 @@
 // Test the binary division library
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Commodore 64 PRG executable file
 .file [name="test-division.prg", type="prg", segments="Program"]
 .segmentdef Program [segments="Basic, Code, Data"]
diff --git a/src/test/ref/test-division.log b/src/test/ref/test-division.log
index 716e4b669..99bc7d9f2 100644
--- a/src/test/ref/test-division.log
+++ b/src/test/ref/test-division.log
@@ -5126,6 +5126,8 @@ Allocated (was zp[1]:86) zp[1]:22 [ divr8u::divisor#0 ]
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
 // Test the binary division library
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="test-division.prg", type="prg", segments="Program"]
@@ -7480,6 +7482,8 @@ Score: 31445
 
   // File Comments
 // Test the binary division library
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="test-division.prg", type="prg", segments="Program"]
diff --git a/src/test/ref/test-lowhigh.asm b/src/test/ref/test-lowhigh.asm
index 72823776d..2dbdc10d6 100644
--- a/src/test/ref/test-lowhigh.asm
+++ b/src/test/ref/test-lowhigh.asm
@@ -1,5 +1,5 @@
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Commodore 64 PRG executable file
 .file [name="test-lowhigh.prg", type="prg", segments="Program"]
 .segmentdef Program [segments="Basic, Code, Data"]
diff --git a/src/test/ref/test-lowhigh.log b/src/test/ref/test-lowhigh.log
index efb7fe1c7..93e3fe2e2 100644
--- a/src/test/ref/test-lowhigh.log
+++ b/src/test/ref/test-lowhigh.log
@@ -1391,8 +1391,8 @@ Allocated (was zp[2]:44) zp[2]:22 [ main::$28 ]
 
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="test-lowhigh.prg", type="prg", segments="Program"]
@@ -2143,8 +2143,8 @@ FINAL ASSEMBLER
 Score: 8692
 
   // File Comments
-// Print a number of zero-terminated strings, each followed by a newline.
-// The sequence of lines is terminated by another zero.
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="test-lowhigh.prg", type="prg", segments="Program"]
diff --git a/src/test/ref/test-multiply-16bit.asm b/src/test/ref/test-multiply-16bit.asm
index cd38fb733..eab1c64bf 100644
--- a/src/test/ref/test-multiply-16bit.asm
+++ b/src/test/ref/test-multiply-16bit.asm
@@ -1,4 +1,6 @@
 // Test the fast multiplication library
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Commodore 64 PRG executable file
 .file [name="test-multiply-16bit.prg", type="prg", segments="Program"]
 .segmentdef Program [segments="Basic, Code, Data"]
diff --git a/src/test/ref/test-multiply-16bit.log b/src/test/ref/test-multiply-16bit.log
index be8200a55..2ce4bf296 100644
--- a/src/test/ref/test-multiply-16bit.log
+++ b/src/test/ref/test-multiply-16bit.log
@@ -5430,6 +5430,8 @@ Allocated (was zp[2]:218) zp[2]:28 [ mulf16s::$9 mulf16s::$12 muls16s::j#2 muls1
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
 // Test the fast multiplication library
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="test-multiply-16bit.prg", type="prg", segments="Program"]
@@ -8063,8 +8065,8 @@ Replacing jump to rts with rts in jmp __b1
 Succesful ASM optimization Pass5DoubleJumpElimination
 Removing instruction __b1:
 Succesful ASM optimization Pass5UnusedLabelElimination
-Fixing long branch [237] bne __b1 to beq
-Fixing long branch [354] bne __b1 to beq
+Fixing long branch [239] bne __b1 to beq
+Fixing long branch [356] bne __b1 to beq
 
 FINAL SYMBOL TABLE
 const byte* BG_COLOR = (byte*) 53281
@@ -8416,6 +8418,8 @@ Score: 464677
 
   // File Comments
 // Test the fast multiplication library
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="test-multiply-16bit.prg", type="prg", segments="Program"]
diff --git a/src/test/ref/test-multiply-8bit.asm b/src/test/ref/test-multiply-8bit.asm
index f8ba8307a..94d6a1e13 100644
--- a/src/test/ref/test-multiply-8bit.asm
+++ b/src/test/ref/test-multiply-8bit.asm
@@ -1,4 +1,6 @@
 // Test the fast multiplication library
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Commodore 64 PRG executable file
 .file [name="test-multiply-8bit.prg", type="prg", segments="Program"]
 .segmentdef Program [segments="Basic, Code, Data"]
diff --git a/src/test/ref/test-multiply-8bit.log b/src/test/ref/test-multiply-8bit.log
index 0450181f3..5527b3e6f 100644
--- a/src/test/ref/test-multiply-8bit.log
+++ b/src/test/ref/test-multiply-8bit.log
@@ -5533,6 +5533,8 @@ Allocated (was zp[1]:116) zp[1]:18 [ mulf8s_prepared::b#0 ]
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
 // Test the fast multiplication library
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="test-multiply-8bit.prg", type="prg", segments="Program"]
@@ -8465,6 +8467,8 @@ Score: 231672
 
   // File Comments
 // Test the fast multiplication library
+// A lightweight library for printing on the C64.
+// Printing with this library is done by calling print_ function for each element
   // Upstart
   // Commodore 64 PRG executable file
 .file [name="test-multiply-8bit.prg", type="prg", segments="Program"]