diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index b7b44fb140872..7a1b36b292c47 100644
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -133,7 +133,10 @@ dnl
 AC_DEFUN([ZEND_INIT], [dnl
 AC_REQUIRE([AC_PROG_CC])
 
-AC_CHECK_HEADERS([cpuid.h])
+AC_CHECK_HEADERS(m4_normalize([
+  cpuid.h
+  libproc.h
+]))
 
 dnl Check for library functions.
 AC_CHECK_FUNCS(m4_normalize([
diff --git a/Zend/zend_call_stack.c b/Zend/zend_call_stack.c
index f12323d0d9cd3..a2887d164f362 100644
--- a/Zend/zend_call_stack.c
+++ b/Zend/zend_call_stack.c
@@ -64,10 +64,12 @@ typedef int boolean_t;
 #include <sys/syscall.h>
 #endif
 #ifdef __sun
-#define _STRUCTURED_PROC 1
-#include <sys/lwp.h>
-#include <sys/procfs.h>
-#include <libproc.h>
+# include <sys/lwp.h>
+# ifdef HAVE_LIBPROC_H
+#  define _STRUCTURED_PROC 1
+#  include <sys/procfs.h>
+#  include <libproc.h>
+# endif
 #include <thread.h>
 #endif
 
@@ -699,6 +701,7 @@ static bool zend_call_stack_get_solaris_pthread(zend_call_stack *stack)
 	return true;
 }
 
+#ifdef HAVE_LIBPROC_H
 static bool zend_call_stack_get_solaris_proc_maps(zend_call_stack *stack)
 {
 	char buffer[4096];
@@ -771,12 +774,15 @@ static bool zend_call_stack_get_solaris_proc_maps(zend_call_stack *stack)
 	close(fd);
 	return r;
 }
+#endif
 
 static bool zend_call_stack_get_solaris(zend_call_stack *stack)
 {
+#ifdef HAVE_LIBPROC_H
 	if (_lwp_self() == 1) {
 		return zend_call_stack_get_solaris_proc_maps(stack);
 	}
+#endif
 	return zend_call_stack_get_solaris_pthread(stack);
 }
 #else