diff --git a/common/image-fdt.c b/common/image-fdt.c
index a54a919..5a8e0c1 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -279,7 +279,7 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
 			fdt_noffset = fit_get_node_from_config(images,
 							       FIT_FDT_PROP,
 							       fdt_addr);
-			if (fdt_noffset == -ENOLINK)
+			if (fdt_noffset == -ESRCH)
 				return 0;
 			else if (fdt_noffset < 0)
 				return 1;
diff --git a/common/image-fit.c b/common/image-fit.c
index b94a3fe..38a639c 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -1466,7 +1466,7 @@ int fit_get_node_from_config(bootm_headers_t *images, const char *prop_name,
 	noffset = fit_conf_get_prop_node(fit_hdr, cfg_noffset, prop_name);
 	if (noffset < 0) {
 		debug("*  %s: no '%s' in config\n", prop_name, prop_name);
-		return -ENOLINK;
+		return -ESRCH;
 	}
 
 	return noffset;
diff --git a/common/image.c b/common/image.c
index 9c6bec5..15537c0 100644
--- a/common/image.c
+++ b/common/image.c
@@ -854,7 +854,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
 			rd_addr = map_to_sysmem(images->fit_hdr_os);
 			rd_noffset = fit_get_node_from_config(images,
 					FIT_RAMDISK_PROP, rd_addr);
-			if (rd_noffset == -ENOLINK)
+			if (rd_noffset == -ESRCH)
 				return 0;
 			else if (rd_noffset < 0)
 				return 1;
diff --git a/lib/sha1.c b/lib/sha1.c
index a121224..69e4ca6 100644
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -36,7 +36,7 @@
 #include <string.h>
 #endif /* USE_HOSTCC */
 #include <watchdog.h>
-#include "sha1.h"
+#include "../include/sha1.h"
 
 /*
  * 32-bit integer manipulation macros (big endian)