1 files changed, 15 insertions, 24 deletions

diff --git a/src/instance.c b/src/instance.c
index 0aa96c9..2511c64 100644
--- a/src/instance.c
+++ b/src/instance.c
@@ -88,78 +88,69 @@ open_wrapper(SuilHost*      host,
              unsigned       n_features)
 {
   const char* module_name = NULL;
-#ifdef SUIL_WITH_GTK2_IN_QT4
+
   if (!strcmp(container_type_uri, QT4_UI_URI) &&
       !strcmp(ui_type_uri, GTK2_UI_URI)) {
     module_name = "suil_gtk2_in_qt4";
   }
-#endif
-#ifdef SUIL_WITH_GTK2_IN_QT5
+
+
   if (!strcmp(container_type_uri, QT5_UI_URI) &&
       !strcmp(ui_type_uri, GTK2_UI_URI)) {
     module_name = "suil_gtk2_in_qt5";
   }
-#endif
-#ifdef SUIL_WITH_QT4_IN_GTK2
+
+
   if (!strcmp(container_type_uri, GTK2_UI_URI) &&
       !strcmp(ui_type_uri, QT4_UI_URI)) {
     module_name = "suil_qt4_in_gtk2";
   }
-#endif
-#ifdef SUIL_WITH_QT5_IN_GTK2
+
+
   if (!strcmp(container_type_uri, GTK2_UI_URI) &&
       !strcmp(ui_type_uri, QT5_UI_URI)) {
     module_name = "suil_qt5_in_gtk2";
   }
-#endif
-#ifdef SUIL_WITH_X11_IN_GTK2
+
   if (!strcmp(container_type_uri, GTK2_UI_URI) &&
       !strcmp(ui_type_uri, X11_UI_URI)) {
     module_name = "suil_x11_in_gtk2";
   }
-#endif
-#ifdef SUIL_WITH_X11_IN_GTK3
+
   if (!strcmp(container_type_uri, GTK3_UI_URI) &&
       !strcmp(ui_type_uri, X11_UI_URI)) {
     module_name = "suil_x11_in_gtk3";
   }
-#endif
-#ifdef SUIL_WITH_QT5_IN_GTK3
+
   if (!strcmp(container_type_uri, GTK3_UI_URI) &&
       !strcmp(ui_type_uri, QT5_UI_URI)) {
     module_name = "suil_qt5_in_gtk3";
   }
-#endif
-#ifdef SUIL_WITH_WIN_IN_GTK2
+
   if (!strcmp(container_type_uri, GTK2_UI_URI) &&
       !strcmp(ui_type_uri, WIN_UI_URI)) {
     module_name = "suil_win_in_gtk2";
   }
-#endif
-#ifdef SUIL_WITH_COCOA_IN_GTK2
+
   if (!strcmp(container_type_uri, GTK2_UI_URI) &&
       !strcmp(ui_type_uri, COCOA_UI_URI)) {
     module_name = "suil_cocoa_in_gtk2";
   }
-#endif
-#ifdef SUIL_WITH_X11_IN_QT4
+
   if (!strcmp(container_type_uri, QT4_UI_URI) &&
       !strcmp(ui_type_uri, X11_UI_URI)) {
     module_name = "suil_x11_in_qt4";
   }
-#endif
-#ifdef SUIL_WITH_X11_IN_QT5
+
   if (!strcmp(container_type_uri, QT5_UI_URI) &&
       !strcmp(ui_type_uri, X11_UI_URI)) {
     module_name = "suil_x11_in_qt5";
   }
-#endif
-#ifdef SUIL_WITH_COCOA_IN_QT5
+
   if (!strcmp(container_type_uri, QT5_UI_URI) &&
       !strcmp(ui_type_uri, COCOA_UI_URI)) {
     module_name = "suil_cocoa_in_qt5";
   }
-#endif
 
   if (!module_name) {
     SUIL_ERRORF("Unable to wrap UI type <%s> as type <%s>\n",