Index: uspace/lib/gfxfont/private/font.h
===================================================================
--- uspace/lib/gfxfont/private/font.h	(revision 313ac8e5226a24618b305138fc1a126ba71dc2e7)
+++ uspace/lib/gfxfont/private/font.h	(revision d145ecbb23dd631ab7c9bcf5f13b55867dd2dac9)
@@ -44,4 +44,5 @@
 #include <types/gfx/font.h>
 #include <types/gfx/typeface.h>
+#include <riff/chunk.h>
 
 /** Font
@@ -85,4 +86,5 @@
 extern errno_t gfx_font_splice_at_glyph(gfx_font_t *, gfx_glyph_t *,
     gfx_rect_t *);
+extern errno_t gfx_font_save(gfx_font_info_t *, riffw_t *);
 
 #endif
Index: uspace/lib/gfxfont/private/glyph.h
===================================================================
--- uspace/lib/gfxfont/private/glyph.h	(revision 313ac8e5226a24618b305138fc1a126ba71dc2e7)
+++ uspace/lib/gfxfont/private/glyph.h	(revision d145ecbb23dd631ab7c9bcf5f13b55867dd2dac9)
@@ -41,4 +41,5 @@
 #include <gfx/coord.h>
 #include <types/gfx/glyph.h>
+#include <riff/chunk.h>
 
 /** Glyph
@@ -76,4 +77,5 @@
 extern errno_t gfx_glyph_transfer(gfx_glyph_t *, gfx_coord_t, gfx_bitmap_t *,
     gfx_rect_t *);
+extern errno_t gfx_glyph_save(gfx_glyph_t *, riffw_t *);
 
 #endif
Index: uspace/lib/gfxfont/private/tpf_file.h
===================================================================
--- uspace/lib/gfxfont/private/tpf_file.h	(revision d145ecbb23dd631ab7c9bcf5f13b55867dd2dac9)
+++ uspace/lib/gfxfont/private/tpf_file.h	(revision d145ecbb23dd631ab7c9bcf5f13b55867dd2dac9)
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2020 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup libgfxfont
+ * @{
+ */
+/**
+ * @file TPF file definitions
+ *
+ */
+
+#ifndef _GFX_PRIVATE_TPF_FILE_H
+#define _GFX_PRIVATE_TPF_FILE_H
+
+enum {
+	/** Typeface RIFF format ID */
+	FORM_TPFC = 0x43465054,
+
+	/** Font list type */
+	LTYPE_font = 0x746e6f66,
+
+	/** Font properties chunk ID */
+	CKID_fprp = 0x70727066,
+	/** Font metrics chunk ID */
+	CKID_fmtr = 0x72746d66,
+	/** Font bitmap chunk ID */
+	CKID_fbmp = 0x706d6266,
+
+	/** Glyph list type */
+	LTYPE_glph = 0x68706c67,
+
+	/** Glyph metrics chunk ID */
+	CKID_gmtr = 0x72746d67,
+	/** Glyph patterns chunk ID */
+	CKID_gpat = 0x74617067,
+	/** Glyph rectangle/origin chunk ID */
+	CKID_gror = 0x726f7267
+};
+
+#endif
+
+/** @}
+ */