diff --git a/dmd2/root/port.c b/dmd2/root/port.c
index d4b20696..2bba4ef2 100644
--- a/dmd2/root/port.c
+++ b/dmd2/root/port.c
@@ -415,7 +415,9 @@ int Port::isFinite(double r)
     return ::finite(r);
 }
 
+#if !defined __HAIKU__
 #undef isinf
+#endif
 int Port::isInfinity(double r)
 {
 #if __APPLE__
diff --git a/dmd2/statement.c b/dmd2/statement.c
index f83b2b64..7503446c 100644
--- a/dmd2/statement.c
+++ b/dmd2/statement.c
@@ -29,6 +29,7 @@
 #include "template.h"
 #include "attrib.h"
 
+#include <pthread.h>
 #if IN_LLVM
 // sizes based on those from tollvm.cpp:DtoMutexType()
 int os_critsecsize()