From a3141a2521537c231e17350d756d827183ea63aa Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Thu, 25 Jun 2026 01:16:09 +0200
Subject: [PATCH] Remove <win32/pwd.h> includes

Follow up of dc34d34230ec152abfe27bf492d206a294359320
---
 ext/standard/file.c     | 6 +-----
 ext/standard/filestat.c | 6 +-----
 ext/standard/pageinfo.c | 6 +-----
 main/php.h              | 8 ++------
 4 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/ext/standard/file.c b/ext/standard/file.c
index f9474af68735..0bb00355744f 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -61,11 +61,7 @@
 #include "file.h"
 
 #ifdef HAVE_PWD_H
-# ifdef PHP_WIN32
-#  include "win32/pwd.h"
-# else
-#  include <pwd.h>
-# endif
+# include <pwd.h>
 #endif
 
 #include "fsock.h"
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index e41f6d1abb61..f7bda3c66bab 100644
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -54,11 +54,7 @@
 #endif
 
 #ifdef HAVE_PWD_H
-# ifdef PHP_WIN32
-#  include "win32/pwd.h"
-# else
-#  include <pwd.h>
-# endif
+# include <pwd.h>
 #endif
 
 #ifdef HAVE_GRP_H
diff --git a/ext/standard/pageinfo.c b/ext/standard/pageinfo.c
index 3ddda25ef0b7..66ba0da5f158 100644
--- a/ext/standard/pageinfo.c
+++ b/ext/standard/pageinfo.c
@@ -19,11 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_PWD_H
-#ifdef PHP_WIN32
-#include "win32/pwd.h"
-#else
-#include <pwd.h>
-#endif
+# include <pwd.h>
 #endif
 #ifdef HAVE_GRP_H
 # include <grp.h>
diff --git a/main/php.h b/main/php.h
index 44076b2c294d..77976a68c018 100644
--- a/main/php.h
+++ b/main/php.h
@@ -205,12 +205,8 @@ typedef unsigned int socklen_t;
 #include <string.h>
 
 #ifdef HAVE_PWD_H
-# ifdef PHP_WIN32
-#include "win32/param.h"
-# else
-#include <pwd.h>
-#include <sys/param.h>
-# endif
+# include <pwd.h>
+# include <sys/param.h>
 #endif
 
 #include <limits.h>