-#ifdef MODEST_HAVE_HILDON0_WIDGETS
-#include <hildon-widgets/hildon-caption.h>
-#include <hildon-widgets/hildon-number-editor.h>
-#include <hildon-widgets/hildon-banner.h>
-#else
-#include <hildon/hildon-caption.h>
-#include <hildon/hildon-number-editor.h>
-#include <hildon/hildon-banner.h>
-#endif /*MODEST_HAVE_HILDON0_WIDGETS*/
+#ifdef MODEST_HAVE_CONIC
+#include <coniciap.h>
+#endif /*MODEST_HAVE_CONIC*/
+
+#include <modest-hildon-includes.h>
+#include <modest-maemo-utils.h>