diff --git a/include/conf.h b/include/conf.h
index 09da0e9a..321fda1f 100644
--- a/include/conf.h
+++ b/include/conf.h
@@ -28,6 +28,11 @@
 #ifndef __ALSA_CONF_H
 #define __ALSA_CONF_H
 
+#include <stddef.h>
+
+#include <alsa/input.h>
+#include <alsa/output.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/control.h b/include/control.h
index e7541d56..b6dfd01a 100644
--- a/include/control.h
+++ b/include/control.h
@@ -28,6 +28,10 @@
 #ifndef __ALSA_CONTROL_H
 #define __ALSA_CONTROL_H
 
+#include <stddef.h>
+
+#include <alsa/conf.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/error.h b/include/error.h
index 7239db85..4d06f2ea 100644
--- a/include/error.h
+++ b/include/error.h
@@ -28,6 +28,8 @@
 #ifndef __ALSA_ERROR_H
 #define __ALSA_ERROR_H
 
+#include <stdarg.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/hwdep.h b/include/hwdep.h
index 46ed1f78..0ea2e561 100644
--- a/include/hwdep.h
+++ b/include/hwdep.h
@@ -28,6 +28,9 @@
 #ifndef __ALSA_HWDEP_H
 #define __ALSA_HWDEP_H
 
+#include <string.h>
+#include <sys/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/input.h b/include/input.h
index f84954a9..879b7678 100644
--- a/include/input.h
+++ b/include/input.h
@@ -29,6 +29,7 @@
 #define __ALSA_INPUT_H
 
 #include <stdarg.h>
+#include <stdio.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/mixer.h b/include/mixer.h
index 735dfdd8..f1d19221 100644
--- a/include/mixer.h
+++ b/include/mixer.h
@@ -28,6 +28,11 @@
 #ifndef __ALSA_MIXER_H
 #define __ALSA_MIXER_H
 
+#include <alsa/control.h>
+#include <alsa/pcm.h>
+
+#include <string.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/output.h b/include/output.h
index 5e16420b..ecf99b64 100644
--- a/include/output.h
+++ b/include/output.h
@@ -29,6 +29,8 @@
 #define __ALSA_OUTPUT_H
 
 #include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/pcm.h b/include/pcm.h
index b5c67889..c8328ca9 100644
--- a/include/pcm.h
+++ b/include/pcm.h
@@ -34,6 +34,10 @@ extern "C" {
 #endif
 
 #include <stdint.h>
+#include <string.h>
+
+#include <alsa/global.h>
+#include <alsa/output.h>
 
 /**
  *  \defgroup PCM PCM Interface
diff --git a/include/pcm_rate.h b/include/pcm_rate.h
index 48473ed4..2d2fcdfa 100644
--- a/include/pcm_rate.h
+++ b/include/pcm_rate.h
@@ -31,6 +31,10 @@
 #ifndef __ALSA_PCM_RATE_H
 #define __ALSA_PCM_RATE_H
 
+#include <alsa/conf.h>
+#include <alsa/output.h>
+#include <alsa/pcm.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/rawmidi.h b/include/rawmidi.h
index 2630d1e6..8b25759d 100644
--- a/include/rawmidi.h
+++ b/include/rawmidi.h
@@ -28,6 +28,13 @@
 #ifndef __ALSA_RAWMIDI_H
 #define __ALSA_RAWMIDI_H
 
+#include <string.h>
+
+#include <sys/types.h>
+
+#include <alsa/conf.h>
+#include <alsa/global.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/seq.h b/include/seq.h
index 5082ad0a..b4e6aced 100644
--- a/include/seq.h
+++ b/include/seq.h
@@ -31,6 +31,9 @@
 
 #include "ump.h"
 
+#include <alsa/seq_event.h>
+#include <alsa/timer.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/timer.h b/include/timer.h
index dc5ca69e..99ce024f 100644
--- a/include/timer.h
+++ b/include/timer.h
@@ -28,6 +28,13 @@
 #ifndef __ALSA_TIMER_H
 #define __ALSA_TIMER_H
 
+#include <string.h>
+
+#include <sys/types.h>
+
+#include <alsa/conf.h>
+#include <alsa/global.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/topology.h b/include/topology.h
index a590d1a8..99e7e105 100644
--- a/include/topology.h
+++ b/include/topology.h
@@ -22,6 +22,7 @@
 #define __ALSA_TOPOLOGY_H
 
 #include <stdint.h>
+#include <string.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/ump_msg.h b/include/ump_msg.h
index 5f0a45ac..8d60354a 100644
--- a/include/ump_msg.h
+++ b/include/ump_msg.h
@@ -10,6 +10,7 @@
 #define __ALSA_UMP_MSG_H
 
 #include <stdint.h>
+#include <string.h>
 
 #ifdef __cplusplus
 extern "C" {