diff --git a/Makefile b/Makefile
index 013c6d8..fec5c97 100644
--- a/Makefile
+++ b/Makefile
@@ -134,7 +134,7 @@
 #
 # Flag ordering: arch, then -f, then -m, then -W
 DEBUG_FLAGS := $(if ${DEBUG},-g -O0,-Os)
-WERROR := -Werror
+WERROR := -Werror -Wno-address-of-packed-member -Wno-enum-conversion
 COMMON_FLAGS := -nostdinc -pipe \
 	-ffreestanding -fno-builtin -fno-stack-protector \
 	${WERROR} -Wall -Wstrict-prototypes ${DEBUG_FLAGS}
@@ -267,6 +267,11 @@
   RUNTEST = tests/test_using_qemu.sh
 endif
 
+ifdef OPENSSL_DIR
+	CFLAGS += -I ${OPENSSL_DIR}/include
+	LDFLAGS += -I ${OPENSSL_DIR}/lib
+endif
+
 export BUILD_RUN
 
 ##############################################################################
@@ -455,9 +460,6 @@
 	cgpt/cgpt_repair.c \
 	cgpt/cgpt_prioritize.c \
 	cgpt/cgpt_common.c \
-	futility/dump_kernel_config_lib.c \
-	host/arch/${ARCH}/lib/crossystem_arch.c \
-	host/lib/crossystem.c \
 	host/lib/file_keys.c \
 	host/lib/fmap.c \
 	host/lib/host_common.c \
@@ -475,6 +477,11 @@
 	host/lib21/host_misc.c \
 	host/lib21/host_signature.c
 
+ifndef HAVE_MACOS
+	UTILLIB_SRCS += futility/dump_kernel_config_lib.c \
+		host/arch/${ARCH}/lib/crossystem_arch.c \
+		host/lib/crossystem.c
+endif
 UTILLIB_OBJS = ${UTILLIB_SRCS:%.c=${BUILD}/%.o}
 ALL_OBJS += ${UTILLIB_OBJS}
 
@@ -507,13 +514,16 @@
 	firmware/stub/vboot_api_stub.c \
 	firmware/stub/vboot_api_stub_disk.c \
 	firmware/stub/vboot_api_stub_init.c \
-	futility/dump_kernel_config_lib.c \
-	host/arch/${ARCH}/lib/crossystem_arch.c \
-	host/lib/crossystem.c \
 	host/lib/extract_vmlinuz.c \
 	host/lib/fmap.c \
 	host/lib/host_misc.c
 
+ifndef HAVE_MACOS
+	HOSTLIB_SRCS += futility/dump_kernel_config_lib.c \
+		host/arch/${ARCH}/lib/crossystem_arch.c \
+		host/lib/crossystem.c
+endif
+
 HOSTLIB_OBJS = ${HOSTLIB_SRCS:%.c=${BUILD}/%.o}
 ALL_OBJS += ${HOSTLIB_OBJS}
 
@@ -674,7 +684,6 @@
 	${FUTIL_STATIC_SRCS} \
 	futility/cmd_bdb.c \
 	futility/cmd_create.c \
-	futility/cmd_dump_kernel_config.c \
 	futility/cmd_load_fmap.c \
 	futility/cmd_pcr.c \
 	futility/cmd_show.c \
@@ -692,6 +701,10 @@
 	futility/vb2_helper.c \
 	futility/bdb_helper.c
 
+ifndef HAVE_MACOS
+	FUTIL_SRCS += futility/cmd_dump_kernel_config.c
+endif
+
 # List of commands built in futility and futility_s.
 FUTIL_STATIC_CMD_LIST = ${BUILD}/gen/futility_static_cmds.c
 FUTIL_CMD_LIST = ${BUILD}/gen/futility_cmds.c