318 files changed, 5 insertions, 3 deletions

diff --git a/data/tests/meson.build b/data/tests/meson.build
index fa0b2c00..1cc0826b 100644
--- a/data/tests/meson.build
+++ b/data/tests/meson.build
@@ -3,7 +3,7 @@
 
 test_conf = {
   'abs_top_builddir': build_root,
-  'PLUGIN_BUILD_SUBDIR': 'plugins/',
+  'PLUGIN_BUILD_SUBDIR': 'src/plugins/',
 }
 
 configure_file(
diff --git a/meson.build b/meson.build
index 34b93486..cc2191fe 100644
--- a/meson.build
+++ b/meson.build
@@ -55,9 +55,9 @@ source_root = meson.current_source_dir()
 build_root = meson.current_build_dir()
 
 build_aux_dir = source_root / 'build-aux'
-plugins_dir = source_root / 'plugins'
 po_dir = source_root / 'po'
 src_dir = source_root / 'src'
+plugins_dir = source_root / 'src/plugins'
 
 top_inc = include_directories('.')
 
@@ -397,7 +397,6 @@ endif
 
 subdir('libmm-glib')
 subdir('src')
-subdir('plugins')
 subdir('cli')
 
 if enable_tests
diff --git a/src/meson.build b/src/meson.build
index 30aedbe9..db345e4c 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -336,3 +336,6 @@ install_data(
 if enable_tests
   subdir('tests')
 endif
+
+# Additional vendor plugins
+subdir('plugins')
\ No newline at end of file
diff --git a/plugins/README.txt b/src/plugins/README.txt
index ff36dc41..ff36dc41 100644
--- a/plugins/README.txt
+++ b/src/plugins/README.txt
diff --git a/plugins/altair/mm-broadband-bearer-altair-lte.c b/src/plugins/altair/mm-broadband-bearer-altair-lte.c
index 812b04d8..812b04d8 100644
--- a/plugins/altair/mm-broadband-bearer-altair-lte.c
+++ b/src/plugins/altair/mm-broadband-bearer-altair-lte.c
diff --git a/plugins/altair/mm-broadband-bearer-altair-lte.h b/src/plugins/altair/mm-broadband-bearer-altair-lte.h
index 907c7743..907c7743 100644
--- a/plugins/altair/mm-broadband-bearer-altair-lte.h
+++ b/src/plugins/altair/mm-broadband-bearer-altair-lte.h
diff --git a/plugins/altair/mm-broadband-modem-altair-lte.c b/src/plugins/altair/mm-broadband-modem-altair-lte.c
index 837d57cc..837d57cc 100644
--- a/plugins/altair/mm-broadband-modem-altair-lte.c
+++ b/src/plugins/altair/mm-broadband-modem-altair-lte.c
diff --git a/plugins/altair/mm-broadband-modem-altair-lte.h b/src/plugins/altair/mm-broadband-modem-altair-lte.h
index fc8d362e..fc8d362e 100644
--- a/plugins/altair/mm-broadband-modem-altair-lte.h
+++ b/src/plugins/altair/mm-broadband-modem-altair-lte.h
diff --git a/plugins/altair/mm-modem-helpers-altair-lte.c b/src/plugins/altair/mm-modem-helpers-altair-lte.c
index d2fd9af7..d2fd9af7 100644
--- a/plugins/altair/mm-modem-helpers-altair-lte.c
+++ b/src/plugins/altair/mm-modem-helpers-altair-lte.c
diff --git a/plugins/altair/mm-modem-helpers-altair-lte.h b/src/plugins/altair/mm-modem-helpers-altair-lte.h
index ff7f64b0..ff7f64b0 100644
--- a/plugins/altair/mm-modem-helpers-altair-lte.h
+++ b/src/plugins/altair/mm-modem-helpers-altair-lte.h
diff --git a/plugins/altair/mm-plugin-altair-lte.c b/src/plugins/altair/mm-plugin-altair-lte.c
index e58fe176..e58fe176 100644
--- a/plugins/altair/mm-plugin-altair-lte.c
+++ b/src/plugins/altair/mm-plugin-altair-lte.c
diff --git a/plugins/altair/mm-plugin-altair-lte.h b/src/plugins/altair/mm-plugin-altair-lte.h
index 385a5cc2..385a5cc2 100644
--- a/plugins/altair/mm-plugin-altair-lte.h
+++ b/src/plugins/altair/mm-plugin-altair-lte.h
diff --git a/plugins/altair/tests/test-modem-helpers-altair-lte.c b/src/plugins/altair/tests/test-modem-helpers-altair-lte.c
index da9eaf32..da9eaf32 100644
--- a/plugins/altair/tests/test-modem-helpers-altair-lte.c
+++ b/src/plugins/altair/tests/test-modem-helpers-altair-lte.c
diff --git a/plugins/anydata/mm-broadband-modem-anydata.c b/src/plugins/anydata/mm-broadband-modem-anydata.c
index 36d72e56..36d72e56 100644
--- a/plugins/anydata/mm-broadband-modem-anydata.c
+++ b/src/plugins/anydata/mm-broadband-modem-anydata.c
diff --git a/plugins/anydata/mm-broadband-modem-anydata.h b/src/plugins/anydata/mm-broadband-modem-anydata.h
index 94145623..94145623 100644
--- a/plugins/anydata/mm-broadband-modem-anydata.h
+++ b/src/plugins/anydata/mm-broadband-modem-anydata.h
diff --git a/plugins/anydata/mm-plugin-anydata.c b/src/plugins/anydata/mm-plugin-anydata.c
index 4b8f0a84..4b8f0a84 100644
--- a/plugins/anydata/mm-plugin-anydata.c
+++ b/src/plugins/anydata/mm-plugin-anydata.c
diff --git a/plugins/anydata/mm-plugin-anydata.h b/src/plugins/anydata/mm-plugin-anydata.h
index 765c19a5..765c19a5 100644
--- a/plugins/anydata/mm-plugin-anydata.h
+++ b/src/plugins/anydata/mm-plugin-anydata.h
diff --git a/plugins/broadmobi/77-mm-broadmobi-port-types.rules b/src/plugins/broadmobi/77-mm-broadmobi-port-types.rules
index 685e1467..685e1467 100644
--- a/plugins/broadmobi/77-mm-broadmobi-port-types.rules
+++ b/src/plugins/broadmobi/77-mm-broadmobi-port-types.rules
diff --git a/plugins/broadmobi/mm-plugin-broadmobi.c b/src/plugins/broadmobi/mm-plugin-broadmobi.c
index 805663fe..805663fe 100644
--- a/plugins/broadmobi/mm-plugin-broadmobi.c
+++ b/src/plugins/broadmobi/mm-plugin-broadmobi.c
diff --git a/plugins/broadmobi/mm-plugin-broadmobi.h b/src/plugins/broadmobi/mm-plugin-broadmobi.h
index 1f46cfce..1f46cfce 100644
--- a/plugins/broadmobi/mm-plugin-broadmobi.h
+++ b/src/plugins/broadmobi/mm-plugin-broadmobi.h
diff --git a/plugins/cinterion/77-mm-cinterion-port-types.rules b/src/plugins/cinterion/77-mm-cinterion-port-types.rules
index c1a9bc4a..c1a9bc4a 100644
--- a/plugins/cinterion/77-mm-cinterion-port-types.rules
+++ b/src/plugins/cinterion/77-mm-cinterion-port-types.rules
diff --git a/plugins/cinterion/mm-broadband-bearer-cinterion.c b/src/plugins/cinterion/mm-broadband-bearer-cinterion.c
index 85fbf69c..85fbf69c 100644
--- a/plugins/cinterion/mm-broadband-bearer-cinterion.c
+++ b/src/plugins/cinterion/mm-broadband-bearer-cinterion.c
diff --git a/plugins/cinterion/mm-broadband-bearer-cinterion.h b/src/plugins/cinterion/mm-broadband-bearer-cinterion.h
index d514759d..d514759d 100644
--- a/plugins/cinterion/mm-broadband-bearer-cinterion.h
+++ b/src/plugins/cinterion/mm-broadband-bearer-cinterion.h
diff --git a/plugins/cinterion/mm-broadband-modem-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-cinterion.c
index b063d454..b063d454 100644
--- a/plugins/cinterion/mm-broadband-modem-cinterion.c
+++ b/src/plugins/cinterion/mm-broadband-modem-cinterion.c
diff --git a/plugins/cinterion/mm-broadband-modem-cinterion.h b/src/plugins/cinterion/mm-broadband-modem-cinterion.h
index 555ee084..555ee084 100644
--- a/plugins/cinterion/mm-broadband-modem-cinterion.h
+++ b/src/plugins/cinterion/mm-broadband-modem-cinterion.h
diff --git a/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
index 740909b1..740909b1 100644
--- a/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
+++ b/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
diff --git a/plugins/cinterion/mm-broadband-modem-mbim-cinterion.h b/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.h
index a2f2ef68..a2f2ef68 100644
--- a/plugins/cinterion/mm-broadband-modem-mbim-cinterion.h
+++ b/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.h
diff --git a/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
index b94e63d3..b94e63d3 100644
--- a/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
+++ b/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
diff --git a/plugins/cinterion/mm-broadband-modem-qmi-cinterion.h b/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.h
index ac8f68be..ac8f68be 100644
--- a/plugins/cinterion/mm-broadband-modem-qmi-cinterion.h
+++ b/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.h
diff --git a/plugins/cinterion/mm-modem-helpers-cinterion.c b/src/plugins/cinterion/mm-modem-helpers-cinterion.c
index f22a998c..f22a998c 100644
--- a/plugins/cinterion/mm-modem-helpers-cinterion.c
+++ b/src/plugins/cinterion/mm-modem-helpers-cinterion.c
diff --git a/plugins/cinterion/mm-modem-helpers-cinterion.h b/src/plugins/cinterion/mm-modem-helpers-cinterion.h
index 3155d0c1..3155d0c1 100644
--- a/plugins/cinterion/mm-modem-helpers-cinterion.h
+++ b/src/plugins/cinterion/mm-modem-helpers-cinterion.h
diff --git a/plugins/cinterion/mm-plugin-cinterion.c b/src/plugins/cinterion/mm-plugin-cinterion.c
index b0f3f992..b0f3f992 100644
--- a/plugins/cinterion/mm-plugin-cinterion.c
+++ b/src/plugins/cinterion/mm-plugin-cinterion.c
diff --git a/plugins/cinterion/mm-plugin-cinterion.h b/src/plugins/cinterion/mm-plugin-cinterion.h
index a8a3b6bb..a8a3b6bb 100644
--- a/plugins/cinterion/mm-plugin-cinterion.h
+++ b/src/plugins/cinterion/mm-plugin-cinterion.h
diff --git a/plugins/cinterion/mm-shared-cinterion.c b/src/plugins/cinterion/mm-shared-cinterion.c
index 36cf60c9..36cf60c9 100644
--- a/plugins/cinterion/mm-shared-cinterion.c
+++ b/src/plugins/cinterion/mm-shared-cinterion.c
diff --git a/plugins/cinterion/mm-shared-cinterion.h b/src/plugins/cinterion/mm-shared-cinterion.h
index eb6beac8..eb6beac8 100644
--- a/plugins/cinterion/mm-shared-cinterion.h
+++ b/src/plugins/cinterion/mm-shared-cinterion.h
diff --git a/plugins/cinterion/tests/test-modem-helpers-cinterion.c b/src/plugins/cinterion/tests/test-modem-helpers-cinterion.c
index d4816199..d4816199 100644
--- a/plugins/cinterion/tests/test-modem-helpers-cinterion.c
+++ b/src/plugins/cinterion/tests/test-modem-helpers-cinterion.c
diff --git a/plugins/dell/77-mm-dell-port-types.rules b/src/plugins/dell/77-mm-dell-port-types.rules
index fa01c116..fa01c116 100644
--- a/plugins/dell/77-mm-dell-port-types.rules
+++ b/src/plugins/dell/77-mm-dell-port-types.rules
diff --git a/plugins/dell/mm-plugin-dell.c b/src/plugins/dell/mm-plugin-dell.c
index 63d8b4da..63d8b4da 100644
--- a/plugins/dell/mm-plugin-dell.c
+++ b/src/plugins/dell/mm-plugin-dell.c
diff --git a/plugins/dell/mm-plugin-dell.h b/src/plugins/dell/mm-plugin-dell.h
index cc1a539e..cc1a539e 100644
--- a/plugins/dell/mm-plugin-dell.h
+++ b/src/plugins/dell/mm-plugin-dell.h
diff --git a/plugins/dlink/77-mm-dlink-port-types.rules b/src/plugins/dlink/77-mm-dlink-port-types.rules
index 0dc7afce..0dc7afce 100644
--- a/plugins/dlink/77-mm-dlink-port-types.rules
+++ b/src/plugins/dlink/77-mm-dlink-port-types.rules
diff --git a/plugins/dlink/mm-plugin-dlink.c b/src/plugins/dlink/mm-plugin-dlink.c
index 72476e2e..72476e2e 100644
--- a/plugins/dlink/mm-plugin-dlink.c
+++ b/src/plugins/dlink/mm-plugin-dlink.c
diff --git a/plugins/dlink/mm-plugin-dlink.h b/src/plugins/dlink/mm-plugin-dlink.h
index 13453cb0..13453cb0 100644
--- a/plugins/dlink/mm-plugin-dlink.h
+++ b/src/plugins/dlink/mm-plugin-dlink.h
diff --git a/plugins/fibocom/77-mm-fibocom-port-types.rules b/src/plugins/fibocom/77-mm-fibocom-port-types.rules
index 1fb26628..1fb26628 100644
--- a/plugins/fibocom/77-mm-fibocom-port-types.rules
+++ b/src/plugins/fibocom/77-mm-fibocom-port-types.rules
diff --git a/plugins/fibocom/mm-broadband-bearer-fibocom-ecm.c b/src/plugins/fibocom/mm-broadband-bearer-fibocom-ecm.c
index bc4ee1ec..bc4ee1ec 100644
--- a/plugins/fibocom/mm-broadband-bearer-fibocom-ecm.c
+++ b/src/plugins/fibocom/mm-broadband-bearer-fibocom-ecm.c
diff --git a/plugins/fibocom/mm-broadband-bearer-fibocom-ecm.h b/src/plugins/fibocom/mm-broadband-bearer-fibocom-ecm.h
index ea367aeb..ea367aeb 100644
--- a/plugins/fibocom/mm-broadband-bearer-fibocom-ecm.h
+++ b/src/plugins/fibocom/mm-broadband-bearer-fibocom-ecm.h
diff --git a/plugins/fibocom/mm-broadband-modem-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-fibocom.c
index 9d659698..9d659698 100644
--- a/plugins/fibocom/mm-broadband-modem-fibocom.c
+++ b/src/plugins/fibocom/mm-broadband-modem-fibocom.c
diff --git a/plugins/fibocom/mm-broadband-modem-fibocom.h b/src/plugins/fibocom/mm-broadband-modem-fibocom.h
index 958841b7..958841b7 100644
--- a/plugins/fibocom/mm-broadband-modem-fibocom.h
+++ b/src/plugins/fibocom/mm-broadband-modem-fibocom.h
diff --git a/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c
index b4655db7..b4655db7 100644
--- a/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c
+++ b/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c
diff --git a/plugins/fibocom/mm-broadband-modem-mbim-fibocom.h b/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.h
index b5c5434f..b5c5434f 100644
--- a/plugins/fibocom/mm-broadband-modem-mbim-fibocom.h
+++ b/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.h
diff --git a/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c
index 7ed39362..7ed39362 100644
--- a/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c
+++ b/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c
diff --git a/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.h b/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.h
index db51cfc8..db51cfc8 100644
--- a/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.h
+++ b/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.h
diff --git a/plugins/fibocom/mm-plugin-fibocom.c b/src/plugins/fibocom/mm-plugin-fibocom.c
index 4ef4d483..4ef4d483 100644
--- a/plugins/fibocom/mm-plugin-fibocom.c
+++ b/src/plugins/fibocom/mm-plugin-fibocom.c
diff --git a/plugins/fibocom/mm-plugin-fibocom.h b/src/plugins/fibocom/mm-plugin-fibocom.h
index e5289979..e5289979 100644
--- a/plugins/fibocom/mm-plugin-fibocom.h
+++ b/src/plugins/fibocom/mm-plugin-fibocom.h
diff --git a/plugins/fibocom/mm-shared-fibocom.c b/src/plugins/fibocom/mm-shared-fibocom.c
index 10b82c59..10b82c59 100644
--- a/plugins/fibocom/mm-shared-fibocom.c
+++ b/src/plugins/fibocom/mm-shared-fibocom.c
diff --git a/plugins/fibocom/mm-shared-fibocom.h b/src/plugins/fibocom/mm-shared-fibocom.h
index cc4348d2..cc4348d2 100644
--- a/plugins/fibocom/mm-shared-fibocom.h
+++ b/src/plugins/fibocom/mm-shared-fibocom.h
diff --git a/plugins/fibocom/mm-shared.c b/src/plugins/fibocom/mm-shared.c
index b99bc3aa..b99bc3aa 100644
--- a/plugins/fibocom/mm-shared.c
+++ b/src/plugins/fibocom/mm-shared.c
diff --git a/plugins/foxconn/77-mm-foxconn-port-types.rules b/src/plugins/foxconn/77-mm-foxconn-port-types.rules
index 344df152..344df152 100644
--- a/plugins/foxconn/77-mm-foxconn-port-types.rules
+++ b/src/plugins/foxconn/77-mm-foxconn-port-types.rules
diff --git a/plugins/foxconn/mm-broadband-modem-mbim-foxconn.c b/src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.c
index cec1c617..cec1c617 100644
--- a/plugins/foxconn/mm-broadband-modem-mbim-foxconn.c
+++ b/src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.c
diff --git a/plugins/foxconn/mm-broadband-modem-mbim-foxconn.h b/src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.h
index 374599e4..374599e4 100644
--- a/plugins/foxconn/mm-broadband-modem-mbim-foxconn.h
+++ b/src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.h
diff --git a/plugins/foxconn/mm-foxconn-t77w968-carrier-mapping.conf b/src/plugins/foxconn/mm-foxconn-t77w968-carrier-mapping.conf
index 79b12c1e..79b12c1e 100644
--- a/plugins/foxconn/mm-foxconn-t77w968-carrier-mapping.conf
+++ b/src/plugins/foxconn/mm-foxconn-t77w968-carrier-mapping.conf
diff --git a/plugins/foxconn/mm-plugin-foxconn.c b/src/plugins/foxconn/mm-plugin-foxconn.c
index d248fb05..d248fb05 100644
--- a/plugins/foxconn/mm-plugin-foxconn.c
+++ b/src/plugins/foxconn/mm-plugin-foxconn.c
diff --git a/plugins/foxconn/mm-plugin-foxconn.h b/src/plugins/foxconn/mm-plugin-foxconn.h
index 4a22ceeb..4a22ceeb 100644
--- a/plugins/foxconn/mm-plugin-foxconn.h
+++ b/src/plugins/foxconn/mm-plugin-foxconn.h
diff --git a/plugins/foxconn/mm-shared.c b/src/plugins/foxconn/mm-shared.c
index 3b017574..3b017574 100644
--- a/plugins/foxconn/mm-shared.c
+++ b/src/plugins/foxconn/mm-shared.c
diff --git a/plugins/generic/mm-plugin-generic.c b/src/plugins/generic/mm-plugin-generic.c
index 6dd37d59..6dd37d59 100644
--- a/plugins/generic/mm-plugin-generic.c
+++ b/src/plugins/generic/mm-plugin-generic.c
diff --git a/plugins/generic/mm-plugin-generic.h b/src/plugins/generic/mm-plugin-generic.h
index 12f9dd9d..12f9dd9d 100644
--- a/plugins/generic/mm-plugin-generic.h
+++ b/src/plugins/generic/mm-plugin-generic.h
diff --git a/plugins/generic/tests/test-service-generic.c b/src/plugins/generic/tests/test-service-generic.c
index d7bc4e01..d7bc4e01 100644
--- a/plugins/generic/tests/test-service-generic.c
+++ b/src/plugins/generic/tests/test-service-generic.c
diff --git a/plugins/gosuncn/77-mm-gosuncn-port-types.rules b/src/plugins/gosuncn/77-mm-gosuncn-port-types.rules
index 122c6666..122c6666 100644
--- a/plugins/gosuncn/77-mm-gosuncn-port-types.rules
+++ b/src/plugins/gosuncn/77-mm-gosuncn-port-types.rules
diff --git a/plugins/gosuncn/mm-plugin-gosuncn.c b/src/plugins/gosuncn/mm-plugin-gosuncn.c
index 010e93eb..010e93eb 100644
--- a/plugins/gosuncn/mm-plugin-gosuncn.c
+++ b/src/plugins/gosuncn/mm-plugin-gosuncn.c
diff --git a/plugins/gosuncn/mm-plugin-gosuncn.h b/src/plugins/gosuncn/mm-plugin-gosuncn.h
index a50e3089..a50e3089 100644
--- a/plugins/gosuncn/mm-plugin-gosuncn.h
+++ b/src/plugins/gosuncn/mm-plugin-gosuncn.h
diff --git a/plugins/haier/77-mm-haier-port-types.rules b/src/plugins/haier/77-mm-haier-port-types.rules
index 0d969fca..0d969fca 100644
--- a/plugins/haier/77-mm-haier-port-types.rules
+++ b/src/plugins/haier/77-mm-haier-port-types.rules
diff --git a/plugins/haier/mm-plugin-haier.c b/src/plugins/haier/mm-plugin-haier.c
index a0951c27..a0951c27 100644
--- a/plugins/haier/mm-plugin-haier.c
+++ b/src/plugins/haier/mm-plugin-haier.c
diff --git a/plugins/haier/mm-plugin-haier.h b/src/plugins/haier/mm-plugin-haier.h
index e1fdfbb1..e1fdfbb1 100644
--- a/plugins/haier/mm-plugin-haier.h
+++ b/src/plugins/haier/mm-plugin-haier.h
diff --git a/plugins/huawei/77-mm-huawei-net-port-types.rules b/src/plugins/huawei/77-mm-huawei-net-port-types.rules
index fed7da06..fed7da06 100644
--- a/plugins/huawei/77-mm-huawei-net-port-types.rules
+++ b/src/plugins/huawei/77-mm-huawei-net-port-types.rules
diff --git a/plugins/huawei/mm-broadband-bearer-huawei.c b/src/plugins/huawei/mm-broadband-bearer-huawei.c
index f166efa5..f166efa5 100644
--- a/plugins/huawei/mm-broadband-bearer-huawei.c
+++ b/src/plugins/huawei/mm-broadband-bearer-huawei.c
diff --git a/plugins/huawei/mm-broadband-bearer-huawei.h b/src/plugins/huawei/mm-broadband-bearer-huawei.h
index d3f43abc..d3f43abc 100644
--- a/plugins/huawei/mm-broadband-bearer-huawei.h
+++ b/src/plugins/huawei/mm-broadband-bearer-huawei.h
diff --git a/plugins/huawei/mm-broadband-modem-huawei.c b/src/plugins/huawei/mm-broadband-modem-huawei.c
index c7c68b9f..c7c68b9f 100644
--- a/plugins/huawei/mm-broadband-modem-huawei.c
+++ b/src/plugins/huawei/mm-broadband-modem-huawei.c
diff --git a/plugins/huawei/mm-broadband-modem-huawei.h b/src/plugins/huawei/mm-broadband-modem-huawei.h
index 9fb16811..9fb16811 100644
--- a/plugins/huawei/mm-broadband-modem-huawei.h
+++ b/src/plugins/huawei/mm-broadband-modem-huawei.h
diff --git a/plugins/huawei/mm-modem-helpers-huawei.c b/src/plugins/huawei/mm-modem-helpers-huawei.c
index 67bb7089..67bb7089 100644
--- a/plugins/huawei/mm-modem-helpers-huawei.c
+++ b/src/plugins/huawei/mm-modem-helpers-huawei.c
diff --git a/plugins/huawei/mm-modem-helpers-huawei.h b/src/plugins/huawei/mm-modem-helpers-huawei.h
index 3d1a4b22..3d1a4b22 100644
--- a/plugins/huawei/mm-modem-helpers-huawei.h
+++ b/src/plugins/huawei/mm-modem-helpers-huawei.h
diff --git a/plugins/huawei/mm-plugin-huawei.c b/src/plugins/huawei/mm-plugin-huawei.c
index ad8d32b0..ad8d32b0 100644
--- a/plugins/huawei/mm-plugin-huawei.c
+++ b/src/plugins/huawei/mm-plugin-huawei.c
diff --git a/plugins/huawei/mm-plugin-huawei.h b/src/plugins/huawei/mm-plugin-huawei.h
index daba2055..daba2055 100644
--- a/plugins/huawei/mm-plugin-huawei.h
+++ b/src/plugins/huawei/mm-plugin-huawei.h
diff --git a/plugins/huawei/mm-sim-huawei.c b/src/plugins/huawei/mm-sim-huawei.c
index f937c773..f937c773 100644
--- a/plugins/huawei/mm-sim-huawei.c
+++ b/src/plugins/huawei/mm-sim-huawei.c
diff --git a/plugins/huawei/mm-sim-huawei.h b/src/plugins/huawei/mm-sim-huawei.h
index eeeefbaf..eeeefbaf 100644
--- a/plugins/huawei/mm-sim-huawei.h
+++ b/src/plugins/huawei/mm-sim-huawei.h
diff --git a/plugins/huawei/tests/test-modem-helpers-huawei.c b/src/plugins/huawei/tests/test-modem-helpers-huawei.c
index e6f2490b..e6f2490b 100644
--- a/plugins/huawei/tests/test-modem-helpers-huawei.c
+++ b/src/plugins/huawei/tests/test-modem-helpers-huawei.c
diff --git a/plugins/icera/mm-broadband-bearer-icera.c b/src/plugins/icera/mm-broadband-bearer-icera.c
index f6477595..f6477595 100644
--- a/plugins/icera/mm-broadband-bearer-icera.c
+++ b/src/plugins/icera/mm-broadband-bearer-icera.c
diff --git a/plugins/icera/mm-broadband-bearer-icera.h b/src/plugins/icera/mm-broadband-bearer-icera.h
index e169cb7c..e169cb7c 100644
--- a/plugins/icera/mm-broadband-bearer-icera.h
+++ b/src/plugins/icera/mm-broadband-bearer-icera.h
diff --git a/plugins/icera/mm-broadband-modem-icera.c b/src/plugins/icera/mm-broadband-modem-icera.c
index 759985e0..759985e0 100644
--- a/plugins/icera/mm-broadband-modem-icera.c
+++ b/src/plugins/icera/mm-broadband-modem-icera.c
diff --git a/plugins/icera/mm-broadband-modem-icera.h b/src/plugins/icera/mm-broadband-modem-icera.h
index cb88aaf5..cb88aaf5 100644
--- a/plugins/icera/mm-broadband-modem-icera.h
+++ b/src/plugins/icera/mm-broadband-modem-icera.h
diff --git a/plugins/icera/mm-modem-helpers-icera.c b/src/plugins/icera/mm-modem-helpers-icera.c
index da1cd873..da1cd873 100644
--- a/plugins/icera/mm-modem-helpers-icera.c
+++ b/src/plugins/icera/mm-modem-helpers-icera.c
diff --git a/plugins/icera/mm-modem-helpers-icera.h b/src/plugins/icera/mm-modem-helpers-icera.h
index fa4f9016..fa4f9016 100644
--- a/plugins/icera/mm-modem-helpers-icera.h
+++ b/src/plugins/icera/mm-modem-helpers-icera.h
diff --git a/plugins/icera/mm-shared.c b/src/plugins/icera/mm-shared.c
index 735d61bf..735d61bf 100644
--- a/plugins/icera/mm-shared.c
+++ b/src/plugins/icera/mm-shared.c
diff --git a/plugins/icera/tests/test-modem-helpers-icera.c b/src/plugins/icera/tests/test-modem-helpers-icera.c
index dceb1e2b..dceb1e2b 100644
--- a/plugins/icera/tests/test-modem-helpers-icera.c
+++ b/src/plugins/icera/tests/test-modem-helpers-icera.c
diff --git a/plugins/intel/mm-broadband-modem-mbim-intel.c b/src/plugins/intel/mm-broadband-modem-mbim-intel.c
index f6cf33db..f6cf33db 100644
--- a/plugins/intel/mm-broadband-modem-mbim-intel.c
+++ b/src/plugins/intel/mm-broadband-modem-mbim-intel.c
diff --git a/plugins/intel/mm-broadband-modem-mbim-intel.h b/src/plugins/intel/mm-broadband-modem-mbim-intel.h
index 549f179d..549f179d 100644
--- a/plugins/intel/mm-broadband-modem-mbim-intel.h
+++ b/src/plugins/intel/mm-broadband-modem-mbim-intel.h
diff --git a/plugins/intel/mm-plugin-intel.c b/src/plugins/intel/mm-plugin-intel.c
index d83edfba..d83edfba 100644
--- a/plugins/intel/mm-plugin-intel.c
+++ b/src/plugins/intel/mm-plugin-intel.c
diff --git a/plugins/intel/mm-plugin-intel.h b/src/plugins/intel/mm-plugin-intel.h
index 3d2880b2..3d2880b2 100644
--- a/plugins/intel/mm-plugin-intel.h
+++ b/src/plugins/intel/mm-plugin-intel.h
diff --git a/plugins/iridium/mm-bearer-iridium.c b/src/plugins/iridium/mm-bearer-iridium.c
index 52e8ada9..52e8ada9 100644
--- a/plugins/iridium/mm-bearer-iridium.c
+++ b/src/plugins/iridium/mm-bearer-iridium.c
diff --git a/plugins/iridium/mm-bearer-iridium.h b/src/plugins/iridium/mm-bearer-iridium.h
index eba6ac54..eba6ac54 100644
--- a/plugins/iridium/mm-bearer-iridium.h
+++ b/src/plugins/iridium/mm-bearer-iridium.h
diff --git a/plugins/iridium/mm-broadband-modem-iridium.c b/src/plugins/iridium/mm-broadband-modem-iridium.c
index 681d9123..681d9123 100644
--- a/plugins/iridium/mm-broadband-modem-iridium.c
+++ b/src/plugins/iridium/mm-broadband-modem-iridium.c
diff --git a/plugins/iridium/mm-broadband-modem-iridium.h b/src/plugins/iridium/mm-broadband-modem-iridium.h
index b9a1270b..b9a1270b 100644
--- a/plugins/iridium/mm-broadband-modem-iridium.h
+++ b/src/plugins/iridium/mm-broadband-modem-iridium.h
diff --git a/plugins/iridium/mm-plugin-iridium.c b/src/plugins/iridium/mm-plugin-iridium.c
index 741847f8..741847f8 100644
--- a/plugins/iridium/mm-plugin-iridium.c
+++ b/src/plugins/iridium/mm-plugin-iridium.c
diff --git a/plugins/iridium/mm-plugin-iridium.h b/src/plugins/iridium/mm-plugin-iridium.h
index b729ce98..b729ce98 100644
--- a/plugins/iridium/mm-plugin-iridium.h
+++ b/src/plugins/iridium/mm-plugin-iridium.h
diff --git a/plugins/iridium/mm-sim-iridium.c b/src/plugins/iridium/mm-sim-iridium.c
index 3495039b..3495039b 100644
--- a/plugins/iridium/mm-sim-iridium.c
+++ b/src/plugins/iridium/mm-sim-iridium.c
diff --git a/plugins/iridium/mm-sim-iridium.h b/src/plugins/iridium/mm-sim-iridium.h
index 2f3e2916..2f3e2916 100644
--- a/plugins/iridium/mm-sim-iridium.h
+++ b/src/plugins/iridium/mm-sim-iridium.h
diff --git a/plugins/linktop/77-mm-linktop-port-types.rules b/src/plugins/linktop/77-mm-linktop-port-types.rules
index dc2ef0d6..dc2ef0d6 100644
--- a/plugins/linktop/77-mm-linktop-port-types.rules
+++ b/src/plugins/linktop/77-mm-linktop-port-types.rules
diff --git a/plugins/linktop/mm-broadband-modem-linktop.c b/src/plugins/linktop/mm-broadband-modem-linktop.c
index a83682c8..a83682c8 100644
--- a/plugins/linktop/mm-broadband-modem-linktop.c
+++ b/src/plugins/linktop/mm-broadband-modem-linktop.c
diff --git a/plugins/linktop/mm-broadband-modem-linktop.h b/src/plugins/linktop/mm-broadband-modem-linktop.h
index 385a20b8..385a20b8 100644
--- a/plugins/linktop/mm-broadband-modem-linktop.h
+++ b/src/plugins/linktop/mm-broadband-modem-linktop.h
diff --git a/plugins/linktop/mm-modem-helpers-linktop.c b/src/plugins/linktop/mm-modem-helpers-linktop.c
index 2ca46bb6..2ca46bb6 100644
--- a/plugins/linktop/mm-modem-helpers-linktop.c
+++ b/src/plugins/linktop/mm-modem-helpers-linktop.c
diff --git a/plugins/linktop/mm-modem-helpers-linktop.h b/src/plugins/linktop/mm-modem-helpers-linktop.h
index 69fa7ee2..69fa7ee2 100644
--- a/plugins/linktop/mm-modem-helpers-linktop.h
+++ b/src/plugins/linktop/mm-modem-helpers-linktop.h
diff --git a/plugins/linktop/mm-plugin-linktop.c b/src/plugins/linktop/mm-plugin-linktop.c
index 8276e59f..8276e59f 100644
--- a/plugins/linktop/mm-plugin-linktop.c
+++ b/src/plugins/linktop/mm-plugin-linktop.c
diff --git a/plugins/linktop/mm-plugin-linktop.h b/src/plugins/linktop/mm-plugin-linktop.h
index 6c8e5789..6c8e5789 100644
--- a/plugins/linktop/mm-plugin-linktop.h
+++ b/src/plugins/linktop/mm-plugin-linktop.h
diff --git a/plugins/linktop/tests/test-modem-helpers-linktop.c b/src/plugins/linktop/tests/test-modem-helpers-linktop.c
index 07aa8378..07aa8378 100644
--- a/plugins/linktop/tests/test-modem-helpers-linktop.c
+++ b/src/plugins/linktop/tests/test-modem-helpers-linktop.c
diff --git a/plugins/longcheer/77-mm-longcheer-port-types.rules b/src/plugins/longcheer/77-mm-longcheer-port-types.rules
index e0fbe849..e0fbe849 100644
--- a/plugins/longcheer/77-mm-longcheer-port-types.rules
+++ b/src/plugins/longcheer/77-mm-longcheer-port-types.rules
diff --git a/plugins/longcheer/mm-broadband-modem-longcheer.c b/src/plugins/longcheer/mm-broadband-modem-longcheer.c
index 0926de2c..0926de2c 100644
--- a/plugins/longcheer/mm-broadband-modem-longcheer.c
+++ b/src/plugins/longcheer/mm-broadband-modem-longcheer.c
diff --git a/plugins/longcheer/mm-broadband-modem-longcheer.h b/src/plugins/longcheer/mm-broadband-modem-longcheer.h
index 710abeef..710abeef 100644
--- a/plugins/longcheer/mm-broadband-modem-longcheer.h
+++ b/src/plugins/longcheer/mm-broadband-modem-longcheer.h
diff --git a/plugins/longcheer/mm-plugin-longcheer.c b/src/plugins/longcheer/mm-plugin-longcheer.c
index 31774efb..31774efb 100644
--- a/plugins/longcheer/mm-plugin-longcheer.c
+++ b/src/plugins/longcheer/mm-plugin-longcheer.c
diff --git a/plugins/longcheer/mm-plugin-longcheer.h b/src/plugins/longcheer/mm-plugin-longcheer.h
index 1a5f2b98..1a5f2b98 100644
--- a/plugins/longcheer/mm-plugin-longcheer.h
+++ b/src/plugins/longcheer/mm-plugin-longcheer.h
diff --git a/plugins/mbm/77-mm-ericsson-mbm.rules b/src/plugins/mbm/77-mm-ericsson-mbm.rules
index 73e08692..73e08692 100644
--- a/plugins/mbm/77-mm-ericsson-mbm.rules
+++ b/src/plugins/mbm/77-mm-ericsson-mbm.rules
diff --git a/plugins/mbm/mm-broadband-bearer-mbm.c b/src/plugins/mbm/mm-broadband-bearer-mbm.c
index c1407ab4..c1407ab4 100644
--- a/plugins/mbm/mm-broadband-bearer-mbm.c
+++ b/src/plugins/mbm/mm-broadband-bearer-mbm.c
diff --git a/plugins/mbm/mm-broadband-bearer-mbm.h b/src/plugins/mbm/mm-broadband-bearer-mbm.h
index a05b456c..a05b456c 100644
--- a/plugins/mbm/mm-broadband-bearer-mbm.h
+++ b/src/plugins/mbm/mm-broadband-bearer-mbm.h
diff --git a/plugins/mbm/mm-broadband-modem-mbm.c b/src/plugins/mbm/mm-broadband-modem-mbm.c
index fbc9830c..fbc9830c 100644
--- a/plugins/mbm/mm-broadband-modem-mbm.c
+++ b/src/plugins/mbm/mm-broadband-modem-mbm.c
diff --git a/plugins/mbm/mm-broadband-modem-mbm.h b/src/plugins/mbm/mm-broadband-modem-mbm.h
index 21eeaef5..21eeaef5 100644
--- a/plugins/mbm/mm-broadband-modem-mbm.h
+++ b/src/plugins/mbm/mm-broadband-modem-mbm.h
diff --git a/plugins/mbm/mm-modem-helpers-mbm.c b/src/plugins/mbm/mm-modem-helpers-mbm.c
index 846cc4d6..846cc4d6 100644
--- a/plugins/mbm/mm-modem-helpers-mbm.c
+++ b/src/plugins/mbm/mm-modem-helpers-mbm.c
diff --git a/plugins/mbm/mm-modem-helpers-mbm.h b/src/plugins/mbm/mm-modem-helpers-mbm.h
index 3e3bf57a..3e3bf57a 100644
--- a/plugins/mbm/mm-modem-helpers-mbm.h
+++ b/src/plugins/mbm/mm-modem-helpers-mbm.h
diff --git a/plugins/mbm/mm-plugin-mbm.c b/src/plugins/mbm/mm-plugin-mbm.c
index 6790d8a8..6790d8a8 100644
--- a/plugins/mbm/mm-plugin-mbm.c
+++ b/src/plugins/mbm/mm-plugin-mbm.c
diff --git a/plugins/mbm/mm-plugin-mbm.h b/src/plugins/mbm/mm-plugin-mbm.h
index ac07d7e1..ac07d7e1 100644
--- a/plugins/mbm/mm-plugin-mbm.h
+++ b/src/plugins/mbm/mm-plugin-mbm.h
diff --git a/plugins/mbm/mm-sim-mbm.c b/src/plugins/mbm/mm-sim-mbm.c
index d3f73954..d3f73954 100644
--- a/plugins/mbm/mm-sim-mbm.c
+++ b/src/plugins/mbm/mm-sim-mbm.c
diff --git a/plugins/mbm/mm-sim-mbm.h b/src/plugins/mbm/mm-sim-mbm.h
index 1d843242..1d843242 100644
--- a/plugins/mbm/mm-sim-mbm.h
+++ b/src/plugins/mbm/mm-sim-mbm.h
diff --git a/plugins/mbm/tests/test-modem-helpers-mbm.c b/src/plugins/mbm/tests/test-modem-helpers-mbm.c
index 4169140a..4169140a 100644
--- a/plugins/mbm/tests/test-modem-helpers-mbm.c
+++ b/src/plugins/mbm/tests/test-modem-helpers-mbm.c
diff --git a/plugins/meson.build b/src/plugins/meson.build
index 9e081beb..9e081beb 100644
--- a/plugins/meson.build
+++ b/src/plugins/meson.build
diff --git a/plugins/motorola/mm-broadband-modem-motorola.c b/src/plugins/motorola/mm-broadband-modem-motorola.c
index 8ebd2114..8ebd2114 100644
--- a/plugins/motorola/mm-broadband-modem-motorola.c
+++ b/src/plugins/motorola/mm-broadband-modem-motorola.c
diff --git a/plugins/motorola/mm-broadband-modem-motorola.h b/src/plugins/motorola/mm-broadband-modem-motorola.h
index f57e5b3d..f57e5b3d 100644
--- a/plugins/motorola/mm-broadband-modem-motorola.h
+++ b/src/plugins/motorola/mm-broadband-modem-motorola.h
diff --git a/plugins/motorola/mm-plugin-motorola.c b/src/plugins/motorola/mm-plugin-motorola.c
index fbe9b2fa..fbe9b2fa 100644
--- a/plugins/motorola/mm-plugin-motorola.c
+++ b/src/plugins/motorola/mm-plugin-motorola.c
diff --git a/plugins/motorola/mm-plugin-motorola.h b/src/plugins/motorola/mm-plugin-motorola.h
index 6812ba36..6812ba36 100644
--- a/plugins/motorola/mm-plugin-motorola.h
+++ b/src/plugins/motorola/mm-plugin-motorola.h
diff --git a/plugins/mtk/77-mm-mtk-port-types.rules b/src/plugins/mtk/77-mm-mtk-port-types.rules
index 96939fd4..96939fd4 100644
--- a/plugins/mtk/77-mm-mtk-port-types.rules
+++ b/src/plugins/mtk/77-mm-mtk-port-types.rules
diff --git a/plugins/mtk/mm-broadband-modem-mtk.c b/src/plugins/mtk/mm-broadband-modem-mtk.c
index 869784f3..869784f3 100644
--- a/plugins/mtk/mm-broadband-modem-mtk.c
+++ b/src/plugins/mtk/mm-broadband-modem-mtk.c
diff --git a/plugins/mtk/mm-broadband-modem-mtk.h b/src/plugins/mtk/mm-broadband-modem-mtk.h
index bbe72cc2..bbe72cc2 100644
--- a/plugins/mtk/mm-broadband-modem-mtk.h
+++ b/src/plugins/mtk/mm-broadband-modem-mtk.h
diff --git a/plugins/mtk/mm-plugin-mtk.c b/src/plugins/mtk/mm-plugin-mtk.c
index 957e38a3..957e38a3 100644
--- a/plugins/mtk/mm-plugin-mtk.c
+++ b/src/plugins/mtk/mm-plugin-mtk.c
diff --git a/plugins/mtk/mm-plugin-mtk.h b/src/plugins/mtk/mm-plugin-mtk.h
index cc7b0d19..cc7b0d19 100644
--- a/plugins/mtk/mm-plugin-mtk.h
+++ b/src/plugins/mtk/mm-plugin-mtk.h
diff --git a/plugins/nokia/77-mm-nokia-port-types.rules b/src/plugins/nokia/77-mm-nokia-port-types.rules
index daa8bd4a..daa8bd4a 100644
--- a/plugins/nokia/77-mm-nokia-port-types.rules
+++ b/src/plugins/nokia/77-mm-nokia-port-types.rules
diff --git a/plugins/nokia/mm-broadband-modem-nokia.c b/src/plugins/nokia/mm-broadband-modem-nokia.c
index fd608868..fd608868 100644
--- a/plugins/nokia/mm-broadband-modem-nokia.c
+++ b/src/plugins/nokia/mm-broadband-modem-nokia.c
diff --git a/plugins/nokia/mm-broadband-modem-nokia.h b/src/plugins/nokia/mm-broadband-modem-nokia.h
index d00a5bcb..d00a5bcb 100644
--- a/plugins/nokia/mm-broadband-modem-nokia.h
+++ b/src/plugins/nokia/mm-broadband-modem-nokia.h
diff --git a/plugins/nokia/mm-plugin-nokia-icera.c b/src/plugins/nokia/mm-plugin-nokia-icera.c
index 78c8fd4c..78c8fd4c 100644
--- a/plugins/nokia/mm-plugin-nokia-icera.c
+++ b/src/plugins/nokia/mm-plugin-nokia-icera.c
diff --git a/plugins/nokia/mm-plugin-nokia-icera.h b/src/plugins/nokia/mm-plugin-nokia-icera.h
index 137692fb..137692fb 100644
--- a/plugins/nokia/mm-plugin-nokia-icera.h
+++ b/src/plugins/nokia/mm-plugin-nokia-icera.h
diff --git a/plugins/nokia/mm-plugin-nokia.c b/src/plugins/nokia/mm-plugin-nokia.c
index b2700b70..b2700b70 100644
--- a/plugins/nokia/mm-plugin-nokia.c
+++ b/src/plugins/nokia/mm-plugin-nokia.c
diff --git a/plugins/nokia/mm-plugin-nokia.h b/src/plugins/nokia/mm-plugin-nokia.h
index e2f3589b..e2f3589b 100644
--- a/plugins/nokia/mm-plugin-nokia.h
+++ b/src/plugins/nokia/mm-plugin-nokia.h
diff --git a/plugins/nokia/mm-sim-nokia.c b/src/plugins/nokia/mm-sim-nokia.c
index a0d7c81a..a0d7c81a 100644
--- a/plugins/nokia/mm-sim-nokia.c
+++ b/src/plugins/nokia/mm-sim-nokia.c
diff --git a/plugins/nokia/mm-sim-nokia.h b/src/plugins/nokia/mm-sim-nokia.h
index 05d6e2b1..05d6e2b1 100644
--- a/plugins/nokia/mm-sim-nokia.h
+++ b/src/plugins/nokia/mm-sim-nokia.h
diff --git a/plugins/novatel/mm-broadband-bearer-novatel-lte.c b/src/plugins/novatel/mm-broadband-bearer-novatel-lte.c
index cd3296e2..cd3296e2 100644
--- a/plugins/novatel/mm-broadband-bearer-novatel-lte.c
+++ b/src/plugins/novatel/mm-broadband-bearer-novatel-lte.c
diff --git a/plugins/novatel/mm-broadband-bearer-novatel-lte.h b/src/plugins/novatel/mm-broadband-bearer-novatel-lte.h
index 4f503865..4f503865 100644
--- a/plugins/novatel/mm-broadband-bearer-novatel-lte.h
+++ b/src/plugins/novatel/mm-broadband-bearer-novatel-lte.h
diff --git a/plugins/novatel/mm-broadband-modem-novatel-lte.c b/src/plugins/novatel/mm-broadband-modem-novatel-lte.c
index 19d1c594..19d1c594 100644
--- a/plugins/novatel/mm-broadband-modem-novatel-lte.c
+++ b/src/plugins/novatel/mm-broadband-modem-novatel-lte.c
diff --git a/plugins/novatel/mm-broadband-modem-novatel-lte.h b/src/plugins/novatel/mm-broadband-modem-novatel-lte.h
index 0f64339d..0f64339d 100644
--- a/plugins/novatel/mm-broadband-modem-novatel-lte.h
+++ b/src/plugins/novatel/mm-broadband-modem-novatel-lte.h
diff --git a/plugins/novatel/mm-broadband-modem-novatel.c b/src/plugins/novatel/mm-broadband-modem-novatel.c
index cd8e5676..cd8e5676 100644
--- a/plugins/novatel/mm-broadband-modem-novatel.c
+++ b/src/plugins/novatel/mm-broadband-modem-novatel.c
diff --git a/plugins/novatel/mm-broadband-modem-novatel.h b/src/plugins/novatel/mm-broadband-modem-novatel.h
index 36604172..36604172 100644
--- a/plugins/novatel/mm-broadband-modem-novatel.h
+++ b/src/plugins/novatel/mm-broadband-modem-novatel.h
diff --git a/plugins/novatel/mm-common-novatel.c b/src/plugins/novatel/mm-common-novatel.c
index b6b0e272..b6b0e272 100644
--- a/plugins/novatel/mm-common-novatel.c
+++ b/src/plugins/novatel/mm-common-novatel.c
diff --git a/plugins/novatel/mm-common-novatel.h b/src/plugins/novatel/mm-common-novatel.h
index 70572fd3..70572fd3 100644
--- a/plugins/novatel/mm-common-novatel.h
+++ b/src/plugins/novatel/mm-common-novatel.h
diff --git a/plugins/novatel/mm-plugin-novatel-lte.c b/src/plugins/novatel/mm-plugin-novatel-lte.c
index 025707ae..025707ae 100644
--- a/plugins/novatel/mm-plugin-novatel-lte.c
+++ b/src/plugins/novatel/mm-plugin-novatel-lte.c
diff --git a/plugins/novatel/mm-plugin-novatel-lte.h b/src/plugins/novatel/mm-plugin-novatel-lte.h
index 8f6c8be1..8f6c8be1 100644
--- a/plugins/novatel/mm-plugin-novatel-lte.h
+++ b/src/plugins/novatel/mm-plugin-novatel-lte.h
diff --git a/plugins/novatel/mm-plugin-novatel.c b/src/plugins/novatel/mm-plugin-novatel.c
index c17f6a9a..c17f6a9a 100644
--- a/plugins/novatel/mm-plugin-novatel.c
+++ b/src/plugins/novatel/mm-plugin-novatel.c
diff --git a/plugins/novatel/mm-plugin-novatel.h b/src/plugins/novatel/mm-plugin-novatel.h
index b553e278..b553e278 100644
--- a/plugins/novatel/mm-plugin-novatel.h
+++ b/src/plugins/novatel/mm-plugin-novatel.h
diff --git a/plugins/novatel/mm-shared.c b/src/plugins/novatel/mm-shared.c
index 6bd11e4b..6bd11e4b 100644
--- a/plugins/novatel/mm-shared.c
+++ b/src/plugins/novatel/mm-shared.c
diff --git a/plugins/novatel/mm-sim-novatel-lte.c b/src/plugins/novatel/mm-sim-novatel-lte.c
index 4d71bd80..4d71bd80 100644
--- a/plugins/novatel/mm-sim-novatel-lte.c
+++ b/src/plugins/novatel/mm-sim-novatel-lte.c
diff --git a/plugins/novatel/mm-sim-novatel-lte.h b/src/plugins/novatel/mm-sim-novatel-lte.h
index df8f38e6..df8f38e6 100644
--- a/plugins/novatel/mm-sim-novatel-lte.h
+++ b/src/plugins/novatel/mm-sim-novatel-lte.h
diff --git a/plugins/option/mm-broadband-bearer-hso.c b/src/plugins/option/mm-broadband-bearer-hso.c
index 9199e7b3..9199e7b3 100644
--- a/plugins/option/mm-broadband-bearer-hso.c
+++ b/src/plugins/option/mm-broadband-bearer-hso.c
diff --git a/plugins/option/mm-broadband-bearer-hso.h b/src/plugins/option/mm-broadband-bearer-hso.h
index def46ac3..def46ac3 100644
--- a/plugins/option/mm-broadband-bearer-hso.h
+++ b/src/plugins/option/mm-broadband-bearer-hso.h
diff --git a/plugins/option/mm-broadband-modem-hso.c b/src/plugins/option/mm-broadband-modem-hso.c
index a2cc1770..a2cc1770 100644
--- a/plugins/option/mm-broadband-modem-hso.c
+++ b/src/plugins/option/mm-broadband-modem-hso.c
diff --git a/plugins/option/mm-broadband-modem-hso.h b/src/plugins/option/mm-broadband-modem-hso.h
index b918719c..b918719c 100644
--- a/plugins/option/mm-broadband-modem-hso.h
+++ b/src/plugins/option/mm-broadband-modem-hso.h
diff --git a/plugins/option/mm-broadband-modem-option.c b/src/plugins/option/mm-broadband-modem-option.c
index dcecd5b0..dcecd5b0 100644
--- a/plugins/option/mm-broadband-modem-option.c
+++ b/src/plugins/option/mm-broadband-modem-option.c
diff --git a/plugins/option/mm-broadband-modem-option.h b/src/plugins/option/mm-broadband-modem-option.h
index faf0595e..faf0595e 100644
--- a/plugins/option/mm-broadband-modem-option.h
+++ b/src/plugins/option/mm-broadband-modem-option.h
diff --git a/plugins/option/mm-plugin-hso.c b/src/plugins/option/mm-plugin-hso.c
index 9a28ca64..9a28ca64 100644
--- a/plugins/option/mm-plugin-hso.c
+++ b/src/plugins/option/mm-plugin-hso.c
diff --git a/plugins/option/mm-plugin-hso.h b/src/plugins/option/mm-plugin-hso.h
index 5ef13439..5ef13439 100644
--- a/plugins/option/mm-plugin-hso.h
+++ b/src/plugins/option/mm-plugin-hso.h
diff --git a/plugins/option/mm-plugin-option.c b/src/plugins/option/mm-plugin-option.c
index 4dcb55a1..4dcb55a1 100644
--- a/plugins/option/mm-plugin-option.c
+++ b/src/plugins/option/mm-plugin-option.c
diff --git a/plugins/option/mm-plugin-option.h b/src/plugins/option/mm-plugin-option.h
index 275fc403..275fc403 100644
--- a/plugins/option/mm-plugin-option.h
+++ b/src/plugins/option/mm-plugin-option.h
diff --git a/plugins/option/mm-shared-option.c b/src/plugins/option/mm-shared-option.c
index a06888a1..a06888a1 100644
--- a/plugins/option/mm-shared-option.c
+++ b/src/plugins/option/mm-shared-option.c
diff --git a/plugins/option/mm-shared-option.h b/src/plugins/option/mm-shared-option.h
index 0d4baf60..0d4baf60 100644
--- a/plugins/option/mm-shared-option.h
+++ b/src/plugins/option/mm-shared-option.h
diff --git a/plugins/option/mm-shared.c b/src/plugins/option/mm-shared.c
index 3f89d86a..3f89d86a 100644
--- a/plugins/option/mm-shared.c
+++ b/src/plugins/option/mm-shared.c
diff --git a/plugins/option/mm-sim-option.c b/src/plugins/option/mm-sim-option.c
index 0871c4f2..0871c4f2 100644
--- a/plugins/option/mm-sim-option.c
+++ b/src/plugins/option/mm-sim-option.c
diff --git a/plugins/option/mm-sim-option.h b/src/plugins/option/mm-sim-option.h
index c502a397..c502a397 100644
--- a/plugins/option/mm-sim-option.h
+++ b/src/plugins/option/mm-sim-option.h
diff --git a/plugins/pantech/mm-broadband-modem-pantech.c b/src/plugins/pantech/mm-broadband-modem-pantech.c
index 4e8b58e0..4e8b58e0 100644
--- a/plugins/pantech/mm-broadband-modem-pantech.c
+++ b/src/plugins/pantech/mm-broadband-modem-pantech.c
diff --git a/plugins/pantech/mm-broadband-modem-pantech.h b/src/plugins/pantech/mm-broadband-modem-pantech.h
index 4a0a3a27..4a0a3a27 100644
--- a/plugins/pantech/mm-broadband-modem-pantech.h
+++ b/src/plugins/pantech/mm-broadband-modem-pantech.h
diff --git a/plugins/pantech/mm-plugin-pantech.c b/src/plugins/pantech/mm-plugin-pantech.c
index 4af1955b..4af1955b 100644
--- a/plugins/pantech/mm-plugin-pantech.c
+++ b/src/plugins/pantech/mm-plugin-pantech.c
diff --git a/plugins/pantech/mm-plugin-pantech.h b/src/plugins/pantech/mm-plugin-pantech.h
index fdbdd9ea..fdbdd9ea 100644
--- a/plugins/pantech/mm-plugin-pantech.h
+++ b/src/plugins/pantech/mm-plugin-pantech.h
diff --git a/plugins/pantech/mm-sim-pantech.c b/src/plugins/pantech/mm-sim-pantech.c
index 33414572..33414572 100644
--- a/plugins/pantech/mm-sim-pantech.c
+++ b/src/plugins/pantech/mm-sim-pantech.c
diff --git a/plugins/pantech/mm-sim-pantech.h b/src/plugins/pantech/mm-sim-pantech.h
index 8d227645..8d227645 100644
--- a/plugins/pantech/mm-sim-pantech.h
+++ b/src/plugins/pantech/mm-sim-pantech.h
diff --git a/plugins/qcom-soc/77-mm-qcom-soc.rules b/src/plugins/qcom-soc/77-mm-qcom-soc.rules
index 9719f96f..9719f96f 100644
--- a/plugins/qcom-soc/77-mm-qcom-soc.rules
+++ b/src/plugins/qcom-soc/77-mm-qcom-soc.rules
diff --git a/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.c b/src/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.c
index 21d62c12..21d62c12 100644
--- a/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.c
+++ b/src/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.c
diff --git a/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.h b/src/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.h
index 92c37beb..92c37beb 100644
--- a/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.h
+++ b/src/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.h
diff --git a/plugins/qcom-soc/mm-plugin-qcom-soc.c b/src/plugins/qcom-soc/mm-plugin-qcom-soc.c
index ae844dd6..ae844dd6 100644
--- a/plugins/qcom-soc/mm-plugin-qcom-soc.c
+++ b/src/plugins/qcom-soc/mm-plugin-qcom-soc.c
diff --git a/plugins/qcom-soc/mm-plugin-qcom-soc.h b/src/plugins/qcom-soc/mm-plugin-qcom-soc.h
index 54da154f..54da154f 100644
--- a/plugins/qcom-soc/mm-plugin-qcom-soc.h
+++ b/src/plugins/qcom-soc/mm-plugin-qcom-soc.h
diff --git a/plugins/quectel/77-mm-quectel-port-types.rules b/src/plugins/quectel/77-mm-quectel-port-types.rules
index 08564161..08564161 100644
--- a/plugins/quectel/77-mm-quectel-port-types.rules
+++ b/src/plugins/quectel/77-mm-quectel-port-types.rules
diff --git a/plugins/quectel/mm-broadband-modem-mbim-quectel.c b/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c
index 0ab40610..0ab40610 100644
--- a/plugins/quectel/mm-broadband-modem-mbim-quectel.c
+++ b/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c
diff --git a/plugins/quectel/mm-broadband-modem-mbim-quectel.h b/src/plugins/quectel/mm-broadband-modem-mbim-quectel.h
index 0d0c2b95..0d0c2b95 100644
--- a/plugins/quectel/mm-broadband-modem-mbim-quectel.h
+++ b/src/plugins/quectel/mm-broadband-modem-mbim-quectel.h
diff --git a/plugins/quectel/mm-broadband-modem-qmi-quectel.c b/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c
index a4ccbfc9..a4ccbfc9 100644
--- a/plugins/quectel/mm-broadband-modem-qmi-quectel.c
+++ b/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c
diff --git a/plugins/quectel/mm-broadband-modem-qmi-quectel.h b/src/plugins/quectel/mm-broadband-modem-qmi-quectel.h
index f1580f0e..f1580f0e 100644
--- a/plugins/quectel/mm-broadband-modem-qmi-quectel.h
+++ b/src/plugins/quectel/mm-broadband-modem-qmi-quectel.h
diff --git a/plugins/quectel/mm-broadband-modem-quectel.c b/src/plugins/quectel/mm-broadband-modem-quectel.c
index ad66b783..ad66b783 100644
--- a/plugins/quectel/mm-broadband-modem-quectel.c
+++ b/src/plugins/quectel/mm-broadband-modem-quectel.c
diff --git a/plugins/quectel/mm-broadband-modem-quectel.h b/src/plugins/quectel/mm-broadband-modem-quectel.h
index bf4ef7a7..bf4ef7a7 100644
--- a/plugins/quectel/mm-broadband-modem-quectel.h
+++ b/src/plugins/quectel/mm-broadband-modem-quectel.h
diff --git a/plugins/quectel/mm-modem-helpers-quectel.c b/src/plugins/quectel/mm-modem-helpers-quectel.c
index 262d9794..262d9794 100644
--- a/plugins/quectel/mm-modem-helpers-quectel.c
+++ b/src/plugins/quectel/mm-modem-helpers-quectel.c
diff --git a/plugins/quectel/mm-modem-helpers-quectel.h b/src/plugins/quectel/mm-modem-helpers-quectel.h
index d4ec0eae..d4ec0eae 100644
--- a/plugins/quectel/mm-modem-helpers-quectel.h
+++ b/src/plugins/quectel/mm-modem-helpers-quectel.h
diff --git a/plugins/quectel/mm-plugin-quectel.c b/src/plugins/quectel/mm-plugin-quectel.c
index 80e1b74d..80e1b74d 100644
--- a/plugins/quectel/mm-plugin-quectel.c
+++ b/src/plugins/quectel/mm-plugin-quectel.c
diff --git a/plugins/quectel/mm-plugin-quectel.h b/src/plugins/quectel/mm-plugin-quectel.h
index ec888821..ec888821 100644
--- a/plugins/quectel/mm-plugin-quectel.h
+++ b/src/plugins/quectel/mm-plugin-quectel.h
diff --git a/plugins/quectel/mm-shared-quectel.c b/src/plugins/quectel/mm-shared-quectel.c
index 47d7cd33..47d7cd33 100644
--- a/plugins/quectel/mm-shared-quectel.c
+++ b/src/plugins/quectel/mm-shared-quectel.c
diff --git a/plugins/quectel/mm-shared-quectel.h b/src/plugins/quectel/mm-shared-quectel.h
index 0dfcbde4..0dfcbde4 100644
--- a/plugins/quectel/mm-shared-quectel.h
+++ b/src/plugins/quectel/mm-shared-quectel.h
diff --git a/plugins/quectel/tests/test-modem-helpers-quectel.c b/src/plugins/quectel/tests/test-modem-helpers-quectel.c
index 0e2c7420..0e2c7420 100644
--- a/plugins/quectel/tests/test-modem-helpers-quectel.c
+++ b/src/plugins/quectel/tests/test-modem-helpers-quectel.c
diff --git a/plugins/samsung/mm-broadband-modem-samsung.c b/src/plugins/samsung/mm-broadband-modem-samsung.c
index 1ffc178f..1ffc178f 100644
--- a/plugins/samsung/mm-broadband-modem-samsung.c
+++ b/src/plugins/samsung/mm-broadband-modem-samsung.c
diff --git a/plugins/samsung/mm-broadband-modem-samsung.h b/src/plugins/samsung/mm-broadband-modem-samsung.h
index 106f973c..106f973c 100644
--- a/plugins/samsung/mm-broadband-modem-samsung.h
+++ b/src/plugins/samsung/mm-broadband-modem-samsung.h
diff --git a/plugins/samsung/mm-plugin-samsung.c b/src/plugins/samsung/mm-plugin-samsung.c
index 3ce64d73..3ce64d73 100644
--- a/plugins/samsung/mm-plugin-samsung.c
+++ b/src/plugins/samsung/mm-plugin-samsung.c
diff --git a/plugins/samsung/mm-plugin-samsung.h b/src/plugins/samsung/mm-plugin-samsung.h
index 85f32028..85f32028 100644
--- a/plugins/samsung/mm-plugin-samsung.h
+++ b/src/plugins/samsung/mm-plugin-samsung.h
diff --git a/plugins/sierra/77-mm-sierra.rules b/src/plugins/sierra/77-mm-sierra.rules
index e26e9a40..e26e9a40 100644
--- a/plugins/sierra/77-mm-sierra.rules
+++ b/src/plugins/sierra/77-mm-sierra.rules
diff --git a/plugins/sierra/mm-broadband-bearer-sierra.c b/src/plugins/sierra/mm-broadband-bearer-sierra.c
index 5c540389..5c540389 100644
--- a/plugins/sierra/mm-broadband-bearer-sierra.c
+++ b/src/plugins/sierra/mm-broadband-bearer-sierra.c
diff --git a/plugins/sierra/mm-broadband-bearer-sierra.h b/src/plugins/sierra/mm-broadband-bearer-sierra.h
index 9f75685e..9f75685e 100644
--- a/plugins/sierra/mm-broadband-bearer-sierra.h
+++ b/src/plugins/sierra/mm-broadband-bearer-sierra.h
diff --git a/plugins/sierra/mm-broadband-modem-sierra-icera.c b/src/plugins/sierra/mm-broadband-modem-sierra-icera.c
index c7dfcf81..c7dfcf81 100644
--- a/plugins/sierra/mm-broadband-modem-sierra-icera.c
+++ b/src/plugins/sierra/mm-broadband-modem-sierra-icera.c
diff --git a/plugins/sierra/mm-broadband-modem-sierra-icera.h b/src/plugins/sierra/mm-broadband-modem-sierra-icera.h
index 97b07d19..97b07d19 100644
--- a/plugins/sierra/mm-broadband-modem-sierra-icera.h
+++ b/src/plugins/sierra/mm-broadband-modem-sierra-icera.h
diff --git a/plugins/sierra/mm-broadband-modem-sierra.c b/src/plugins/sierra/mm-broadband-modem-sierra.c
index 83611f6d..83611f6d 100644
--- a/plugins/sierra/mm-broadband-modem-sierra.c
+++ b/src/plugins/sierra/mm-broadband-modem-sierra.c
diff --git a/plugins/sierra/mm-broadband-modem-sierra.h b/src/plugins/sierra/mm-broadband-modem-sierra.h
index 9804b184..9804b184 100644
--- a/plugins/sierra/mm-broadband-modem-sierra.h
+++ b/src/plugins/sierra/mm-broadband-modem-sierra.h
diff --git a/plugins/sierra/mm-common-sierra.c b/src/plugins/sierra/mm-common-sierra.c
index 72cbc34f..72cbc34f 100644
--- a/plugins/sierra/mm-common-sierra.c
+++ b/src/plugins/sierra/mm-common-sierra.c
diff --git a/plugins/sierra/mm-common-sierra.h b/src/plugins/sierra/mm-common-sierra.h
index 22471c0f..22471c0f 100644
--- a/plugins/sierra/mm-common-sierra.h
+++ b/src/plugins/sierra/mm-common-sierra.h
diff --git a/plugins/sierra/mm-modem-helpers-sierra.c b/src/plugins/sierra/mm-modem-helpers-sierra.c
index 821be199..821be199 100644
--- a/plugins/sierra/mm-modem-helpers-sierra.c
+++ b/src/plugins/sierra/mm-modem-helpers-sierra.c
diff --git a/plugins/sierra/mm-modem-helpers-sierra.h b/src/plugins/sierra/mm-modem-helpers-sierra.h
index f5c6cd2c..f5c6cd2c 100644
--- a/plugins/sierra/mm-modem-helpers-sierra.h
+++ b/src/plugins/sierra/mm-modem-helpers-sierra.h
diff --git a/plugins/sierra/mm-plugin-sierra-legacy.c b/src/plugins/sierra/mm-plugin-sierra-legacy.c
index 521b8ad1..521b8ad1 100644
--- a/plugins/sierra/mm-plugin-sierra-legacy.c
+++ b/src/plugins/sierra/mm-plugin-sierra-legacy.c
diff --git a/plugins/sierra/mm-plugin-sierra-legacy.h b/src/plugins/sierra/mm-plugin-sierra-legacy.h
index 787118d6..787118d6 100644
--- a/plugins/sierra/mm-plugin-sierra-legacy.h
+++ b/src/plugins/sierra/mm-plugin-sierra-legacy.h
diff --git a/plugins/sierra/mm-plugin-sierra.c b/src/plugins/sierra/mm-plugin-sierra.c
index e4b4b676..e4b4b676 100644
--- a/plugins/sierra/mm-plugin-sierra.c
+++ b/src/plugins/sierra/mm-plugin-sierra.c
diff --git a/plugins/sierra/mm-plugin-sierra.h b/src/plugins/sierra/mm-plugin-sierra.h
index 59b6e6b9..59b6e6b9 100644
--- a/plugins/sierra/mm-plugin-sierra.h
+++ b/src/plugins/sierra/mm-plugin-sierra.h
diff --git a/plugins/sierra/mm-shared.c b/src/plugins/sierra/mm-shared.c
index 665aceca..665aceca 100644
--- a/plugins/sierra/mm-shared.c
+++ b/src/plugins/sierra/mm-shared.c
diff --git a/plugins/sierra/mm-sim-sierra.c b/src/plugins/sierra/mm-sim-sierra.c
index 2f3caa48..2f3caa48 100644
--- a/plugins/sierra/mm-sim-sierra.c
+++ b/src/plugins/sierra/mm-sim-sierra.c
diff --git a/plugins/sierra/mm-sim-sierra.h b/src/plugins/sierra/mm-sim-sierra.h
index 470d4e95..470d4e95 100644
--- a/plugins/sierra/mm-sim-sierra.h
+++ b/src/plugins/sierra/mm-sim-sierra.h
diff --git a/plugins/sierra/tests/test-modem-helpers-sierra.c b/src/plugins/sierra/tests/test-modem-helpers-sierra.c
index b0c66496..b0c66496 100644
--- a/plugins/sierra/tests/test-modem-helpers-sierra.c
+++ b/src/plugins/sierra/tests/test-modem-helpers-sierra.c
diff --git a/plugins/simtech/77-mm-simtech-port-types.rules b/src/plugins/simtech/77-mm-simtech-port-types.rules
index e51a60dd..e51a60dd 100644
--- a/plugins/simtech/77-mm-simtech-port-types.rules
+++ b/src/plugins/simtech/77-mm-simtech-port-types.rules
diff --git a/plugins/simtech/mm-broadband-modem-qmi-simtech.c b/src/plugins/simtech/mm-broadband-modem-qmi-simtech.c
index 93ff8576..93ff8576 100644
--- a/plugins/simtech/mm-broadband-modem-qmi-simtech.c
+++ b/src/plugins/simtech/mm-broadband-modem-qmi-simtech.c
diff --git a/plugins/simtech/mm-broadband-modem-qmi-simtech.h b/src/plugins/simtech/mm-broadband-modem-qmi-simtech.h
index 2f5b819b..2f5b819b 100644
--- a/plugins/simtech/mm-broadband-modem-qmi-simtech.h
+++ b/src/plugins/simtech/mm-broadband-modem-qmi-simtech.h
diff --git a/plugins/simtech/mm-broadband-modem-simtech.c b/src/plugins/simtech/mm-broadband-modem-simtech.c
index 2ca0c6ae..2ca0c6ae 100644
--- a/plugins/simtech/mm-broadband-modem-simtech.c
+++ b/src/plugins/simtech/mm-broadband-modem-simtech.c
diff --git a/plugins/simtech/mm-broadband-modem-simtech.h b/src/plugins/simtech/mm-broadband-modem-simtech.h
index a2b57fea..a2b57fea 100644
--- a/plugins/simtech/mm-broadband-modem-simtech.h
+++ b/src/plugins/simtech/mm-broadband-modem-simtech.h
diff --git a/plugins/simtech/mm-modem-helpers-simtech.c b/src/plugins/simtech/mm-modem-helpers-simtech.c
index 0403c145..0403c145 100644
--- a/plugins/simtech/mm-modem-helpers-simtech.c
+++ b/src/plugins/simtech/mm-modem-helpers-simtech.c
diff --git a/plugins/simtech/mm-modem-helpers-simtech.h b/src/plugins/simtech/mm-modem-helpers-simtech.h
index 1949d2e7..1949d2e7 100644
--- a/plugins/simtech/mm-modem-helpers-simtech.h
+++ b/src/plugins/simtech/mm-modem-helpers-simtech.h
diff --git a/plugins/simtech/mm-plugin-simtech.c b/src/plugins/simtech/mm-plugin-simtech.c
index 9b4f377e..9b4f377e 100644
--- a/plugins/simtech/mm-plugin-simtech.c
+++ b/src/plugins/simtech/mm-plugin-simtech.c
diff --git a/plugins/simtech/mm-plugin-simtech.h b/src/plugins/simtech/mm-plugin-simtech.h
index eab8630c..eab8630c 100644
--- a/plugins/simtech/mm-plugin-simtech.h
+++ b/src/plugins/simtech/mm-plugin-simtech.h
diff --git a/plugins/simtech/mm-shared-simtech.c b/src/plugins/simtech/mm-shared-simtech.c
index 99c2346e..99c2346e 100644
--- a/plugins/simtech/mm-shared-simtech.c
+++ b/src/plugins/simtech/mm-shared-simtech.c
diff --git a/plugins/simtech/mm-shared-simtech.h b/src/plugins/simtech/mm-shared-simtech.h
index 37a221ca..37a221ca 100644
--- a/plugins/simtech/mm-shared-simtech.h
+++ b/src/plugins/simtech/mm-shared-simtech.h
diff --git a/plugins/simtech/tests/test-modem-helpers-simtech.c b/src/plugins/simtech/tests/test-modem-helpers-simtech.c
index ba6532cc..ba6532cc 100644
--- a/plugins/simtech/tests/test-modem-helpers-simtech.c
+++ b/src/plugins/simtech/tests/test-modem-helpers-simtech.c
diff --git a/plugins/symbol.map b/src/plugins/symbol.map
index b2c9f9cf..b2c9f9cf 100644
--- a/plugins/symbol.map
+++ b/src/plugins/symbol.map
diff --git a/plugins/telit/77-mm-telit-port-types.rules b/src/plugins/telit/77-mm-telit-port-types.rules
index b9439ffc..b9439ffc 100644
--- a/plugins/telit/77-mm-telit-port-types.rules
+++ b/src/plugins/telit/77-mm-telit-port-types.rules
diff --git a/plugins/telit/mm-broadband-modem-mbim-telit.c b/src/plugins/telit/mm-broadband-modem-mbim-telit.c
index 8437c841..8437c841 100644
--- a/plugins/telit/mm-broadband-modem-mbim-telit.c
+++ b/src/plugins/telit/mm-broadband-modem-mbim-telit.c
diff --git a/plugins/telit/mm-broadband-modem-mbim-telit.h b/src/plugins/telit/mm-broadband-modem-mbim-telit.h
index 50c21e20..50c21e20 100644
--- a/plugins/telit/mm-broadband-modem-mbim-telit.h
+++ b/src/plugins/telit/mm-broadband-modem-mbim-telit.h
diff --git a/plugins/telit/mm-broadband-modem-telit.c b/src/plugins/telit/mm-broadband-modem-telit.c
index 1683d38a..1683d38a 100644
--- a/plugins/telit/mm-broadband-modem-telit.c
+++ b/src/plugins/telit/mm-broadband-modem-telit.c
diff --git a/plugins/telit/mm-broadband-modem-telit.h b/src/plugins/telit/mm-broadband-modem-telit.h
index f68465e7..f68465e7 100644
--- a/plugins/telit/mm-broadband-modem-telit.h
+++ b/src/plugins/telit/mm-broadband-modem-telit.h
diff --git a/plugins/telit/mm-common-telit.c b/src/plugins/telit/mm-common-telit.c
index 911c605b..911c605b 100644
--- a/plugins/telit/mm-common-telit.c
+++ b/src/plugins/telit/mm-common-telit.c
diff --git a/plugins/telit/mm-common-telit.h b/src/plugins/telit/mm-common-telit.h
index 0c5dbe7a..0c5dbe7a 100644
--- a/plugins/telit/mm-common-telit.h
+++ b/src/plugins/telit/mm-common-telit.h
diff --git a/plugins/telit/mm-modem-helpers-telit.c b/src/plugins/telit/mm-modem-helpers-telit.c
index c0df8093..c0df8093 100644
--- a/plugins/telit/mm-modem-helpers-telit.c
+++ b/src/plugins/telit/mm-modem-helpers-telit.c
diff --git a/plugins/telit/mm-modem-helpers-telit.h b/src/plugins/telit/mm-modem-helpers-telit.h
index 38449769..38449769 100644
--- a/plugins/telit/mm-modem-helpers-telit.h
+++ b/src/plugins/telit/mm-modem-helpers-telit.h
diff --git a/plugins/telit/mm-plugin-telit.c b/src/plugins/telit/mm-plugin-telit.c
index d19966d6..d19966d6 100644
--- a/plugins/telit/mm-plugin-telit.c
+++ b/src/plugins/telit/mm-plugin-telit.c
diff --git a/plugins/telit/mm-plugin-telit.h b/src/plugins/telit/mm-plugin-telit.h
index 0c61fbb8..0c61fbb8 100644
--- a/plugins/telit/mm-plugin-telit.h
+++ b/src/plugins/telit/mm-plugin-telit.h
diff --git a/plugins/telit/mm-shared-telit.c b/src/plugins/telit/mm-shared-telit.c
index 09c122bb..09c122bb 100644
--- a/plugins/telit/mm-shared-telit.c
+++ b/src/plugins/telit/mm-shared-telit.c
diff --git a/plugins/telit/mm-shared-telit.h b/src/plugins/telit/mm-shared-telit.h
index bf093ea5..bf093ea5 100644
--- a/plugins/telit/mm-shared-telit.h
+++ b/src/plugins/telit/mm-shared-telit.h
diff --git a/plugins/telit/mm-shared.c b/src/plugins/telit/mm-shared.c
index ad2843dd..ad2843dd 100644
--- a/plugins/telit/mm-shared.c
+++ b/src/plugins/telit/mm-shared.c
diff --git a/plugins/telit/tests/test-mm-modem-helpers-telit.c b/src/plugins/telit/tests/test-mm-modem-helpers-telit.c
index e14ba6ba..e14ba6ba 100644
--- a/plugins/telit/tests/test-mm-modem-helpers-telit.c
+++ b/src/plugins/telit/tests/test-mm-modem-helpers-telit.c
diff --git a/plugins/tests/gsm-port.conf b/src/plugins/tests/gsm-port.conf
index ae157834..ae157834 100644
--- a/plugins/tests/gsm-port.conf
+++ b/src/plugins/tests/gsm-port.conf
diff --git a/plugins/tests/test-fixture.c b/src/plugins/tests/test-fixture.c
index 29eb8d55..29eb8d55 100644
--- a/plugins/tests/test-fixture.c
+++ b/src/plugins/tests/test-fixture.c
diff --git a/plugins/tests/test-fixture.h b/src/plugins/tests/test-fixture.h
index b6c24379..b6c24379 100644
--- a/plugins/tests/test-fixture.h
+++ b/src/plugins/tests/test-fixture.h
diff --git a/plugins/tests/test-helpers.c b/src/plugins/tests/test-helpers.c
index 8148d908..8148d908 100644
--- a/plugins/tests/test-helpers.c
+++ b/src/plugins/tests/test-helpers.c
diff --git a/plugins/tests/test-helpers.h b/src/plugins/tests/test-helpers.h
index 8362754c..8362754c 100644
--- a/plugins/tests/test-helpers.h
+++ b/src/plugins/tests/test-helpers.h
diff --git a/plugins/tests/test-keyfiles.c b/src/plugins/tests/test-keyfiles.c
index f92df9c3..f92df9c3 100644
--- a/plugins/tests/test-keyfiles.c
+++ b/src/plugins/tests/test-keyfiles.c
diff --git a/plugins/tests/test-port-context.c b/src/plugins/tests/test-port-context.c
index e96cff7b..e96cff7b 100644
--- a/plugins/tests/test-port-context.c
+++ b/src/plugins/tests/test-port-context.c
diff --git a/plugins/tests/test-port-context.h b/src/plugins/tests/test-port-context.h
index 9aaf1077..9aaf1077 100644
--- a/plugins/tests/test-port-context.h
+++ b/src/plugins/tests/test-port-context.h
diff --git a/plugins/tests/test-udev-rules.c b/src/plugins/tests/test-udev-rules.c
index fe11c783..fe11c783 100644
--- a/plugins/tests/test-udev-rules.c
+++ b/src/plugins/tests/test-udev-rules.c
diff --git a/plugins/thuraya/mm-broadband-modem-thuraya.c b/src/plugins/thuraya/mm-broadband-modem-thuraya.c
index 92c8a8a2..92c8a8a2 100644
--- a/plugins/thuraya/mm-broadband-modem-thuraya.c
+++ b/src/plugins/thuraya/mm-broadband-modem-thuraya.c
diff --git a/plugins/thuraya/mm-broadband-modem-thuraya.h b/src/plugins/thuraya/mm-broadband-modem-thuraya.h
index 42df9b9c..42df9b9c 100644
--- a/plugins/thuraya/mm-broadband-modem-thuraya.h
+++ b/src/plugins/thuraya/mm-broadband-modem-thuraya.h
diff --git a/plugins/thuraya/mm-modem-helpers-thuraya.c b/src/plugins/thuraya/mm-modem-helpers-thuraya.c
index 0c713a18..0c713a18 100644
--- a/plugins/thuraya/mm-modem-helpers-thuraya.c
+++ b/src/plugins/thuraya/mm-modem-helpers-thuraya.c
diff --git a/plugins/thuraya/mm-modem-helpers-thuraya.h b/src/plugins/thuraya/mm-modem-helpers-thuraya.h
index 33bb079f..33bb079f 100644
--- a/plugins/thuraya/mm-modem-helpers-thuraya.h
+++ b/src/plugins/thuraya/mm-modem-helpers-thuraya.h
diff --git a/plugins/thuraya/mm-plugin-thuraya.c b/src/plugins/thuraya/mm-plugin-thuraya.c
index 5097e24e..5097e24e 100644
--- a/plugins/thuraya/mm-plugin-thuraya.c
+++ b/src/plugins/thuraya/mm-plugin-thuraya.c
diff --git a/plugins/thuraya/mm-plugin-thuraya.h b/src/plugins/thuraya/mm-plugin-thuraya.h
index fb86090d..fb86090d 100644
--- a/plugins/thuraya/mm-plugin-thuraya.h
+++ b/src/plugins/thuraya/mm-plugin-thuraya.h
diff --git a/plugins/thuraya/tests/test-mm-modem-helpers-thuraya.c b/src/plugins/thuraya/tests/test-mm-modem-helpers-thuraya.c
index bdc073d0..bdc073d0 100644
--- a/plugins/thuraya/tests/test-mm-modem-helpers-thuraya.c
+++ b/src/plugins/thuraya/tests/test-mm-modem-helpers-thuraya.c
diff --git a/plugins/tplink/77-mm-tplink-port-types.rules b/src/plugins/tplink/77-mm-tplink-port-types.rules
index f5c8894e..f5c8894e 100644
--- a/plugins/tplink/77-mm-tplink-port-types.rules
+++ b/src/plugins/tplink/77-mm-tplink-port-types.rules
diff --git a/plugins/tplink/mm-plugin-tplink.c b/src/plugins/tplink/mm-plugin-tplink.c
index 1c03fef0..1c03fef0 100644
--- a/plugins/tplink/mm-plugin-tplink.c
+++ b/src/plugins/tplink/mm-plugin-tplink.c
diff --git a/plugins/tplink/mm-plugin-tplink.h b/src/plugins/tplink/mm-plugin-tplink.h
index 16dc5f5b..16dc5f5b 100644
--- a/plugins/tplink/mm-plugin-tplink.h
+++ b/src/plugins/tplink/mm-plugin-tplink.h
diff --git a/plugins/ublox/77-mm-ublox-port-types.rules b/src/plugins/ublox/77-mm-ublox-port-types.rules
index c2a1ac99..c2a1ac99 100644
--- a/plugins/ublox/77-mm-ublox-port-types.rules
+++ b/src/plugins/ublox/77-mm-ublox-port-types.rules
diff --git a/plugins/ublox/README b/src/plugins/ublox/README
index 573be2ce..573be2ce 100644
--- a/plugins/ublox/README
+++ b/src/plugins/ublox/README
diff --git a/plugins/ublox/mm-broadband-bearer-ublox.c b/src/plugins/ublox/mm-broadband-bearer-ublox.c
index 27db9b11..27db9b11 100644
--- a/plugins/ublox/mm-broadband-bearer-ublox.c
+++ b/src/plugins/ublox/mm-broadband-bearer-ublox.c
diff --git a/plugins/ublox/mm-broadband-bearer-ublox.h b/src/plugins/ublox/mm-broadband-bearer-ublox.h
index 36c26894..36c26894 100644
--- a/plugins/ublox/mm-broadband-bearer-ublox.h
+++ b/src/plugins/ublox/mm-broadband-bearer-ublox.h
diff --git a/plugins/ublox/mm-broadband-modem-ublox.c b/src/plugins/ublox/mm-broadband-modem-ublox.c
index 12be08c3..12be08c3 100644
--- a/plugins/ublox/mm-broadband-modem-ublox.c
+++ b/src/plugins/ublox/mm-broadband-modem-ublox.c
diff --git a/plugins/ublox/mm-broadband-modem-ublox.h b/src/plugins/ublox/mm-broadband-modem-ublox.h
index f1c6bbcf..f1c6bbcf 100644
--- a/plugins/ublox/mm-broadband-modem-ublox.h
+++ b/src/plugins/ublox/mm-broadband-modem-ublox.h
diff --git a/plugins/ublox/mm-modem-helpers-ublox.c b/src/plugins/ublox/mm-modem-helpers-ublox.c
index 84a7cf27..84a7cf27 100644
--- a/plugins/ublox/mm-modem-helpers-ublox.c
+++ b/src/plugins/ublox/mm-modem-helpers-ublox.c
diff --git a/plugins/ublox/mm-modem-helpers-ublox.h b/src/plugins/ublox/mm-modem-helpers-ublox.h
index 06bba003..06bba003 100644
--- a/plugins/ublox/mm-modem-helpers-ublox.h
+++ b/src/plugins/ublox/mm-modem-helpers-ublox.h
diff --git a/plugins/ublox/mm-plugin-ublox.c b/src/plugins/ublox/mm-plugin-ublox.c
index db6d94d3..db6d94d3 100644
--- a/plugins/ublox/mm-plugin-ublox.c
+++ b/src/plugins/ublox/mm-plugin-ublox.c
diff --git a/plugins/ublox/mm-plugin-ublox.h b/src/plugins/ublox/mm-plugin-ublox.h
index adfc6247..adfc6247 100644
--- a/plugins/ublox/mm-plugin-ublox.h
+++ b/src/plugins/ublox/mm-plugin-ublox.h
diff --git a/plugins/ublox/mm-sim-ublox.c b/src/plugins/ublox/mm-sim-ublox.c
index 5850767e..5850767e 100644
--- a/plugins/ublox/mm-sim-ublox.c
+++ b/src/plugins/ublox/mm-sim-ublox.c
diff --git a/plugins/ublox/mm-sim-ublox.h b/src/plugins/ublox/mm-sim-ublox.h
index 31e2c98b..31e2c98b 100644
--- a/plugins/ublox/mm-sim-ublox.h
+++ b/src/plugins/ublox/mm-sim-ublox.h
diff --git a/plugins/ublox/tests/test-modem-helpers-ublox.c b/src/plugins/ublox/tests/test-modem-helpers-ublox.c
index 2d662877..2d662877 100644
--- a/plugins/ublox/tests/test-modem-helpers-ublox.c
+++ b/src/plugins/ublox/tests/test-modem-helpers-ublox.c
diff --git a/plugins/via/mm-broadband-modem-via.c b/src/plugins/via/mm-broadband-modem-via.c
index 896db8cd..896db8cd 100644
--- a/plugins/via/mm-broadband-modem-via.c
+++ b/src/plugins/via/mm-broadband-modem-via.c
diff --git a/plugins/via/mm-broadband-modem-via.h b/src/plugins/via/mm-broadband-modem-via.h
index 2a31117f..2a31117f 100644
--- a/plugins/via/mm-broadband-modem-via.h
+++ b/src/plugins/via/mm-broadband-modem-via.h
diff --git a/plugins/via/mm-plugin-via.c b/src/plugins/via/mm-plugin-via.c
index b1939092..b1939092 100644
--- a/plugins/via/mm-plugin-via.c
+++ b/src/plugins/via/mm-plugin-via.c
diff --git a/plugins/via/mm-plugin-via.h b/src/plugins/via/mm-plugin-via.h
index 68d8c5f6..68d8c5f6 100644
--- a/plugins/via/mm-plugin-via.h
+++ b/src/plugins/via/mm-plugin-via.h
diff --git a/plugins/wavecom/mm-broadband-modem-wavecom.c b/src/plugins/wavecom/mm-broadband-modem-wavecom.c
index 521e72de..521e72de 100644
--- a/plugins/wavecom/mm-broadband-modem-wavecom.c
+++ b/src/plugins/wavecom/mm-broadband-modem-wavecom.c
diff --git a/plugins/wavecom/mm-broadband-modem-wavecom.h b/src/plugins/wavecom/mm-broadband-modem-wavecom.h
index 89bdbde8..89bdbde8 100644
--- a/plugins/wavecom/mm-broadband-modem-wavecom.h
+++ b/src/plugins/wavecom/mm-broadband-modem-wavecom.h
diff --git a/plugins/wavecom/mm-plugin-wavecom.c b/src/plugins/wavecom/mm-plugin-wavecom.c
index 8e3f9d2c..8e3f9d2c 100644
--- a/plugins/wavecom/mm-plugin-wavecom.c
+++ b/src/plugins/wavecom/mm-plugin-wavecom.c
diff --git a/plugins/wavecom/mm-plugin-wavecom.h b/src/plugins/wavecom/mm-plugin-wavecom.h
index c1d76309..c1d76309 100644
--- a/plugins/wavecom/mm-plugin-wavecom.h
+++ b/src/plugins/wavecom/mm-plugin-wavecom.h
diff --git a/plugins/x22x/77-mm-x22x-port-types.rules b/src/plugins/x22x/77-mm-x22x-port-types.rules
index 40e7677a..40e7677a 100644
--- a/plugins/x22x/77-mm-x22x-port-types.rules
+++ b/src/plugins/x22x/77-mm-x22x-port-types.rules
diff --git a/plugins/x22x/mm-broadband-modem-x22x.c b/src/plugins/x22x/mm-broadband-modem-x22x.c
index 1ce32f57..1ce32f57 100644
--- a/plugins/x22x/mm-broadband-modem-x22x.c
+++ b/src/plugins/x22x/mm-broadband-modem-x22x.c
diff --git a/plugins/x22x/mm-broadband-modem-x22x.h b/src/plugins/x22x/mm-broadband-modem-x22x.h
index 74c2b48a..74c2b48a 100644
--- a/plugins/x22x/mm-broadband-modem-x22x.h
+++ b/src/plugins/x22x/mm-broadband-modem-x22x.h
diff --git a/plugins/x22x/mm-plugin-x22x.c b/src/plugins/x22x/mm-plugin-x22x.c
index 7b49cff8..7b49cff8 100644
--- a/plugins/x22x/mm-plugin-x22x.c
+++ b/src/plugins/x22x/mm-plugin-x22x.c
diff --git a/plugins/x22x/mm-plugin-x22x.h b/src/plugins/x22x/mm-plugin-x22x.h
index bea588c6..bea588c6 100644
--- a/plugins/x22x/mm-plugin-x22x.h
+++ b/src/plugins/x22x/mm-plugin-x22x.h
diff --git a/plugins/xmm/mm-broadband-modem-mbim-xmm.c b/src/plugins/xmm/mm-broadband-modem-mbim-xmm.c
index 287c67f7..287c67f7 100644
--- a/plugins/xmm/mm-broadband-modem-mbim-xmm.c
+++ b/src/plugins/xmm/mm-broadband-modem-mbim-xmm.c
diff --git a/plugins/xmm/mm-broadband-modem-mbim-xmm.h b/src/plugins/xmm/mm-broadband-modem-mbim-xmm.h
index 88e87cb7..88e87cb7 100644
--- a/plugins/xmm/mm-broadband-modem-mbim-xmm.h
+++ b/src/plugins/xmm/mm-broadband-modem-mbim-xmm.h
diff --git a/plugins/xmm/mm-broadband-modem-xmm.c b/src/plugins/xmm/mm-broadband-modem-xmm.c
index 7698ec66..7698ec66 100644
--- a/plugins/xmm/mm-broadband-modem-xmm.c
+++ b/src/plugins/xmm/mm-broadband-modem-xmm.c
diff --git a/plugins/xmm/mm-broadband-modem-xmm.h b/src/plugins/xmm/mm-broadband-modem-xmm.h
index f63a4bfc..f63a4bfc 100644
--- a/plugins/xmm/mm-broadband-modem-xmm.h
+++ b/src/plugins/xmm/mm-broadband-modem-xmm.h
diff --git a/plugins/xmm/mm-modem-helpers-xmm.c b/src/plugins/xmm/mm-modem-helpers-xmm.c
index 70e02a8f..70e02a8f 100644
--- a/plugins/xmm/mm-modem-helpers-xmm.c
+++ b/src/plugins/xmm/mm-modem-helpers-xmm.c
diff --git a/plugins/xmm/mm-modem-helpers-xmm.h b/src/plugins/xmm/mm-modem-helpers-xmm.h
index a18f0667..a18f0667 100644
--- a/plugins/xmm/mm-modem-helpers-xmm.h
+++ b/src/plugins/xmm/mm-modem-helpers-xmm.h
diff --git a/plugins/xmm/mm-shared-xmm.c b/src/plugins/xmm/mm-shared-xmm.c
index 90f8867a..90f8867a 100644
--- a/plugins/xmm/mm-shared-xmm.c
+++ b/src/plugins/xmm/mm-shared-xmm.c
diff --git a/plugins/xmm/mm-shared-xmm.h b/src/plugins/xmm/mm-shared-xmm.h
index a1f51639..a1f51639 100644
--- a/plugins/xmm/mm-shared-xmm.h
+++ b/src/plugins/xmm/mm-shared-xmm.h
diff --git a/plugins/xmm/mm-shared.c b/src/plugins/xmm/mm-shared.c
index 203f0fbb..203f0fbb 100644
--- a/plugins/xmm/mm-shared.c
+++ b/src/plugins/xmm/mm-shared.c
diff --git a/plugins/xmm/tests/test-modem-helpers-xmm.c b/src/plugins/xmm/tests/test-modem-helpers-xmm.c
index e40ffcab..e40ffcab 100644
--- a/plugins/xmm/tests/test-modem-helpers-xmm.c
+++ b/src/plugins/xmm/tests/test-modem-helpers-xmm.c
diff --git a/plugins/zte/77-mm-zte-port-types.rules b/src/plugins/zte/77-mm-zte-port-types.rules
index 46a83aca..46a83aca 100644
--- a/plugins/zte/77-mm-zte-port-types.rules
+++ b/src/plugins/zte/77-mm-zte-port-types.rules
diff --git a/plugins/zte/mm-broadband-modem-zte-icera.c b/src/plugins/zte/mm-broadband-modem-zte-icera.c
index 66aea942..66aea942 100644
--- a/plugins/zte/mm-broadband-modem-zte-icera.c
+++ b/src/plugins/zte/mm-broadband-modem-zte-icera.c
diff --git a/plugins/zte/mm-broadband-modem-zte-icera.h b/src/plugins/zte/mm-broadband-modem-zte-icera.h
index fb319046..fb319046 100644
--- a/plugins/zte/mm-broadband-modem-zte-icera.h
+++ b/src/plugins/zte/mm-broadband-modem-zte-icera.h
diff --git a/plugins/zte/mm-broadband-modem-zte.c b/src/plugins/zte/mm-broadband-modem-zte.c
index 35283531..35283531 100644
--- a/plugins/zte/mm-broadband-modem-zte.c
+++ b/src/plugins/zte/mm-broadband-modem-zte.c
diff --git a/plugins/zte/mm-broadband-modem-zte.h b/src/plugins/zte/mm-broadband-modem-zte.h
index a61eead4..a61eead4 100644
--- a/plugins/zte/mm-broadband-modem-zte.h
+++ b/src/plugins/zte/mm-broadband-modem-zte.h
diff --git a/plugins/zte/mm-common-zte.c b/src/plugins/zte/mm-common-zte.c
index 5c992c22..5c992c22 100644
--- a/plugins/zte/mm-common-zte.c
+++ b/src/plugins/zte/mm-common-zte.c
diff --git a/plugins/zte/mm-common-zte.h b/src/plugins/zte/mm-common-zte.h
index 66ee6eeb..66ee6eeb 100644
--- a/plugins/zte/mm-common-zte.h
+++ b/src/plugins/zte/mm-common-zte.h
diff --git a/plugins/zte/mm-plugin-zte.c b/src/plugins/zte/mm-plugin-zte.c
index a39386e6..a39386e6 100644
--- a/plugins/zte/mm-plugin-zte.c
+++ b/src/plugins/zte/mm-plugin-zte.c
diff --git a/plugins/zte/mm-plugin-zte.h b/src/plugins/zte/mm-plugin-zte.h
index 353ce86e..353ce86e 100644
--- a/plugins/zte/mm-plugin-zte.h
+++ b/src/plugins/zte/mm-plugin-zte.h