Index: scconfig/Rev.h
===================================================================
--- scconfig/Rev.h	(revision 36561)
+++ scconfig/Rev.h	(revision 36562)
@@ -1 +1 @@
-static const int myrev = 36322;
+static const int myrev = 36562;
Index: scconfig/Rev.tab
===================================================================
--- scconfig/Rev.tab	(revision 36561)
+++ scconfig/Rev.tab	(revision 36562)
@@ -1,3 +1,4 @@
+36562	configure	font engine rewrite
 36322	configure	generalize export_lpr so it can be moved to librnd
 36311	configure	export dialog generalization so that the code can be moved for librnd
 36279	configure	export plugin generalization for librnd
Index: src/Makefile.in
===================================================================
--- src/Makefile.in	(revision 36561)
+++ src/Makefile.in	(revision 36562)
@@ -69,6 +69,7 @@
 	extobj_act.o
 	font.o
 	font_act.o
+	font_rnd.o
 	file_act.o
 	find.o
 	flag.o
Index: src/font.c
===================================================================
--- src/font.c	(revision 36561)
+++ src/font.c	(revision 36562)
@@ -34,9 +34,8 @@
 #include <string.h>
 #include <genht/hash.h>
 
-#include <rnd_inclib/font/vtgla.c>
-#include <rnd_inclib/font/xform_mx.c>
-#include <rnd_inclib/font/font.c>
+#include <rnd_inclib/font/xform_mx.h>
+#include <rnd_inclib/font/font.h>
 
 #include "font.h"
 #include "board.h"
Index: src/font_rnd.c
===================================================================
--- src/font_rnd.c	(nonexistent)
+++ src/font_rnd.c	(revision 36562)
@@ -0,0 +1,4 @@
+/* Temporary solution for compiling the new font code before it is moved to librnd */
+#include <rnd_inclib/font/vtgla.c>
+#include <rnd_inclib/font/xform_mx.c>
+#include <rnd_inclib/font/font.c>