diff --git a/Makefile.am b/Makefile.am
index c17638e..488a3f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -110,7 +110,6 @@ builtin_sources =
 builtin_nodist =
 
 include Makefile.plugins
-include Makefile.profiles
 
 if EXPERIMENTAL
 builtin_modules += sap
diff --git a/Makefile.plugins b/Makefile.plugins
index 9052b3a..a4442f3 100644
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -21,3 +21,105 @@ builtin_sources += plugins/dbusoob.c
 builtin_modules += neard
 builtin_sources += plugins/neard.c
 endif
+
+builtin_modules += audio
+builtin_sources += profiles/audio/main.c \
+			profiles/audio/manager.h profiles/audio/manager.c \
+			profiles/audio/control.h profiles/audio/control.c \
+			profiles/audio/avctp.h profiles/audio/avctp.c \
+			profiles/audio/avrcp.h profiles/audio/avrcp.c \
+			profiles/audio/device.h profiles/audio/device.c \
+			profiles/audio/source.h profiles/audio/source.c \
+			profiles/audio/sink.h profiles/audio/sink.c \
+			profiles/audio/a2dp.h profiles/audio/a2dp.c \
+			profiles/audio/avdtp.h profiles/audio/avdtp.c \
+			profiles/audio/media.h profiles/audio/media.c \
+			profiles/audio/transport.h profiles/audio/transport.c \
+			profiles/audio/player.h profiles/audio/player.c \
+			profiles/audio/a2dp-codecs.h
+
+builtin_modules += network
+builtin_sources += profiles/network/main.c \
+			profiles/network/manager.h profiles/network/manager.c \
+			profiles/network/common.h profiles/network/common.c \
+			profiles/network/server.h profiles/network/server.c \
+			profiles/network/connection.h \
+			profiles/network/connection.c
+
+builtin_modules += input
+builtin_sources += profiles/input/main.c \
+			profiles/input/manager.h profiles/input/manager.c \
+			profiles/input/server.h profiles/input/server.c \
+			profiles/input/device.h profiles/input/device.c
+
+builtin_modules += hog
+builtin_sources += profiles/input/hog_manager.c profiles/input/hog_device.h \
+			profiles/input/hog_device.c profiles/input/uhid_copy.h \
+			profiles/input/suspend.h profiles/input/suspend-dummy.c
+
+builtin_modules += health
+builtin_sources += profiles/health/mcap_lib.h profiles/health/mcap_internal.h \
+			profiles/health/mcap.h profiles/health/mcap.c \
+			profiles/health/mcap_sync.c \
+			profiles/health/hdp_main.c profiles/health/hdp_types.h \
+			profiles/health/hdp_manager.h \
+			profiles/health/hdp_manager.c \
+			profiles/health/hdp.h profiles/health/hdp.c \
+			profiles/health/hdp_util.h profiles/health/hdp_util.c
+
+builtin_modules += thermometer
+builtin_sources += profiles/thermometer/main.c \
+			profiles/thermometer/manager.h \
+			profiles/thermometer/manager.c \
+			profiles/thermometer/thermometer.h \
+			profiles/thermometer/thermometer.c
+
+builtin_modules += alert
+builtin_sources += profiles/alert/main.c profiles/alert/server.h \
+			profiles/alert/server.c profiles/alert/manager.h \
+			profiles/alert/manager.c
+
+builtin_modules += time
+builtin_sources += profiles/time/main.c profiles/time/server.h \
+			profiles/time/server.c profiles/time/manager.c \
+			profiles/time/manager.h
+
+builtin_modules += proximity
+builtin_sources += profiles/proximity/main.c profiles/proximity/manager.h \
+			profiles/proximity/manager.c \
+			profiles/proximity/monitor.h \
+			profiles/proximity/monitor.c \
+			profiles/proximity/reporter.h \
+			profiles/proximity/reporter.c \
+			profiles/proximity/linkloss.h \
+			profiles/proximity/linkloss.c \
+			profiles/proximity/immalert.h \
+			profiles/proximity/immalert.c
+
+builtin_modules += deviceinfo
+builtin_sources += profiles/deviceinfo/main.c \
+			profiles/deviceinfo/manager.h \
+			profiles/deviceinfo/manager.c \
+			profiles/deviceinfo/deviceinfo.h \
+			profiles/deviceinfo/deviceinfo.c
+
+builtin_modules += gatt
+builtin_sources += profiles/gatt/main.c profiles/gatt/manager.h \
+			profiles/gatt/manager.c profiles/gatt/gas.h \
+			profiles/gatt/gas.c
+
+builtin_modules += scanparam
+builtin_sources += profiles/scanparam/main.c \
+			profiles/scanparam/manager.h \
+			profiles/scanparam/manager.c \
+			profiles/scanparam/scan.h profiles/scanparam/scan.c
+
+builtin_modules += heartrate
+builtin_sources += profiles/heartrate/main.c \
+			profiles/heartrate/manager.c \
+			profiles/heartrate/manager.h \
+			profiles/heartrate/heartrate.c \
+			profiles/heartrate/heartrate.h
+
+builtin_modules += cyclingspeed
+builtin_sources += profiles/cyclingspeed/cyclingspeed.c
diff --git a/Makefile.profiles b/Makefile.profiles
deleted file mode 100644
index 5bd7ea2..0000000
--- a/Makefile.profiles
+++ /dev/null
@@ -1,102 +0,0 @@
-
-builtin_modules += audio
-builtin_sources += profiles/audio/main.c \
-			profiles/audio/manager.h profiles/audio/manager.c \
-			profiles/audio/control.h profiles/audio/control.c \
-			profiles/audio/avctp.h profiles/audio/avctp.c \
-			profiles/audio/avrcp.h profiles/audio/avrcp.c \
-			profiles/audio/device.h profiles/audio/device.c \
-			profiles/audio/source.h profiles/audio/source.c \
-			profiles/audio/sink.h profiles/audio/sink.c \
-			profiles/audio/a2dp.h profiles/audio/a2dp.c \
-			profiles/audio/avdtp.h profiles/audio/avdtp.c \
-			profiles/audio/media.h profiles/audio/media.c \
-			profiles/audio/transport.h profiles/audio/transport.c \
-			profiles/audio/player.h profiles/audio/player.c \
-			profiles/audio/a2dp-codecs.h
-
-builtin_modules += network
-builtin_sources += profiles/network/main.c \
-			profiles/network/manager.h profiles/network/manager.c \
-			profiles/network/common.h profiles/network/common.c \
-			profiles/network/server.h profiles/network/server.c \
-			profiles/network/connection.h \
-			profiles/network/connection.c
-
-builtin_modules += input
-builtin_sources += profiles/input/main.c \
-			profiles/input/manager.h profiles/input/manager.c \
-			profiles/input/server.h profiles/input/server.c \
-			profiles/input/device.h profiles/input/device.c
-
-builtin_modules += hog
-builtin_sources += profiles/input/hog_manager.c profiles/input/hog_device.h \
-			profiles/input/hog_device.c profiles/input/uhid_copy.h \
-			profiles/input/suspend.h profiles/input/suspend-dummy.c
-
-builtin_modules += health
-builtin_sources += profiles/health/mcap_lib.h profiles/health/mcap_internal.h \
-			profiles/health/mcap.h profiles/health/mcap.c \
-			profiles/health/mcap_sync.c \
-			profiles/health/hdp_main.c profiles/health/hdp_types.h \
-			profiles/health/hdp_manager.h \
-			profiles/health/hdp_manager.c \
-			profiles/health/hdp.h profiles/health/hdp.c \
-			profiles/health/hdp_util.h profiles/health/hdp_util.c
-
-builtin_modules += thermometer
-builtin_sources += profiles/thermometer/main.c \
-			profiles/thermometer/manager.h \
-			profiles/thermometer/manager.c \
-			profiles/thermometer/thermometer.h \
-			profiles/thermometer/thermometer.c
-
-builtin_modules += alert
-builtin_sources += profiles/alert/main.c profiles/alert/server.h \
-			profiles/alert/server.c profiles/alert/manager.h \
-			profiles/alert/manager.c
-
-builtin_modules += time
-builtin_sources += profiles/time/main.c profiles/time/server.h \
-			profiles/time/server.c profiles/time/manager.c \
-			profiles/time/manager.h
-
-builtin_modules += proximity
-builtin_sources += profiles/proximity/main.c profiles/proximity/manager.h \
-			profiles/proximity/manager.c \
-			profiles/proximity/monitor.h \
-			profiles/proximity/monitor.c \
-			profiles/proximity/reporter.h \
-			profiles/proximity/reporter.c \
-			profiles/proximity/linkloss.h \
-			profiles/proximity/linkloss.c \
-			profiles/proximity/immalert.h \
-			profiles/proximity/immalert.c
-
-builtin_modules += deviceinfo
-builtin_sources += profiles/deviceinfo/main.c \
-			profiles/deviceinfo/manager.h \
-			profiles/deviceinfo/manager.c \
-			profiles/deviceinfo/deviceinfo.h \
-			profiles/deviceinfo/deviceinfo.c
-
-builtin_modules += gatt
-builtin_sources += profiles/gatt/main.c profiles/gatt/manager.h \
-			profiles/gatt/manager.c profiles/gatt/gas.h \
-			profiles/gatt/gas.c
-
-builtin_modules += scanparam
-builtin_sources += profiles/scanparam/main.c \
-			profiles/scanparam/manager.h \
-			profiles/scanparam/manager.c \
-			profiles/scanparam/scan.h profiles/scanparam/scan.c
-
-builtin_modules += heartrate
-builtin_sources += profiles/heartrate/main.c \
-			profiles/heartrate/manager.c \
-			profiles/heartrate/manager.h \
-			profiles/heartrate/heartrate.c \
-			profiles/heartrate/heartrate.h
-
-builtin_modules += cyclingspeed
-builtin_sources += profiles/cyclingspeed/cyclingspeed.c