diff --git a/drivers/alsa/alsa_driver.c b/drivers/alsa/alsa_driver.c
index a360e5b..9022874 100644
--- a/drivers/alsa/alsa_driver.c
+++ b/drivers/alsa/alsa_driver.c
@@ -233,7 +233,7 @@ alsa_driver_hw_specific (alsa_driver_t *driver, int hw_monitoring,
 static void
 alsa_driver_setup_io_function_pointers (alsa_driver_t *driver)
 {
-  if (SNDRV_PCM_FORMAT_FLOAT_LE == driver->playback_sample_format) {
+  if (SND_PCM_FORMAT_FLOAT_LE == driver->playback_sample_format) {
 	  if (driver->playback_interleaved) {
 		  driver->channel_copy = memcpy_interleave_d32_s32;
 		} else {
diff --git a/drivers/alsa/alsa_driver.h b/drivers/alsa/alsa_driver.h
index 7380262..5ea491d 100644
--- a/drivers/alsa/alsa_driver.h
+++ b/drivers/alsa/alsa_driver.h
@@ -21,6 +21,7 @@
 #define __jack_alsa_driver_h__
 
 #include <alsa/asoundlib.h>
+#include <alsa/pcm.h>
 #include <jack/bitset.h>
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
@@ -31,14 +32,12 @@
 #define IS_BE 0
 #endif
 
-
-
 #include <jack/types.h>
 #include <jack/hardware.h>
 #include <jack/driver.h>
-#include <jack/memops.h>
 #include <jack/jack.h>
 
+#include "memops.h"
 #include "../alsa-midi/alsa_midi.h"
 
 typedef void (*ReadCopyFunction)  (jack_default_audio_sample_t *dst, char *src,