diff --git a/command.c b/command.c
index 355e2bdf..aad2302a 100644
--- a/command.c
+++ b/command.c
@@ -24,7 +24,6 @@ extern int erase_char, erase2_char, kill_char;
 extern int sigs;
 extern int quit_if_one_screen;
 extern int one_screen;
-extern int squished;
 extern int sc_width;
 extern int sc_height;
 extern char *kent;
@@ -39,10 +38,7 @@ extern int hshift;
 extern int bs_mode;
 extern int proc_backspace;
 extern int show_attn;
-extern int status_col;
 extern POSITION highest_hilite;
-extern POSITION start_attnpos;
-extern POSITION end_attnpos;
 extern char *every_first_cmd;
 extern char version[];
 extern struct scrpos initial_scrpos;
@@ -50,18 +46,15 @@ extern IFILE curr_ifile;
 extern void *ml_search;
 extern void *ml_examine;
 extern int wheel_lines;
-extern int header_lines;
 extern int def_search_type;
 extern int updown_match;
 #if SHELL_ESCAPE || PIPEC
 extern void *ml_shell;
 #endif
 #if EDITOR
-extern char *editor;
 extern char *editproto;
 #endif
 extern int shift_count;
-extern int oldbot;
 extern int forw_prompt;
 extern int incr_search;
 extern int full_screen;
diff --git a/edit.c b/edit.c
index 6ca7b22e..4ec8ef09 100644
--- a/edit.c
+++ b/edit.c
@@ -23,7 +23,6 @@
 public int fd0 = 0;
 
 extern int new_file;
-extern int cbufs;
 extern char *every_first_cmd;
 extern int force_open;
 extern int is_tty;
diff --git a/forwback.c b/forwback.c
index 4ff66068..e89e2090 100644
--- a/forwback.c
+++ b/forwback.c
@@ -31,8 +31,6 @@ extern int plusoption;
 extern int forw_scroll;
 extern int back_scroll;
 extern int ignore_eoi;
-extern int clear_bg;
-extern int final_attr;
 extern int header_lines;
 extern int header_cols;
 extern int full_screen;
diff --git a/input.c b/input.c
index c56af3e5..5974faa4 100644
--- a/input.c
+++ b/input.c
@@ -22,7 +22,6 @@
 extern int squeeze;
 extern int hshift;
 extern int quit_if_one_screen;
-extern int sigs;
 extern int ignore_eoi;
 extern int status_col;
 extern int wordwrap;
diff --git a/line.c b/line.c
index eab288dc..0e2b510a 100644
--- a/line.c
+++ b/line.c
@@ -87,7 +87,6 @@ extern int proc_return;
 extern int linenums;
 extern int ctldisp;
 extern int twiddle;
-extern int binattr;
 extern int status_col;
 extern int status_col_width;
 extern int linenum_width;
diff --git a/main.c b/main.c
index 3fcd57be..e0410ac6 100644
--- a/main.c
+++ b/main.c
@@ -57,7 +57,6 @@ public int      one_screen;
 extern int      less_is_more;
 extern int      missing_cap;
 extern int      know_dumb;
-extern int      pr_type;
 extern int      quit_if_one_screen;
 extern int      no_init;
 extern int      errmsgs;
diff --git a/optfunc.c b/optfunc.c
index 450e2567..3d560bec 100644
--- a/optfunc.c
+++ b/optfunc.c
@@ -27,7 +27,6 @@
 #include "less.h"
 #include "option.h"
 
-extern int nbufs;
 extern int bufspace;
 extern int pr_type;
 extern int plusoption;
@@ -36,7 +35,6 @@ extern int sc_width;
 extern int sc_height;
 extern int secure;
 extern int dohelp;
-extern int is_tty;
 extern char openquote;
 extern char closequote;
 extern char *prproto[];
@@ -79,6 +77,7 @@ extern char ztags[];
 #endif
 #if LESSTEST
 extern char *ttyin_name;
+extern int is_tty;
 #endif /*LESSTEST*/
 #if MSDOS_COMPILER
 extern int nm_fg_color, nm_bg_color;
diff --git a/position.c b/position.c
index c4d554f3..71c42e16 100644
--- a/position.c
+++ b/position.c
@@ -25,7 +25,6 @@ static POSITION *table = NULL;  /* The position table */
 static int table_size = 0;
 
 extern int sc_width, sc_height;
-extern int header_lines;
 extern int hshift;
 
 /*
diff --git a/prompt.c b/prompt.c
index 01265c27..b7ecc874 100644
--- a/prompt.c
+++ b/prompt.c
@@ -22,8 +22,6 @@
 
 extern int pr_type;
 extern int new_file;
-extern int sc_width;
-extern int so_s_width, so_e_width;
 extern int linenums;
 extern int hshift;
 extern int sc_height;
diff --git a/screen.c b/screen.c
index 8ef2aff5..1dcb1ce8 100644
--- a/screen.c
+++ b/screen.c
@@ -279,11 +279,8 @@ char PC_, *UP, *BC;
 extern int quiet;               /* If VERY_QUIET, use visual bell for bell */
 extern int no_vbell;
 extern int no_back_scroll;
-extern int swindow;
 extern int no_init;
 extern int no_keypad;
-extern int sigs;
-extern int wscroll;
 extern int top_scroll;
 extern int quit_if_one_screen;
 extern int oldbot;
@@ -294,6 +291,7 @@ extern int use_color;
 extern int hilite_search;
 #endif
 #if MSDOS_COMPILER==WIN32C
+extern int wscroll;
 extern HANDLE tty;
 extern DWORD console_mode;
 #ifndef ENABLE_EXTENDED_FLAGS
diff --git a/search.c b/search.c
index adebd141..7e5b343f 100644
--- a/search.c
+++ b/search.c
@@ -23,7 +23,6 @@ extern int sigs;
 extern int how_search;
 extern int caseless;
 extern int linenums;
-extern int sc_height;
 extern int jump_sline;
 extern int bs_mode;
 extern int proc_backspace;
diff --git a/signal.c b/signal.c
index d3c67023..bfbc32bd 100644
--- a/signal.c
+++ b/signal.c
@@ -27,7 +27,6 @@
 public int sigs;
 
 extern int sc_width, sc_height;
-extern int lnloop;
 extern int linenums;
 extern int wscroll;
 extern int reading;
diff --git a/ttyin.c b/ttyin.c
index 96486f53..78447144 100644
--- a/ttyin.c
+++ b/ttyin.c
@@ -31,9 +31,6 @@ public int tty;
 #if LESSTEST
 public char *ttyin_name = NULL;
 #endif /*LESSTEST*/
-extern int sigs;
-extern int utf_mode;
-extern int wheel_lines;
 
 #if !MSDOS_COMPILER
 static int open_tty_device(constant char* dev)