diff --git a/linux/alsa/usx2y.c b/linux/alsa/usx2y.c
index 289ed662..dfad47c6 100644
--- a/linux/alsa/usx2y.c
+++ b/linux/alsa/usx2y.c
@@ -25,7 +25,7 @@
 
 //#include <jack/internal.h>
 //#include <jack/engine.h>
-#include <jack/messagebuffer.h>
+//#include <jack/messagebuffer.h>
 #include <sys/mman.h>
 
 #ifndef ARRAY_SIZE
@@ -53,7 +53,7 @@ int usx2y_change_sample_clock (jack_hardware_t *hw, SampleClockMode mode)
 static void
 usx2y_release (jack_hardware_t *hw)
 {
-	usx2y_t *h = (usx2y_t *) hw->private;
+	usx2y_t *h = (usx2y_t *) hw->private_hw;
 
 	if (h == 0)
 		return;
@@ -73,7 +73,7 @@ usx2y_driver_get_channel_addresses_playback (alsa_driver_t *driver,
 	snd_pcm_uframes_t playback_iso_avail;
 	char *playback;
 
-	usx2y_t *h = (usx2y_t *) driver->hw->private;
+	usx2y_t *h = (usx2y_t *) driver->hw->private_hw;
 
 	if (0 > h->playback_iso_start) {
 		int bytes = driver->playback_sample_bytes * 2 * driver->frames_per_cycle *
@@ -141,7 +141,7 @@ usx2y_driver_get_channel_addresses_capture (alsa_driver_t *driver,
 	snd_pcm_uframes_t capture_iso_avail;
 	int capture_offset;
 
-	usx2y_t *h = (usx2y_t *) driver->hw->private;
+	usx2y_t *h = (usx2y_t *) driver->hw->private_hw;
 
 	if (0 > h->capture_iso_start) {
 		iso = h->hwdep_pcm_shm->capture_iso_start;
@@ -212,7 +212,7 @@ usx2y_driver_start (alsa_driver_t *driver)
 	int err, i;
 	snd_pcm_uframes_t poffset, pavail;
 
-	usx2y_t *h = (usx2y_t *) driver->hw->private;
+	usx2y_t *h = (usx2y_t *) driver->hw->private_hw;
 
 	for (i = 0; i < driver->capture_nchannels; i++)
 		// US428 channels 3+4 are on a seperate 2 channel stream.
@@ -352,7 +352,7 @@ usx2y_driver_stop (alsa_driver_t *driver)
 	JSList* node;
 	int chn;
 
-	usx2y_t *h = (usx2y_t *) driver->hw->private;
+	usx2y_t *h = (usx2y_t *) driver->hw->private_hw;
 
 	/* silence all capture port buffers, because we might
 	   be entering offline mode.
@@ -662,7 +662,7 @@ jack_alsa_usx2y_hw_new (alsa_driver_t *driver)
 
 	hw->capabilities = 0;
 	hw->input_monitor_mask = 0;
-	hw->private = 0;
+	hw->private_hw = 0;
 
 	hw->set_input_monitor_mask = usx2y_set_input_monitor_mask;
 	hw->change_sample_clock = usx2y_change_sample_clock;
@@ -686,7 +686,7 @@ jack_alsa_usx2y_hw_new (alsa_driver_t *driver)
 			h = (usx2y_t *) malloc (sizeof (usx2y_t));
 			h->driver = driver;
 			h->hwdep_handle = hwdep_handle;
-			hw->private = h;
+			hw->private_hw = h;
 			/* Set our own operational function pointers. */
 			usx2y_driver_setup(driver);
 			jack_info("ALSA/USX2Y: EXPERIMENTAL hwdep pcm device %s"