diff --git a/Makefile b/Makefile
index c279864..1314f83 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-# Makefile for emacs, updated Wed, Oct 09, 2013  1:11:02 PM
+# Makefile for emacs, updated Wed, Oct 09, 2013  1:41:31 PM
 
 SRC=ansi.c basic.c bind.c bindable.c buffer.c crypt.c display.c ebind.c eval.c exec.c execute.c file.c fileio.c flook.c globals.c ibmpc.c input.c isearch.c line.c lock.c log.c main.c names.c pklock.c posix.c random.c region.c search.c spawn.c tcap.c termio.c utf8.c vmsvt.c vt52.c window.c word.c wrapper.c
 OBJ=ansi.o basic.o bind.o bindable.o buffer.o crypt.o display.o ebind.o eval.o exec.o execute.o file.o fileio.o flook.o globals.o ibmpc.o input.o isearch.o line.o lock.o log.o main.o names.o pklock.o posix.o random.o region.o search.o spawn.o tcap.o termio.o utf8.o vmsvt.o vt52.o window.o word.o wrapper.o
-HDR=basic.h bind.h bindable.h buffer.h crypt.h defines.h display.h ebind.h edef.h efunc.h estruct.h eval.h exec.h execute.h file.h fileio.h flook.h globals.h input.h isearch.h line.h lock.h log.h names.h pklock.h random.h region.h retcode.h search.h spawn.h terminal.h termio.h utf8.h version.h window.h word.h wrapper.h
+HDR=basic.h bind.h bindable.h buffer.h crypt.h defines.h display.h ebind.h efunc.h estruct.h eval.h exec.h execute.h file.h fileio.h flook.h globals.h input.h isearch.h line.h lock.h log.h names.h pklock.h random.h region.h retcode.h search.h spawn.h terminal.h termio.h utf8.h version.h window.h word.h wrapper.h
 
 # DO NOT ADD OR MODIFY ANY LINES ABOVE THIS -- make source creates them
 
@@ -126,83 +126,82 @@ depend: ${SRC}
 
 # DO NOT DELETE THIS LINE -- make depend uses it
 
-ansi.o: ansi.c estruct.h retcode.h edef.h globals.h
+ansi.o: ansi.c estruct.h retcode.h globals.h
 basic.o: basic.c basic.h buffer.h crypt.h line.h utf8.h display.h \
- estruct.h retcode.h edef.h globals.h input.h bind.h random.h terminal.h \
+ estruct.h retcode.h globals.h input.h bind.h random.h terminal.h \
  defines.h window.h
-bind.o: bind.c bind.h edef.h estruct.h retcode.h globals.h bindable.h \
- buffer.h crypt.h line.h utf8.h display.h ebind.h exec.h file.h flook.h \
- input.h names.h window.h defines.h
+bind.o: bind.c bind.h estruct.h retcode.h globals.h bindable.h buffer.h \
+ crypt.h line.h utf8.h display.h ebind.h exec.h file.h flook.h input.h \
+ names.h window.h defines.h
 bindable.o: bindable.c bindable.h defines.h buffer.h crypt.h line.h \
- utf8.h display.h edef.h estruct.h retcode.h globals.h file.h input.h \
- bind.h lock.h terminal.h
+ utf8.h display.h estruct.h retcode.h globals.h file.h input.h bind.h \
+ lock.h terminal.h
 buffer.o: buffer.c buffer.h crypt.h line.h utf8.h defines.h display.h \
- edef.h estruct.h retcode.h globals.h file.h input.h bind.h window.h
+ estruct.h retcode.h globals.h file.h input.h bind.h window.h
 crypt.o: crypt.c crypt.h
 display.o: display.c display.h buffer.h crypt.h line.h utf8.h estruct.h \
- retcode.h edef.h globals.h input.h bind.h termio.h terminal.h defines.h \
+ retcode.h globals.h input.h bind.h termio.h terminal.h defines.h \
  version.h wrapper.h window.h
-ebind.o: ebind.c ebind.h basic.h bind.h edef.h estruct.h retcode.h \
- globals.h bindable.h buffer.h crypt.h line.h utf8.h eval.h exec.h file.h \
- isearch.h random.h region.h search.h spawn.h window.h defines.h word.h
+ebind.o: ebind.c ebind.h basic.h bind.h estruct.h retcode.h globals.h \
+ bindable.h buffer.h crypt.h line.h utf8.h eval.h exec.h file.h isearch.h \
+ random.h region.h search.h spawn.h window.h defines.h word.h
 eval.o: eval.c eval.h basic.h bind.h buffer.h crypt.h line.h utf8.h \
- display.h estruct.h retcode.h edef.h globals.h exec.h execute.h flook.h \
- input.h random.h search.h terminal.h defines.h termio.h version.h \
- window.h
+ display.h estruct.h retcode.h globals.h exec.h execute.h flook.h input.h \
+ random.h search.h terminal.h defines.h termio.h version.h window.h
 exec.o: exec.c exec.h buffer.h crypt.h line.h utf8.h bind.h display.h \
- estruct.h retcode.h edef.h globals.h eval.h file.h flook.h input.h \
- window.h defines.h
-execute.o: execute.c execute.h edef.h estruct.h retcode.h globals.h \
- bind.h random.h display.h file.h crypt.h buffer.h line.h utf8.h \
- terminal.h defines.h window.h
+ estruct.h retcode.h globals.h eval.h file.h flook.h input.h window.h \
+ defines.h
+execute.o: execute.c execute.h estruct.h retcode.h globals.h bind.h \
+ random.h display.h file.h crypt.h buffer.h line.h utf8.h terminal.h \
+ defines.h window.h
 file.o: file.c file.h crypt.h retcode.h buffer.h line.h utf8.h defines.h \
- estruct.h edef.h globals.h execute.h fileio.h input.h bind.h lock.h \
- log.h window.h
+ estruct.h globals.h execute.h fileio.h input.h bind.h lock.h log.h \
+ window.h
 fileio.o: fileio.c fileio.h crypt.h retcode.h defines.h
 flook.o: flook.c flook.h retcode.h defines.h fileio.h crypt.h
 globals.o: globals.c globals.h defines.h retcode.h
-ibmpc.o: ibmpc.c estruct.h retcode.h edef.h globals.h
-input.o: input.c input.h bind.h edef.h estruct.h retcode.h globals.h \
- bindable.h display.h exec.h names.h terminal.h defines.h wrapper.h
+ibmpc.o: ibmpc.c estruct.h retcode.h globals.h
+input.o: input.c input.h bind.h estruct.h retcode.h globals.h bindable.h \
+ display.h exec.h names.h terminal.h defines.h wrapper.h
 isearch.o: isearch.c isearch.h basic.h buffer.h crypt.h line.h utf8.h \
- display.h estruct.h retcode.h edef.h globals.h input.h bind.h search.h \
+ display.h estruct.h retcode.h globals.h input.h bind.h search.h \
  terminal.h defines.h window.h
-line.o: line.c line.h utf8.h buffer.h crypt.h edef.h estruct.h retcode.h \
+line.o: line.c line.h utf8.h buffer.h crypt.h estruct.h retcode.h \
  globals.h log.h window.h defines.h
-lock.o: lock.c lock.h estruct.h retcode.h display.h edef.h globals.h \
- input.h bind.h
+lock.o: lock.c lock.h estruct.h retcode.h display.h globals.h input.h \
+ bind.h
 log.o: log.c log.h retcode.h
 main.o: main.c basic.h bind.h bindable.h buffer.h crypt.h line.h utf8.h \
- display.h edef.h estruct.h retcode.h globals.h eval.h execute.h file.h \
- input.h lock.h log.h random.h search.h terminal.h defines.h termio.h \
- version.h window.h
+ display.h estruct.h retcode.h globals.h eval.h execute.h file.h input.h \
+ lock.h log.h random.h search.h terminal.h defines.h termio.h version.h \
+ window.h
 names.o: names.c names.h basic.h bind.h bindable.h buffer.h crypt.h \
  line.h utf8.h display.h eval.h exec.h file.h retcode.h isearch.h \
  region.h random.h search.h spawn.h window.h defines.h word.h
-pklock.o: pklock.c pklock.h estruct.h retcode.h edef.h globals.h
+pklock.o: pklock.c pklock.h estruct.h retcode.h globals.h
 posix.o: posix.c termio.h
 random.o: random.c random.h basic.h buffer.h crypt.h line.h utf8.h \
- display.h estruct.h retcode.h edef.h globals.h execute.h input.h bind.h \
- log.h search.h terminal.h defines.h window.h
+ display.h estruct.h retcode.h globals.h execute.h input.h bind.h log.h \
+ search.h terminal.h defines.h window.h
 region.o: region.c region.h line.h utf8.h buffer.h crypt.h estruct.h \
- retcode.h edef.h globals.h log.h window.h defines.h
+ retcode.h globals.h log.h window.h defines.h
 search.o: search.c search.h line.h utf8.h basic.h buffer.h crypt.h \
- display.h edef.h estruct.h retcode.h globals.h input.h bind.h log.h \
- terminal.h defines.h window.h
+ display.h estruct.h retcode.h globals.h input.h bind.h log.h terminal.h \
+ defines.h window.h
 spawn.o: spawn.c spawn.h defines.h buffer.h crypt.h line.h utf8.h \
- display.h estruct.h retcode.h edef.h globals.h file.h flook.h input.h \
- bind.h log.h terminal.h window.h
-tcap.o: tcap.c terminal.h defines.h display.h estruct.h retcode.h edef.h \
+ display.h estruct.h retcode.h globals.h file.h flook.h input.h bind.h \
+ log.h terminal.h window.h
+tcap.o: tcap.c terminal.h defines.h display.h estruct.h retcode.h \
  globals.h termio.h
 termio.o: termio.c termio.h estruct.h retcode.h utf8.h
 utf8.o: utf8.c utf8.h
-vmsvt.o: vmsvt.c estruct.h retcode.h edef.h globals.h
-vt52.o: vt52.c estruct.h retcode.h edef.h globals.h
+vmsvt.o: vmsvt.c estruct.h retcode.h globals.h
+vt52.o: vt52.c estruct.h retcode.h globals.h
 window.o: window.c window.h defines.h buffer.h crypt.h line.h utf8.h \
- basic.h display.h edef.h estruct.h retcode.h globals.h execute.h \
- terminal.h wrapper.h
+ basic.h display.h estruct.h retcode.h globals.h execute.h terminal.h \
+ wrapper.h
 word.o: word.c word.h basic.h buffer.h crypt.h line.h utf8.h estruct.h \
- retcode.h edef.h globals.h log.h random.h region.h window.h defines.h
+ retcode.h globals.h log.h random.h region.h window.h defines.h
 wrapper.o: wrapper.c wrapper.h
 
 # DEPENDENCIES MUST END AT END OF FILE
diff --git a/ansi.c b/ansi.c
index a60eb64..041db06 100644
--- a/ansi.c
+++ b/ansi.c
@@ -11,7 +11,7 @@
 
 #include        <stdio.h>
 #include	"estruct.h"
-#include        "edef.h"
+#include        "globals.h"
 
 #if     ANSI
 
diff --git a/basic.c b/basic.c
index edbe6c2..a88fff8 100644
--- a/basic.c
+++ b/basic.c
@@ -19,7 +19,7 @@
 #include "buffer.h"
 #include "display.h"
 #include "estruct.h"
-#include "edef.h"
+#include "globals.h"
 #include "input.h"
 #include "line.h"
 #include "random.h"
diff --git a/bind.c b/bind.c
index b88b51c..782fd0f 100644
--- a/bind.c
+++ b/bind.c
@@ -13,7 +13,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "edef.h"
+#include "estruct.h"
+#include "globals.h"
 #include "bindable.h"
 #include "buffer.h"
 #include "display.h"
diff --git a/bindable.c b/bindable.c
index 10fa26c..82d879e 100644
--- a/bindable.c
+++ b/bindable.c
@@ -7,7 +7,8 @@
 #include "defines.h"
 #include "buffer.h"
 #include "display.h"
-#include "edef.h"
+#include "estruct.h"
+#include "globals.h"
 #include "file.h"
 #include "input.h"
 #include "lock.h"
diff --git a/buffer.c b/buffer.c
index 9712d12..68fff57 100644
--- a/buffer.c
+++ b/buffer.c
@@ -18,8 +18,8 @@
 
 #include "defines.h"
 #include "display.h"
-/* #include "estruct.h" */
-#include "edef.h"
+#include "estruct.h"
+#include "globals.h"
 #include "file.h"
 #include "input.h"
 #include "window.h"
diff --git a/display.c b/display.c
index 7296a8c..a1994cc 100644
--- a/display.c
+++ b/display.c
@@ -20,7 +20,7 @@
 
 #include "buffer.h"
 #include "estruct.h"
-#include "edef.h"
+#include "globals.h"
 #include "input.h"
 #include "line.h"
 #include "termio.h"
diff --git a/ebind.c b/ebind.c
index 7af8614..ce2bfd1 100644
--- a/ebind.c
+++ b/ebind.c
@@ -13,7 +13,8 @@
 
 #include "basic.h"
 #include "bind.h"
-#include "edef.h"
+#include "estruct.h"
+#include "globals.h"
 #include "bindable.h"
 #include "buffer.h"
 #include "eval.h"
diff --git a/edef.h b/edef.h
deleted file mode 100644
index 617e0e1..0000000
--- a/edef.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*	edef.h
- *
- *	Global variable definitions
- *
- *	written by Dave G. Conroy
- *	modified by Steve Wilhite, George Jones
- *	greatly modified by Daniel Lawrence
- *	modified by Petri Kutvonen
- */
-#ifndef EDEF_H_
-#define EDEF_H_
-
-#include "estruct.h"
-#include "globals.h"
-
-#endif  /* EDEF_H_ */
diff --git a/eval.c b/eval.c
index 0bd9efa..6b19832 100644
--- a/eval.c
+++ b/eval.c
@@ -18,7 +18,7 @@
 #include "buffer.h"
 #include "display.h"
 #include "estruct.h"
-#include "edef.h"
+#include "globals.h"
 #include "exec.h"
 #include "execute.h"
 #include "flook.h"
diff --git a/exec.c b/exec.c
index 734c246..46dcbc7 100644
--- a/exec.c
+++ b/exec.c
@@ -18,7 +18,7 @@
 #include "bind.h"
 #include "display.h"
 #include "estruct.h"
-#include "edef.h"
+#include "globals.h"
 #include "eval.h"
 #include "file.h"
 #include "flook.h"
diff --git a/execute.c b/execute.c
index 73ba632..c367b33 100644
--- a/execute.c
+++ b/execute.c
@@ -3,7 +3,8 @@
 
 #include <stdlib.h>
 
-#include "edef.h"
+#include "estruct.h"
+#include "globals.h"
 #include "bind.h"
 #include "random.h"
 #include "display.h"
diff --git a/file.c b/file.c
index 92a2301..d011ad9 100644
--- a/file.c
+++ b/file.c
@@ -19,7 +19,7 @@
 #include "crypt.h"
 #include "defines.h"
 #include "estruct.h"
-#include "edef.h"
+#include "globals.h"
 #include "execute.h"
 #include "fileio.h"
 #include "input.h"
diff --git a/ibmpc.c b/ibmpc.c
index 577017d..217aa31 100644
--- a/ibmpc.c
+++ b/ibmpc.c
@@ -12,7 +12,7 @@
 
 #include        <stdio.h>
 #include	"estruct.h"
-#include        "edef.h"
+#include        "globals.h"
 
 #if     IBMPC
 #if	PKCODE
diff --git a/input.c b/input.c
index ae68c28..12e7b44 100644
--- a/input.c
+++ b/input.c
@@ -15,7 +15,8 @@
 #include <unistd.h>
 
 #include "bind.h"
-#include "edef.h"
+#include "estruct.h"
+#include "globals.h"
 #include "bindable.h"
 #include "display.h"
 #include "exec.h"
diff --git a/isearch.c b/isearch.c
index 77d6ef4..74a7147 100644
--- a/isearch.c
+++ b/isearch.c
@@ -31,7 +31,7 @@
 #include "buffer.h"
 #include "display.h"
 #include "estruct.h"
-#include "edef.h"
+#include "globals.h"
 #include "input.h"
 #include "line.h"
 #include "search.h"
diff --git a/line.c b/line.c
index 2c60c2e..3c07aec 100644
--- a/line.c
+++ b/line.c
@@ -21,7 +21,8 @@
 #include <string.h>
 
 #include "buffer.h"
-#include "edef.h"
+#include "estruct.h"
+#include "globals.h"
 #include "log.h"
 #include "window.h"
 
diff --git a/lock.c b/lock.c
index 1f2f516..ac380ae 100644
--- a/lock.c
+++ b/lock.c
@@ -11,7 +11,7 @@
 
 #include "display.h"
 #include "estruct.h"
-#include "edef.h"
+#include "globals.h"
 #include "input.h"
 
 #if (FILOCK && BSD) || SVR4
diff --git a/main.c b/main.c
index e0b29ad..76af13a 100644
--- a/main.c
+++ b/main.c
@@ -64,8 +64,8 @@
 #include "bindable.h"
 #include "buffer.h"
 #include "display.h"
-#include "edef.h"    /* Global definitions. */
-#include "estruct.h" /* Global structures and defines. */
+#include "estruct.h"	/* Global structures and defines. */
+#include "globals.h"    /* Global definitions. */
 #include "eval.h"
 #include "execute.h"
 #include "file.h"
diff --git a/pklock.c b/pklock.c
index a403d76..8acf550 100644
--- a/pklock.c
+++ b/pklock.c
@@ -6,7 +6,7 @@
  */
 
 #include "estruct.h"
-#include "edef.h"
+#include "globals.h"
 
 #if (FILOCK && BSD) || SVR4
 #include <sys/types.h>
diff --git a/posix.c b/posix.c
index 062f776..c6103ca 100644
--- a/posix.c
+++ b/posix.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 
 #include "estruct.h"
-#include "edef.h"
+#include "globals.h"
 #include "utf8.h"
 
 int ttrow = HUGE ;		/* Row location of HW cursor */
diff --git a/random.c b/random.c
index 3e445a3..0196ebf 100644
--- a/random.c
+++ b/random.c
@@ -16,7 +16,7 @@
 #include "buffer.h"
 #include "display.h"
 #include "estruct.h"
-#include "edef.h"
+#include "globals.h"
 #include "execute.h"
 #include "input.h"
 #include "line.h"
diff --git a/region.c b/region.c
index 3a390b1..86a72ce 100644
--- a/region.c
+++ b/region.c
@@ -14,7 +14,7 @@
 
 #include "buffer.h"
 #include "estruct.h"
-#include "edef.h"
+#include "globals.h"
 #include "line.h"
 #include "log.h"
 #include "window.h"
diff --git a/search.c b/search.c
index 4e46b50..7ef94b8 100644
--- a/search.c
+++ b/search.c
@@ -67,7 +67,8 @@
 #include "basic.h"
 #include "buffer.h"
 #include "display.h"
-#include "edef.h"
+#include "estruct.h"
+#include "globals.h"
 #include "input.h"
 #include "line.h"
 #include "log.h"
diff --git a/spawn.c b/spawn.c
index b872801..654354f 100644
--- a/spawn.c
+++ b/spawn.c
@@ -18,7 +18,7 @@
 #include "buffer.h"
 #include "display.h"
 #include "estruct.h"
-#include "edef.h"
+#include "globals.h"
 #include "file.h"
 #include "flook.h"
 #include "input.h"
diff --git a/tcap.c b/tcap.c
index 59310de..9176c20 100644
--- a/tcap.c
+++ b/tcap.c
@@ -29,7 +29,7 @@
 
 #include "display.h"
 #include "estruct.h"
-#include "edef.h"
+#include "globals.h"
 #include "termio.h"
 
 #if TERMCAP
diff --git a/vmsvt.c b/vmsvt.c
index b04dab0..ce599ae 100644
--- a/vmsvt.c
+++ b/vmsvt.c
@@ -11,7 +11,7 @@
 
 #include	<stdio.h>	/* Standard I/O package         */
 #include	"estruct.h"	/* Emacs' structures            */
-#include	"edef.h"	/* Emacs' definitions           */
+#include	"globals.h"	/* Emacs' definitions           */
 
 #if	VMSVT
 
diff --git a/vt52.c b/vt52.c
index bec7267..4c13af0 100644
--- a/vt52.c
+++ b/vt52.c
@@ -15,7 +15,7 @@
 
 #include        <stdio.h>
 #include        "estruct.h"
-#include	"edef.h"
+#include	"globals.h"
 
 #if     VT52
 
diff --git a/window.c b/window.c
index dab5f8f..5ec64ff 100644
--- a/window.c
+++ b/window.c
@@ -14,8 +14,8 @@
 #include "basic.h"
 #include "buffer.h"
 #include "display.h"
-/* #include "estruct.h" */
-#include "edef.h"
+#include "estruct.h"
+#include "globals.h"
 #include "execute.h"
 #include "line.h"
 #include "terminal.h"
diff --git a/word.c b/word.c
index 3a3b0e8..21e3560 100644
--- a/word.c
+++ b/word.c
@@ -15,7 +15,7 @@
 #include "basic.h"
 #include "buffer.h"
 #include "estruct.h"
-#include "edef.h"
+#include "globals.h"
 #include "line.h"
 #include "log.h"
 #include "random.h"