diff --git a/src/devices/sound/beep.cpp b/src/devices/sound/beep.cpp
index 58096c4b561..47f4701a662 100644
--- a/src/devices/sound/beep.cpp
+++ b/src/devices/sound/beep.cpp
@@ -2,15 +2,13 @@
 // copyright-holders:Kevin Thacker
 /***************************************************************************
 
-    beep.c
+    Simple beeper sound driver
 
     This is used for computers/systems which can only output a constant tone.
     This tone can be turned on and off.
     e.g. PCW and PCW16 computer systems
     KT - 25-Jun-2000
 
-    Sound handler
-
 ****************************************************************************/
 
 #include "emu.h"
@@ -22,15 +20,6 @@
 // device type definition
 DEFINE_DEVICE_TYPE(BEEP, beep_device, "beep", "Beep")
 
-
-//**************************************************************************
-//  LIVE DEVICE
-//**************************************************************************
-
-//-------------------------------------------------
-//  beep_device - constructor
-//-------------------------------------------------
-
 beep_device::beep_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 	: device_t(mconfig, BEEP, tag, owner, clock)
 	, device_sound_interface(mconfig, *this)
diff --git a/src/devices/sound/beep.h b/src/devices/sound/beep.h
index 6c5ef2ae65f..52943d83465 100644
--- a/src/devices/sound/beep.h
+++ b/src/devices/sound/beep.h
@@ -1,5 +1,11 @@
 // license:BSD-3-Clause
 // copyright-holders:Kevin Thacker
+/**********************************************************************
+
+    Simple beeper sound driver
+
+**********************************************************************/
+
 #ifndef MAME_SOUND_BEEP_H
 #define MAME_SOUND_BEEP_H
 
diff --git a/src/devices/sound/spkrdev.cpp b/src/devices/sound/spkrdev.cpp
index cf5e761ee46..b33e4ee5520 100644
--- a/src/devices/sound/spkrdev.cpp
+++ b/src/devices/sound/spkrdev.cpp
@@ -1,17 +1,16 @@
 // license:BSD-3-Clause
-// copyright-holders:Nicola Salmoria
+// copyright-holders:Nathan Woods, Anders Hallström
 /***************************************************************************
 
-    speaker.c
-
     Sound driver to emulate a simple speaker,
     driven by one or more output bits
 
-    Original author: (unsigned)
-    Filtering: Anders Hallstr?m
+    Original author: MESS Team
+    Filtering: Anders Hallström
+
 ****************************************************************************/
 
-/* Discussion of oversampling and anti-alias filtering: (Anders Hallstr?m)
+/* Discussion of oversampling and anti-alias filtering: (Anders Hallström)
  *
  * This driver is for machines that directly control
  * one or more simple digital-to-analog converters (DAC)
@@ -93,6 +92,7 @@ speaker_sound_device::speaker_sound_device(const machine_config &mconfig, const
 {
 }
 
+
 //-------------------------------------------------
 //  device_start - device-specific startup
 //-------------------------------------------------
diff --git a/src/devices/sound/spkrdev.h b/src/devices/sound/spkrdev.h
index 596a4f94854..49b8eae2756 100644
--- a/src/devices/sound/spkrdev.h
+++ b/src/devices/sound/spkrdev.h
@@ -1,12 +1,12 @@
 // license:BSD-3-Clause
-// copyright-holders:Nicola Salmoria
+// copyright-holders:Nathan Woods, Anders Hallström
 /**********************************************************************
 
-    speaker.h
     Sound driver to emulate a simple speaker,
     driven by one or more output bits
 
 **********************************************************************/
+
 #ifndef MAME_SOUND_SPKRDEV_H
 #define MAME_SOUND_SPKRDEV_H
 
diff --git a/src/devices/sound/wave.cpp b/src/devices/sound/wave.cpp
index 99c56615171..1a53aaa95f7 100644
--- a/src/devices/sound/wave.cpp
+++ b/src/devices/sound/wave.cpp
@@ -2,17 +2,15 @@
 // copyright-holders:Nathan Woods
 /***************************************************************************
 
-    wave.c
+    Cassette wave samples sound driver
 
-    Code that interfaces
-    Functions to handle loading, creation, recording and playback
-    of wave samples for IO_CASSETTE
+    Code that interfaces functions to handle loading, creation,
+    recording and playback of wave samples for IO_CASSETTE
 
     2010-06-19 - Found that since 0.132, the right channel is badly out of
     sync on a mono system, causing bad sound. Added code to disable
     the second channel on a mono system.
 
-
 ****************************************************************************/
 
 #include "emu.h"
diff --git a/src/devices/sound/wave.h b/src/devices/sound/wave.h
index e81379ee93a..73c9b94873a 100644
--- a/src/devices/sound/wave.h
+++ b/src/devices/sound/wave.h
@@ -1,5 +1,11 @@
 // license:BSD-3-Clause
 // copyright-holders:Nathan Woods
+/**********************************************************************
+
+    Cassette wave samples sound driver
+
+**********************************************************************/
+
 #ifndef MAME_SOUND_WAVE_H
 #define MAME_SOUND_WAVE_H
 
diff --git a/src/mame/drivers/tiamc1.cpp b/src/mame/drivers/tiamc1.cpp
index aac302ba266..aaa1a6c495a 100644
--- a/src/mame/drivers/tiamc1.cpp
+++ b/src/mame/drivers/tiamc1.cpp
@@ -123,6 +123,7 @@
 
 #include "cpu/i8085/i8085.h"
 #include "machine/i8255.h"
+#include "machine/pit8253.h"
 #include "screen.h"
 #include "speaker.h"