diff --git a/ChangeLog b/ChangeLog
index 8f6accf4f..242db8ed0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
         * e_win now traps elm_win_activate to ensure that internal elm
           windows don't fail to raise as expected if user has configured
           E to ignore activate hints
+        * Various #defines in e_int_menus.h are now enums
 
 2012-12-29 Mike Blumenkrantz
 
diff --git a/NEWS b/NEWS
index 1f8458ca6..c772a8e6f 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,7 @@ Improvements:
     * Improve title of fileman settings.
     * Mixer settings dialog is now resizable
     * Increased maximum menu size, improved menu autoscrolling
+    * Various #defines in e_int_menus.h are now enums
 
 Fixes:
     * Force check changed upon confirmation dialog closure for engine settings.
diff --git a/src/bin/e_int_menus.h b/src/bin/e_int_menus.h
index 6808b7450..047be9ef9 100644
--- a/src/bin/e_int_menus.h
+++ b/src/bin/e_int_menus.h
@@ -6,22 +6,35 @@ typedef struct _E_Int_Menu_Augmentation E_Int_Menu_Augmentation;
 #ifndef E_INT_MENUS_H
 #define E_INT_MENUS_H
 
-#define E_CLIENTLIST_GROUP_NONE 0
-#define E_CLIENTLIST_GROUP_DESK 1
-#define E_CLIENTLIST_GROUP_CLASS 2
+typedef enum
+{
+   E_CLIENTLIST_GROUP_NONE,
+   E_CLIENTLIST_GROUP_DESK,
+   E_CLIENTLIST_GROUP_CLASS
+} E_Clientlist_Group_Type;
 
-#define E_CLIENTLIST_GROUP_SEP_NONE 0
-#define E_CLIENTLIST_GROUP_SEP_BAR 1
-#define E_CLIENTLIST_GROUP_SEP_MENU 2
+typedef enum
+{
+   E_CLIENTLIST_GROUP_SEP_NONE,
+   E_CLIENTLIST_GROUP_SEP_BAR,
+   E_CLIENTLIST_GROUP_SEP_MENU
+} E_Clientlist_Group_Sep_Type;
 
-#define E_CLIENTLIST_SORT_NONE 0
-#define E_CLIENTLIST_SORT_ALPHA 1
-#define E_CLIENTLIST_SORT_ZORDER 2
-#define E_CLIENTLIST_SORT_MOST_RECENT 3
+typedef enum
+{
+   E_CLIENTLIST_SORT_NONE,
+   E_CLIENTLIST_SORT_ALPHA,
+   E_CLIENTLIST_SORT_ZORDER,
+   E_CLIENTLIST_SORT_MOST_RECENT
+} E_Clientlist_Group_Sort_Type;
+
+typedef enum
+{
+   E_CLIENTLIST_GROUPICONS_OWNER,
+   E_CLIENTLIST_GROUPICONS_CURRENT,
+   E_CLIENTLIST_GROUPICONS_SEP,
+} E_Clientlist_Groupicons_Type;
 
-#define E_CLIENTLIST_GROUPICONS_OWNER 0
-#define E_CLIENTLIST_GROUPICONS_CURRENT 1
-#define E_CLIENTLIST_GROUPICONS_SEP 2
 
 #define E_CLIENTLIST_MAX_CAPTION_LEN 256