diff --git a/src/apps/bin/make/dir.c b/src/apps/bin/make/dir.c
index e862b9d06d..3f1a9a44f5 100644
--- a/src/apps/bin/make/dir.c
+++ b/src/apps/bin/make/dir.c
@@ -20,6 +20,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "make.h"
 #include "hash.h"
+#include "glob.h"
 
 #ifdef	HAVE_DIRENT_H
 # include <dirent.h>
diff --git a/src/apps/bin/make/glob/glob.c b/src/apps/bin/make/glob/glob.c
index 4bbf7bb013..9d09c1656f 100644
--- a/src/apps/bin/make/glob/glob.c
+++ b/src/apps/bin/make/glob/glob.c
@@ -175,7 +175,7 @@ extern void bcopy ();
 # define strcoll	strcmp
 #endif
 
-#if !defined HAVE_MEMPCPY && __GLIBC__ - 0 == 2 && __GLIBC_MINOR__ >= 1
+#if !defined __BEOS__ && !defined HAVE_MEMPCPY && __GLIBC__ - 0 == 2 && __GLIBC_MINOR__ >= 1
 # define HAVE_MEMPCPY	1
 # undef  mempcpy
 # define mempcpy(Dest, Src, Len) __mempcpy (Dest, Src, Len)
diff --git a/src/apps/bin/make/glob/glob.h b/src/apps/bin/make/glob/glob.h
index 9f735fe8ae..db4b919d03 100644
--- a/src/apps/bin/make/glob/glob.h
+++ b/src/apps/bin/make/glob/glob.h
@@ -24,7 +24,7 @@ extern "C" {
 
 #undef	__ptr_t
 #if defined __cplusplus || (defined __STDC__ && __STDC__) || defined WINDOWS32
-# if !defined __GLIBC__ || !defined __P
+# if !defined __GLIBC__ || !defined __P || !defined __PMT
 #  undef __P
 #  undef __PMT
 #  define __P(protos)	protos