diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index ce3aa933dfec..f8336da131a4 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -112,31 +112,31 @@ core_constructor_list = [
 # dbaccess/util/dba.component
     ("com_sun_star_comp_dba_ORowSet_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
 # forms/util/frm.component
-    "com_sun_star_comp_forms_FormOperations_get_implementation",
-    "com_sun_star_comp_forms_ODatabaseForm_get_implementation",
-    "com_sun_star_comp_forms_OFormattedFieldWrapper_ForcedFormatted_get_implementation",
-    "com_sun_star_comp_forms_ORichTextModel_get_implementation",
-    "com_sun_star_comp_forms_OScrollBarModel_get_implementation",
-    "com_sun_star_comp_forms_OSpinButtonModel_get_implementation",
-    "com_sun_star_form_Model_get_implementation",
-    "com_sun_star_form_OButtonControl_get_implementation",
-    "com_sun_star_form_OButtonModel_get_implementation",
-    "com_sun_star_form_OCheckBoxControl_get_implementation",
-    "com_sun_star_form_OCheckBoxModel_get_implementation",
-    "com_sun_star_form_OComboBoxControl_get_implementation",
-    "com_sun_star_form_OComboBoxModel_get_implementation",
-    "com_sun_star_form_ODateControl_get_implementation",
-    "com_sun_star_form_ODateModel_get_implementation",
-    "com_sun_star_form_OEditControl_get_implementation",
-    "com_sun_star_form_OEditModel_get_implementation",
-    "com_sun_star_form_OFixedTextModel_get_implementation",
-    "com_sun_star_form_OFormsCollection_get_implementation",
-    "com_sun_star_form_OGridControlModel_get_implementation",
-    "com_sun_star_form_OGroupBoxModel_get_implementation",
-    "com_sun_star_form_OListBoxModel_get_implementation",
-    "com_sun_star_form_ONumericModel_get_implementation",
-    "com_sun_star_form_ORadioButtonModel_get_implementation",
-    "com_sun_star_form_XForms_get_implementation",
+    ("com_sun_star_comp_forms_FormOperations_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_comp_forms_ODatabaseForm_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_comp_forms_OFormattedFieldWrapper_ForcedFormatted_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_comp_forms_ORichTextModel_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_comp_forms_OScrollBarModel_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_comp_forms_OSpinButtonModel_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_form_Model_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_form_OButtonControl_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_form_OButtonModel_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_form_OCheckBoxControl_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_form_OCheckBoxModel_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_form_OComboBoxControl_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_form_OComboBoxModel_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_form_ODateControl_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_form_ODateModel_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_form_OEditControl_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_form_OEditModel_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_form_OFixedTextModel_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_form_OFormsCollection_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_form_OGridControlModel_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_form_OGroupBoxModel_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_form_OListBoxModel_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_form_ONumericModel_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_form_ORadioButtonModel_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+    ("com_sun_star_form_XForms_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
 # framework/util/fwk.component
     "com_sun_star_comp_framework_AutoRecovery_get_implementation",
     "com_sun_star_comp_framework_Desktop_get_implementation",