diff --git a/.gitattributes b/.gitattributes
index f02f1415845..d33b4f5d264 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2170,7 +2170,6 @@ src/emu/emuopts.c svneol=native#text/plain
 src/emu/emuopts.h svneol=native#text/plain
 src/emu/emupal.c svneol=native#text/plain
 src/emu/emupal.h svneol=native#text/plain
-src/emu/emutempl.h svneol=native#text/plain
 src/emu/fileio.c svneol=native#text/plain
 src/emu/fileio.h svneol=native#text/plain
 src/emu/gamedrv.h svneol=native#text/plain
diff --git a/src/emu/emu.h b/src/emu/emu.h
index 8106abc66be..64381cb032a 100644
--- a/src/emu/emu.h
+++ b/src/emu/emu.h
@@ -22,7 +22,6 @@
 
 // core emulator headers -- must be first
 #include "emucore.h"
-#include "emutempl.h"
 #include "eminline.h"
 #include "profiler.h"
 
diff --git a/src/emu/emutempl.h b/src/emu/emutempl.h
deleted file mode 100644
index a56a12de788..00000000000
--- a/src/emu/emutempl.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-/***************************************************************************
-
-    emutempl.h
-
-    Core templates for basic non-string types.
-
-***************************************************************************/
-
-#pragma once
-
-#ifndef __EMUTEMPL_H__
-#define __EMUTEMPL_H__
-
-
-//**************************************************************************
-//  TYPE DEFINITIONS
-//**************************************************************************
-
-
-#endif  /* __EMUTEMPL_H__ */
diff --git a/src/emu/machine.c b/src/emu/machine.c
index 94c8751348b..ee00e281941 100644
--- a/src/emu/machine.c
+++ b/src/emu/machine.c
@@ -783,23 +783,6 @@ void running_machine::add_logerror_callback(logerror_callback callback)
 }
 
 
-//-------------------------------------------------
-//  logerror - printf-style error logging
-//-------------------------------------------------
-
-void CLIB_DECL running_machine::logerror(const char *format, ...)
-{
-	// process only if there is a target
-	if (m_logerror_list.first() != NULL)
-	{
-		va_list arg;
-		va_start(arg, format);
-		vlogerror(format, arg);
-		va_end(arg);
-	}
-}
-
-
 //-------------------------------------------------
 //  vlogerror - vprintf-style error logging
 //-------------------------------------------------
diff --git a/src/emu/machine.h b/src/emu/machine.h
index 764d933b9fd..b6e8ee1384f 100644
--- a/src/emu/machine.h
+++ b/src/emu/machine.h
@@ -251,7 +251,6 @@ public:
 	void watchdog_enable(bool enable = true);
 
 	// misc
-	void CLIB_DECL logerror(const char *format, ...) ATTR_PRINTF(2,3);
 	void CLIB_DECL vlogerror(const char *format, va_list args);
 	UINT32 rand();
 	const char *describe_context();
diff --git a/src/emu/mame.c b/src/emu/mame.c
index 98062b14877..01a8ce2667c 100644
--- a/src/emu/mame.c
+++ b/src/emu/mame.c
@@ -121,16 +121,6 @@ static output_delegate output_cb[OUTPUT_CHANNEL_COUNT] =
     CORE IMPLEMENTATION
 ***************************************************************************/
 
-/*-------------------------------------------------
-    mame_is_valid_machine - return true if the
-    given machine is valid
--------------------------------------------------*/
-
-int mame_is_valid_machine(running_machine &machine)
-{
-	return (&machine == global_machine);
-}
-
 /*-------------------------------------------------
     mame_execute - run the core emulation
 -------------------------------------------------*/
@@ -397,18 +387,8 @@ void CLIB_DECL logerror(const char *format, ...)
 {
 	va_list arg;
 	va_start(arg, format);
-	vlogerror(format, arg);
+	if (global_machine != NULL)
+		global_machine->vlogerror(format, arg);
 	va_end(arg);
 }
 
-
-/*-------------------------------------------------
-    vlogerror - log to the debugger and any other
-    OSD-defined output streams
--------------------------------------------------*/
-
-void CLIB_DECL vlogerror(const char *format, va_list arg)
-{
-	if (global_machine != NULL)
-		global_machine->vlogerror(format, arg);
-}
diff --git a/src/emu/mame.h b/src/emu/mame.h
index 074d735c282..5afcd655819 100644
--- a/src/emu/mame.h
+++ b/src/emu/mame.h
@@ -129,7 +129,6 @@ void CLIB_DECL popmessage(const char *format, ...) ATTR_PRINTF(1,2);
 
 // log to the standard error.log file
 void CLIB_DECL logerror(const char *format, ...) ATTR_PRINTF(1,2);
-void CLIB_DECL vlogerror(const char *format, va_list arg);
 
 
 #endif  /* __MAME_H__ */
diff --git a/src/osd/osdepend.h b/src/osd/osdepend.h
index 756f8a0972b..b15e91f2155 100644
--- a/src/osd/osdepend.h
+++ b/src/osd/osdepend.h
@@ -14,7 +14,6 @@
 #define __OSDEPEND_H__
 
 #include "emucore.h"
-#include "emutempl.h"
 #include "osdcore.h"
 #include "unicode.h"