diff --git a/src/emu/clifront.c b/src/emu/clifront.c
index fbbb9229515..19f49ef8d98 100644
--- a/src/emu/clifront.c
+++ b/src/emu/clifront.c
@@ -24,9 +24,6 @@
 #include <new>
 #include <ctype.h>
 
-#ifdef MESS
-#include "climess.h"
-#endif /* MESS */
 
 
 
diff --git a/src/emu/devimage.c b/src/emu/devimage.c
index e606e572cc0..750527f2fac 100644
--- a/src/emu/devimage.c
+++ b/src/emu/devimage.c
@@ -387,7 +387,7 @@ done:
 			}
 		}
 	}
-	return err ? FALSE : TRUE;
+	return err ? IMAGE_INIT_FAIL : IMAGE_INIT_PASS;
 }
 
 
@@ -409,7 +409,7 @@ bool legacy_image_device_base::load(const char *path)
 
 bool legacy_image_device_base::finish_load()
 {
-    bool err = FALSE;
+    bool err = IMAGE_INIT_PASS;
 
     if (m_is_loading)
     {
diff --git a/src/emu/diimage.h b/src/emu/diimage.h
index 27b35286c19..4292493d483 100644
--- a/src/emu/diimage.h
+++ b/src/emu/diimage.h
@@ -121,6 +121,11 @@ typedef void (*device_image_get_devices_func)(device_image_interface &device);
 //  MACROS
 //**************************************************************************
 
+#define IMAGE_INIT_PASS		FALSE
+#define IMAGE_INIT_FAIL		TRUE
+#define IMAGE_VERIFY_PASS	FALSE
+#define IMAGE_VERIFY_FAIL	TRUE
+
 #define DEVICE_IMAGE_LOAD_NAME(name)        device_load_##name
 #define DEVICE_IMAGE_LOAD(name)             int DEVICE_IMAGE_LOAD_NAME(name)(device_image_interface &image)
 
diff --git a/src/emu/image.c b/src/emu/image.c
index 96bf64219f9..29ac173117c 100644
--- a/src/emu/image.c
+++ b/src/emu/image.c
@@ -215,16 +215,14 @@ void image_device_init(running_machine *machine)
 
 		if ((image_name != NULL) && (image_name[0] != '\0'))
 		{
-			bool result = FALSE;
-
 			/* mark init state */
 			image->set_init_phase();
 			
 			/* try to load this image */
-			result = image->load(image_name);
+			bool result = image->load(image_name);
 
 			/* did the image load fail? */
-			if (!result)
+			if (result)
 			{
 				/* retrieve image error message */
 				const char *image_err = image->error();
diff --git a/src/emu/info.c b/src/emu/info.c
index 7ef0b71e9a1..a9587984d4d 100644
--- a/src/emu/info.c
+++ b/src/emu/info.c
@@ -18,10 +18,6 @@
 
 #include <ctype.h>
 
-#ifdef MESS
-#include "infomess.h"
-#endif /* MESS */
-
 /* MESS/MAME configuration */
 #ifdef MESS
 #define XML_ROOT "mess"
diff --git a/src/mame/mame.mak b/src/mame/mame.mak
index 76a1dc76479..0b4c6dae51e 100644
--- a/src/mame/mame.mak
+++ b/src/mame/mame.mak
@@ -1332,7 +1332,6 @@ $(MAMEOBJ)/taito.a: \
 	$(DRIVERS)/volfied.o $(MACHINE)/volfied.o $(VIDEO)/volfied.o \
 	$(DRIVERS)/warriorb.o $(VIDEO)/warriorb.o \
 	$(DRIVERS)/wgp.o $(VIDEO)/wgp.o \
-	$(MACHINE)/daikaiju.o \
 	$(AUDIO)/taitosnd.o \
 	$(AUDIO)/t5182.o \
 	$(MACHINE)/taitoio.o \