Scrub pwd.h and grp.h handling so we don't have to play any
silly games.
 -Erik
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 */