diff --git a/rocclr/compiler/lib/loaders/elf/utils/libelf/_libelf.h b/rocclr/compiler/lib/loaders/elf/utils/libelf/_libelf.h
index 23d21b3661..0fcf2859ec 100644
--- a/rocclr/compiler/lib/loaders/elf/utils/libelf/_libelf.h
+++ b/rocclr/compiler/lib/loaders/elf/utils/libelf/_libelf.h
@@ -29,6 +29,7 @@
 #ifndef	__LIBELF_H_
 #define	__LIBELF_H_
 
+#include <limits.h>
 #include <sys/queue.h>
 
 #include "_libelf_config.h"
diff --git a/rocclr/compiler/lib/loaders/elf/utils/libelf/libelf.h b/rocclr/compiler/lib/loaders/elf/utils/libelf/libelf.h
index a3adf744c2..a13c9d45c4 100644
--- a/rocclr/compiler/lib/loaders/elf/utils/libelf/libelf.h
+++ b/rocclr/compiler/lib/loaders/elf/utils/libelf/libelf.h
@@ -29,11 +29,9 @@
 #ifndef	_LIBELF_H_
 #define	_LIBELF_H_
 
+#include <sys/types.h>
 #include <sys/queue.h>
 #include <elfdefinitions.h>
-#ifdef ANDROID
-#include "sys/types.h"
-#endif
 #ifndef EM_HSAIL
 #define EM_HSAIL 0xAF5A
 #endif