diff --git a/inc/lspglob.h b/inc/lspglob.h
index 62ce09b..4d0a41e 100755
--- a/inc/lspglob.h
+++ b/inc/lspglob.h
@@ -168,6 +168,31 @@ extern int UnixPipeIn;
 extern int UnixPipeOut;
 extern int UnixPID;
 
+/* Interrupt frame calls */
+extern LispPTR DOBUFFEREDTRANSITION_index;
+extern LispPTR INTERRUPTFRAME_index;
+extern LispPTR PERIODIC_INTERRUPTFRAME_index;
+extern LispPTR DORECLAIM_index;
+
+/* BITBLT related atoms */
+extern LispPTR BITBLTBITMAP_index;
+extern LispPTR BLTSHADEBITMAP_index;
+extern LispPTR BLTCHAR_index;
+extern LispPTR TEDIT_BLTCHAR_index;
+#ifdef COLOR
+extern LispPTR SLOWBLTCHAR_index;
+extern LispPTR COLORSCREEN_index;
+#endif
+
+/* BITBLT operation atoms */
+extern DLword TEXTURE_atom;
+extern DLword MERGE_atom;
+extern DLword INPUT_atom;
+extern DLword INVERT_atom;
+extern DLword ERASE_atom;
+extern DLword PAINT_atom;
+extern DLword REPLACE_atom;
+
 /* Atom index for IL:\MVLIST, for the VALUES opcode */
 extern LispPTR MVLIST_index;
 
diff --git a/src/bbtsub.c b/src/bbtsub.c
index 3e28121..af9d555 100644
--- a/src/bbtsub.c
+++ b/src/bbtsub.c
@@ -281,13 +281,6 @@ extern int ScreenLocked; /* for mouse tracking */
 
 extern struct pixrect *SrcePixRect, *DestPixRect, *TexturePixRect;
 extern struct pixrect *BlackTexturePixRect, *WhiteTexturePixRect;
-extern DLword TEXTURE_atom;
-extern DLword MERGE_atom;
-extern DLword INPUT_atom;
-extern DLword INVERT_atom;
-extern DLword ERASE_atom;
-extern DLword PAINT_atom;
-extern DLword REPLACE_atom;
 
 /************************************************************************/
 /*                                                                      */
@@ -633,8 +626,6 @@ LispPTR bitblt_bitmap(LispPTR *args) {
   DLword *srcbase, *dstbase;
   int dlx, dty, slx, sty, srcbpl, dstbpl, op, src_comp, backwardflg = 0, displayflg = 0;
 
-  extern DLword MERGE_atom;
-
 #ifdef INIT
   init_kbd_startup;
 #endif
diff --git a/src/initsout.c b/src/initsout.c
index 1f6151c..8ceeebc 100644
--- a/src/initsout.c
+++ b/src/initsout.c
@@ -366,8 +366,6 @@ void init_for_keyhandle(void) {
   extern DLword *CTopKeyevent;
   extern LispPTR *KEYBOARDEVENTQUEUE68k;
   extern LispPTR *KEYBUFFERING68k;
-  extern LispPTR DOBUFFEREDTRANSITION_index;
-  extern LispPTR INTERRUPTFRAME_index;
   extern LispPTR *TIMER_INTERRUPT_PENDING68k;
   extern LispPTR *PENDINGINTERRUPT68k;
   extern LispPTR *MOUSECHORDTICKS68k;
@@ -387,8 +385,6 @@ void init_for_keyhandle(void) {
 
   extern LispPTR *PERIODIC_INTERRUPT68k;
   extern LispPTR *PERIODIC_INTERRUPT_FREQUENCY68k;
-  extern LispPTR PERIODIC_INTERRUPTFRAME_index;
-  extern LispPTR DORECLAIM_index;
   extern LispPTR *IOINTERRUPTFLAGS_word;
 
   CURSORDESTHEIGHT68k = MakeAtom68k("\\CURSORDESTHEIGHT");
@@ -443,14 +439,9 @@ void init_for_bltchar(void) {
   char *IL;
 
   extern LispPTR *TOPWDS68k;
-  extern LispPTR BLTCHAR_index;
-  extern LispPTR TEDIT_BLTCHAR_index;
-
 #ifdef COLOR
   extern LispPTR *SCREENBITMAPS68k;
-  extern LispPTR SLOWBLTCHAR_index;
   extern LispPTR *COLORSCREEN68k; /*  \\COLORSCREEN */
-  extern LispPTR COLORSCREEN_index;
 #endif
   IL = "INTERLISP";
 
@@ -482,11 +473,8 @@ void init_for_bltchar(void) {
 /************************************************************************/
 
 void init_for_bitblt(void) {
-  extern LispPTR BITBLTBITMAP_index;
-  extern LispPTR BLTSHADEBITMAP_index;
 #ifdef COLOR
   extern LispPTR *COLORSCREEN68k;
-  extern LispPTR COLORSCREEN_index;
 #endif /* COLOR */
 
   if (!for_makeinit) {
diff --git a/src/lineblt8.c b/src/lineblt8.c
index d10056a..cee572e 100644
--- a/src/lineblt8.c
+++ b/src/lineblt8.c
@@ -12,6 +12,7 @@
 
 #include <sys/types.h>
 #include "lispemul.h"
+#include "lspglob.h"
 #include "lineblt8defs.h"
 #include "commondefs.h"
 
@@ -146,12 +147,6 @@ void lineBlt8(DLword *srcbase, int offset, u_char *destl, int width,
   static unsigned char beforecolor1 = 0;
   static int color_array[COLOR8ARRAYSIZE];
 
-  extern DLword REPLACE_atom;
-  extern DLword INPUT_atom;
-  extern DLword INVERT_atom;
-  extern DLword PAINT_atom;
-  extern DLword ERASE_atom;
-
   if (sourcetype == INVERT_atom) {
     int tempcol;
     tempcol = color0;
diff --git a/src/mnxmeth.c b/src/mnxmeth.c
index 922db21..b65f87a 100644
--- a/src/mnxmeth.c
+++ b/src/mnxmeth.c
@@ -59,11 +59,6 @@ extern char *sysout_name;
 extern int save_argc;
 extern char **save_argv;
 
-extern DLword INVERT_atom;
-extern DLword ERASE_atom;
-extern DLword PAINT_atom;
-extern DLword REPLACE_atom;
-
 extern const unsigned char reversedbits[];
 
 /**************************************************************/
diff --git a/src/picture.c b/src/picture.c
index 5014ff1..f278f2e 100644
--- a/src/picture.c
+++ b/src/picture.c
@@ -110,8 +110,6 @@
 #define VIDEOFILE_WRITE 67
 #define VIDEOFILE_POSITION 68
 
-extern DLword REPLACE_atom, INVERT_atom, PAINT_atom, ERASE_atom;
-
 #ifdef VIDEO
 extern int Video_OnOff_Flg;
 #endif /* VIDEO */
diff --git a/src/rawcolor.c b/src/rawcolor.c
index ce15095..9e2659e 100644
--- a/src/rawcolor.c
+++ b/src/rawcolor.c
@@ -503,8 +503,6 @@ void Uncolorize_Bitmap(LispPTR args[])
 /*									*/
 /************************************************************************/
 
-extern DLword INPUT_atom, REPLACE_atom;
-
 LispPTR Colorize_Bitmap(LispPTR args[])
 {
   BITMAP *s_bitmap, *d_bitmap;
@@ -584,7 +582,6 @@ bad_arg:
 
 void Draw_8BppColorLine(LispPTR *args)
 {
-  extern DLword REPLACE_atom, INVERT_atom, PAINT_atom, ERASE_atom;
   extern int ScreenLocked;
 
   u_char color;
diff --git a/src/xc.c b/src/xc.c
index 6580d59..357f4e3 100644
--- a/src/xc.c
+++ b/src/xc.c
@@ -1086,15 +1086,11 @@ check_interrupt:
     static int period_cnt = 60;
     extern int KBDEventFlg;
     extern int ETHEREventCount;
-    extern LispPTR DOBUFFEREDTRANSITION_index;
-    extern LispPTR INTERRUPTFRAME_index;
     extern LispPTR *KEYBUFFERING68k;
     extern LispPTR *PENDINGINTERRUPT68k;
     extern LispPTR ATOM_STARTED;
     extern LispPTR *PERIODIC_INTERRUPT68k;
     extern LispPTR *PERIODIC_INTERRUPT_FREQUENCY68k;
-    extern LispPTR PERIODIC_INTERRUPTFRAME_index;
-    extern LispPTR DORECLAIM_index;
     extern int URaid_req;
 
   /* Check for an Stack Overflow */