diff --git a/src/add-ons/kernel/drivers/audio/ice1712/debug.h b/src/add-ons/kernel/drivers/audio/ice1712/debug.h
index ed985014da..c684bc038e 100644
--- a/src/add-ons/kernel/drivers/audio/ice1712/debug.h
+++ b/src/add-ons/kernel/drivers/audio/ice1712/debug.h
@@ -29,4 +29,8 @@
 #	define TRACE_VV(a...) ;
 #endif
 
+#define ASSERT(a) if (a) {} else TRACE("ASSERT failed! file = %s, line = %d\n",\
+	__FILE__,__LINE__)
+	
+
 #endif // _DEBUG_ICE1712_H_
diff --git a/src/add-ons/kernel/drivers/audio/ice1712/ice1712.c b/src/add-ons/kernel/drivers/audio/ice1712/ice1712.c
index 5c6f44c31f..1a6dd4d3aa 100644
--- a/src/add-ons/kernel/drivers/audio/ice1712/ice1712.c
+++ b/src/add-ons/kernel/drivers/audio/ice1712/ice1712.c
@@ -10,23 +10,22 @@
  */
 
 
-#include <KernelExport.h>
-#include <Drivers.h>
-#include <Errors.h>
-#include <OS.h>
-#include <fcntl.h>
-#include <image.h>
-#include <midi_driver.h>
-#include <string.h>
-#include <drivers/driver_settings.h>
-
 #include "ice1712.h"
 #include "ice1712_reg.h"
 #include "io.h"
 #include "multi.h"
 #include "util.h"
 
-#include "debug.h"
+#include <KernelExport.h>
+#include <Drivers.h>
+#include <OS.h>
+#include <midi_driver.h>
+#include <drivers/driver_settings.h>
+
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+
 
 status_t init_hardware(void);
 status_t init_driver(void);
@@ -135,7 +134,7 @@ ice_1712_int(void *arg)
 static status_t
 ice1712_setup(ice1712 *ice)
 {
-	int result, i;
+	int i;
 	uint8 reg8 = 0;
 	uint16 mute;
 
@@ -151,7 +150,7 @@ ice1712_setup(ice1712 *ice)
 	write_ccs_uint8(ice, CCS_CONTROL_STATUS, 0x01);
 	snooze(200000);
 
-	result = read_eeprom(ice, ice->eeprom_data);
+	read_eeprom(ice, ice->eeprom_data);
 
 /*	TRACE("EEprom -> ");
 	for (i = 0; i < 32; i++)
diff --git a/src/add-ons/kernel/drivers/audio/ice1712/ice1712.h b/src/add-ons/kernel/drivers/audio/ice1712/ice1712.h
index b848a18262..ece826ad03 100644
--- a/src/add-ons/kernel/drivers/audio/ice1712/ice1712.h
+++ b/src/add-ons/kernel/drivers/audio/ice1712/ice1712.h
@@ -12,9 +12,12 @@
 #define _ICE1712_H_
 
 
-#include <PCI.h>
+#include "debug.h"
 #include "hmulti_audio.h"
 
+#include <PCI.h>
+
+
 #define DRIVER_NAME "ice1712"
 #define VERSION "0.5"
 
diff --git a/src/add-ons/kernel/drivers/audio/ice1712/multi.c b/src/add-ons/kernel/drivers/audio/ice1712/multi.c
index bf17e4a523..9867e9bc1d 100644
--- a/src/add-ons/kernel/drivers/audio/ice1712/multi.c
+++ b/src/add-ons/kernel/drivers/audio/ice1712/multi.c
@@ -332,10 +332,8 @@ ice1712_get_global_format(ice1712 *card, multi_format_info *data)
 status_t
 ice1712_set_global_format(ice1712 *card, multi_format_info *data)
 {
-	uint8 i;
-
-	TRACE("Input Sampling Rate = %d\n", (int)data->input.rate);
-	TRACE("Output Sampling Rate = %d\n", (int)data->output.rate);
+	TRACE("Input Sampling Rate = %d\n", data->input.rate);
+	TRACE("Output Sampling Rate = %d\n", data->output.rate);
 
 	//We can't have a different rate for input and output
 	//so just wait to change our sample rate when
@@ -361,8 +359,7 @@ ice1712_set_global_format(ice1712 *card, multi_format_info *data)
 		}
 		write_mt_uint8(card, MT_SAMPLING_RATE_SELECT, card->sampling_rate);
 	}
-	i = read_mt_uint8(card, MT_SAMPLING_RATE_SELECT);
-	TRACE("New rate = %#x\n", i);
+	TRACE("New rate = %#x\n", read_mt_uint8(card, MT_SAMPLING_RATE_SELECT));
 
 	return B_OK;
 }