diff --git a/src/bin/e_color.h b/src/bin/e_color.h
index dbf3b0be3..ed4b1f0f9 100644
--- a/src/bin/e_color.h
+++ b/src/bin/e_color.h
@@ -1,9 +1,8 @@
 #ifdef E_TYPEDEFS
 
-typedef enum _E_Color_Component E_Color_Component;
 typedef struct _E_Color E_Color;
 
-enum _E_Color_Component
+typedef enum E_Color_Component
 {
    E_COLOR_COMPONENT_R,
    E_COLOR_COMPONENT_G,
@@ -12,7 +11,7 @@ enum _E_Color_Component
    E_COLOR_COMPONENT_S,
    E_COLOR_COMPONENT_V,
    E_COLOR_COMPONENT_MAX
-};
+} E_Color_Component;
 
 #else
 #ifndef E_COLOR_HEADER
diff --git a/src/bin/e_sys.h b/src/bin/e_sys.h
index bb3e3d613..b95bebcf4 100644
--- a/src/bin/e_sys.h
+++ b/src/bin/e_sys.h
@@ -1,9 +1,8 @@
 #ifdef E_TYPEDEFS
 
 typedef struct _E_Sys_Con_Action E_Sys_Con_Action;
-typedef enum _E_Sys_Action E_Sys_Action;
 
-enum _E_Sys_Action
+typedef enum _E_Sys_Action
 {
    E_SYS_NONE,
    E_SYS_EXIT,
@@ -15,7 +14,7 @@ enum _E_Sys_Action
    E_SYS_REBOOT,
    E_SYS_SUSPEND,
    E_SYS_HIBERNATE
-};
+} E_Sys_Action;
 
 struct _E_Sys_Con_Action
 {