diff --git a/src/dialog.h b/src/dialog.h
index 3c099462..3a92f19c 100644
--- a/src/dialog.h
+++ b/src/dialog.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2014 Kim Woelders
+ * Copyright (C) 2004-2021 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #if ENABLE_DIALOGS
+#include "xtypes.h"
 
 /* Dialog items */
 #define DITEM_NONE         0
diff --git a/src/sound_alsa.c b/src/sound_alsa.c
index b22558e3..98efd64f 100644
--- a/src/sound_alsa.c
+++ b/src/sound_alsa.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Kim Woelders
+ * Copyright (C) 2020-2021 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -20,11 +20,14 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include "E.h"
+#include "config.h"
+
 #if defined(ENABLE_SOUND) && defined(USE_SOUND_ALSA)
-#include "sound.h"
 #include <alsa/asoundlib.h>
 
+#include "sound.h"
+#include "util.h"
+
 #define DO_FORK 1
 
 #define PCM_DEVICE "default"
diff --git a/src/sound_esd.c b/src/sound_esd.c
index 6c0d8e84..1b77889f 100644
--- a/src/sound_esd.c
+++ b/src/sound_esd.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2020 Kim Woelders
+ * Copyright (C) 2004-2021 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -21,10 +21,14 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include "E.h"
+#include "config.h"
+
 #if defined(ENABLE_SOUND) && defined(USE_SOUND_ESD)
-#include "sound.h"
 #include <esd.h>
+#include <unistd.h>
+
+#include "sound.h"
+#include "util.h"
 
 #ifdef USE_MODULES
 #define Estrdup strdup
diff --git a/src/sound_player.c b/src/sound_player.c
index f996567a..d04d2127 100644
--- a/src/sound_player.c
+++ b/src/sound_player.c
@@ -20,11 +20,12 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+#include "config.h"
 
-#include "E.h"
 #if defined(ENABLE_SOUND) && defined(USE_SOUND_PLAYER)
 #include "file.h"
 #include "sound.h"
+#include "util.h"
 
 #ifdef USE_MODULES
 #define Estrdup strdup
diff --git a/src/sound_pulse.c b/src/sound_pulse.c
index da6f5ac4..df4e995a 100644
--- a/src/sound_pulse.c
+++ b/src/sound_pulse.c
@@ -20,13 +20,16 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include "E.h"
+#include "config.h"
+
 #if defined(ENABLE_SOUND) && defined(USE_SOUND_PULSE)
-#include "sound.h"
 #include <fcntl.h>
 #include <pulse/pulseaudio.h>
 #include <sys/stat.h>
 
+#include "sound.h"
+#include "util.h"
+
 #ifdef USE_MODULES
 #define Estrdup strdup
 #endif
diff --git a/src/sound_sndio.c b/src/sound_sndio.c
index 39ac7997..b289dda4 100644
--- a/src/sound_sndio.c
+++ b/src/sound_sndio.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012 Jonathan Armani <armani@openbsd.org>
- * Copyright (C) 2020 Kim Woelders
+ * Copyright (C) 2020-2021 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -21,12 +21,14 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+#include "config.h"
 
-#include "E.h"
 #if defined(ENABLE_SOUND) && defined(USE_SOUND_SNDIO)
-#include "sound.h"
 #include <sndio.h>
 
+#include "sound.h"
+#include "util.h"
+
 #ifdef USE_MODULES
 #define Estrdup strdup
 #endif