diff --git a/src/bin/e_bryce.c b/src/bin/e_bryce.c
index 4369e3140..74871ac4a 100644
--- a/src/bin/e_bryce.c
+++ b/src/bin/e_bryce.c
@@ -43,12 +43,12 @@ typedef struct Bryce
    Eina_Bool autohide;
    unsigned int version;
 
-   Eina_Bool hidden : 1;
-   Eina_Bool animating : 1;
-   Eina_Bool mouse_in : 1;
-   Eina_Bool noshadow : 1;
-   Eina_Bool size_changed : 1;
-   Eina_Bool editing : 1;
+   Eina_Bool hidden E_BITFIELD;
+   Eina_Bool animating E_BITFIELD;
+   Eina_Bool mouse_in E_BITFIELD;
+   Eina_Bool noshadow E_BITFIELD;
+   Eina_Bool size_changed E_BITFIELD;
+   Eina_Bool editing E_BITFIELD;
 } Bryce;
 
 typedef struct Bryces
diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 6ea96054c..aa35610d5 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -3238,7 +3238,7 @@ e_client_res_change_geometry_restore(E_Client *ec)
 {
    struct
    {
-      unsigned char valid : 1;
+      unsigned char valid E_BITFIELD;
       int           x, y, w, h;
       struct
       {
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index d7130d2cc..c1a7941c7 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -101,34 +101,34 @@ typedef struct _E_Comp_Object
    unsigned int         animating;  // it's busy animating
    unsigned int         failures; //number of consecutive e_pixmap_image_draw() failures
    unsigned int         force_visible; //number of visible obj_mirror objects
-   Eina_Bool            deleted : 1;  // deleted
-   Eina_Bool            defer_hide : 1;  // flag to get hide to work on deferred hide
-   Eina_Bool            showing : 1;  // object is currently in "show" animation
-   Eina_Bool            visible : 1;  // is visible
+   Eina_Bool            deleted E_BITFIELD;  // deleted
+   Eina_Bool            defer_hide E_BITFIELD;  // flag to get hide to work on deferred hide
+   Eina_Bool            showing E_BITFIELD;  // object is currently in "show" animation
+   Eina_Bool            visible E_BITFIELD;  // is visible
 
-   Eina_Bool            shaped : 1;  // is shaped
-   Eina_Bool            update : 1;  // has updates to fetch
-   Eina_Bool            redirected : 1;  // has updates to fetch
-   Eina_Bool            native : 1;  // native
+   Eina_Bool            shaped E_BITFIELD;  // is shaped
+   Eina_Bool            update E_BITFIELD;  // has updates to fetch
+   Eina_Bool            redirected E_BITFIELD;  // has updates to fetch
+   Eina_Bool            native E_BITFIELD;  // native
 
-   Eina_Bool            nocomp : 1;  // nocomp applied
-   Eina_Bool            nocomp_need_update : 1;  // nocomp in effect, but this window updated while in nocomp mode
-   Eina_Bool            real_hid : 1;  // last hide was a real window unmap
+   Eina_Bool            nocomp E_BITFIELD;  // nocomp applied
+   Eina_Bool            nocomp_need_update E_BITFIELD;  // nocomp in effect, but this window updated while in nocomp mode
+   Eina_Bool            real_hid E_BITFIELD;  // last hide was a real window unmap
 
-   Eina_Bool            effect_set : 1; //effect_obj has a valid group
-   Eina_Bool            effect_running : 1; //effect_obj is playing an animation
-   Eina_Bool            effect_clip : 1; //effect_obj is clipped
-   Eina_Bool            effect_clip_able : 1; //effect_obj will be clipped for effects
+   Eina_Bool            effect_set E_BITFIELD; //effect_obj has a valid group
+   Eina_Bool            effect_running E_BITFIELD; //effect_obj is playing an animation
+   Eina_Bool            effect_clip E_BITFIELD; //effect_obj is clipped
+   Eina_Bool            effect_clip_able E_BITFIELD; //effect_obj will be clipped for effects
 
-   Eina_Bool            zoomap_disabled : 1; //whether zoomap is usable
-   Eina_Bool            updates_exist : 1;
-   Eina_Bool            updates_full : 1; // entire object will be updated
+   Eina_Bool            zoomap_disabled E_BITFIELD; //whether zoomap is usable
+   Eina_Bool            updates_exist E_BITFIELD;
+   Eina_Bool            updates_full E_BITFIELD; // entire object will be updated
 
-   Eina_Bool            force_move : 1;
-   Eina_Bool            frame_extends : 1; //frame may extend beyond object size
-   Eina_Bool            blanked : 1; //window is rendering blank content (externally composited)
+   Eina_Bool            force_move E_BITFIELD;
+   Eina_Bool            frame_extends E_BITFIELD; //frame may extend beyond object size
+   Eina_Bool            blanked E_BITFIELD; //window is rendering blank content (externally composited)
 
-   Eina_Bool            agent_updating : 1; //updating agents
+   Eina_Bool            agent_updating E_BITFIELD; //updating agents
 } E_Comp_Object;
 
 
diff --git a/src/bin/e_comp_wl_extensions.c b/src/bin/e_comp_wl_extensions.c
index 7e93ece23..3c4924706 100644
--- a/src/bin/e_comp_wl_extensions.c
+++ b/src/bin/e_comp_wl_extensions.c
@@ -40,9 +40,9 @@ typedef struct Constraint
    Eina_Tiler *pending;
    Evas_Point *pending_xy;
    Evas_Point *pointer_xy;
-   Eina_Bool lock : 1; // if not lock, confine
-   Eina_Bool persistent : 1;
-   Eina_Bool active : 1;
+   Eina_Bool lock E_BITFIELD; // if not lock, confine
+   Eina_Bool persistent E_BITFIELD;
+   Eina_Bool active E_BITFIELD;
 } Constraint;
 
 static Eina_List *active_constraints;
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 91faf9f88..342e81aaf 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -37,7 +37,7 @@ struct _E_Comp_X_Data
 
    Eina_List *retry_clients;
    Ecore_Timer *retry_timer;
-   Eina_Bool restack : 1;
+   Eina_Bool restack E_BITFIELD;
 };
 
 typedef struct Pending_Configure
diff --git a/src/bin/e_dbusmenu.c b/src/bin/e_dbusmenu.c
index bc87097ab..55b113d8b 100644
--- a/src/bin/e_dbusmenu.c
+++ b/src/bin/e_dbusmenu.c
@@ -9,7 +9,7 @@ struct _E_DBusMenu_Ctx
    void                     *data;
    E_DBusMenu_Pop_Request_Cb pop_request_cb;
    E_DBusMenu_Update_Cb      update_cb;
-   Eina_Bool  hacks : 1;
+   Eina_Bool  hacks E_BITFIELD;
 };
 
 static const char *Menu_Item_Type_Names[] =
diff --git a/src/bin/e_deskmirror.c b/src/bin/e_deskmirror.c
index d47a6e821..ea4655b6b 100644
--- a/src/bin/e_deskmirror.c
+++ b/src/bin/e_deskmirror.c
@@ -27,10 +27,10 @@ typedef struct E_Smart_Data
    E_Desk *desk;
    E_Object_Delfn *desk_delfn;
 
-   Eina_Bool pager : 1;
-   Eina_Bool taskbar : 1;
+   Eina_Bool pager E_BITFIELD;
+   Eina_Bool taskbar E_BITFIELD;
 
-   Eina_Bool resize : 1;
+   Eina_Bool resize E_BITFIELD;
 } E_Smart_Data;
 
 typedef struct Mirror
@@ -42,7 +42,7 @@ typedef struct Mirror
    Evas_Object *mirror;
    int x, y, w, h;
    int ref;
-   Eina_Bool added : 1;
+   Eina_Bool added E_BITFIELD;
 } Mirror;
 
 typedef struct Mirror_Border
diff --git a/src/bin/e_exec.c b/src/bin/e_exec.c
index 851058ddc..6d97a08f8 100644
--- a/src/bin/e_exec.c
+++ b/src/bin/e_exec.c
@@ -31,7 +31,7 @@ struct _E_Exec_Watch
 {
    void        (*func)(void *data, E_Exec_Instance *inst, E_Exec_Watch_Type type);
    const void *data;
-   Eina_Bool   delete_me : 1;
+   Eina_Bool   delete_me E_BITFIELD;
 };
 
 struct _E_Config_Dialog_Data
diff --git a/src/bin/e_flowlayout.c b/src/bin/e_flowlayout.c
index e603d2932..62d238e32 100644
--- a/src/bin/e_flowlayout.c
+++ b/src/bin/e_flowlayout.c
@@ -9,12 +9,12 @@ struct _E_Smart_Data
    Evas_Object  *obj;
    Evas_Object  *clip;
    int           frozen;
-   unsigned char changed : 1;
-   unsigned char horizontal : 1;
-   unsigned char homogenous : 1;
-   unsigned char fill : 1;
-   unsigned char flowright : 1;
-   unsigned char flowbottom : 1;
+   unsigned char changed E_BITFIELD;
+   unsigned char horizontal E_BITFIELD;
+   unsigned char homogenous E_BITFIELD;
+   unsigned char fill E_BITFIELD;
+   unsigned char flowright E_BITFIELD;
+   unsigned char flowbottom E_BITFIELD;
    Eina_List    *items;
    struct
    {
@@ -31,10 +31,10 @@ struct _E_Smart_Data
 struct _E_Flowlayout_Item
 {
    E_Smart_Data *sd;
-   unsigned char fill_w : 1;
-   unsigned char fill_h : 1;
-   unsigned char expand_w : 1;
-   unsigned char expand_h : 1;
+   unsigned char fill_w E_BITFIELD;
+   unsigned char fill_h E_BITFIELD;
+   unsigned char expand_w E_BITFIELD;
+   unsigned char expand_h E_BITFIELD;
    struct
    {
       Evas_Coord w, h;
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 1dd3ffaca..2861d7239 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -84,7 +84,7 @@ struct _E_Fm2_Smart_Data
    {
       Ecore_Thread *thread;
       const char   *filename;
-      Eina_Bool done : 1;
+      Eina_Bool done E_BITFIELD;
    } new_file;
 
    E_Fm2_Icon      *last_selected;
@@ -102,12 +102,12 @@ struct _E_Fm2_Smart_Data
    Eina_List       *rename_dialogs;
    E_Entry_Dialog  *entry_dialog;
    E_Dialog        *image_dialog;
-   Eina_Bool        iconlist_changed : 1;
-   Eina_Bool        order_file : 1;
-   Eina_Bool        typebuf_visible : 1;
-   Eina_Bool        show_hidden_files : 1;
-   Eina_Bool        listing : 1;
-   Eina_Bool        inherited_dir_props : 1;
+   Eina_Bool        iconlist_changed E_BITFIELD;
+   Eina_Bool        order_file E_BITFIELD;
+   Eina_Bool        typebuf_visible E_BITFIELD;
+   Eina_Bool        show_hidden_files E_BITFIELD;
+   Eina_Bool        listing E_BITFIELD;
+   Eina_Bool        inherited_dir_props E_BITFIELD;
    signed char      view_mode;  /* -1 = unset */
    signed short     icon_size;  /* -1 = unset */
    E_Fm2_View_Flags view_flags;
@@ -130,7 +130,7 @@ struct _E_Fm2_Smart_Data
       Eina_List   *actions;
       Ecore_Idler *idler;
       Ecore_Timer *timer;
-      Eina_Bool    deletions : 1;
+      Eina_Bool    deletions E_BITFIELD;
    } live;
 
    struct
@@ -139,8 +139,8 @@ struct _E_Fm2_Smart_Data
       const char  *start;
       Ecore_Timer *timer;
       unsigned int wildcard;
-      Eina_Bool    setting : 1;
-      Eina_Bool    disabled : 1;
+      Eina_Bool    setting E_BITFIELD;
+      Eina_Bool    disabled E_BITFIELD;
    } typebuf;
 
    int                  busy_count;
@@ -154,12 +154,12 @@ struct _E_Fm2_Smart_Data
    Eina_List           *mount_ops;
    E_Fm2_Mount         *mount;
    signed char          drop_after;
-   Eina_Bool            drop_show : 1;
-   Eina_Bool            drop_in_show : 1;
-   Eina_Bool            drop_all : 1;
-   Eina_Bool            drag : 1;
-   Eina_Bool            selecting : 1;
-   Eina_Bool            toomany : 1;
+   Eina_Bool            drop_show E_BITFIELD;
+   Eina_Bool            drop_in_show E_BITFIELD;
+   Eina_Bool            drop_all E_BITFIELD;
+   Eina_Bool            drag E_BITFIELD;
+   Eina_Bool            selecting E_BITFIELD;
+   Eina_Bool            toomany E_BITFIELD;
    struct
    {
       int ox, oy;
@@ -177,7 +177,7 @@ struct _E_Fm2_Region
    E_Fm2_Smart_Data *sd;
    Evas_Coord        x, y, w, h;
    Eina_List        *list;
-   Eina_Bool         realized : 1;
+   Eina_Bool         realized E_BITFIELD;
 };
 
 struct _E_Fm2_Icon
@@ -205,24 +205,24 @@ struct _E_Fm2_Icon
    {
       Evas_Coord   x, y;
       Ecore_Timer *dnd_end_timer; //we need this for XDirectSave drops so we don't lose the icon
-      Eina_Bool    start : 1;
-      Eina_Bool    dnd : 1; // currently dragging
-      Eina_Bool    src : 1; // drag source
-      Eina_Bool    hidden : 1; // dropped into different dir
+      Eina_Bool    start E_BITFIELD;
+      Eina_Bool    dnd E_BITFIELD; // currently dragging
+      Eina_Bool    src E_BITFIELD; // drag source
+      Eina_Bool    hidden E_BITFIELD; // dropped into different dir
    } drag;
 
    int       saved_rel;
 
-   Eina_Bool realized : 1;
-   Eina_Bool selected : 1;
-   Eina_Bool last_selected : 1;
-   Eina_Bool saved_pos : 1;
-   Eina_Bool odd : 1;
-   Eina_Bool down_sel : 1;
-   Eina_Bool removable_state_change : 1;
-   Eina_Bool thumb_failed : 1;
-   Eina_Bool queued : 1;
-   Eina_Bool inserted : 1;
+   Eina_Bool realized E_BITFIELD;
+   Eina_Bool selected E_BITFIELD;
+   Eina_Bool last_selected E_BITFIELD;
+   Eina_Bool saved_pos E_BITFIELD;
+   Eina_Bool odd E_BITFIELD;
+   Eina_Bool down_sel E_BITFIELD;
+   Eina_Bool removable_state_change E_BITFIELD;
+   Eina_Bool thumb_failed E_BITFIELD;
+   Eina_Bool queued E_BITFIELD;
+   Eina_Bool inserted E_BITFIELD;
 };
 
 struct _E_Fm2_Finfo
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index cc21b140e..9396bb2ac 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -3461,9 +3461,9 @@ struct _E_Smart_Data
 {
    Evas_Coord    x, y, w, h;
    Evas_Object  *obj, *clip;
-   unsigned char horizontal : 1;
-   unsigned char doing_config : 1;
-   unsigned char redo_config : 1;
+   unsigned char horizontal E_BITFIELD;
+   unsigned char doing_config E_BITFIELD;
+   unsigned char redo_config E_BITFIELD;
    Eina_List    *items;
    int           frozen;
    Evas_Coord    minw, minh, req;
@@ -3486,7 +3486,7 @@ struct _E_Gadcon_Layout_Item
 
    Evas_Coord       x, y, w, h;
    Evas_Object     *obj;
-   unsigned char    can_move : 1;
+   unsigned char    can_move E_BITFIELD;
 };
 
 /* local subsystem functions */
diff --git a/src/bin/e_gadget.c b/src/bin/e_gadget.c
index 5f91fb4c1..5baf1c3f9 100644
--- a/src/bin/e_gadget.c
+++ b/src/bin/e_gadget.c
@@ -88,8 +88,8 @@ struct E_Gadget_Config
    Evas_Point down; //coords from mouse down
    E_Gadget_Config *orig; //gadget is a copy of the original gadget during a move
    E_Gadget_Site_Anchor resizing;
-   Eina_Bool moving : 1;
-   Eina_Bool display_del : 1; //deleted using ->display
+   Eina_Bool moving E_BITFIELD;
+   Eina_Bool display_del E_BITFIELD; //deleted using ->display
 };
 
 typedef struct E_Gadget_Sites
diff --git a/src/bin/e_gadget_runner.c b/src/bin/e_gadget_runner.c
index dfe2c0ee4..6f14bea91 100644
--- a/src/bin/e_gadget_runner.c
+++ b/src/bin/e_gadget_runner.c
@@ -20,7 +20,7 @@ typedef struct Config_Item
    int exit_mode;
    Eina_Stringshare *cmd;
    void *inst;
-   Eina_Bool cmd_changed : 1;
+   Eina_Bool cmd_changed E_BITFIELD;
 } Config_Item;
 
 typedef struct Instance
@@ -66,7 +66,7 @@ typedef struct Wizard_Item
    E_Gadget_Wizard_End_Cb cb;
    void *data;
    int id;
-   Eina_Bool sandbox : 1;
+   Eina_Bool sandbox E_BITFIELD;
 } Wizard_Item;
 
 static void
diff --git a/src/bin/e_icon.c b/src/bin/e_icon.c
index b5c6187eb..f736a5e0f 100644
--- a/src/bin/e_icon.c
+++ b/src/bin/e_icon.c
@@ -15,13 +15,13 @@ struct _E_Smart_Data
    double        last_resize;
    int           size;
    int           frame, frame_count;
-   unsigned char fill_inside : 1;
-   unsigned char scale_up : 1;
-   unsigned char preload : 1;
-   unsigned char loading : 1;
-   unsigned char animated : 1;
-   unsigned char invalid : 1;
-   Eina_Bool     edje : 1;
+   unsigned char fill_inside E_BITFIELD;
+   unsigned char scale_up E_BITFIELD;
+   unsigned char preload E_BITFIELD;
+   unsigned char loading E_BITFIELD;
+   unsigned char animated E_BITFIELD;
+   unsigned char invalid E_BITFIELD;
+   Eina_Bool     edje E_BITFIELD;
 };
 
 struct _Cache_Item
diff --git a/src/bin/e_ilist.c b/src/bin/e_ilist.c
index cc7b52dd8..49bdb98dd 100644
--- a/src/bin/e_ilist.c
+++ b/src/bin/e_ilist.c
@@ -13,9 +13,9 @@ struct _E_Smart_Data
    Eina_List    *selected_items;
    int           selected;
    const char   *theme;
-   unsigned char selector : 1;
-   unsigned char multi_select : 1;
-   unsigned char on_hold : 1;
+   unsigned char selector E_BITFIELD;
+   unsigned char multi_select E_BITFIELD;
+   unsigned char on_hold E_BITFIELD;
 
    struct
    {
@@ -23,7 +23,7 @@ struct _E_Smart_Data
       unsigned int size;
       Ecore_Timer *timer;
    } typebuf;
-   Eina_Bool disabled : 1;
+   Eina_Bool disabled E_BITFIELD;
 };
 
 static void          _e_smart_init(void);
diff --git a/src/bin/e_int_config_comp.c b/src/bin/e_int_config_comp.c
index d2b79d634..68317d45b 100644
--- a/src/bin/e_int_config_comp.c
+++ b/src/bin/e_int_config_comp.c
@@ -21,7 +21,7 @@ struct _E_Config_Dialog_Data
       int disable_menus;
       int disable_objects;
       int disable_all;
-      int toggle_changed : 1;
+      int toggle_changed E_BITFIELD;
    } match;
 
    Evas_Object *styles_il;
@@ -49,7 +49,7 @@ struct _E_Config_Dialog_Data
    int fast_objects;
    int fast;
    Evas_Object *fast_ob;
-   int fast_changed : 1;
+   int fast_changed E_BITFIELD;
 };
 
 /* Protos */
diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c
index efcc6a801..6d71b4a5a 100644
--- a/src/bin/e_int_config_modules.c
+++ b/src/bin/e_int_config_modules.c
@@ -12,7 +12,7 @@ struct _CFModule
    E_Module    *module;
    Evas_Object *end;
    int          idx;
-   Eina_Bool    enabled : 1;
+   Eina_Bool    enabled E_BITFIELD;
 };
 
 struct _CFType
diff --git a/src/bin/e_layout.c b/src/bin/e_layout.c
index 33ddbf594..e742c48eb 100644
--- a/src/bin/e_layout.c
+++ b/src/bin/e_layout.c
@@ -13,7 +13,7 @@ struct _E_Smart_Data
    Evas_Object  *obj;
    Evas_Object  *clip;
    int           frozen;
-   unsigned char changed : 1;
+   unsigned char changed E_BITFIELD;
    Eina_Inlist  *items;
 };
 
diff --git a/src/bin/e_msg.c b/src/bin/e_msg.c
index 0b549017b..004b7ac9b 100644
--- a/src/bin/e_msg.c
+++ b/src/bin/e_msg.c
@@ -6,7 +6,7 @@ struct _E_Msg_Handler
 {
    void          (*func)(void *data, const char *name, const char *info, int val, E_Object *obj, void *msgdata);
    void         *data;
-   unsigned char delete_me : 1;
+   unsigned char delete_me E_BITFIELD;
 };
 
 struct _E_Msg_Event
diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c
index 346b2726a..b041e4cdd 100644
--- a/src/bin/e_pixmap.c
+++ b/src/bin/e_pixmap.c
@@ -54,9 +54,9 @@ struct _E_Pixmap
    Eina_List *free_buffers;
 #endif
 
-   Eina_Bool usable : 1;
-   Eina_Bool dirty : 1;
-   Eina_Bool image_argb : 1;
+   Eina_Bool usable E_BITFIELD;
+   Eina_Bool dirty E_BITFIELD;
+   Eina_Bool image_argb E_BITFIELD;
 };
 
 #ifdef HAVE_WAYLAND
diff --git a/src/bin/e_powersave.c b/src/bin/e_powersave.c
index baac18a3e..0844e909f 100644
--- a/src/bin/e_powersave.c
+++ b/src/bin/e_powersave.c
@@ -5,7 +5,7 @@ struct _E_Powersave_Deferred_Action
 {
    void          (*func)(void *data);
    const void   *data;
-   unsigned char delete_me : 1;
+   unsigned char delete_me E_BITFIELD;
 };
 
 struct _E_Powersave_Sleeper
diff --git a/src/bin/e_scrollframe.c b/src/bin/e_scrollframe.c
index 450d46a23..c23600dd5 100644
--- a/src/bin/e_scrollframe.c
+++ b/src/bin/e_scrollframe.c
@@ -30,11 +30,11 @@ struct _E_Smart_Data
       double          anim_start;
       Ecore_Animator *momentum_animator;
       Evas_Coord      locked_x, locked_y;
-      unsigned char   now : 1;
-      unsigned char   dragged : 1;
-      unsigned char   dir_x : 1;
-      unsigned char   dir_y : 1;
-      unsigned char   locked : 1;
+      unsigned char   now E_BITFIELD;
+      unsigned char   dragged E_BITFIELD;
+      unsigned char   dir_x E_BITFIELD;
+      unsigned char   dir_y E_BITFIELD;
+      unsigned char   locked E_BITFIELD;
    } down;
 
    struct
@@ -55,14 +55,14 @@ struct _E_Smart_Data
    } pan_func;
    struct
    {
-      Eina_Bool forced : 1;
+      Eina_Bool forced E_BITFIELD;
    } thumbscroll;
 
-   unsigned char hbar_visible : 1;
-   unsigned char vbar_visible : 1;
-   unsigned char extern_pan : 1;
-   unsigned char one_dir_at_a_time : 1;
-   Eina_Bool     key_nav : 1;
+   unsigned char hbar_visible E_BITFIELD;
+   unsigned char vbar_visible E_BITFIELD;
+   unsigned char extern_pan E_BITFIELD;
+   unsigned char one_dir_at_a_time E_BITFIELD;
+   Eina_Bool     key_nav E_BITFIELD;
 };
 
 /* local subsystem functions */
diff --git a/src/bin/e_slidecore.c b/src/bin/e_slidecore.c
index 9af0d46ba..368adc8fb 100644
--- a/src/bin/e_slidecore.c
+++ b/src/bin/e_slidecore.c
@@ -18,7 +18,7 @@ struct _E_Smart_Data
    Ecore_Animator *slide_animator;
    Evas_Coord      dist, pos, slide_pos, slide_start_pos;
    int             p1, p2, pn;
-   unsigned char   down : 1;
+   unsigned char   down E_BITFIELD;
 };
 
 struct _E_Smart_Item
diff --git a/src/bin/e_slider.c b/src/bin/e_slider.c
index f0ee09861..06a95782f 100644
--- a/src/bin/e_slider.c
+++ b/src/bin/e_slider.c
@@ -23,7 +23,7 @@ struct _E_Smart_Data
    Evas_Coord   minw, minh;
    Ecore_Timer *set_timer;
    Eina_List   *special_values;
-   Eina_Bool    disabled : 1;
+   Eina_Bool    disabled E_BITFIELD;
 };
 
 struct _E_Slider_Special_Value
diff --git a/src/bin/e_slidesel.c b/src/bin/e_slidesel.c
index 33f96a917..424d5ef96 100644
--- a/src/bin/e_slidesel.c
+++ b/src/bin/e_slidesel.c
@@ -18,8 +18,8 @@ struct _E_Smart_Data
    Evas_Coord    down_x, down_y;
    E_Smart_Item *cur;
    double        down_time;
-   unsigned char down : 1;
-   unsigned char down_cancel : 1;
+   unsigned char down E_BITFIELD;
+   unsigned char down_cancel E_BITFIELD;
 };
 
 struct _E_Smart_Item
diff --git a/src/bin/e_thumb.c b/src/bin/e_thumb.c
index 2fed2c9b8..108599167 100644
--- a/src/bin/e_thumb.c
+++ b/src/bin/e_thumb.c
@@ -13,9 +13,9 @@ struct _E_Thumb
       int x, y, x_count, y_count;
    } desk_pan;
    Eina_List    *sigsrc;
-   unsigned char queued : 1;
-   unsigned char busy : 1;
-   unsigned char done : 1;
+   unsigned char queued E_BITFIELD;
+   unsigned char busy E_BITFIELD;
+   unsigned char done E_BITFIELD;
 };
 
 /* local subsystem functions */
diff --git a/src/bin/e_video.c b/src/bin/e_video.c
index cbd384655..0be82358d 100644
--- a/src/bin/e_video.c
+++ b/src/bin/e_video.c
@@ -6,7 +6,7 @@ struct _Video
 {
    Evas_Object_Smart_Clipped_Data __clipped_data;
    Evas_Object *clip, *o_vid;
-   Eina_Bool lowqual : 1;
+   Eina_Bool lowqual E_BITFIELD;
 };
 
 typedef struct _Vidimg Vidimg;
diff --git a/src/bin/e_widget.c b/src/bin/e_widget.c
index 91cdd953b..c8a7cbcfd 100644
--- a/src/bin/e_widget.c
+++ b/src/bin/e_widget.c
@@ -22,10 +22,10 @@ struct _E_Smart_Data
    void          (*on_disable_func)(void *data, Evas_Object *obj);
    void         *on_disable_data;
    void         *data;
-   unsigned char can_focus : 1;
-   unsigned char child_can_focus : 1;
-   unsigned char focused : 1;
-   unsigned char disabled : 1;
+   unsigned char can_focus E_BITFIELD;
+   unsigned char child_can_focus E_BITFIELD;
+   unsigned char focused E_BITFIELD;
+   unsigned char disabled E_BITFIELD;
 };
 
 /* local subsystem functions */
diff --git a/src/bin/e_widget_bgpreview.c b/src/bin/e_widget_bgpreview.c
index 6dd32af58..678065b73 100644
--- a/src/bin/e_widget_bgpreview.c
+++ b/src/bin/e_widget_bgpreview.c
@@ -14,8 +14,8 @@ struct _E_Widget_Desk_Data
    int                  zone, x, y;
    Ecore_Event_Handler *bg_upd_hdl;
    Ecore_Job           *resize_job;
-   Eina_Bool            configurable : 1;
-   Eina_Bool            thumb : 1;
+   Eina_Bool            configurable E_BITFIELD;
+   Eina_Bool            thumb E_BITFIELD;
 };
 
 /* local function prototypes */
diff --git a/src/bin/e_widget_filepreview.c b/src/bin/e_widget_filepreview.c
index fef62c91a..343907802 100644
--- a/src/bin/e_widget_filepreview.c
+++ b/src/bin/e_widget_filepreview.c
@@ -45,18 +45,18 @@ struct _E_Widget_Data
    const char   *mime;
    double        vid_pct;
 
-   Eina_Bool     mime_icon : 1;
-   Eina_Bool     is_dir : 1;
-   Eina_Bool     is_txt : 1;
-   Eina_Bool     is_font : 1;
-   Eina_Bool     prev_is_fm : 1;
-   Eina_Bool     prev_is_txt : 1;
-   Eina_Bool     prev_is_font : 1;
-   Eina_Bool     prev_is_video : 1;
-   Eina_Bool     clamp_video : 1;
-   Eina_Bool     delete_me : 1;
-   Eina_Bool     preview_text_file_next : 1;
-   Eina_Bool     vid_sized : 1;
+   Eina_Bool     mime_icon E_BITFIELD;
+   Eina_Bool     is_dir E_BITFIELD;
+   Eina_Bool     is_txt E_BITFIELD;
+   Eina_Bool     is_font E_BITFIELD;
+   Eina_Bool     prev_is_fm E_BITFIELD;
+   Eina_Bool     prev_is_txt E_BITFIELD;
+   Eina_Bool     prev_is_font E_BITFIELD;
+   Eina_Bool     prev_is_video E_BITFIELD;
+   Eina_Bool     clamp_video E_BITFIELD;
+   Eina_Bool     delete_me E_BITFIELD;
+   Eina_Bool     preview_text_file_next E_BITFIELD;
+   Eina_Bool     vid_sized E_BITFIELD;
 };
 
 static void  _e_wid_fprev_preview_update(void *data, Evas_Object *obj, void *event_info);
diff --git a/src/bin/e_widget_fsel.c b/src/bin/e_widget_fsel.c
index 4e78f8ade..e36df9966 100644
--- a/src/bin/e_widget_fsel.c
+++ b/src/bin/e_widget_fsel.c
@@ -25,8 +25,8 @@ struct _E_Widget_Data
    void         (*chg_func)(void *data, Evas_Object *obj);
    void        *chg_data;
    int          preview;
-   Eina_Bool    nochange : 1; // block changing of entry
-   Eina_Bool    fprev : 1; // current fprev is dir
+   Eina_Bool    nochange E_BITFIELD; // block changing of entry
+   Eina_Bool    fprev E_BITFIELD; // current fprev is dir
 };
 
 static void _e_wid_del_hook(Evas_Object *obj);
diff --git a/src/bin/e_widget_toolbar.c b/src/bin/e_widget_toolbar.c
index e41a6f0d1..d7d9c64e9 100644
--- a/src/bin/e_widget_toolbar.c
+++ b/src/bin/e_widget_toolbar.c
@@ -7,8 +7,8 @@ struct _E_Widget_Data
    Evas_Object *o_base, *o_box;
    int          icon_w, icon_h;
    Eina_List   *items;
-   Eina_Bool    scrollable : 1;
-   Eina_Bool    focus_steal : 1;
+   Eina_Bool    scrollable E_BITFIELD;
+   Eina_Bool    focus_steal E_BITFIELD;
 };
 
 struct _Item
@@ -16,7 +16,7 @@ struct _Item
    Evas_Object *o_toolbar, *o_base, *o_icon;
    void         (*func)(void *data1, void *data2);
    const void  *data1, *data2;
-   Eina_Bool    selected : 1;
+   Eina_Bool    selected E_BITFIELD;
 };
 
 static void _e_wid_del_hook(Evas_Object *obj);
diff --git a/src/bin/e_win.c b/src/bin/e_win.c
index 8206cb87b..a93151d07 100644
--- a/src/bin/e_win.c
+++ b/src/bin/e_win.c
@@ -10,13 +10,13 @@ typedef struct _Elm_Win_Trap_Ctx
    E_Client      *client;
    E_Pointer     *pointer;
    int x, y, w, h;
-   Eina_Bool      centered : 1;
-   Eina_Bool      placed : 1;
-   Eina_Bool      sized : 1;
-   Eina_Bool      internal_no_remember : 1;
-   Eina_Bool      internal_no_reopen : 1;
-   Eina_Bool      visible : 1;
-   Eina_Bool      override : 1;
+   Eina_Bool      centered E_BITFIELD;
+   Eina_Bool      placed E_BITFIELD;
+   Eina_Bool      sized E_BITFIELD;
+   Eina_Bool      internal_no_remember E_BITFIELD;
+   Eina_Bool      internal_no_reopen E_BITFIELD;
+   Eina_Bool      visible E_BITFIELD;
+   Eina_Bool      override E_BITFIELD;
 } Elm_Win_Trap_Ctx;
 
 
diff --git a/src/bin/e_xsettings.c b/src/bin/e_xsettings.c
index f3bdab1b3..d6ff6eb90 100644
--- a/src/bin/e_xsettings.c
+++ b/src/bin/e_xsettings.c
@@ -27,7 +27,7 @@ struct _Settings_Manager
    Ecore_Timer   *timer_retry;
    unsigned long  serial;
    Ecore_X_Atom   _atom_xsettings_screen;
-   Eina_Bool enabled : 1;
+   Eina_Bool enabled E_BITFIELD;
 };
 
 struct _Setting
diff --git a/src/bin/e_zoomap.c b/src/bin/e_zoomap.c
index 682412fc6..41578e347 100644
--- a/src/bin/e_zoomap.c
+++ b/src/bin/e_zoomap.c
@@ -11,9 +11,9 @@ struct _E_Smart_Data
    Evas_Coord   x, y, w, h;
    Evas_Coord   child_w, child_h;
    unsigned int recurse;
-   Eina_Bool    solid : 1;
-   Eina_Bool    smooth : 1;
-   Eina_Bool    always : 1;
+   Eina_Bool    solid E_BITFIELD;
+   Eina_Bool    smooth E_BITFIELD;
+   Eina_Bool    always E_BITFIELD;
 };
 
 /* local subsystem functions */
diff --git a/src/modules/conf_bindings/e_int_config_keybindings.c b/src/modules/conf_bindings/e_int_config_keybindings.c
index 14c987a30..e493e4e45 100644
--- a/src/modules/conf_bindings/e_int_config_keybindings.c
+++ b/src/modules/conf_bindings/e_int_config_keybindings.c
@@ -69,7 +69,7 @@ struct _E_Config_Dialog_Data
       const char    *binding, *action, *cur;
       char          *params;
       int            cur_act, add;
-      Eina_Bool     changed : 1;
+      Eina_Bool     changed E_BITFIELD;
 
       E_Grab_Dialog *eg;
    } locals;
diff --git a/src/modules/conf_intl/e_int_config_intl.c b/src/modules/conf_intl/e_int_config_intl.c
index fe7c05eee..7ef2bf277 100644
--- a/src/modules/conf_intl/e_int_config_intl.c
+++ b/src/modules/conf_intl/e_int_config_intl.c
@@ -98,7 +98,7 @@ struct _E_Config_Dialog_Data
 
       Evas_Object *locale_entry;
    } gui;
-   Eina_Bool desklock : 1;
+   Eina_Bool desklock E_BITFIELD;
 };
 
 const E_Intl_Pair basic_language_predefined_pairs[] = {
diff --git a/src/modules/conf_theme/e_int_config_theme.c b/src/modules/conf_theme/e_int_config_theme.c
index 7a3bd246f..d69abaab3 100644
--- a/src/modules/conf_theme/e_int_config_theme.c
+++ b/src/modules/conf_theme/e_int_config_theme.c
@@ -24,7 +24,7 @@ struct _E_Config_Dialog_Data
    Eina_List       *theme_init; /* list of eio ops to load themes */
    Eina_List       *themes; /* eet file refs to work around load locking */
    int              show_splash;
-   Eina_Bool        free : 1;
+   Eina_Bool        free E_BITFIELD;
 
    /* Dialog */
    Evas_Object      *win_import;
diff --git a/src/modules/connman/agent.c b/src/modules/connman/agent.c
index f227bc5a6..1c38600d9 100644
--- a/src/modules/connman/agent.c
+++ b/src/modules/connman/agent.c
@@ -37,7 +37,7 @@ struct _E_Connman_Agent
    Eldbus_Service_Interface *iface;
    Eldbus_Message *msg;
    Eldbus_Connection *conn;
-   Eina_Bool canceled:1;
+   Eina_Bool canceled E_BITFIELD;
 };
 
 static void
diff --git a/src/modules/everything/evry_view.c b/src/modules/everything/evry_view.c
index 9e2a33a43..ae72d1bf0 100644
--- a/src/modules/everything/evry_view.c
+++ b/src/modules/everything/evry_view.c
@@ -63,13 +63,13 @@ struct _Item
    Evas_Object *obj;
    Evas_Coord   x, y, w, h;
    Evas_Object *frame, *image, *thumb;
-   Eina_Bool    selected : 1;
-   Eina_Bool    have_thumb : 1;
-   Eina_Bool    do_thumb : 1;
-   Eina_Bool    get_thumb : 1;
-   Eina_Bool    showing : 1;
-   Eina_Bool    visible : 1;
-   Eina_Bool    changed : 1;
+   Eina_Bool    selected E_BITFIELD;
+   Eina_Bool    have_thumb E_BITFIELD;
+   Eina_Bool    do_thumb E_BITFIELD;
+   Eina_Bool    get_thumb E_BITFIELD;
+   Eina_Bool    showing E_BITFIELD;
+   Eina_Bool    visible E_BITFIELD;
+   Eina_Bool    changed E_BITFIELD;
    int          pos;
    int          max_w, max_h;
 };
diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index 12b474d7e..624fda642 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -37,7 +37,7 @@ struct _E_Fwin
    Evas_Object         *over_obj;
 
    const char          *wallpaper_file;
-   Eina_Bool            wallpaper_is_edj : 1;
+   Eina_Bool            wallpaper_is_edj E_BITFIELD;
    const char          *overlay_file;
    const char          *scrollframe_file;
    const char          *theme_file;
@@ -75,7 +75,7 @@ struct _E_Fwin_Page
    } fm_pan, fm_pan_last;
 
    int                  index;
-   Eina_Bool           setting : 1;
+   Eina_Bool           setting E_BITFIELD;
 };
 
 struct _E_Fwin_Apps_Dialog
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index 8cff88492..7455cc2a8 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -60,7 +60,7 @@ struct _IBar
    IBar_Order  *io;
    Evas_Coord   dnd_x, dnd_y;
    IBar_Icon   *menu_icon;
-   Eina_Bool    focused : 1;
+   Eina_Bool    focused E_BITFIELD;
 };
 
 struct _IBar_Icon
@@ -83,14 +83,14 @@ struct _IBar_Icon
    int              mouse_down;
    struct
    {
-      unsigned char start : 1;
-      unsigned char dnd : 1;
+      unsigned char start E_BITFIELD;
+      unsigned char dnd E_BITFIELD;
       int           x, y;
    } drag;
-   Eina_Bool       focused : 1;
-   Eina_Bool       not_in_order : 1;
-   Eina_Bool       menu_grabbed : 1;
-   Eina_Bool       starting : 1;
+   Eina_Bool       focused E_BITFIELD;
+   Eina_Bool       not_in_order E_BITFIELD;
+   Eina_Bool       menu_grabbed E_BITFIELD;
+   Eina_Bool       starting E_BITFIELD;
 };
 
 static IBar        *_ibar_new(Evas_Object *parent, Instance *inst);
diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c
index 7d0f4be55..23d4f153a 100644
--- a/src/modules/ibox/e_mod_main.c
+++ b/src/modules/ibox/e_mod_main.c
@@ -63,8 +63,8 @@ struct _IBox_Icon
    E_Client    *client;
    struct
    {
-      unsigned char start : 1;
-      unsigned char dnd : 1;
+      unsigned char start E_BITFIELD;
+      unsigned char dnd E_BITFIELD;
       int           x, y;
       int           dx, dy;
    } drag;
diff --git a/src/modules/lokker/lokker.c b/src/modules/lokker/lokker.c
index 82ea45d25..fb73cde72 100644
--- a/src/modules/lokker/lokker.c
+++ b/src/modules/lokker/lokker.c
@@ -16,8 +16,8 @@ typedef struct Lokker_Popup
    Evas_Object *comp_object;
    Evas_Object *bg_object;
    Evas_Object *login_box;
-   Eina_Bool show_anim : 1;
-   Eina_Bool hide_anim : 1;
+   Eina_Bool show_anim E_BITFIELD;
+   Eina_Bool hide_anim E_BITFIELD;
 } Lokker_Popup;
 
 typedef struct Lokker_Data
@@ -27,7 +27,7 @@ typedef struct Lokker_Data
    Ecore_Event_Handler *move_handler;
    char                 passwd[PASSWD_LEN];
    int                  state;
-   Eina_Bool            selected : 1;
+   Eina_Bool            selected E_BITFIELD;
 } Lokker_Data;
 
 static pid_t _auth_child_pid = -1;
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 7b5505f8e..a2f4f258b 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -45,13 +45,13 @@ struct _Pager
    int             xnum, ynum;
    Eina_List      *desks;
    Pager_Desk     *active_pd;
-   unsigned char   dragging : 1;
-   unsigned char   just_dragged : 1;
+   unsigned char   dragging E_BITFIELD;
+   unsigned char   just_dragged E_BITFIELD;
    Evas_Coord      dnd_x, dnd_y;
    Pager_Desk     *active_drop_pd;
    E_Client       *active_drag_client;
    Ecore_Job      *recalc;
-   Eina_Bool       invert : 1;
+   Eina_Bool       invert E_BITFIELD;
 };
 
 struct _Pager_Desk
@@ -62,12 +62,12 @@ struct _Pager_Desk
    Evas_Object *o_desk;
    Evas_Object *o_layout;
    int          xpos, ypos, urgent;
-   int          current : 1;
+   int          current E_BITFIELD;
    struct
    {
       Pager        *from_pager;
-      unsigned char in_pager : 1;
-      unsigned char start : 1;
+      unsigned char in_pager E_BITFIELD;
+      unsigned char start E_BITFIELD;
       int           x, y, dx, dy, button;
    } drag;
 };
@@ -78,13 +78,13 @@ struct _Pager_Win
    Pager_Desk   *desk;
    Evas_Object  *o_window;
    Evas_Object  *o_mirror;
-   unsigned char skip_winlist : 1;
+   unsigned char skip_winlist E_BITFIELD;
    struct
    {
       Pager        *from_pager;
-      unsigned char start : 1;
-      unsigned char in_pager : 1;
-      unsigned char desktop  : 1;
+      unsigned char start E_BITFIELD;
+      unsigned char in_pager E_BITFIELD;
+      unsigned char desktop  E_BITFIELD;
       int           x, y, dx, dy, button;
    } drag;
 };
@@ -95,7 +95,7 @@ struct _Pager_Popup
    Evas_Object  *o_bg;
    Pager        *pager;
    Ecore_Timer  *timer;
-   unsigned char urgent : 1;
+   unsigned char urgent E_BITFIELD;
 };
 
 static void             _pager_cb_mirror_add(Pager_Desk *pd, Evas_Object *obj, Evas_Object *mirror);
diff --git a/src/modules/pager/gadget/pager.c b/src/modules/pager/gadget/pager.c
index 6c99b92f6..880198e6a 100644
--- a/src/modules/pager/gadget/pager.c
+++ b/src/modules/pager/gadget/pager.c
@@ -23,12 +23,12 @@ struct _Pager
    int           xnum, ynum;
    Eina_List    *desks;
    Pager_Desk   *active_pd;
-   unsigned char dragging : 1;
-   unsigned char just_dragged : 1;
+   unsigned char dragging E_BITFIELD;
+   unsigned char just_dragged E_BITFIELD;
    E_Client     *active_drag_client;
    Ecore_Job    *recalc;
-   Eina_Bool     invert : 1;
-   Eina_Bool     plain : 1;
+   Eina_Bool     invert E_BITFIELD;
+   Eina_Bool     plain E_BITFIELD;
 };
 
 struct _Pager_Desk
@@ -40,12 +40,12 @@ struct _Pager_Desk
    Evas_Object *o_layout;
    Evas_Object *drop_handler;
    int          xpos, ypos, urgent;
-   int          current : 1;
+   int          current E_BITFIELD;
    struct
    {
       Pager        *from_pager;
-      unsigned char in_pager : 1;
-      unsigned char start : 1;
+      unsigned char in_pager E_BITFIELD;
+      unsigned char start E_BITFIELD;
       int           x, y, dx, dy, button;
    } drag;
 };
@@ -57,13 +57,13 @@ struct _Pager_Win
    Evas_Object  *o_window;
    Evas_Object  *o_mirror;
    Evas_Object  *o_icon;
-   unsigned char skip_winlist : 1;
+   unsigned char skip_winlist E_BITFIELD;
    struct
    {
       Pager        *from_pager;
-      unsigned char start : 1;
-      unsigned char in_pager : 1;
-      unsigned char desktop  : 1;
+      unsigned char start E_BITFIELD;
+      unsigned char in_pager E_BITFIELD;
+      unsigned char desktop  E_BITFIELD;
       int           x, y, dx, dy, button;
    } drag;
 };
@@ -74,7 +74,7 @@ struct _Pager_Popup
    Evas_Object  *o_bg;
    Pager        *pager;
    Ecore_Timer  *timer;
-   unsigned char urgent : 1;
+   unsigned char urgent E_BITFIELD;
 };
 
 static void         _pager_cb_mirror_add(Pager_Desk *pd, Evas_Object *obj, Evas_Object *mirror);
diff --git a/src/modules/pager_plain/e_mod_main.c b/src/modules/pager_plain/e_mod_main.c
index 26089d1e9..2d14edc39 100644
--- a/src/modules/pager_plain/e_mod_main.c
+++ b/src/modules/pager_plain/e_mod_main.c
@@ -45,11 +45,11 @@ struct _Pager
    int             xnum, ynum;
    Eina_List      *desks;
    Pager_Desk     *active_pd;
-   unsigned char   dragging : 1;
-   unsigned char   just_dragged : 1;
+   unsigned char   dragging E_BITFIELD;
+   unsigned char   just_dragged E_BITFIELD;
    Evas_Coord      dnd_x, dnd_y;
    Pager_Desk     *active_drop_pd;
-   Eina_Bool invert : 1;
+   Eina_Bool invert E_BITFIELD;
 };
 
 struct _Pager_Desk
@@ -61,12 +61,12 @@ struct _Pager_Desk
    Evas_Object *o_layout;
    Evas_Object *o_bg;
    int          xpos, ypos, urgent;
-   int          current : 1;
+   int          current E_BITFIELD;
    struct
    {
       Pager        *from_pager;
-      unsigned char in_pager : 1;
-      unsigned char start : 1;
+      unsigned char in_pager E_BITFIELD;
+      unsigned char start E_BITFIELD;
       int           x, y, dx, dy, button;
    } drag;
 };
@@ -77,13 +77,13 @@ struct _Pager_Win
    Pager_Desk   *desk;
    Evas_Object  *o_window;
    Evas_Object  *o_icon;
-   unsigned char skip_winlist : 1;
+   unsigned char skip_winlist E_BITFIELD;
    struct
    {
       Pager        *from_pager;
-      unsigned char start : 1;
-      unsigned char in_pager : 1;
-      unsigned char desktop  : 1;
+      unsigned char start E_BITFIELD;
+      unsigned char in_pager E_BITFIELD;
+      unsigned char desktop  E_BITFIELD;
       int           x, y, dx, dy, button;
    } drag;
 };
@@ -94,7 +94,7 @@ struct _Pager_Popup
    Pager        *pager;
    Evas_Object  *o_bg;
    Ecore_Timer  *timer;
-   unsigned char urgent : 1;
+   unsigned char urgent E_BITFIELD;
 };
 
 static void             _pager_desk_livethumb_setup(Pager_Desk *pd);
diff --git a/src/modules/sysinfo/batman/batman_fallback.c b/src/modules/sysinfo/batman/batman_fallback.c
index fd6270e9d..457807980 100644
--- a/src/modules/sysinfo/batman/batman_fallback.c
+++ b/src/modules/sysinfo/batman/batman_fallback.c
@@ -245,8 +245,8 @@ struct _Sys_Class_Power_Supply_Uevent
    int               basis_empty;
    int               basis_full;
 
-   unsigned char     have_current_avg : 1;
-   unsigned char     have_current_now : 1;
+   unsigned char     have_current_avg E_BITFIELD;
+   unsigned char     have_current_now E_BITFIELD;
 };
 
 static Eina_List *events = NULL;
diff --git a/src/modules/tasks/e_mod_main.c b/src/modules/tasks/e_mod_main.c
index eead41748..d9abd487a 100644
--- a/src/modules/tasks/e_mod_main.c
+++ b/src/modules/tasks/e_mod_main.c
@@ -47,10 +47,10 @@ struct _Tasks_Item
    E_Client    *client; // The client this item points to
    Evas_Object *o_item; // The edje theme object
    Evas_Object *o_icon; // The icon
-   Eina_Bool skip_taskbar : 1;
-   Eina_Bool focused : 1;
-   Eina_Bool urgent : 1;
-   Eina_Bool iconified : 1;
+   Eina_Bool skip_taskbar E_BITFIELD;
+   Eina_Bool focused E_BITFIELD;
+   Eina_Bool urgent E_BITFIELD;
+   Eina_Bool iconified E_BITFIELD;
 };
 
 static Tasks       *_tasks_new(Evas *e, E_Zone *zone, const char *id);
diff --git a/src/modules/teamwork/e_mod_tw.c b/src/modules/teamwork/e_mod_tw.c
index d84543fcf..e573a1c63 100644
--- a/src/modules/teamwork/e_mod_tw.c
+++ b/src/modules/teamwork/e_mod_tw.c
@@ -32,9 +32,9 @@ typedef struct Media
    Eina_List *clients;
    Eina_Stringshare *tmpfile;
    Eina_Bool video;
-   Eina_Bool dummy : 1;
-   Eina_Bool valid : 1;
-   Eina_Bool show : 1;
+   Eina_Bool dummy E_BITFIELD;
+   Eina_Bool valid E_BITFIELD;
+   Eina_Bool show E_BITFIELD;
 } Media;
 
 typedef enum
diff --git a/src/modules/tiling/e_mod_tiling.c b/src/modules/tiling/e_mod_tiling.c
index 2f38ebc5b..324c6d4d0 100644
--- a/src/modules/tiling/e_mod_tiling.c
+++ b/src/modules/tiling/e_mod_tiling.c
@@ -43,9 +43,9 @@ typedef struct Client_Extra
       const char *bordername;
    } orig;
    int       last_frame_adjustment; // FIXME: Hack for frame resize bug.
-   Eina_Bool floating : 1;
-   Eina_Bool tiled : 1;
-   Eina_Bool tracked : 1;
+   Eina_Bool floating E_BITFIELD;
+   Eina_Bool tiled E_BITFIELD;
+   Eina_Bool tracked E_BITFIELD;
 } Client_Extra;
 
 typedef struct _Instance
diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c
index 1b5738378..f9144f8cb 100644
--- a/src/modules/winlist/e_winlist.c
+++ b/src/modules/winlist/e_winlist.c
@@ -9,8 +9,8 @@ struct _E_Winlist_Win
    Evas_Object  *bg_object;
    Evas_Object  *icon_object;
    E_Client     *client;
-   unsigned char was_iconified : 1;
-   unsigned char was_shaded : 1;
+   unsigned char was_iconified E_BITFIELD;
+   unsigned char was_shaded E_BITFIELD;
 };
 
 static void      _e_winlist_size_adjust(void);
diff --git a/src/modules/wireless/connman.c b/src/modules/wireless/connman.c
index dbf079aeb..e9004328f 100644
--- a/src/modules/wireless/connman.c
+++ b/src/modules/wireless/connman.c
@@ -56,9 +56,9 @@ typedef struct Connman_Technology
    Eldbus_Proxy *proxy;
    Eina_Stringshare *tethering_ssid;
    Eina_Stringshare *tethering_passwd;
-   Eina_Bool powered : 1;
-   Eina_Bool connected : 1;
-   Eina_Bool tethering : 1;
+   Eina_Bool powered E_BITFIELD;
+   Eina_Bool connected E_BITFIELD;
+   Eina_Bool tethering E_BITFIELD;
 } Connman_Technology;
 
 typedef struct
@@ -110,8 +110,8 @@ typedef struct
    Eina_Stringshare *proxy_url;
    Eina_Array *proxy_servers;
    Eina_Array *proxy_excludes;
-   Eina_Bool ipv6 : 1;
-   Eina_Bool favorite : 1;
+   Eina_Bool ipv6 E_BITFIELD;
+   Eina_Bool favorite E_BITFIELD;
 } Connman_Service;
 
 typedef enum
diff --git a/src/modules/wireless/wireless.c b/src/modules/wireless/wireless.c
index f631e03ca..97fa6b3b2 100644
--- a/src/modules/wireless/wireless.c
+++ b/src/modules/wireless/wireless.c
@@ -60,7 +60,7 @@ typedef struct Wireless_Auth_Popup
    Evas_Object *popup;
    Wireless_Auth_Cb cb;
    void *data;
-   Eina_Bool sent : 1;
+   Eina_Bool sent E_BITFIELD;
 } Wireless_Auth_Popup;
 
 static Eina_Array *wireless_networks;
diff --git a/src/modules/xwayland/dnd.c b/src/modules/xwayland/dnd.c
index 2c0594d82..684137548 100644
--- a/src/modules/xwayland/dnd.c
+++ b/src/modules/xwayland/dnd.c
@@ -39,7 +39,7 @@ typedef struct
    Ecore_X_Atom selection;
    Ecore_X_Atom property;
    Eina_Binbuf *buf;
-   Eina_Bool incr : 1;
+   Eina_Bool incr E_BITFIELD;
 } Pipe;
 
 static void