diff -r -ubBw giraffe-1.0.0-alpha.12.org/Makefile giraffe-1.0.0-alpha.12/Makefile
--- giraffe-1.0.0-alpha.12.org/Makefile	2022-11-26 19:55:26
+++ giraffe-1.0.0-alpha.12/Makefile	2022-11-26 23:40:47
@@ -194,7 +194,7 @@
 # are prefixed by '.' and, therefore, so is its result.
 #
 $(POLYML_VARIANT_SRC_FILES) :
-	ln -sf $(notdir $@)$(call find-ceil,version-sort,.$(POLYML_VERSION_SUFFIX),$(suffix $(wildcard $@.*))) $@
+	ln -sf $(notdir $@).default $@
 
 sml-polyml : $(POLYML_VARIANT_SRC_FILES)
 else
diff -r -ubBw giraffe-1.0.0-alpha.12.org/src/polyml/giraffe-cairo-1.0.c giraffe-1.0.0-alpha.12/src/polyml/giraffe-cairo-1.0.c
--- giraffe-1.0.0-alpha.12.org/src/polyml/giraffe-cairo-1.0.c	2022-11-26 19:55:26
+++ giraffe-1.0.0-alpha.12/src/polyml/giraffe-cairo-1.0.c	2022-11-26 18:14:21
@@ -11,7 +11,7 @@
 
 #include <string.h>
 #include <glib.h>
-#include <cairo/cairo.h>
+#include <cairo.h>
 
 #include "giraffe.c"
 #include "cairo-1.0/giraffe.c"
diff -r -ubBw giraffe-1.0.0-alpha.12.org/src/polyml/giraffe-gio-2.0.c giraffe-1.0.0-alpha.12/src/polyml/giraffe-gio-2.0.c
--- giraffe-1.0.0-alpha.12.org/src/polyml/giraffe-gio-2.0.c	2022-11-26 19:55:26
+++ giraffe-1.0.0-alpha.12/src/polyml/giraffe-gio-2.0.c	2022-11-26 18:18:38
@@ -10,7 +10,6 @@
  */
 
 #include <string.h>
-#include <gio/gdesktopappinfo.h>
 #include <gio/gfiledescriptorbased.h>
 #include <gio/gio.h>
 #include <gio/gunixconnection.h>
diff -r -ubBw giraffe-1.0.0-alpha.12.org/src/polyml/giraffe-harfbuzz-0.0.c giraffe-1.0.0-alpha.12/src/polyml/giraffe-harfbuzz-0.0.c
--- giraffe-1.0.0-alpha.12.org/src/polyml/giraffe-harfbuzz-0.0.c	2022-11-26 19:55:26
+++ giraffe-1.0.0-alpha.12/src/polyml/giraffe-harfbuzz-0.0.c	2022-11-26 18:19:38
@@ -11,7 +11,7 @@
 
 #include <string.h>
 #include <glib.h>
-#include <harfbuzz/hb-ot.h>
+#include <hb-ot.h>
 
 #ifndef HB_CHECK_VERSION
 #define HB_CHECK_VERSION(major,minor,micro) \