diff --git a/Makefile b/Makefile
index 910f67c..b61ac87 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-# Makefile for emacs, updated Thu, Oct 10, 2013 12:28:18 PM
+# Makefile for emacs, updated Thu, Oct 10, 2013  1:03:16 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 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 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 efunc.h estruct.h eval.h exec.h execute.h file.h fileio.h flook.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 estruct.h eval.h exec.h execute.h file.h fileio.h flook.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
 
@@ -166,7 +166,7 @@ isearch.o: isearch.c isearch.h basic.h buffer.h crypt.h line.h utf8.h \
  defines.h window.h
 line.o: line.c line.h utf8.h buffer.h crypt.h estruct.h retcode.h log.h \
  window.h defines.h
-lock.o: lock.c lock.h estruct.h retcode.h display.h input.h bind.h
+lock.o: lock.c lock.h estruct.h retcode.h
 log.o: log.c log.h retcode.h
 main.o: main.c estruct.h retcode.h basic.h bind.h bindable.h buffer.h \
  crypt.h line.h utf8.h display.h eval.h execute.h file.h input.h lock.h \
@@ -174,7 +174,7 @@ main.o: main.c estruct.h retcode.h basic.h bind.h bindable.h buffer.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 retcode.h file.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
+pklock.o: pklock.c estruct.h retcode.h pklock.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 execute.h input.h bind.h log.h search.h \
diff --git a/efunc.h b/efunc.h
deleted file mode 100644
index f47bfd4..0000000
--- a/efunc.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _EFUNC_H_
-#define _EFUNC_H_
-
-/*  efunc.h
- *
- *  Function declarations and names.
- *
- *  This file list all the C code functions used and the names to use
- *      to bind keys to them. To add functions, declare it here in both the
- *      extern function list and the name binding table.
- *
- *  modified by Petri Kutvonen
- */
-
-/* External function declarations. */
-
-#if	BSD | SVR4
-/* lock.c */
-#include "lock.h"
-#endif
-
-#endif
diff --git a/lock.c b/lock.c
index ee8d12b..a39c51a 100644
--- a/lock.c
+++ b/lock.c
@@ -1,3 +1,4 @@
+#include "estruct.h"
 #include "lock.h"
 
 /*	LOCK.C
@@ -7,17 +8,18 @@
  *	written by Daniel Lawrence
  */
 
+#if	BSD | SVR4
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "display.h"
-#include "estruct.h"
 #include "input.h"
 
 #if (FILOCK && BSD) || SVR4
 #include "pklock.h"
 #endif
 
-#if	BSD | SVR4
 #include <sys/errno.h>
 
 static char *lname[NLOCKS];		/* names of all locked files */
diff --git a/lock.h b/lock.h
index b0e7ace..aa04d75 100644
--- a/lock.h
+++ b/lock.h
@@ -1,7 +1,9 @@
 #ifndef _LOCK_H_
 #define _LOCK_H_
 
-#include "estruct.h"
+#ifndef _ESTRUCT_H_
+#error uEmacs compilation settings needs to be done!
+#endif
 
 #if	BSD | SVR4
 
@@ -11,5 +13,4 @@ int lock( const char *fname) ;
 int unlock( const char *fname) ;
 
 #endif
-
 #endif
diff --git a/pklock.c b/pklock.c
index a727882..4ce1b34 100644
--- a/pklock.c
+++ b/pklock.c
@@ -1,3 +1,5 @@
+/* pklock.c -- implements pklock.h */
+#include "estruct.h"
 #include "pklock.h"
 
 /*	PKLOCK.C
@@ -5,8 +7,6 @@
  *	locking routines as modified by Petri Kutvonen
  */
 
-#include "estruct.h"
-
 #if (FILOCK && BSD) || SVR4
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/pklock.h b/pklock.h
index 7b62237..7cba16c 100644
--- a/pklock.h
+++ b/pklock.h
@@ -1,6 +1,10 @@
 #ifndef _PKLOCK_H_
 #define _PKLOCK_H_
 
+#ifndef _ESTRUCT_H_
+#error uEmacs compilation settings needs to be done!
+#endif
+
 #if (FILOCK && BSD) || SVR4
 
 char *dolock( const char *fname) ;