diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt
index bef6fc6bf..9e043b899 100644
--- a/src/config/CMakeLists.txt
+++ b/src/config/CMakeLists.txt
@@ -1,232 +1,233 @@
 # Copyright (c) 2017-2019 The Bitcoin developers
 
 # This generates config.h which provides numerous defines
 # about the state of the plateform we are building on.
 
 include(CheckIncludeFiles)
 include(CheckSymbolExists)
 include(CheckCXXSourceCompiles)
 
 # Version
 set(CLIENT_VERSION_MAJOR ${bitcoin-abc_VERSION_MAJOR})
 set(CLIENT_VERSION_MINOR ${bitcoin-abc_VERSION_MINOR})
 set(CLIENT_VERSION_REVISION ${bitcoin-abc_VERSION_PATCH})
 
 option(CLIENT_VERSION_IS_RELEASE "Build a release version" OFF)
 
 # Generate the version.h file
 configure_file(version.h.cmake.in version.h ESCAPE_QUOTES)
 
 # Endianness
 check_include_files("endian.h" HAVE_ENDIAN_H)
 check_include_files("sys/endian.h" HAVE_SYS_ENDIAN_H)
 
 if(HAVE_ENDIAN_H)
 	set(ENDIAN_FILE "endian.h")
 elseif(HAVE_SYS_ENDIAN_H)
 	set(ENDIAN_FILE "sys/endian.h")
 else()
 endif()
 
 if(ENDIAN_FILE)
 	check_symbol_exists(htole16 ${ENDIAN_FILE} HAVE_DECL_HTOLE16)
 	check_symbol_exists(htobe16 ${ENDIAN_FILE} HAVE_DECL_HTOBE16)
 	check_symbol_exists(be16toh ${ENDIAN_FILE} HAVE_DECL_BE16TOH)
 	check_symbol_exists(le16toh ${ENDIAN_FILE} HAVE_DECL_LE16TOH)
 	check_symbol_exists(htobe32 ${ENDIAN_FILE} HAVE_DECL_HTOBE32)
 	check_symbol_exists(htole32 ${ENDIAN_FILE} HAVE_DECL_HTOLE32)
 	check_symbol_exists(be32toh ${ENDIAN_FILE} HAVE_DECL_BE32TOH)
 	check_symbol_exists(le32toh ${ENDIAN_FILE} HAVE_DECL_LE32TOH)
 	check_symbol_exists(htobe64 ${ENDIAN_FILE} HAVE_DECL_HTOBE64)
 	check_symbol_exists(htole64 ${ENDIAN_FILE} HAVE_DECL_HTOLE64)
 	check_symbol_exists(be64toh ${ENDIAN_FILE} HAVE_DECL_BE64TOH)
 	check_symbol_exists(le64toh ${ENDIAN_FILE} HAVE_DECL_LE64TOH)
 endif()
 
 # Byte swap
 check_include_files("byteswap.h" HAVE_BYTESWAP_H)
 
 check_symbol_exists(bswap_16 "byteswap.h" HAVE_DECL_BSWAP_16)
 check_symbol_exists(bswap_32 "byteswap.h" HAVE_DECL_BSWAP_32)
 check_symbol_exists(bswap_64 "byteswap.h" HAVE_DECL_BSWAP_64)
 
 # sys/select.h and sys/prctl.h headers
 check_include_files("sys/select.h" HAVE_SYS_SELECT_H)
 check_include_files("sys/prctl.h" HAVE_SYS_PRCTL_H)
 
 # Bitmanip intrinsics
 function(check_builtin_exist SYMBOL VARIABLE)
 	set(
 		SOURCE_FILE
 		"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckBuiltinExists.c"
 	)
 	set(
 		CMAKE_CONFIGURABLE_FILE_CONTENT
 		"int main(int argc, char** argv) { (void)argv; return ${SYMBOL}(argc); }\n"
 	)
 	configure_file(
 		"${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in"
 		"${SOURCE_FILE}"
 		@ONLY
 	)
 	if(NOT CMAKE_REQUIRED_QUIET)
 		message(STATUS "Looking for ${SYMBOL}")
 	endif()
 	try_compile(${VARIABLE}
 		${CMAKE_BINARY_DIR}
 		${SOURCE_FILE}
 		OUTPUT_VARIABLE OUTPUT
 	)
 	if(${VARIABLE})
 		if(NOT CMAKE_REQUIRED_QUIET)
 			message(STATUS "Looking for ${SYMBOL} - found")
 		endif()
 		set(${VARIABLE} 1 CACHE INTERNAL "Have symbol ${SYMBOL}" PARENT_SCOPE)
 		file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
 			"Determining if the ${SYMBOL} "
 			"exist passed with the following output:\n"
 			"${OUTPUT}\nFile ${SOURCEFILE}:\n"
 			"${CMAKE_CONFIGURABLE_FILE_CONTENT}\n")
 	else()
 		if(NOT CMAKE_REQUIRED_QUIET)
 			message(STATUS "Looking for ${SYMBOL} - not found")
 		endif()
 		set(${VARIABLE} "" CACHE INTERNAL "Have symbol ${SYMBOL}" PARENT_SCOPE)
 		file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
 			"Determining if the ${SYMBOL} "
 			"exist failed with the following output:\n"
 			"${OUTPUT}\nFile ${SOURCEFILE}:\n"
 			"${CMAKE_CONFIGURABLE_FILE_CONTENT}\n")
 	endif()
 endfunction()
 
 check_builtin_exist(__builtin_clz HAVE_DECL___BUILTIN_CLZ)
 check_builtin_exist(__builtin_clzl HAVE_DECL___BUILTIN_CLZL)
 check_builtin_exist(__builtin_clzll HAVE_DECL___BUILTIN_CLZLL)
 check_builtin_exist(__builtin_popcount HAVE_DECL___BUILTIN_POPCOUNT)
 
 # Memory management capabilities
 check_symbol_exists(M_ARENA_MAX "malloc.h" HAVE_MALLOPT_ARENA_MAX)
 check_symbol_exists(malloc_info "malloc.h" HAVE_MALLOC_INFO)
 
 # Various system libraries
 check_symbol_exists(strnlen "string.h" HAVE_DECL_STRNLEN)
 # daemon() is located in unistd.h on linux and in stdlib.h on BSDs and macOS.
 check_symbol_exists(daemon "unistd.h;stdlib.h" HAVE_DECL_DAEMON)
 
 # Check for ways to obtain entropy
 check_symbol_exists(getentropy "unistd.h" HAVE_GETENTROPY)
-check_symbol_exists(getentropy "sys/random.h" HAVE_GETENTROPY_RAND)
+# macOS needs unistd.h and sys/random.h to define getentropy
+check_symbol_exists(getentropy "unistd.h;sys/random.h" HAVE_GETENTROPY_RAND)
 
 # getifaddrs and freeifaddrs may be unavailable with some Android versions
 check_symbol_exists(getifaddrs "sys/types.h;ifaddrs.h" HAVE_DECL_GETIFADDRS)
 check_symbol_exists(freeifaddrs "sys/types.h;ifaddrs.h" HAVE_DECL_FREEIFADDRS)
 
 check_cxx_source_compiles("
 	#include <unistd.h>  /* for syscall */
 	#include <sys/syscall.h>  /* for SYS_getrandom */
 	#include <linux/random.h>
 	int main() {
 		syscall(SYS_getrandom, nullptr, 0, 0);
 		return 0;
 	}
 " HAVE_SYS_GETRANDOM)
 
 check_cxx_source_compiles("
 	#include <sys/types.h>
 	#include <sys/sysctl.h>
 	int main() {
 		static const int name[2] = {CTL_KERN, KERN_ARND};
 		sysctl(name, 2, nullptr, nullptr, nullptr, 0);
 		return 0;
 	}
 " HAVE_SYSCTL_ARND)
 
 check_cxx_source_compiles("
     #include <cstdint>
     #include <type_traits>
     int main() {
         static_assert(std::is_same<int8_t, char>::value, \"\");
         return 0;
     }
 " CHAR_EQUALS_INT8)
 
 check_cxx_source_compiles("
     #include <sys/types.h>
     #include <type_traits>
     int main() {
         static_assert(sizeof(off_t) == 8, \"\");
         return 0;
     }
 " HAVE_LARGE_FILE_SUPPORT)
 
 check_cxx_source_compiles("
     __attribute__((visibility(\"default\"))) int main() {
         return 0;
     }
 " HAVE_FUNC_ATTRIBUTE_VISIBILITY)
 
 check_cxx_source_compiles("
     __declspec(dllexport) int main() {
         return 0;
     }
 " HAVE_FUNC_ATTRIBUTE_DLLEXPORT)
 
 #__fdelt_chk's params and return type have changed from long unsigned int to
 # long int. See which one is present here.
 include(CheckPrototypeDefinition)
 
 set(CMAKE_REQUIRED_DEFINITIONS -D_FORTIFY_SOURCE=2)
 # Without some optimization the compiler won't detect the prototype conflict
 # and always succeed to build.
 set(CMAKE_REQUIRED_FLAGS -O2)
 
 check_prototype_definition(
 	__fdelt_warn
 	"extern long unsigned int __fdelt_warn(long unsigned int a)"
 	"0"
 	"sys/select.h"
 	FDELT_PROTOTYPE_LONG_UNSIGNED_INT
 )
 
 if(FDELT_PROTOTYPE_LONG_UNSIGNED_INT)
 	set(FDELT_TYPE "long unsigned int")
 else()
 	set(FDELT_TYPE "long int")
 endif()
 
 # OpenSSL functionality
 set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
 set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
 check_symbol_exists(EVP_MD_CTX_new "openssl/evp.h" HAVE_DECL_EVP_MD_CTX_NEW)
 
 # Activate wallet
 set(ENABLE_WALLET ${BUILD_BITCOIN_WALLET})
 
 # Activate ZeroMQ
 set(ENABLE_ZMQ ${BUILD_BITCOIN_ZMQ})
 
 # Try to find libqrencode
 # Only used in the wallet GUI
 if(ENABLE_QRCODE AND BUILD_BITCOIN_WALLET AND BUILD_BITCOIN_QT)
 	find_package(QREncode REQUIRED)
 	set(USE_QRCODE 1 CACHE INTERNAL "QR code is enabled")
 endif()
 
 # Try to find miniupnpc
 if(ENABLE_UPNP)
 	find_package(MiniUPnPc REQUIRED)
 
 	# The expected behavior is as follow:
 	#  - If UPnP is enabled USE_UPNP must be defined
 	#  - If UPnP should be the default port map method, USE_UPNP should be
 	#    defined to 1, otherwise it should be defined to 0.
 	set(USE_UPNP ${START_WITH_UPNP} CACHE INTERNAL "UPnP is enabled")
 endif()
 
 if(ENABLE_NOTIFICATIONS)
 	set(USE_DBUS 1)
 endif()
 
 # Generate the config
 configure_file(bitcoin-config.h.cmake.in bitcoin-config.h ESCAPE_QUOTES)