summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/formats')
-rw-r--r--src/lib/formats/a5105_dsk.c3
-rw-r--r--src/lib/formats/abc800_dsk.c3
-rw-r--r--src/lib/formats/adam_dsk.c3
-rw-r--r--src/lib/formats/ap_dsk35.c1
-rw-r--r--src/lib/formats/apollo_dsk.c3
-rw-r--r--src/lib/formats/applix_dsk.c3
-rw-r--r--src/lib/formats/asst128_dsk.c3
-rw-r--r--src/lib/formats/bw12_dsk.c3
-rw-r--r--src/lib/formats/bw2_dsk.c3
-rw-r--r--src/lib/formats/cbm_crt.c3
-rw-r--r--src/lib/formats/cbm_crt.h1
-rw-r--r--src/lib/formats/ccvf_dsk.c3
-rw-r--r--src/lib/formats/coco_cas.c2
-rw-r--r--src/lib/formats/comx35_dsk.c3
-rw-r--r--src/lib/formats/concept_dsk.c3
-rw-r--r--src/lib/formats/coupedsk.c3
-rw-r--r--src/lib/formats/cpis_dsk.c2
-rw-r--r--src/lib/formats/d64_dsk.c2
-rw-r--r--src/lib/formats/d67_dsk.c2
-rw-r--r--src/lib/formats/d71_dsk.c2
-rw-r--r--src/lib/formats/d80_dsk.c2
-rw-r--r--src/lib/formats/d81_dsk.c3
-rw-r--r--src/lib/formats/d82_dsk.c2
-rw-r--r--src/lib/formats/d88_dsk.c3
-rw-r--r--src/lib/formats/dcp_dsk.c3
-rw-r--r--src/lib/formats/dfi_dsk.c2
-rw-r--r--src/lib/formats/dim_dsk.c2
-rw-r--r--src/lib/formats/dip_dsk.c3
-rw-r--r--src/lib/formats/dmk_dsk.c3
-rw-r--r--src/lib/formats/dmv_dsk.c3
-rw-r--r--src/lib/formats/dsk_dsk.c2
-rw-r--r--src/lib/formats/ep64_dsk.c3
-rw-r--r--src/lib/formats/esq16_dsk.c3
-rw-r--r--src/lib/formats/esq8_dsk.c3
-rw-r--r--src/lib/formats/excali64_dsk.c3
-rw-r--r--src/lib/formats/fdd_dsk.c3
-rw-r--r--src/lib/formats/flex_dsk.c2
-rw-r--r--src/lib/formats/flopimg.c1
-rw-r--r--src/lib/formats/fmtowns_dsk.c3
-rw-r--r--src/lib/formats/g64_dsk.c2
-rw-r--r--src/lib/formats/hxcmfm_dsk.c3
-rw-r--r--src/lib/formats/imd_dsk.c2
-rw-r--r--src/lib/formats/ipf_dsk.c2
-rw-r--r--src/lib/formats/iq151_dsk.c3
-rw-r--r--src/lib/formats/itt3030_dsk.c3
-rw-r--r--src/lib/formats/kaypro_dsk.c3
-rw-r--r--src/lib/formats/kc85_dsk.c3
-rw-r--r--src/lib/formats/m20_dsk.c2
-rw-r--r--src/lib/formats/m5_dsk.c3
-rw-r--r--src/lib/formats/mfi_dsk.c3
-rw-r--r--src/lib/formats/mm_dsk.c3
-rw-r--r--src/lib/formats/nanos_dsk.c3
-rw-r--r--src/lib/formats/naslite_dsk.c3
-rw-r--r--src/lib/formats/nfd_dsk.c3
-rw-r--r--src/lib/formats/oric_dsk.c2
-rw-r--r--src/lib/formats/pasti_dsk.c2
-rw-r--r--src/lib/formats/pc98fdi_dsk.c2
-rw-r--r--src/lib/formats/pyldin_dsk.c2
-rw-r--r--src/lib/formats/ql_dsk.c3
-rw-r--r--src/lib/formats/rx50_dsk.c3
-rw-r--r--src/lib/formats/sf7000_dsk.c3
-rw-r--r--src/lib/formats/smx_dsk.c3
-rw-r--r--src/lib/formats/st_dsk.c3
-rw-r--r--src/lib/formats/tandy2k_dsk.c3
-rw-r--r--src/lib/formats/td0_dsk.c2
-rw-r--r--src/lib/formats/ti99_dsk.c3
-rw-r--r--src/lib/formats/tiki100_dsk.c3
-rw-r--r--src/lib/formats/trd_dsk.c3
-rw-r--r--src/lib/formats/tvc_dsk.c3
-rw-r--r--src/lib/formats/upd765_dsk.c2
-rw-r--r--src/lib/formats/victor9k_dsk.c2
-rw-r--r--src/lib/formats/wd177x_dsk.c2
-rw-r--r--src/lib/formats/xdf_dsk.c3
73 files changed, 120 insertions, 70 deletions
diff --git a/src/lib/formats/a5105_dsk.c b/src/lib/formats/a5105_dsk.c
index 61586f93851..33d7f15e1fd 100644
--- a/src/lib/formats/a5105_dsk.c
+++ b/src/lib/formats/a5105_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/a5105_dsk.h"
a5105_format::a5105_format() : upd765_format(formats)
diff --git a/src/lib/formats/abc800_dsk.c b/src/lib/formats/abc800_dsk.c
index b1d0db2c640..5686d502382 100644
--- a/src/lib/formats/abc800_dsk.c
+++ b/src/lib/formats/abc800_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/abc800_dsk.h"
abc800_format::abc800_format() : wd177x_format(formats)
diff --git a/src/lib/formats/adam_dsk.c b/src/lib/formats/adam_dsk.c
index 1b966a3395b..e78e94a4763 100644
--- a/src/lib/formats/adam_dsk.c
+++ b/src/lib/formats/adam_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/adam_dsk.h"
adam_format::adam_format() : wd177x_format(formats)
diff --git a/src/lib/formats/ap_dsk35.c b/src/lib/formats/ap_dsk35.c
index 86d8e19656d..8eee2ee0dab 100644
--- a/src/lib/formats/ap_dsk35.c
+++ b/src/lib/formats/ap_dsk35.c
@@ -97,6 +97,7 @@
*********************************************************************/
#include <stdio.h>
+#include <assert.h>
#include "emu.h"
#include "ap_dsk35.h"
diff --git a/src/lib/formats/apollo_dsk.c b/src/lib/formats/apollo_dsk.c
index eec6e24beb2..2770122a5c9 100644
--- a/src/lib/formats/apollo_dsk.c
+++ b/src/lib/formats/apollo_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/apollo_dsk.h"
apollo_format::apollo_format() : upd765_format(formats)
diff --git a/src/lib/formats/applix_dsk.c b/src/lib/formats/applix_dsk.c
index c90b93a5203..726f11daed9 100644
--- a/src/lib/formats/applix_dsk.c
+++ b/src/lib/formats/applix_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/applix_dsk.h"
applix_format::applix_format() : wd177x_format(formats)
diff --git a/src/lib/formats/asst128_dsk.c b/src/lib/formats/asst128_dsk.c
index feffad34c08..fe64cc725ee 100644
--- a/src/lib/formats/asst128_dsk.c
+++ b/src/lib/formats/asst128_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/asst128_dsk.h"
asst128_format::asst128_format() : upd765_format(formats)
diff --git a/src/lib/formats/bw12_dsk.c b/src/lib/formats/bw12_dsk.c
index e497225bc08..06c8be72347 100644
--- a/src/lib/formats/bw12_dsk.c
+++ b/src/lib/formats/bw12_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/bw12_dsk.h"
bw12_format::bw12_format() : upd765_format(formats)
diff --git a/src/lib/formats/bw2_dsk.c b/src/lib/formats/bw2_dsk.c
index e5f66b5fe05..3dc46e9b225 100644
--- a/src/lib/formats/bw2_dsk.c
+++ b/src/lib/formats/bw2_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/bw2_dsk.h"
bw2_format::bw2_format() : upd765_format(formats)
diff --git a/src/lib/formats/cbm_crt.c b/src/lib/formats/cbm_crt.c
index 6ce4cc992d8..6e771fc8b0f 100644
--- a/src/lib/formats/cbm_crt.c
+++ b/src/lib/formats/cbm_crt.c
@@ -39,6 +39,9 @@
*********************************************************************/
+#include "emu.h" // offs_t, fatalerror
+#include "astring.h"
+#include "corefile.h"
#include "cbm_crt.h"
diff --git a/src/lib/formats/cbm_crt.h b/src/lib/formats/cbm_crt.h
index bfb8732442c..8049ddacff7 100644
--- a/src/lib/formats/cbm_crt.h
+++ b/src/lib/formats/cbm_crt.h
@@ -13,7 +13,6 @@
#ifndef __CBM_CRT__
#define __CBM_CRT__
-#include "emu.h"
#include "formats/imageutl.h"
diff --git a/src/lib/formats/ccvf_dsk.c b/src/lib/formats/ccvf_dsk.c
index d8dc0117bd3..30894e32d72 100644
--- a/src/lib/formats/ccvf_dsk.c
+++ b/src/lib/formats/ccvf_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include "emu.h" // offs_t
+#include "astring.h"
#include "formats/ccvf_dsk.h"
ccvf_format::ccvf_format()
diff --git a/src/lib/formats/coco_cas.c b/src/lib/formats/coco_cas.c
index 880549c96ce..efc660943e3 100644
--- a/src/lib/formats/coco_cas.c
+++ b/src/lib/formats/coco_cas.c
@@ -31,7 +31,7 @@
**************************************************************************/
-#include "emu.h"
+#include "emu.h" // PAIR
#include "coco_cas.h"
#define COCO_WAVESAMPLES_HEADER (1.0)
diff --git a/src/lib/formats/comx35_dsk.c b/src/lib/formats/comx35_dsk.c
index 860cc13b74d..aa8603f3c1c 100644
--- a/src/lib/formats/comx35_dsk.c
+++ b/src/lib/formats/comx35_dsk.c
@@ -36,7 +36,8 @@
*/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/comx35_dsk.h"
comx35_format::comx35_format() : wd177x_format(formats)
diff --git a/src/lib/formats/concept_dsk.c b/src/lib/formats/concept_dsk.c
index 3c742248043..c23a3c35675 100644
--- a/src/lib/formats/concept_dsk.c
+++ b/src/lib/formats/concept_dsk.c
@@ -10,7 +10,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "flopimg.h"
#include "formats/concept_dsk.h"
diff --git a/src/lib/formats/coupedsk.c b/src/lib/formats/coupedsk.c
index 30ddcd394a8..e57d01abadf 100644
--- a/src/lib/formats/coupedsk.c
+++ b/src/lib/formats/coupedsk.c
@@ -6,7 +6,8 @@
**************************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/coupedsk.h"
#include "flopimg.h"
diff --git a/src/lib/formats/cpis_dsk.c b/src/lib/formats/cpis_dsk.c
index 9ad24d1d236..ff550a06af3 100644
--- a/src/lib/formats/cpis_dsk.c
+++ b/src/lib/formats/cpis_dsk.c
@@ -7,8 +7,8 @@
*********************************************************************/
#include <string.h>
+#include <assert.h>
-#include "emu.h"
#include "formats/cpis_dsk.h"
#include "formats/basicdsk.h"
diff --git a/src/lib/formats/d64_dsk.c b/src/lib/formats/d64_dsk.c
index 9c0fa259363..39f4d94ae14 100644
--- a/src/lib/formats/d64_dsk.c
+++ b/src/lib/formats/d64_dsk.c
@@ -10,7 +10,7 @@
*********************************************************************/
-#include "emu.h"
+#include "emu.h" // offs_t, emu_fatalerror, fatalerror
#include "formats/d64_dsk.h"
d64_format::d64_format()
diff --git a/src/lib/formats/d67_dsk.c b/src/lib/formats/d67_dsk.c
index 39ce16131de..82adcbb3487 100644
--- a/src/lib/formats/d67_dsk.c
+++ b/src/lib/formats/d67_dsk.c
@@ -8,7 +8,7 @@
*********************************************************************/
-#include "emu.h"
+#include "emu.h" // offs_t
#include "formats/d67_dsk.h"
d67_format::d67_format() : d64_format(file_formats)
diff --git a/src/lib/formats/d71_dsk.c b/src/lib/formats/d71_dsk.c
index f7925526fda..3ec66697a22 100644
--- a/src/lib/formats/d71_dsk.c
+++ b/src/lib/formats/d71_dsk.c
@@ -8,7 +8,7 @@
*********************************************************************/
-#include "emu.h"
+#include "emu.h" // offs_t
#include "formats/d71_dsk.h"
d71_format::d71_format() : d64_format(formats)
diff --git a/src/lib/formats/d80_dsk.c b/src/lib/formats/d80_dsk.c
index 55a6f0d8ade..1f9c05f2f59 100644
--- a/src/lib/formats/d80_dsk.c
+++ b/src/lib/formats/d80_dsk.c
@@ -8,7 +8,7 @@
*********************************************************************/
-#include "emu.h"
+#include "emu.h" // offs_t
#include "formats/d80_dsk.h"
d80_format::d80_format() : d64_format(file_formats)
diff --git a/src/lib/formats/d81_dsk.c b/src/lib/formats/d81_dsk.c
index 4c04ef51293..714b9c3cd9e 100644
--- a/src/lib/formats/d81_dsk.c
+++ b/src/lib/formats/d81_dsk.c
@@ -73,7 +73,8 @@ PER SECTOR ORGANIZATION:
*/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/d81_dsk.h"
d81_format::d81_format() : wd177x_format(formats)
diff --git a/src/lib/formats/d82_dsk.c b/src/lib/formats/d82_dsk.c
index 4d89f5e1313..33ffb4977c9 100644
--- a/src/lib/formats/d82_dsk.c
+++ b/src/lib/formats/d82_dsk.c
@@ -8,7 +8,7 @@
*********************************************************************/
-#include "emu.h"
+#include "emu.h" // offs_t
#include "formats/d82_dsk.h"
d82_format::d82_format() : d80_format(file_formats)
diff --git a/src/lib/formats/d88_dsk.c b/src/lib/formats/d88_dsk.c
index 0d41d49db5e..0a8f84e7b13 100644
--- a/src/lib/formats/d88_dsk.c
+++ b/src/lib/formats/d88_dsk.c
@@ -27,7 +27,8 @@
*
*/
-#include "emu.h"
+ #include <assert.h>
+
#include "flopimg.h"
#include "imageutl.h"
diff --git a/src/lib/formats/dcp_dsk.c b/src/lib/formats/dcp_dsk.c
index bdcc2966036..dc05f4a4b44 100644
--- a/src/lib/formats/dcp_dsk.c
+++ b/src/lib/formats/dcp_dsk.c
@@ -20,7 +20,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "dcp_dsk.h"
dcp_format::dcp_format()
diff --git a/src/lib/formats/dfi_dsk.c b/src/lib/formats/dfi_dsk.c
index 28a774c906e..2d5f83300db 100644
--- a/src/lib/formats/dfi_dsk.c
+++ b/src/lib/formats/dfi_dsk.c
@@ -11,7 +11,7 @@
* Correctly note exact index timing.
*/
-#include "emu.h"
+ #include "emu.h" // fatalerror
#include "dfi_dsk.h"
#include <zlib.h>
#define NUMBER_OF_MULTIREADS 3
diff --git a/src/lib/formats/dim_dsk.c b/src/lib/formats/dim_dsk.c
index 8287647483e..27d3e4e4ec5 100644
--- a/src/lib/formats/dim_dsk.c
+++ b/src/lib/formats/dim_dsk.c
@@ -7,8 +7,8 @@
*********************************************************************/
#include <string.h>
+#include <assert.h>
-#include "emu.h"
#include "dim_dsk.h"
#include "basicdsk.h"
diff --git a/src/lib/formats/dip_dsk.c b/src/lib/formats/dip_dsk.c
index 85f142df8fa..ae320e4cb7e 100644
--- a/src/lib/formats/dip_dsk.c
+++ b/src/lib/formats/dip_dsk.c
@@ -14,7 +14,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "dip_dsk.h"
dip_format::dip_format()
diff --git a/src/lib/formats/dmk_dsk.c b/src/lib/formats/dmk_dsk.c
index 2af453d66fa..1c87d268b48 100644
--- a/src/lib/formats/dmk_dsk.c
+++ b/src/lib/formats/dmk_dsk.c
@@ -13,7 +13,8 @@ TODO:
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "dmk_dsk.h"
diff --git a/src/lib/formats/dmv_dsk.c b/src/lib/formats/dmv_dsk.c
index 2dabe9ff05e..02469ed74d4 100644
--- a/src/lib/formats/dmv_dsk.c
+++ b/src/lib/formats/dmv_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/dmv_dsk.h"
dmv_format::dmv_format() : upd765_format(formats)
diff --git a/src/lib/formats/dsk_dsk.c b/src/lib/formats/dsk_dsk.c
index 93ae590e846..3d874f129d6 100644
--- a/src/lib/formats/dsk_dsk.c
+++ b/src/lib/formats/dsk_dsk.c
@@ -7,8 +7,8 @@
*********************************************************************/
#include <string.h>
+#include <assert.h>
-#include "emu.h"
#include "imageutl.h"
#include "flopimg.h"
diff --git a/src/lib/formats/ep64_dsk.c b/src/lib/formats/ep64_dsk.c
index ee63ee20ab9..80981bf698e 100644
--- a/src/lib/formats/ep64_dsk.c
+++ b/src/lib/formats/ep64_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/ep64_dsk.h"
ep64_format::ep64_format() : wd177x_format(formats)
diff --git a/src/lib/formats/esq16_dsk.c b/src/lib/formats/esq16_dsk.c
index 4b370cfe0bd..01b1120e677 100644
--- a/src/lib/formats/esq16_dsk.c
+++ b/src/lib/formats/esq16_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "flopimg.h"
#include "formats/esq16_dsk.h"
diff --git a/src/lib/formats/esq8_dsk.c b/src/lib/formats/esq8_dsk.c
index 8af0bc46a84..763c303d20a 100644
--- a/src/lib/formats/esq8_dsk.c
+++ b/src/lib/formats/esq8_dsk.c
@@ -10,7 +10,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "flopimg.h"
#include "formats/esq8_dsk.h"
diff --git a/src/lib/formats/excali64_dsk.c b/src/lib/formats/excali64_dsk.c
index 5de86815099..cff39939171 100644
--- a/src/lib/formats/excali64_dsk.c
+++ b/src/lib/formats/excali64_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/excali64_dsk.h"
excali64_format::excali64_format() : wd177x_format(formats)
diff --git a/src/lib/formats/fdd_dsk.c b/src/lib/formats/fdd_dsk.c
index e9d76a99973..10d9958ca59 100644
--- a/src/lib/formats/fdd_dsk.c
+++ b/src/lib/formats/fdd_dsk.c
@@ -31,7 +31,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "fdd_dsk.h"
fdd_format::fdd_format()
diff --git a/src/lib/formats/flex_dsk.c b/src/lib/formats/flex_dsk.c
index 975cf246ecf..34aa965643d 100644
--- a/src/lib/formats/flex_dsk.c
+++ b/src/lib/formats/flex_dsk.c
@@ -4,7 +4,7 @@
* Created on: 24/06/2014
*/
-#include "emu.h"
+ #include "emu.h" // logerror
#include "flex_dsk.h"
flex_format::flex_format()
diff --git a/src/lib/formats/flopimg.c b/src/lib/formats/flopimg.c
index dacd76d5b8b..1b460638374 100644
--- a/src/lib/formats/flopimg.c
+++ b/src/lib/formats/flopimg.c
@@ -11,6 +11,7 @@
#include <stdio.h>
#include <ctype.h>
#include <limits.h>
+#include <assert.h>
#include "emu.h"
#include "osdcore.h"
diff --git a/src/lib/formats/fmtowns_dsk.c b/src/lib/formats/fmtowns_dsk.c
index 71db43650ba..83bfd2fbd51 100644
--- a/src/lib/formats/fmtowns_dsk.c
+++ b/src/lib/formats/fmtowns_dsk.c
@@ -6,7 +6,8 @@
* Created on: 23/03/2014
*/
-#include "emu.h"
+ #include <assert.h>
+
#include "formats/fmtowns_dsk.h"
fmtowns_format::fmtowns_format() : wd177x_format(formats)
diff --git a/src/lib/formats/g64_dsk.c b/src/lib/formats/g64_dsk.c
index 5beba1ca35f..fec6b6e9c3d 100644
--- a/src/lib/formats/g64_dsk.c
+++ b/src/lib/formats/g64_dsk.c
@@ -10,7 +10,7 @@
*********************************************************************/
-#include "emu.h"
+#include "emu.h" // emu_fatalerror, offs_t
#include "formats/g64_dsk.h"
#define G64_FORMAT_HEADER "GCR-1541"
diff --git a/src/lib/formats/hxcmfm_dsk.c b/src/lib/formats/hxcmfm_dsk.c
index 967f05539a3..0203f8f7e26 100644
--- a/src/lib/formats/hxcmfm_dsk.c
+++ b/src/lib/formats/hxcmfm_dsk.c
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#include "emu.h"
+
+#include <assert.h>
#include "hxcmfm_dsk.h"
diff --git a/src/lib/formats/imd_dsk.c b/src/lib/formats/imd_dsk.c
index ef5478f638f..631e4f2e45d 100644
--- a/src/lib/formats/imd_dsk.c
+++ b/src/lib/formats/imd_dsk.c
@@ -7,7 +7,7 @@
*********************************************************************/
#include <string.h>
-#include "emu.h"
+#include <assert.h>
#include "flopimg.h"
struct imddsk_tag
diff --git a/src/lib/formats/ipf_dsk.c b/src/lib/formats/ipf_dsk.c
index 7e1704f9b55..3cbd46dcb5a 100644
--- a/src/lib/formats/ipf_dsk.c
+++ b/src/lib/formats/ipf_dsk.c
@@ -1,4 +1,4 @@
-#include "emu.h"
+#include <assert.h>
#include "ipf_dsk.h"
const floppy_format_type FLOPPY_IPF_FORMAT = &floppy_image_format_creator<ipf_format>;
diff --git a/src/lib/formats/iq151_dsk.c b/src/lib/formats/iq151_dsk.c
index f0df2c19555..dcffad85751 100644
--- a/src/lib/formats/iq151_dsk.c
+++ b/src/lib/formats/iq151_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/iq151_dsk.h"
iq151_format::iq151_format() : upd765_format(formats)
diff --git a/src/lib/formats/itt3030_dsk.c b/src/lib/formats/itt3030_dsk.c
index 7e0a5709897..7fed1bf3505 100644
--- a/src/lib/formats/itt3030_dsk.c
+++ b/src/lib/formats/itt3030_dsk.c
@@ -10,7 +10,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/itt3030_dsk.h"
itt3030_format::itt3030_format() : wd177x_format(formats)
diff --git a/src/lib/formats/kaypro_dsk.c b/src/lib/formats/kaypro_dsk.c
index 3781bb3de0a..e9924ce11c9 100644
--- a/src/lib/formats/kaypro_dsk.c
+++ b/src/lib/formats/kaypro_dsk.c
@@ -16,7 +16,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/kaypro_dsk.h"
kayproii_format::kayproii_format() : upd765_format(formats)
diff --git a/src/lib/formats/kc85_dsk.c b/src/lib/formats/kc85_dsk.c
index 0787ef5e82e..84111ff1171 100644
--- a/src/lib/formats/kc85_dsk.c
+++ b/src/lib/formats/kc85_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/kc85_dsk.h"
kc85_format::kc85_format() : upd765_format(formats)
diff --git a/src/lib/formats/m20_dsk.c b/src/lib/formats/m20_dsk.c
index 0371f595d63..cf440908c9f 100644
--- a/src/lib/formats/m20_dsk.c
+++ b/src/lib/formats/m20_dsk.c
@@ -13,8 +13,8 @@
*********************************************************************/
#include <string.h>
+#include <assert.h>
-#include "emu.h"
#include "m20_dsk.h"
#include "basicdsk.h"
diff --git a/src/lib/formats/m5_dsk.c b/src/lib/formats/m5_dsk.c
index fc8f9f98d43..9652eedbb72 100644
--- a/src/lib/formats/m5_dsk.c
+++ b/src/lib/formats/m5_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/m5_dsk.h"
m5_format::m5_format() : upd765_format(formats)
diff --git a/src/lib/formats/mfi_dsk.c b/src/lib/formats/mfi_dsk.c
index 13a23abe94b..2bd4b326501 100644
--- a/src/lib/formats/mfi_dsk.c
+++ b/src/lib/formats/mfi_dsk.c
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#include "emu.h"
+#include <assert.h>
+
#include "mfi_dsk.h"
#include <zlib.h>
diff --git a/src/lib/formats/mm_dsk.c b/src/lib/formats/mm_dsk.c
index 53939295378..0634c0e3ede 100644
--- a/src/lib/formats/mm_dsk.c
+++ b/src/lib/formats/mm_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/mm_dsk.h"
mm1_format::mm1_format() : upd765_format(formats)
diff --git a/src/lib/formats/nanos_dsk.c b/src/lib/formats/nanos_dsk.c
index fd8478b5b45..1536d0677c8 100644
--- a/src/lib/formats/nanos_dsk.c
+++ b/src/lib/formats/nanos_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/nanos_dsk.h"
nanos_format::nanos_format() : upd765_format(formats)
diff --git a/src/lib/formats/naslite_dsk.c b/src/lib/formats/naslite_dsk.c
index da043358b16..342407a7c95 100644
--- a/src/lib/formats/naslite_dsk.c
+++ b/src/lib/formats/naslite_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/naslite_dsk.h"
naslite_format::naslite_format() : upd765_format(formats)
diff --git a/src/lib/formats/nfd_dsk.c b/src/lib/formats/nfd_dsk.c
index ea886e9dd3a..083d59417b2 100644
--- a/src/lib/formats/nfd_dsk.c
+++ b/src/lib/formats/nfd_dsk.c
@@ -77,7 +77,8 @@
*********************************************************************/
-#include "emu.h"
+ #include <assert.h>
+
#include "nfd_dsk.h"
nfd_format::nfd_format()
diff --git a/src/lib/formats/oric_dsk.c b/src/lib/formats/oric_dsk.c
index aaef1928f0a..340fb507c2d 100644
--- a/src/lib/formats/oric_dsk.c
+++ b/src/lib/formats/oric_dsk.c
@@ -8,7 +8,7 @@
*********************************************************************/
-#include "emu.h"
+#include "emu.h" // logerror
#include "formats/oric_dsk.h"
oric_dsk_format::oric_dsk_format()
diff --git a/src/lib/formats/pasti_dsk.c b/src/lib/formats/pasti_dsk.c
index e78f816b8df..c39954490b8 100644
--- a/src/lib/formats/pasti_dsk.c
+++ b/src/lib/formats/pasti_dsk.c
@@ -1,4 +1,4 @@
-#include "emu.h"
+#include "emu.h" // logerror
#include "pasti_dsk.h"
// Pasti format supported using the documentation at
diff --git a/src/lib/formats/pc98fdi_dsk.c b/src/lib/formats/pc98fdi_dsk.c
index 81aeaf7a42b..83433606400 100644
--- a/src/lib/formats/pc98fdi_dsk.c
+++ b/src/lib/formats/pc98fdi_dsk.c
@@ -8,7 +8,7 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
#include "pc98fdi_dsk.h"
pc98fdi_format::pc98fdi_format()
diff --git a/src/lib/formats/pyldin_dsk.c b/src/lib/formats/pyldin_dsk.c
index 07d75f58724..de43ab1947b 100644
--- a/src/lib/formats/pyldin_dsk.c
+++ b/src/lib/formats/pyldin_dsk.c
@@ -8,7 +8,7 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
#include "formats/pyldin_dsk.h"
pyldin_format::pyldin_format() : upd765_format(formats)
diff --git a/src/lib/formats/ql_dsk.c b/src/lib/formats/ql_dsk.c
index 5351a92c83f..b3ceb233218 100644
--- a/src/lib/formats/ql_dsk.c
+++ b/src/lib/formats/ql_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/ql_dsk.h"
ql_format::ql_format() : wd177x_format(formats)
diff --git a/src/lib/formats/rx50_dsk.c b/src/lib/formats/rx50_dsk.c
index 4ece096fba6..429f22eafec 100644
--- a/src/lib/formats/rx50_dsk.c
+++ b/src/lib/formats/rx50_dsk.c
@@ -27,7 +27,8 @@
FORMAT A: /F:160 on DOS; turn MEDIACHK ON
************************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "flopimg.h"
#include "formats/rx50_dsk.h"
diff --git a/src/lib/formats/sf7000_dsk.c b/src/lib/formats/sf7000_dsk.c
index e15a42e7b41..31d0c37ab15 100644
--- a/src/lib/formats/sf7000_dsk.c
+++ b/src/lib/formats/sf7000_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/sf7000_dsk.h"
sf7000_format::sf7000_format() : upd765_format(formats)
diff --git a/src/lib/formats/smx_dsk.c b/src/lib/formats/smx_dsk.c
index 4729f65f8bb..9158a586c13 100644
--- a/src/lib/formats/smx_dsk.c
+++ b/src/lib/formats/smx_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/smx_dsk.h"
smx_format::smx_format() : wd177x_format(formats)
diff --git a/src/lib/formats/st_dsk.c b/src/lib/formats/st_dsk.c
index 72787b58a19..a30165993ea 100644
--- a/src/lib/formats/st_dsk.c
+++ b/src/lib/formats/st_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/st_dsk.h"
st_format::st_format()
diff --git a/src/lib/formats/tandy2k_dsk.c b/src/lib/formats/tandy2k_dsk.c
index cc15e75b17b..e08865c9493 100644
--- a/src/lib/formats/tandy2k_dsk.c
+++ b/src/lib/formats/tandy2k_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/tandy2k_dsk.h"
tandy2k_format::tandy2k_format() : upd765_format(formats)
diff --git a/src/lib/formats/td0_dsk.c b/src/lib/formats/td0_dsk.c
index cc5a72993a5..a9a7ed702a1 100644
--- a/src/lib/formats/td0_dsk.c
+++ b/src/lib/formats/td0_dsk.c
@@ -13,7 +13,7 @@
*/
#include <string.h>
-#include "emu.h"
+#include <assert.h>
#include "flopimg.h"
#define BUFSZ 512 // new input buffer
diff --git a/src/lib/formats/ti99_dsk.c b/src/lib/formats/ti99_dsk.c
index b1c473fef3e..d18ef3c4192 100644
--- a/src/lib/formats/ti99_dsk.c
+++ b/src/lib/formats/ti99_dsk.c
@@ -41,10 +41,11 @@
*
********************************************************************/
-#include "emu.h"
#include <string.h>
#include <time.h>
+#include <assert.h>
+#include "emu.h" // logerror
#include "imageutl.h"
#include "ti99_dsk.h"
diff --git a/src/lib/formats/tiki100_dsk.c b/src/lib/formats/tiki100_dsk.c
index 4704f6e9911..1a05af7a5af 100644
--- a/src/lib/formats/tiki100_dsk.c
+++ b/src/lib/formats/tiki100_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/tiki100_dsk.h"
tiki100_format::tiki100_format() : wd177x_format(formats)
diff --git a/src/lib/formats/trd_dsk.c b/src/lib/formats/trd_dsk.c
index 6ee08e6a2c0..7cacd98fb4a 100644
--- a/src/lib/formats/trd_dsk.c
+++ b/src/lib/formats/trd_dsk.c
@@ -6,7 +6,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/trd_dsk.h"
trd_format::trd_format() : wd177x_format(formats)
diff --git a/src/lib/formats/tvc_dsk.c b/src/lib/formats/tvc_dsk.c
index fdbe28365b5..8a2254cb7cc 100644
--- a/src/lib/formats/tvc_dsk.c
+++ b/src/lib/formats/tvc_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/tvc_dsk.h"
tvc_format::tvc_format() : wd177x_format(formats)
diff --git a/src/lib/formats/upd765_dsk.c b/src/lib/formats/upd765_dsk.c
index 5966e1de1a3..b26da4c2d98 100644
--- a/src/lib/formats/upd765_dsk.c
+++ b/src/lib/formats/upd765_dsk.c
@@ -8,7 +8,7 @@
*********************************************************************/
-#include "emu.h"
+#include "emu.h" // emu_fatalerror
#include "formats/upd765_dsk.h"
upd765_format::upd765_format(const format *_formats)
diff --git a/src/lib/formats/victor9k_dsk.c b/src/lib/formats/victor9k_dsk.c
index 694ac3dbf80..08328fd2619 100644
--- a/src/lib/formats/victor9k_dsk.c
+++ b/src/lib/formats/victor9k_dsk.c
@@ -97,7 +97,7 @@
zone.
*/
-#include "emu.h"
+#include "emu.h" // logerror, BIT, emu_fatalerror
#include "formats/victor9k_dsk.h"
victor9k_format::victor9k_format()
diff --git a/src/lib/formats/wd177x_dsk.c b/src/lib/formats/wd177x_dsk.c
index 57223fecc2f..8ced951fd51 100644
--- a/src/lib/formats/wd177x_dsk.c
+++ b/src/lib/formats/wd177x_dsk.c
@@ -8,7 +8,7 @@
*********************************************************************/
-#include "emu.h"
+#include "emu.h" // emu_fatalerror
#include "formats/wd177x_dsk.h"
wd177x_format::wd177x_format(const format *_formats)
diff --git a/src/lib/formats/xdf_dsk.c b/src/lib/formats/xdf_dsk.c
index 6b81877b701..c77d685d9be 100644
--- a/src/lib/formats/xdf_dsk.c
+++ b/src/lib/formats/xdf_dsk.c
@@ -8,7 +8,8 @@
*********************************************************************/
-#include "emu.h"
+#include <assert.h>
+
#include "formats/xdf_dsk.h"
xdf_format::xdf_format() : upd765_format(formats)