Index: rom/booter.c
===================================================================
--- rom/booter.c	(revision 39a696bd71d6ae6c71a378daf9b52b4be6f64983)
+++ rom/booter.c	(revision b28a12ef97b945387f5b106a616f46d89ccff6b6)
@@ -8,15 +8,5 @@
 #define	PRINTIT	1	/* define non-zero to get printf output from booter */
 
-#include "all.h"
-
-extern	int16_t	flread(int8_t *buff, int32_t len, FILE *fp);
-extern	int32_t	getl(FILE *stream);
-
-#if	PRINTIT
-extern	struct	fcb	*SnapFCB(struct fcb *fcp);
-extern	int16_t	ClusMap(struct fcb *fcp);
-
-extern	int16_t waitcr2(void);
-#endif
+#include "rom.h"
 
 static FILE	*B_file;		/* boot file pointer */
Index: rom/romp.c
===================================================================
--- rom/romp.c	(revision 39a696bd71d6ae6c71a378daf9b52b4be6f64983)
+++ rom/romp.c	(revision b28a12ef97b945387f5b106a616f46d89ccff6b6)
@@ -24,5 +24,5 @@
 #define	ONEMEG	1	/* 1 if 1024K, 0 if 512K RAM space (Buchla 700) */
 
-#include "all.h"
+#include "rom.h"
 
 /* 
@@ -99,110 +99,4 @@
 /*
    ============================================================================
-	external functions and forward references
-   ============================================================================
-*/
-
-extern	uint16_t	setipl(uint16_t arg);
-
-extern	void	rjumpto(void *addr);
-extern	void	halt(void);
-extern	void	sjumpto(void *addr, void *stack);
-extern	void	trap15(void);
-extern	void	xtrap15(void);
-
-#if	ON_B700
-extern	void	hdvini(void);
-extern	int16_t	booter(int8_t *fn, int32_t textadr);
-extern	void	vsndpal(int16_t pp[16][3]);
-#endif
-
-/* external variables */
-
-extern	int16_t	wzcrsh, *crshpc, *crshsp, *crshus, crshst[16];
-
-#if	ON_B700
-extern	int16_t	B_log_s;
-extern	int16_t	B_dbg_s;
-extern	int8_t	*B_buf_a;
-extern	int16_t	_bpbin;
-extern	int16_t	dfltpal[16][3];
-#endif
-
-extern	uint16_t	crshsr;
-extern	int32_t	crshrg[16];
-extern	int8_t	crshvc[4];
-
-/* forward references */
-
-int16_t	cp_dump(void);
-int16_t	cp_fill(void);
-int16_t	cp_copy(void);
-int16_t	cp_null(void);
-int16_t	cp_ilev(void);
-int16_t	cp_ldmp(void);
-int16_t	cp_go(void);
-int16_t	cp_read(void);
-int16_t	cp_mset(void);
-int16_t	cp_rset(void);
-int16_t	cp_wset(void);
-int16_t	cp_mtst(void);
-int16_t	cp_wdmp(void);
-int16_t	cp_wfil(void);
-int16_t	cp_vrst(void);
-int16_t	cp_monc(void);
-int16_t	cp_mons(void);
-int16_t	cp_monl(void);
-int16_t	cp_chek(void);
-
-#if	ON_B700
-int16_t	cx_dini(void);
-int16_t	cx_mlod(void);
-int16_t	cp_boot(void);
-int16_t	cx_boot(void);
-int16_t	cx_adsp(void);
-#endif
-
-int16_t	cx_dump(void);
-int16_t	cx_fill(void);
-int16_t	cx_copy(void);
-int16_t	cx_rset(void);
-int16_t	cx_load(void);
-int16_t	cx_go(void);
-int16_t	cx_read(void);
-int16_t	cx_help(void);
-void	cx_exit(void);
-int16_t	cx_writ(void);
-int16_t	cx_regs(void);
-int16_t	cx_mset(void);
-int16_t	cx_bpb(void);
-int16_t	cx_wset(void);
-int16_t	cx_wdmp(void);
-int16_t	cx_wfil(void);
-void	cx_rest(void);
-int16_t	cx_vrst(void);
-int16_t	cx_vreg(void);
-int16_t	cx_mon(void);
-int16_t	cx_next(void);
-int16_t	cx_ilev(void);
-int16_t	do_srec(int8_t *line);
-int16_t	cx_crsh(void);
-int16_t	cx_mtst(void);
-void	cx_zap(void);
-int16_t	cx_ldmp(void);
-int16_t	cx_omap(void);
-int16_t	cx_chek(void);
-
-extern	int16_t setjmp(struct JMP_BUF *env);
-extern	void longjmp(struct JMP_BUF *env, int16_t val);
-extern	void tsetup(void);
-
-extern	int8_t	hs_mtst[];
-
-/* 
-
-*/
-
-/*
-   ============================================================================
 	error message string definitions
    ============================================================================