diff --git a/bin/su/su.c b/bin/su/su.c
index 564abb8..91f411b 100644
--- a/bin/su/su.c
+++ b/bin/su/su.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/bin/su/su.c#5 $
+ * $P4: //depot/projects/openpam/bin/su/su.c#6 $
  */
 
 #include <sys/param.h>
@@ -40,6 +40,7 @@
 #include <err.h>
 #include <pwd.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <syslog.h>
 #include <unistd.h>
 
diff --git a/include/security/openpam.h b/include/security/openpam.h
index e7bd8cb..16f3960 100644
--- a/include/security/openpam.h
+++ b/include/security/openpam.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/openpam.h#19 $
+ * $P4: //depot/projects/openpam/include/security/openpam.h#20 $
  */
 
 #ifndef _SECURITY_OPENPAM_H_INCLUDED
@@ -137,9 +137,12 @@ _openpam_log(int _level,
 	const char *_fmt,
 	...);
 
-#if defined(__STDC__) && (__STDC_VERSION__ >= 199901L)
-#define openpam_log(lvl, fmt, ...) \
-	_openpam_log((lvl), __func__, fmt, __VA_ARGS__)
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+#define openpam_log(lvl, ...) \
+	_openpam_log((lvl), __func__, __VA_ARGS__)
+#elif defined(__GNUC__) && (__GNUC__ >= 3)
+#define openpam_log(lvl, ...) \
+	_openpam_log((lvl), __func__, __VA_ARGS__)
 #elif defined(__GNUC__) && (__GNUC__ >= 2) && (__GNUC_MINOR__ >= 95)
 #define openpam_log(lvl, fmt...) \
 	_openpam_log((lvl), __func__, ##fmt)
diff --git a/lib/pam_get_authtok.c b/lib/pam_get_authtok.c
index 8a447c3..d56de79 100644
--- a/lib/pam_get_authtok.c
+++ b/lib/pam_get_authtok.c
@@ -31,12 +31,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#17 $
+ * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#18 $
  */
 
 #include <sys/param.h>
 
 #include <stdlib.h>
+#include <string.h>
 
 #include <security/pam_appl.h>
 #include <security/openpam.h>