diff --git a/src/devices/bus/nes_ctrl/ctrl.cpp b/src/devices/bus/nes_ctrl/ctrl.cpp
index a946eeb80fb..239ea58233b 100644
--- a/src/devices/bus/nes_ctrl/ctrl.cpp
+++ b/src/devices/bus/nes_ctrl/ctrl.cpp
@@ -41,7 +41,6 @@
 **********************************************************************/
 
 #include "emu.h"
-#include "screen.h"
 #include "ctrl.h"
 // slot devices
 #include "4score.h"
diff --git a/src/devices/bus/nes_ctrl/ctrl.h b/src/devices/bus/nes_ctrl/ctrl.h
index 0acefbf4654..bc013f5eca3 100644
--- a/src/devices/bus/nes_ctrl/ctrl.h
+++ b/src/devices/bus/nes_ctrl/ctrl.h
@@ -17,6 +17,8 @@
 
 #pragma once
 
+#include "screen.h"
+
 
 //**************************************************************************
 //  TYPE DEFINITIONS
diff --git a/src/devices/bus/sms_ctrl/smsctrl.h b/src/devices/bus/sms_ctrl/smsctrl.h
index ced9176efb0..c237543e5d6 100644
--- a/src/devices/bus/sms_ctrl/smsctrl.h
+++ b/src/devices/bus/sms_ctrl/smsctrl.h
@@ -12,6 +12,8 @@
 #ifndef MAME_BUS_SMS_CTRL_SMSCTRL_H
 #define MAME_BUS_SMS_CTRL_SMSCTRL_H
 
+#include "screen.h"
+
 #pragma once
 
 
diff --git a/src/devices/cpu/f2mc16/mb9061x.cpp b/src/devices/cpu/f2mc16/mb9061x.cpp
index df337b49fb5..b299d2ab6b1 100644
--- a/src/devices/cpu/f2mc16/mb9061x.cpp
+++ b/src/devices/cpu/f2mc16/mb9061x.cpp
@@ -324,7 +324,7 @@ READ8_MEMBER(mb9061x_device::tbtc_r)
 
 WRITE8_MEMBER(mb9061x_device::tbtc_w)
 {
-	static const float periods[4] = { 1.024, 4.096, 16.384, 131.072 };
+	static const float periods[4] = { 1.024f, 4.096f, 16.384f, 131.072f };
 
 	//printf("%02x to TBTC\n", data);
 //  if ((!(data & TBTC_TBR)) || ((data & (TBTC_TBC1|TBTC_TBC0)) != (m_tbtc & (TBTC_TBC1|TBTC_TBC0))))
diff --git a/src/devices/machine/acorn_vidc.cpp b/src/devices/machine/acorn_vidc.cpp
index 012ed9f9819..1bc5f9fc1e4 100644
--- a/src/devices/machine/acorn_vidc.cpp
+++ b/src/devices/machine/acorn_vidc.cpp
@@ -372,8 +372,8 @@ inline void acorn_vidc10_device::refresh_stereo_image(uint8_t channel)
 	    -001 full left
 	    -000 "undefined" TODO: verify what it actually means
 	*/
-	const float left_gain[8] = { 1.0, 2.0, 1.66, 1.34, 1.0, 0.66, 0.34, 0.0 };
-	const float right_gain[8] = { 1.0, 0.0, 0.34, 0.66, 1.0, 1.34, 1.66, 2.0 };
+	const float left_gain[8] = { 1.0f, 2.0f, 1.66f, 1.34f, 1.0f, 0.66f, 0.34f, 0.0f };
+	const float right_gain[8] = { 1.0f, 0.0f, 0.34f, 0.66f, 1.0f, 1.34f, 1.66f, 2.0f };
 
 	m_lspeaker->set_input_gain(channel,left_gain[m_stereo_image[channel]]*m_sound_input_gain);
 	m_rspeaker->set_input_gain(channel,right_gain[m_stereo_image[channel]]*m_sound_input_gain);
diff --git a/src/devices/machine/acorn_vidc.h b/src/devices/machine/acorn_vidc.h
index 7a73e6c277c..83a9bcbc000 100644
--- a/src/devices/machine/acorn_vidc.h
+++ b/src/devices/machine/acorn_vidc.h
@@ -114,7 +114,7 @@ private:
 	bool     m_sound_frequency_test_bit;
 	bool     m_sound_mode;
 	u8       m_stereo_image[8];
-	const float m_sound_input_gain = 0.05;
+	const float m_sound_input_gain = 0.05f;
 	const int m_sound_max_channels = 8;
 	int16_t  m_ulaw_lookup[256];
 	void refresh_sound_frequency();
diff --git a/src/devices/video/epic12_blit0.cpp b/src/devices/video/epic12_blit0.cpp
index 8bd7d8a4ff3..3bf5072d0da 100644
--- a/src/devices/video/epic12_blit0.cpp
+++ b/src/devices/video/epic12_blit0.cpp
@@ -1,12 +1,13 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
+#include "emu.h"
+
 #define REALLY_SIMPLE 0
 /* Non-Flipped, Non-Tinted, Transparent */
 #define FLIPX 0
 #define TINT 0
 #define TRANSPARENT 1
 
-#include "emu.h"
 #include "epic12.h"
 
 /* Special Case */
diff --git a/src/devices/video/epic12_blit1.cpp b/src/devices/video/epic12_blit1.cpp
index 7ef055ce463..8b21e25f72c 100644
--- a/src/devices/video/epic12_blit1.cpp
+++ b/src/devices/video/epic12_blit1.cpp
@@ -1,12 +1,13 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
+#include "emu.h"
+
 #define REALLY_SIMPLE 0
 /* Non-Flipped, Non-Tinted, Non-Transparent */
 #define FLIPX 0
 #define TINT 0
 #define TRANSPARENT 0
 
-#include "emu.h"
 #include "epic12.h"
 
 /* Special Case */
diff --git a/src/devices/video/epic12_blit2.cpp b/src/devices/video/epic12_blit2.cpp
index 8909ca1df7e..f483a9c4c8c 100644
--- a/src/devices/video/epic12_blit2.cpp
+++ b/src/devices/video/epic12_blit2.cpp
@@ -1,12 +1,13 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
+#include "emu.h"
+
 #define REALLY_SIMPLE 0
 /* X-Flipped, Non-Tinted, Transparent */
 #define FLIPX 1
 #define TINT 0
 #define TRANSPARENT 1
 
-#include "emu.h"
 #include "epic12.h"
 
 /* Special Case */
diff --git a/src/devices/video/epic12_blit3.cpp b/src/devices/video/epic12_blit3.cpp
index 7bc6b7ca44a..5f90b580952 100644
--- a/src/devices/video/epic12_blit3.cpp
+++ b/src/devices/video/epic12_blit3.cpp
@@ -1,12 +1,13 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
+#include "emu.h"
+
 #define REALLY_SIMPLE 0
 /* X-Flipped, Non-Tinted, Non-Transparent */
 #define FLIPX 1
 #define TINT 0
 #define TRANSPARENT 0
 
-#include "emu.h"
 #include "epic12.h"
 
 /* Special Case */
diff --git a/src/devices/video/epic12_blit4.cpp b/src/devices/video/epic12_blit4.cpp
index 06dec67898c..4220977d2b2 100644
--- a/src/devices/video/epic12_blit4.cpp
+++ b/src/devices/video/epic12_blit4.cpp
@@ -1,12 +1,13 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
+#include "emu.h"
+
 #define REALLY_SIMPLE 0
 /* Non-Flipped, Tinted, Transparent */
 #define FLIPX 0
 #define TINT 1
 #define TRANSPARENT 1
 
-#include "emu.h"
 #include "epic12.h"
 
 /* Special Case */
diff --git a/src/devices/video/epic12_blit5.cpp b/src/devices/video/epic12_blit5.cpp
index 9520abb64e9..d8c694d8ebf 100644
--- a/src/devices/video/epic12_blit5.cpp
+++ b/src/devices/video/epic12_blit5.cpp
@@ -1,12 +1,13 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
+#include "emu.h"
+
 #define REALLY_SIMPLE 0
 /* Non-Flipped, Tinted, Non-Transparent */
 #define FLIPX 0
 #define TINT 1
 #define TRANSPARENT 0
 
-#include "emu.h"
 #include "epic12.h"
 
 /* Special Case */
diff --git a/src/devices/video/epic12_blit6.cpp b/src/devices/video/epic12_blit6.cpp
index 3cdcf2f4b9a..eedab81025f 100644
--- a/src/devices/video/epic12_blit6.cpp
+++ b/src/devices/video/epic12_blit6.cpp
@@ -1,12 +1,13 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
+#include "emu.h"
+
 #define REALLY_SIMPLE 0
 /* X-Flipped, Tinted, Transparent */
 #define FLIPX 1
 #define TINT 1
 #define TRANSPARENT 1
 
-#include "emu.h"
 #include "epic12.h"
 
 /* Special Case */
diff --git a/src/devices/video/epic12_blit7.cpp b/src/devices/video/epic12_blit7.cpp
index 480f85011dd..adfadba8e0e 100644
--- a/src/devices/video/epic12_blit7.cpp
+++ b/src/devices/video/epic12_blit7.cpp
@@ -1,12 +1,13 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
+#include "emu.h"
+
 #define REALLY_SIMPLE 0
 /* X-Flipped, Tinted, Non-Transparent */
 #define FLIPX 1
 #define TINT 1
 #define TRANSPARENT 0
 
-#include "emu.h"
 #include "epic12.h"
 
 /* Special Case */
diff --git a/src/mame/drivers/starrider.cpp b/src/mame/drivers/starrider.cpp
index 73203efff43..a4e1f7ea68c 100644
--- a/src/mame/drivers/starrider.cpp
+++ b/src/mame/drivers/starrider.cpp
@@ -567,7 +567,9 @@ void sr_state::cpu_wd_w(u8 data)
 {
 	// U22 (74LS161) parallel load zero
 	if ((data & 0x3e) == 0x14)
-		/* TODO: watchdog reset */;
+	{
+		/* TODO: watchdog reset */
+	}
 }
 
 u8 sr_state::cpu_nvram_r(address_space &space, offs_t offset)