diff --git a/src/pkcs15init/pkcs15-lib.c b/src/pkcs15init/pkcs15-lib.c
index 0a8e3d63..091bed61 100644
--- a/src/pkcs15init/pkcs15-lib.c
+++ b/src/pkcs15init/pkcs15-lib.c
@@ -36,6 +36,7 @@
 #include <ctype.h>
 #include <stdarg.h>
 #include <string.h>
+#include <limits.h>
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
@@ -134,7 +135,7 @@ static int get_profile_from_config(struct sc_card *card, char *card_prof_name)
 	struct sc_context *ctx = card->ctx;
 	const char *tmp;
 	scconf_block **blocks, *blk;
-	int i, r;
+	int i;
 
 	for (i = 0; ctx->conf_blocks[i]; i++) {
 		blocks = scconf_find_blocks(ctx->conf, ctx->conf_blocks[i],
diff --git a/src/pkcs15init/profile.c b/src/pkcs15init/profile.c
index 8200674c..f80b2c23 100644
--- a/src/pkcs15init/profile.c
+++ b/src/pkcs15init/profile.c
@@ -25,6 +25,7 @@
 #include <ctype.h>
 #include <stdarg.h>
 #include <string.h>
+#include <limits.h>
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
@@ -353,7 +354,7 @@ static const char *
 sc_profile_locate(const char *name)
 {
 	static char	path[1024];
-	char            profile_dir[MAX_PATH];
+	char            profile_dir[PATH_MAX];
 
 	/* Name with suffix tagged onto it? */
 	snprintf(path, sizeof(path), "%s.%s", name, SC_PKCS15_PROFILE_SUFFIX);