diff --git a/src/descrambler/capmt.c b/src/descrambler/capmt.c
index cedd5a82..c4dbf3f7 100644
--- a/src/descrambler/capmt.c
+++ b/src/descrambler/capmt.c
@@ -378,7 +378,7 @@ capmt_pid_remove(capmt_t *capmt, int adapter, int pid)
   for (i = 0; i < MAX_PIDS; i++)
     if (ca->ca_pids[i].pid == pid)
       break;
-  if (i >= MAX_PIDS);
+  if (i >= MAX_PIDS)
     return;
   mmi = LIST_FIRST(&capmt->capmt_adapters[adapter].ca_tuner->mi_mux_active);
   descrambler_close_pid(mmi->mmi_mux, &ca->ca_pids[i], pid);
diff --git a/src/utils.c b/src/utils.c
index c771c59f..9c252a4b 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -25,9 +25,16 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <unistd.h>
-#include <endian.h>
 #include "tvheadend.h"
 
+#if defined(PLATFORM_DARWIN)
+#include <machine/endian.h>
+#elif defined(PLATFORM_FREEBSD)
+#include <sys/endian.h>
+#else
+#include <endian.h>
+#endif
+
 #ifndef BYTE_ORDER
 #define BYTE_ORDER __BYTE_ORDER
 #endif