diff --git a/src/eltorito.c b/src/eltorito.c
index fb8d682..27193d7 100644
--- a/src/eltorito.c
+++ b/src/eltorito.c
@@ -234,7 +234,7 @@ int create_image(IsoImage *image, const char *image_path,
         ret = iso_stream_read(stream, &mbr, sizeof(mbr));
         iso_stream_close(stream);
         if (ret != sizeof(mbr)) {
-            iso_msg_submit(image->id, LIBISO_EL_TORITO_WRONG_IMG, 
+            iso_msg_submit(image->id, ISO_BOOT_IMAGE_NOT_VALID, 
                           "Can't read MBR from image file.");
             return ret < 0 ? ret : ISO_FILE_READ_ERROR;
         }
@@ -789,7 +789,7 @@ int patch_boot_image(uint8_t *buf, Ecma119Image *t, size_t imgsize)
     }
     if (offset != imgsize) {
         /* file length not multiple of 4 */
-        return iso_msg_submit(t->image->id, LIBISO_ISOLINUX_CANT_PATCH, 
+        return iso_msg_submit(t->image->id, ISO_ISOLINUX_CANT_PATCH, 
             "Unexpected isolinux image length. Patch might not work.");
     }
     
diff --git a/src/messages.h b/src/messages.h
index 2507e80..63d4d63 100644
--- a/src/messages.h
+++ b/src/messages.h
@@ -21,68 +21,6 @@
  */
 extern int iso_message_id;
 
-/** File cannot be added to image (ignored) */
-#define LIBISO_FILE_IGNORED         0x00030100
-/** File cannot be writing to image (ignored) */
-#define LIBISO_FILE_CANT_WRITE      0x00030101
-/** Read error */
-#define LIBISO_READ_ERROR           0x00030102
-/** Write error */
-#define LIBISO_WRITE_ERROR          0x00030103
-/** Cannot create writer thread */
-#define LIBISO_THREAD_ERROR         0x00030110
-
-/** Charset conversion error */
-#define LIBISO_CHARSET_ERROR        0x00030500
-
-/** Can't read file (ignored) */
-#define LIBISO_CANT_READ_FILE		0x00031001
-/** Can't read file (operation canceled) */
-#define LIBISO_FILE_READ_ERROR		0x00031002
-/** File doesn't exist */
-#define LIBISO_FILE_DOESNT_EXIST	0x00031003
-/** Read access denied */
-#define LIBISO_FILE_NO_READ_ACCESS	0x00031004
-
-/** Unsupported image feature */
-#define LIBISO_IMG_UNSUPPORTED		0x00031000
-/** Unsupported Vol Desc that will be ignored */
-#define LIBISO_UNSUPPORTED_VD		0x00031001
-/** damaged image */
-#define LIBISO_WRONG_IMG			0x00031002
-/** Can't read previous image file */
-#define LIBISO_CANT_READ_IMG		0x00031003
-
-/* Unsupported SUSP entry */
-#define LIBISO_SUSP_UNHANLED		0x00030101
-/* Wrong SUSP entry, that cause RR to be ignored */
-#define LIBISO_SUSP_WRONG			0x00030102
-/* Unsupported multiple SUSP ER entries where found */
-#define LIBISO_SUSP_MULTIPLE_ER		0x00030103
-
-/** Unsupported RR feature. */
-#define LIBISO_RR_UNSUPPORTED		0x00030111
-/** Error in a Rock Ridge entry. */
-#define LIBISO_RR_ERROR				0x00030112
-/* Wrong/Damaged Rock Ridge */
-#define LIBISO_RR_WARNING           0x00030113
-
-/** Unsupported boot vol desc. */
-#define LIBISO_BOOT_VD_UNHANLED			0x00030201
-/** Wrong or damaged el-torito catalog */
-#define LIBISO_EL_TORITO_WRONG			0x00030202
-/** Unsupproted el-torito feature */
-#define LIBISO_EL_TORITO_UNHANLED		0x00030203
-/** Trying to add an invalid file as a El-Torito image */
-#define LIBISO_EL_TORITO_WRONG_IMG		0x00030204
-/** Can't properly patch isolinux image */
-#define LIBISO_ISOLINUX_CANT_PATCH		0x00030205
-/** Copying El-Torito from a previous image without enought info about it */
-#define LIBISO_EL_TORITO_BLIND_COPY		0x00030206
-
-/** Unsupported file type for Joliet tree */
-#define LIBISO_JOLIET_WRONG_FILE_TYPE	0x00030301
-
 /**
  * Submit a debug message.
  */