diff --git a/src/io.c b/src/io.c
index 2d21f593..2fe375ec 100644
--- a/src/io.c
+++ b/src/io.c
@@ -42,8 +42,10 @@
 # include <netinet/in.h>
 # include <sys/select.h>
 # include <sys/socket.h>
-# include <sys/time.h>
 # include <arpa/inet.h>
+# ifdef HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# endif
 #endif
 #include <sys/types.h>
 
diff --git a/src/upnp.c b/src/upnp.c
index 9a1de568..c7c36784 100755
--- a/src/upnp.c
+++ b/src/upnp.c
@@ -20,6 +20,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -32,6 +36,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+
 #include "conf.h"
 #include "daapd.h"
 #include "err.h"