diff --git a/src/disc_86f.c b/src/disc_86f.c
index 5a7614e32..bda81815f 100644
--- a/src/disc_86f.c
+++ b/src/disc_86f.c
@@ -1909,7 +1909,11 @@ void d86f_format_track(int drive, int side, int do_write)
 			break;
 		case FMT_SECTOR_DATA:
 			max_len = dtl;
-			if (do_write)  d86f_write_direct(drive, side, d86f[drive].fill, 0);
+			if (do_write)
+			{
+				d86f_write_direct(drive, side, d86f[drive].fill, 0);
+				d86f_handler[drive].write_data(drive, side, d86f[drive].datac++, d86f[drive].pos);
+			}
 			d86f_calccrc(drive, d86f[drive].fill);
 			break;
 		case FMT_SECTOR_GAP3:
diff --git a/src/scsi_aha154x.h b/src/scsi_aha154x.h
deleted file mode 100644
index 69b23aa0f..000000000
--- a/src/scsi_aha154x.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef SCSI_AHA154X_H
-# define SCSI_AHA154X_H
-
-
-extern device_t aha1540b_device;
-extern device_t aha1542cf_device;
-  
-  
-#endif	/*SCSI_AHA154X_H*/