diff --git a/legacy/elementary/src/lib/elm_priv.h b/legacy/elementary/src/lib/elm_priv.h
index 719cbf1afe..dbfb8cbda0 100644
--- a/legacy/elementary/src/lib/elm_priv.h
+++ b/legacy/elementary/src/lib/elm_priv.h
@@ -80,7 +80,6 @@ typedef struct _Elm_Config_Bindings_Widget   Elm_Config_Bindings_Widget;
 typedef struct _Elm_Config_Binding_Key   Elm_Config_Binding_Key;
 typedef struct _Elm_Config_Binding_Modifier  Elm_Config_Binding_Modifier;
 typedef struct _Elm_Module               Elm_Module;
-typedef struct _Elm_Datetime_Module_Data Elm_Datetime_Module_Data;
 
 struct _Edje_Signal_Data
 {
@@ -332,17 +331,6 @@ struct _Elm_Module
    int          references;
 };
 
-struct _Elm_Datetime_Module_Data
-{
-   Evas_Object *base;
-   void         (*field_limit_get)(Evas_Object *obj,
-                                   Elm_Datetime_Field_Type field_type,
-                                   int *range_min,
-                                   int *range_max);
-   const char  *(*field_format_get)(Evas_Object * obj,
-                                    Elm_Datetime_Field_Type field_type);
-};
-
 Eo                   *_elm_atspi_bridge_root_get(void);
 void                 _elm_atspi_bridge_init(void);
 void                 _elm_atspi_bridge_shutdown(void);
diff --git a/legacy/elementary/src/lib/elm_widget_datetime.h b/legacy/elementary/src/lib/elm_widget_datetime.h
index 328e2e8fea..7d9600c775 100644
--- a/legacy/elementary/src/lib/elm_widget_datetime.h
+++ b/legacy/elementary/src/lib/elm_widget_datetime.h
@@ -23,15 +23,27 @@
 /**
  * Base layout smart data extended with datetime instance data.
  */
-typedef struct _Elm_Datetime_Data       Elm_Datetime_Data;
-typedef struct _Datetime_Field          Datetime_Field;
-typedef struct _Datetime_Mod_Api        Datetime_Mod_Api;
-typedef struct _Format_Map              Format_Map;
+typedef struct _Elm_Datetime_Module_Data Elm_Datetime_Module_Data;
+typedef struct _Elm_Datetime_Data        Elm_Datetime_Data;
+typedef struct _Datetime_Field           Datetime_Field;
+typedef struct _Datetime_Mod_Api         Datetime_Mod_Api;
+typedef struct _Format_Map               Format_Map;
 
 #define ELM_DATETIME_TYPE_COUNT           6
 #define ELM_DATETIME_MAX_FORMAT_LEN       64
 #define ELM_DATETIME_MAX_FIELD_FORMAT_LEN 3
 
+struct _Elm_Datetime_Module_Data
+{
+   Evas_Object *base;
+   void         (*field_limit_get)(Evas_Object *obj,
+                                   Elm_Datetime_Field_Type field_type,
+                                   int *range_min,
+                                   int *range_max);
+   const char  *(*field_format_get)(Evas_Object * obj,
+                                    Elm_Datetime_Field_Type field_type);
+};
+
 struct _Datetime_Field
 {
    Evas_Object            *item_obj;
diff --git a/legacy/elementary/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c b/legacy/elementary/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
index 81cf9472ad..4405e11769 100644
--- a/legacy/elementary/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
+++ b/legacy/elementary/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <Elementary.h>
-#include "elm_priv.h"
+#include "elm_widget_datetime.h"
 
 #define DATETIME_FIELD_COUNT    6
 #define FIELD_FORMAT_LEN        3
@@ -327,7 +327,7 @@ EAPI Elm_Datetime_Module_Data *
 obj_hook(Evas_Object *obj)
 {
    Ctxpopup_Module_Data *ctx_mod;
-   ctx_mod = ELM_NEW(Ctxpopup_Module_Data);
+   ctx_mod = calloc(1, sizeof(Ctxpopup_Module_Data));
    if (!ctx_mod) return NULL;
 
    evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE,