diff --git a/putty.h b/putty.h
index a14da123..d09f89b4 100644
--- a/putty.h
+++ b/putty.h
@@ -5,7 +5,7 @@
 #include <limits.h>                    /* for INT_MAX */
 
 #include "defs.h"
-#include "puttyps.h"
+#include "platform.h"
 #include "network.h"
 #include "misc.h"
 #include "marshal.h"
diff --git a/puttyps.h b/puttyps.h
deleted file mode 100644
index 27916d27..00000000
--- a/puttyps.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Find the platform-specific header for this platform.
- */
-
-#ifndef PUTTY_PUTTYPS_H
-#define PUTTY_PUTTYPS_H
-
-#ifdef _WINDOWS
-
-#include "winstuff.h"
-
-#else
-
-#include "unix.h"
-
-#endif
-
-#endif
diff --git a/unix/unix.h b/unix/platform.h
similarity index 99%
rename from unix/unix.h
rename to unix/platform.h
index d62c42f3..8f24b893 100644
--- a/unix/unix.h
+++ b/unix/platform.h
@@ -1,5 +1,9 @@
-#ifndef PUTTY_UNIX_H
-#define PUTTY_UNIX_H
+/*
+ * unix/platform.h: Unix-specific inter-module stuff.
+ */
+
+#ifndef PUTTY_UNIX_PLATFORM_H
+#define PUTTY_UNIX_PLATFORM_H
 
 #if HAVE_CMAKE_H
 #include "cmake.h"
@@ -457,4 +461,4 @@ bool cliloop_no_pw_setup(void *ctx, pollwrapper *pw);
 void cliloop_no_pw_check(void *ctx, pollwrapper *pw);
 bool cliloop_always_continue(void *ctx, bool, bool);
 
-#endif /* PUTTY_UNIX_H */
+#endif /* PUTTY_UNIX_PLATFORM_H */
diff --git a/windows/winstuff.h b/windows/platform.h
similarity index 99%
rename from windows/winstuff.h
rename to windows/platform.h
index 5f2557dd..8fadf803 100644
--- a/windows/winstuff.h
+++ b/windows/platform.h
@@ -1,9 +1,9 @@
 /*
- * winstuff.h: Windows-specific inter-module stuff.
+ * windows/platform.h: Windows-specific inter-module stuff.
  */
 
-#ifndef PUTTY_WINSTUFF_H
-#define PUTTY_WINSTUFF_H
+#ifndef PUTTY_WINDOWS_PLATFORM_H
+#define PUTTY_WINDOWS_PLATFORM_H
 
 #if HAVE_CMAKE_H
 #include "cmake.h"
@@ -708,4 +708,4 @@ void cli_main_loop(cliloop_pre_t pre, cliloop_post_t post, void *ctx);
 bool cliloop_null_pre(void *vctx, const HANDLE **, size_t *);
 bool cliloop_null_post(void *vctx, size_t);
 
-#endif
+#endif /* PUTTY_WINDOWS_PLATFORM_H */