--- a/libopagent/opagent.c
+++ b/libopagent/opagent.c
@@ -78,7 +78,7 @@ static unsigned int _bfd_mach;
 static int define_bfd_vars(void)
 {
 	bfd * bfd;
-	bfd_boolean r;
+	bool r;
 	int len;
 #define MAX_PATHLENGTH 2048
 	char mypath[MAX_PATHLENGTH];
--- a/opjitconv/create_bfd.c
+++ b/opjitconv/create_bfd.c
@@ -65,7 +65,7 @@ static int fill_symtab(void)
 		syms[i] = s;
 	}
 	r = bfd_set_symtab(cur_bfd, syms, entry_count);
-	if (r == FALSE) {
+	if (r == false) {
 		bfd_perror("bfd_set_symtab");
 		rc = OP_JIT_CONV_FAIL;
 	}
@@ -88,11 +88,11 @@ asection * create_section(bfd * abfd, ch
 		goto error;
 	}
 	op_bfd_set_section_vma(abfd, section, vma);
-	if (op_bfd_set_section_size(abfd, section, size) == FALSE) {
+	if (op_bfd_set_section_size(abfd, section, size) == false) {
 		bfd_perror("bfd_set_section_size");
 		goto error;
 	}
-	if (op_bfd_set_section_flags(abfd, section, flags) == FALSE) {
+	if (op_bfd_set_section_flags(abfd, section, flags) == false) {
 		bfd_perror("bfd_set_section_flags");
 		goto error;
 	}
@@ -134,7 +134,7 @@ static int create_text_section(int start
 int fill_section_content(bfd * abfd, asection * section,
 			 void const * b, file_ptr offset, size_t sz)
 {
-	if (bfd_set_section_contents(abfd, section, b, offset, sz) == FALSE) {
+	if (bfd_set_section_contents(abfd, section, b, offset, sz) == false) {
 		bfd_perror("bfd_set_section_contents");
 		return OP_JIT_CONV_FAIL;
 	}
@@ -257,11 +257,11 @@ bfd * open_elf(char const * filename)
 		bfd_perror("bfd_openw");
 		goto error1;
 	}
-	if (bfd_set_format(abfd, bfd_object) == FALSE) {
+	if (bfd_set_format(abfd, bfd_object) == false) {
 		bfd_perror("bfd_set_format");
 		goto error;
 	}
-	if (bfd_set_arch_mach(abfd, dump_bfd_arch, dump_bfd_mach) == FALSE) {
+	if (bfd_set_arch_mach(abfd, dump_bfd_arch, dump_bfd_mach) == false) {
 		bfd_perror("bfd_set_arch_mach");
 		goto error;
 	}