diff --git a/src/headers/pe_get_image_section_tbl_addr.c b/src/headers/pe_get_image_section_tbl_addr.c
index 98420de..f5a7054 100644
--- a/src/headers/pe_get_image_section_tbl_addr.c
+++ b/src/headers/pe_get_image_section_tbl_addr.c
@@ -37,7 +37,7 @@ struct pe_raw_sec_hdr * pe_get_image_named_section_addr(const void * base, const
 	struct pe_raw_sec_hdr *		hdr;
 	struct pe_raw_coff_file_hdr *	coff;
 	char *				ch;
-	uint32_t			len;
+	size_t				len;
 	uint32_t			pos;
 	uint64_t			sname;
 
diff --git a/src/internal/pe_impl.h b/src/internal/pe_impl.h
index c854824..a316bf3 100644
--- a/src/internal/pe_impl.h
+++ b/src/internal/pe_impl.h
@@ -19,7 +19,7 @@ struct pe_block {
 };
 
 
-static __inline__ int32_t pe_impl_strlen_ansi(const char * str)
+static __inline__ intptr_t pe_impl_strlen_ansi(const char * str)
 {
 	const char * ch;
 	const char * upper_bound;
@@ -35,7 +35,7 @@ static __inline__ int32_t pe_impl_strlen_ansi(const char * str)
 }
 
 
-static __inline__ int32_t pe_impl_strlen_utf16(const wchar16_t * str)
+static __inline__ intptr_t pe_impl_strlen_utf16(const wchar16_t * str)
 {
 	const wchar16_t * wch;
 	const wchar16_t * upper_bound;