diff --git a/cmdgen.c b/cmdgen.c
index c3720b57..8e2d07a5 100644
--- a/cmdgen.c
+++ b/cmdgen.c
@@ -2,8 +2,6 @@
  * cmdgen.c - command-line form of PuTTYgen
  */
 
-#define PUTTY_DO_GLOBALS
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/fuzzterm.c b/fuzzterm.c
index f1085589..b5d98975 100644
--- a/fuzzterm.c
+++ b/fuzzterm.c
@@ -2,7 +2,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#define PUTTY_DO_GLOBALS
 #include "putty.h"
 #include "terminal.h"
 
diff --git a/pscp.c b/pscp.c
index 916d829c..f17eb983 100644
--- a/pscp.c
+++ b/pscp.c
@@ -19,7 +19,6 @@
 #include <time.h>
 #include <assert.h>
 
-#define PUTTY_DO_GLOBALS
 #include "putty.h"
 #include "psftp.h"
 #include "ssh.h"
diff --git a/psftp.c b/psftp.c
index 1fee4e3d..cb1657b1 100644
--- a/psftp.c
+++ b/psftp.c
@@ -8,7 +8,6 @@
 #include <assert.h>
 #include <limits.h>
 
-#define PUTTY_DO_GLOBALS
 #include "putty.h"
 #include "psftp.h"
 #include "storage.h"
diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 3574e1db..edae2b9e 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -27,10 +27,6 @@
 #include "x11misc.h"
 #endif
 
-#ifdef TESTMODE
-#define PUTTY_DO_GLOBALS               /* actually _define_ globals */
-#endif
-
 #include "storage.h"
 #include "dialog.h"
 #include "tree234.h"
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index b0f679c8..b8571776 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -27,8 +27,6 @@
 #include <gtk/gtkimmodule.h>
 #endif
 
-#define PUTTY_DO_GLOBALS               /* actually _define_ globals */
-
 #define MAY_REFER_TO_GTK_IN_HEADERS
 
 #include "putty.h"
diff --git a/unix/uxpgnt.c b/unix/uxpgnt.c
index d5eca2e6..5743795a 100644
--- a/unix/uxpgnt.c
+++ b/unix/uxpgnt.c
@@ -14,7 +14,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#define PUTTY_DO_GLOBALS               /* actually _define_ globals */
 #include "putty.h"
 #include "ssh.h"
 #include "misc.h"
diff --git a/unix/uxplink.c b/unix/uxplink.c
index b1aa1bf4..10f33548 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -15,7 +15,6 @@
 #include <sys/ioctl.h>
 #include <sys/time.h>
 
-#define PUTTY_DO_GLOBALS               /* actually _define_ globals */
 #include "putty.h"
 #include "ssh.h"
 #include "storage.h"
diff --git a/unix/uxserver.c b/unix/uxserver.c
index 5852388e..b851a817 100644
--- a/unix/uxserver.c
+++ b/unix/uxserver.c
@@ -38,7 +38,6 @@
 #include <sys/ioctl.h>
 #include <sys/time.h>
 
-#define PUTTY_DO_GLOBALS               /* actually _define_ globals */
 #include "putty.h"
 #include "mpint.h"
 #include "ssh.h"
diff --git a/windows/window.c b/windows/window.c
index 5bddff03..42289bee 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -18,7 +18,6 @@
 #define COMPILE_MULTIMON_STUBS
 #endif
 
-#define PUTTY_DO_GLOBALS               /* actually _define_ globals */
 #include "putty.h"
 #include "terminal.h"
 #include "storage.h"
diff --git a/windows/winpgen.c b/windows/winpgen.c
index d11e2758..38ebbbc9 100644
--- a/windows/winpgen.c
+++ b/windows/winpgen.c
@@ -7,8 +7,6 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#define PUTTY_DO_GLOBALS
-
 #include "putty.h"
 #include "ssh.h"
 #include "licence.h"
diff --git a/windows/winpgnt.c b/windows/winpgnt.c
index 87709caf..d8c95109 100644
--- a/windows/winpgnt.c
+++ b/windows/winpgnt.c
@@ -9,8 +9,6 @@
 #include <assert.h>
 #include <tchar.h>
 
-#define PUTTY_DO_GLOBALS
-
 #include "putty.h"
 #include "ssh.h"
 #include "misc.h"
diff --git a/windows/winplink.c b/windows/winplink.c
index 2f4cc043..fa56c1e7 100644
--- a/windows/winplink.c
+++ b/windows/winplink.c
@@ -7,7 +7,6 @@
 #include <assert.h>
 #include <stdarg.h>
 
-#define PUTTY_DO_GLOBALS               /* actually _define_ globals */
 #include "putty.h"
 #include "storage.h"
 #include "tree234.h"
diff --git a/windows/winstuff.h b/windows/winstuff.h
index 0b558c7c..4d31920e 100644
--- a/windows/winstuff.h
+++ b/windows/winstuff.h
@@ -157,19 +157,6 @@ struct FontSpec *fontspec_new(
     (p_##name = module ?                                \
      (t_##name) GetProcAddress(module, #name) : NULL)
 
-/*
- * Global variables. Most modules declare these `extern', but
- * window.c will do `#define PUTTY_DO_GLOBALS' before including this
- * module, and so will get them properly defined.
-*/
-#ifndef GLOBAL
-#ifdef PUTTY_DO_GLOBALS
-#define GLOBAL
-#else
-#define GLOBAL extern
-#endif
-#endif
-
 #define PUTTY_REG_POS "Software\\SimonTatham\\PuTTY"
 #define PUTTY_REG_PARENT "Software\\SimonTatham"
 #define PUTTY_REG_PARENT_CHILD "PuTTY"