Scrub pwd.h and grp.h handling so we don't have to play any
silly games.
-Erik
diff --git a/libbb/my_getgrgid.c b/libbb/my_getgrgid.c
index bf2067e..88bafc9 100644
--- a/libbb/my_getgrgid.c
+++ b/libbb/my_getgrgid.c
@@ -22,8 +22,8 @@
#include <stdio.h>
#include <string.h>
#include "libbb.h"
-#include "pwd.h"
-#include "grp.h"
+#include "pwd_.h"
+#include "grp_.h"
/* gets a groupname given a gid */
diff --git a/libbb/my_getgrnam.c b/libbb/my_getgrnam.c
index f21d482..f80d3f8 100644
--- a/libbb/my_getgrnam.c
+++ b/libbb/my_getgrnam.c
@@ -22,8 +22,8 @@
#include <stdio.h>
#include <string.h>
#include "libbb.h"
-#include "pwd.h"
-#include "grp.h"
+#include "pwd_.h"
+#include "grp_.h"
/* returns a gid given a group name */
diff --git a/libbb/my_getpwnam.c b/libbb/my_getpwnam.c
index db7f4a6..04951a4 100644
--- a/libbb/my_getpwnam.c
+++ b/libbb/my_getpwnam.c
@@ -22,8 +22,8 @@
#include <stdio.h>
#include <string.h>
#include "libbb.h"
-#include "pwd.h"
-#include "grp.h"
+#include "pwd_.h"
+#include "grp_.h"
/* returns a uid given a username */
diff --git a/libbb/my_getpwnamegid.c b/libbb/my_getpwnamegid.c
index 4866b97..07e02c1 100644
--- a/libbb/my_getpwnamegid.c
+++ b/libbb/my_getpwnamegid.c
@@ -22,8 +22,8 @@
#include <stdio.h>
#include <string.h>
#include "libbb.h"
-#include "pwd.h"
-#include "grp.h"
+#include "pwd_.h"
+#include "grp_.h"
diff --git a/libbb/my_getpwuid.c b/libbb/my_getpwuid.c
index 5236c7d..2abe7a7 100644
--- a/libbb/my_getpwuid.c
+++ b/libbb/my_getpwuid.c
@@ -22,8 +22,8 @@
#include <stdio.h>
#include <string.h>
#include "libbb.h"
-#include "pwd.h"
-#include "grp.h"
+#include "pwd_.h"
+#include "grp_.h"