***************
*** 486,492 ****
  	long checksum;			/* checksum */
  	unsigned short timestamp;	/* for LRU management of fonts */
  	ubyte flags;			/* flags byte (see values below) */
- #ifdef Omega
  	wide_ubyte maxchar;			/* largest character code */
  #else
  	ubyte maxchar;			/* largest character code */
--- 540,546 ----
  	long checksum;			/* checksum */
  	unsigned short timestamp;	/* for LRU management of fonts */
  	ubyte flags;			/* flags byte (see values below) */
+ #if defined(Omega) || defined(KANJI)
  	wide_ubyte maxchar;			/* largest character code */
  #else
  	ubyte maxchar;			/* largest character code */
***************
*** 498,503 ****
  	struct glyph *glyph;
  		/* these fields are used by (loaded) virtual fonts */
  	struct font **vf_table;		/* list of fonts used by this vf */
  	struct tn *vf_chain;		/* ditto, if TeXnumber >= VFTABLELEN */
  	struct font *first_font;	/* first font defined */
  	struct macro *macro;
--- 552,570 ----
  	struct glyph *glyph;
  		/* these fields are used by (loaded) virtual fonts */
  	struct font **vf_table;		/* list of fonts used by this vf */
+ #if	defined(KANJI) && !defined(ASCIIDNP)
+ 	struct glyph **kglyph;
+ #ifdef	USE_ZEIT
+ 	int vf;
+ #ifdef	NTTZEIT
+ 	int index;
+ #endif	/* NTTZEIT */
+ #endif	/* USE_ZEIT */
+ #endif	/* KANJI && !ASCIIDNP */
+ #ifdef PTEX
+ 	int dir;
+ 	int tate;
+ #endif
  	struct tn *vf_chain;		/* ditto, if TeXnumber >= VFTABLELEN */
  	struct font *first_font;	/* first font defined */
  	struct macro *macro;
***************
*** 905,914 ****
  #endif /* GRID */
  #ifndef	TEXXET
  extern	long	set_char ARGS((wide_ubyte));
  extern	long	load_n_set_char ARGS((wide_ubyte));
  extern	long	set_vf_char ARGS((wide_ubyte));
  #else
  extern	void	set_char ARGS((wide_ubyte, wide_ubyte));
  extern	void	load_n_set_char ARGS((wide_ubyte, wide_ubyte));
  extern	void	set_vf_char ARGS((wide_ubyte, wide_ubyte));
  #endif
--- 1061,1076 ----
  #endif /* GRID */
  #ifndef	TEXXET
  extern	long	set_char ARGS((wide_ubyte));
+ #if	defined(KANJI) && !defined(ASCIIDNP)
+ extern	long	set_char2 ARGS((wide_ubyte));
+ #endif	/* KANJI && !ASCIIDNP */
  extern	long	load_n_set_char ARGS((wide_ubyte));
  extern	long	set_vf_char ARGS((wide_ubyte));
  #else
  extern	void	set_char ARGS((wide_ubyte, wide_ubyte));
+ #if	defined(KANJI) && !defined(ASCIIDNP)
+ extern	void	set_char2 ARGS((wide_ubyte, wide_ubyte));
+ #endif	/* KANJI && !ASCIIDNP */
  extern	void	load_n_set_char ARGS((wide_ubyte, wide_ubyte));
  extern	void	set_vf_char ARGS((wide_ubyte, wide_ubyte));
  #endif