diff --git a/Changelog b/Changelog
index 79db4ce..abc1bf4 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,8 @@
 [Changes 1.2.2]
 
+* Remove dll_functions, dll_numeric, dll_commands, dll_variable, dll_ctcp,
+  and dll_window variables from the module exports table. (caf)
+
 * Add save_dllvar() function exported to modules, and switch cavlink
   and nap plugins to use it. (caf)
 
diff --git a/include/module.h b/include/module.h
index 17128e9..e036892 100644
--- a/include/module.h
+++ b/include/module.h
@@ -10,7 +10,7 @@
  * if we change the table below, we change this module number to the 
  * current date (YYYYMMDDxx where xx is a serial number).
  */
-#define MODULE_VERSION 2017110601UL
+#define MODULE_VERSION 2017110602UL
 
 #include "struct.h"
 
@@ -616,15 +616,7 @@ enum FUNCTION_VALUE
 	SCREEN_LIST,
 	IRCLOG_FP,
 	DOING_NOTICE,
-	LAST_SENT_MSG_BODY, /* NO LONGER USED */
-	SENT_NICK, /* NO LONGER USED */
 
-	DLL_FUNCTIONS,
-	DLL_NUMERIC,
-	DLL_COMMANDS,
-	DLL_VARIABLE,
-	DLL_CTCP,
-	DLL_WINDOW,
 	WINDOW_DISPLAY,
 	STATUS_UPDATE_FLAG,
 	TABKEY_ARRAY,
diff --git a/include/modval.h b/include/modval.h
index 9b44d37..fc64b8a 100644
--- a/include/modval.h
+++ b/include/modval.h
@@ -657,12 +657,6 @@ extern Function_ptr *global;
 #define output_screen (*((Screen **)global[OUTPUT_SCREEN]))
 #define screen_list (*((Screen **)global[SCREEN_LIST]))
 #define irclog_fp (*((FILE **)global[IRCLOG_FP]))
-#define dll_functions (*((BuiltInDllFunctions **)global[DLL_FUNCTIONS]))
-#define dll_numeric (*((NumericFunction **)global[DLL_NUMERIC]))
-#define dll_commands (*((IrcCommandDll **)global[DLL_COMMANDS]))
-#define dll_variable (*((IrcVariableDll **)global[DLL_VARIABLE]))
-#define dll_ctcp (*((CtcpEntryDll **)global[DLL_CTCP]))
-#define dll_window (*((WindowDll **)global[DLL_WINDOW]))
 #define window_display ((int) *((int *)global[WINDOW_DISPLAY]))
 #define status_update_flag ((int) *((int *)global[STATUS_UPDATE_FLAG]))
 #define tabkey_array (*((NickTab **)global[TABKEY_ARRAY]))
diff --git a/source/modules.c b/source/modules.c
index 0b83b84..aa846c0 100644
--- a/source/modules.c
+++ b/source/modules.c
@@ -660,18 +660,8 @@ static int already_done = 0;
 	global_table[OUTPUT_SCREEN]		= (Function_ptr) &output_screen;
 	global_table[SCREEN_LIST]		= (Function_ptr) &screen_list;
 	global_table[DOING_NOTICE]      = (Function_ptr) &doing_notice;
-	global_table[SENT_NICK]         = 0;	/* No longer used */
-	global_table[LAST_SENT_MSG_BODY]    = 0;	/* No longer used */
                                 
 	global_table[IRCLOG_FP]			= (Function_ptr) &irclog_fp;
-#ifdef WANT_DLL
-	global_table[DLL_FUNCTIONS]		= (Function_ptr) &dll_functions;
-	global_table[DLL_NUMERIC]		= (Function_ptr) &dll_numeric_list;
-	global_table[DLL_COMMANDS]		= (Function_ptr) &dll_commands;
-	global_table[DLL_WINDOW]		= (Function_ptr) &dll_window;
-	global_table[DLL_VARIABLE]		= (Function_ptr) &dll_variable;
-	global_table[DLL_CTCP]			= (Function_ptr) &dll_ctcp;
-#endif
 	global_table[WINDOW_DISPLAY]		= (Function_ptr) &window_display;
 	global_table[STATUS_UPDATE_FLAG]	= (Function_ptr) &status_update_flag;
 	global_table[TABKEY_ARRAY]		= (Function_ptr) &tabkey_array;