diff --git a/.depend b/.depend
index c5f8561..d47c7ea 100644
--- a/.depend
+++ b/.depend
@@ -1,75 +1,45 @@
 src/usb_moded-android.o:\
 	src/usb_moded-android.c\
-	config-static.h\
 	src/usb_moded-android.h\
 	src/usb_moded-config-private.h\
 	src/usb_moded-config.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
 	src/usb_moded-mac.h\
 	src/usb_moded-modesetting.h\
-	src/usb_moded.h\
 
 src/usb_moded-android.pic.o:\
 	src/usb_moded-android.c\
-	config-static.h\
 	src/usb_moded-android.h\
 	src/usb_moded-config-private.h\
 	src/usb_moded-config.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
 	src/usb_moded-mac.h\
 	src/usb_moded-modesetting.h\
-	src/usb_moded.h\
 
 src/usb_moded-appsync-dbus.o:\
 	src/usb_moded-appsync-dbus.c\
-	config-static.h\
 	src/usb_moded-appsync-dbus-private.h\
 	src/usb_moded-appsync-dbus.h\
 	src/usb_moded-appsync.h\
-	src/usb_moded-config-private.h\
-	src/usb_moded-config.h\
-	src/usb_moded-dbus-private.h\
-	src/usb_moded-dbus.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
-	src/usb_moded-modes.h\
-	src/usb_moded.h\
 
 src/usb_moded-appsync-dbus.pic.o:\
 	src/usb_moded-appsync-dbus.c\
-	config-static.h\
 	src/usb_moded-appsync-dbus-private.h\
 	src/usb_moded-appsync-dbus.h\
 	src/usb_moded-appsync.h\
-	src/usb_moded-config-private.h\
-	src/usb_moded-config.h\
-	src/usb_moded-dbus-private.h\
-	src/usb_moded-dbus.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
-	src/usb_moded-modes.h\
-	src/usb_moded.h\
 
 src/usb_moded-appsync.o:\
 	src/usb_moded-appsync.c\
-	src/usb_moded-appsync-dbus-private.h\
-	src/usb_moded-appsync-dbus.h\
 	src/usb_moded-appsync.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
-	src/usb_moded-modesetting.h\
 	src/usb_moded-systemd.h\
 
 src/usb_moded-appsync.pic.o:\
 	src/usb_moded-appsync.c\
-	src/usb_moded-appsync-dbus-private.h\
-	src/usb_moded-appsync-dbus.h\
 	src/usb_moded-appsync.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
-	src/usb_moded-modesetting.h\
 	src/usb_moded-systemd.h\
 
 src/usb_moded-common.o:\
@@ -83,6 +53,7 @@ src/usb_moded-common.o:\
 	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
 	src/usb_moded-modes.h\
+	src/usb_moded-worker.h\
 	src/usb_moded.h\
 
 src/usb_moded-common.pic.o:\
@@ -96,6 +67,7 @@ src/usb_moded-common.pic.o:\
 	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
 	src/usb_moded-modes.h\
+	src/usb_moded-worker.h\
 	src/usb_moded.h\
 
 src/usb_moded-config.o:\
@@ -110,7 +82,6 @@ src/usb_moded-config.o:\
 	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
 	src/usb_moded-modes.h\
-	src/usb_moded-modesetting.h\
 	src/usb_moded-ssu.h\
 	src/usb_moded-worker.h\
 	src/usb_moded.h\
@@ -127,7 +98,6 @@ src/usb_moded-config.pic.o:\
 	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
 	src/usb_moded-modes.h\
-	src/usb_moded-modesetting.h\
 	src/usb_moded-ssu.h\
 	src/usb_moded-worker.h\
 	src/usb_moded.h\
@@ -140,10 +110,8 @@ src/usb_moded-configfs.o:\
 	src/usb_moded-config-private.h\
 	src/usb_moded-config.h\
 	src/usb_moded-configfs.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
 	src/usb_moded-mac.h\
-	src/usb_moded-modesetting.h\
 	src/usb_moded.h\
 
 src/usb_moded-configfs.pic.o:\
@@ -154,10 +122,8 @@ src/usb_moded-configfs.pic.o:\
 	src/usb_moded-config-private.h\
 	src/usb_moded-config.h\
 	src/usb_moded-configfs.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
 	src/usb_moded-mac.h\
-	src/usb_moded-modesetting.h\
 	src/usb_moded.h\
 
 src/usb_moded-control.o:\
@@ -193,8 +159,6 @@ src/usb_moded-control.pic.o:\
 src/usb_moded-dbus.o:\
 	src/usb_moded-dbus.c\
 	config-static.h\
-	src/usb_moded-appsync-dbus-private.h\
-	src/usb_moded-appsync-dbus.h\
 	src/usb_moded-common.h\
 	src/usb_moded-config-private.h\
 	src/usb_moded-config.h\
@@ -204,15 +168,12 @@ src/usb_moded-dbus.o:\
 	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
 	src/usb_moded-modes.h\
-	src/usb_moded-modesetting.h\
 	src/usb_moded-network.h\
 	src/usb_moded.h\
 
 src/usb_moded-dbus.pic.o:\
 	src/usb_moded-dbus.c\
 	config-static.h\
-	src/usb_moded-appsync-dbus-private.h\
-	src/usb_moded-appsync-dbus.h\
 	src/usb_moded-common.h\
 	src/usb_moded-config-private.h\
 	src/usb_moded-config.h\
@@ -222,7 +183,6 @@ src/usb_moded-dbus.pic.o:\
 	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
 	src/usb_moded-modes.h\
-	src/usb_moded-modesetting.h\
 	src/usb_moded-network.h\
 	src/usb_moded.h\
 
@@ -234,9 +194,7 @@ src/usb_moded-devicelock.o:\
 	src/usb_moded-dbus-private.h\
 	src/usb_moded-dbus.h\
 	src/usb_moded-devicelock.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
-	src/usb_moded-modes.h\
 	src/usb_moded.h\
 
 src/usb_moded-devicelock.pic.o:\
@@ -247,9 +205,7 @@ src/usb_moded-devicelock.pic.o:\
 	src/usb_moded-dbus-private.h\
 	src/usb_moded-dbus.h\
 	src/usb_moded-devicelock.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
-	src/usb_moded-modes.h\
 	src/usb_moded.h\
 
 src/usb_moded-dsme.o:\
@@ -260,7 +216,6 @@ src/usb_moded-dsme.o:\
 	src/usb_moded-dbus-private.h\
 	src/usb_moded-dbus.h\
 	src/usb_moded-dsme.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
 	src/usb_moded-modesetting.h\
 	src/usb_moded.h\
@@ -273,7 +228,6 @@ src/usb_moded-dsme.pic.o:\
 	src/usb_moded-dbus-private.h\
 	src/usb_moded-dbus.h\
 	src/usb_moded-dsme.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
 	src/usb_moded-modesetting.h\
 	src/usb_moded.h\
@@ -319,7 +273,6 @@ src/usb_moded-modesetting.o:\
 	src/usb_moded-dbus.h\
 	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
-	src/usb_moded-modes.h\
 	src/usb_moded-modesetting.h\
 	src/usb_moded-modules.h\
 	src/usb_moded-network.h\
@@ -339,7 +292,6 @@ src/usb_moded-modesetting.pic.o:\
 	src/usb_moded-dbus.h\
 	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
-	src/usb_moded-modes.h\
 	src/usb_moded-modesetting.h\
 	src/usb_moded-modules.h\
 	src/usb_moded-network.h\
@@ -348,29 +300,13 @@ src/usb_moded-modesetting.pic.o:\
 
 src/usb_moded-modules.o:\
 	src/usb_moded-modules.c\
-	config-static.h\
-	src/usb_moded-config.h\
-	src/usb_moded-dbus-private.h\
-	src/usb_moded-dbus.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
-	src/usb_moded-modes.h\
-	src/usb_moded-modesetting.h\
 	src/usb_moded-modules.h\
-	src/usb_moded.h\
 
 src/usb_moded-modules.pic.o:\
 	src/usb_moded-modules.c\
-	config-static.h\
-	src/usb_moded-config.h\
-	src/usb_moded-dbus-private.h\
-	src/usb_moded-dbus.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
-	src/usb_moded-modes.h\
-	src/usb_moded-modesetting.h\
 	src/usb_moded-modules.h\
-	src/usb_moded.h\
 
 src/usb_moded-network.o:\
 	src/usb_moded-network.c\
@@ -403,7 +339,6 @@ src/usb_moded-network.pic.o:\
 src/usb_moded-sigpipe.o:\
 	src/usb_moded-sigpipe.c\
 	config-static.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
 	src/usb_moded-sigpipe.h\
 	src/usb_moded.h\
@@ -411,7 +346,6 @@ src/usb_moded-sigpipe.o:\
 src/usb_moded-sigpipe.pic.o:\
 	src/usb_moded-sigpipe.c\
 	config-static.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
 	src/usb_moded-sigpipe.h\
 	src/usb_moded.h\
@@ -428,23 +362,17 @@ src/usb_moded-ssu.pic.o:\
 
 src/usb_moded-systemd.o:\
 	src/usb_moded-systemd.c\
-	config-static.h\
 	src/usb_moded-dbus-private.h\
 	src/usb_moded-dbus.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
 	src/usb_moded-systemd.h\
-	src/usb_moded.h\
 
 src/usb_moded-systemd.pic.o:\
 	src/usb_moded-systemd.c\
-	config-static.h\
 	src/usb_moded-dbus-private.h\
 	src/usb_moded-dbus.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
 	src/usb_moded-systemd.h\
-	src/usb_moded.h\
 
 src/usb_moded-trigger.o:\
 	src/usb_moded-trigger.c\
@@ -453,12 +381,8 @@ src/usb_moded-trigger.o:\
 	src/usb_moded-config-private.h\
 	src/usb_moded-config.h\
 	src/usb_moded-control.h\
-	src/usb_moded-devicelock.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
-	src/usb_moded-modesetting.h\
 	src/usb_moded-trigger.h\
-	src/usb_moded-udev.h\
 	src/usb_moded.h\
 
 src/usb_moded-trigger.pic.o:\
@@ -468,12 +392,8 @@ src/usb_moded-trigger.pic.o:\
 	src/usb_moded-config-private.h\
 	src/usb_moded-config.h\
 	src/usb_moded-control.h\
-	src/usb_moded-devicelock.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
-	src/usb_moded-modesetting.h\
 	src/usb_moded-trigger.h\
-	src/usb_moded-udev.h\
 	src/usb_moded.h\
 
 src/usb_moded-udev.o:\
@@ -485,9 +405,7 @@ src/usb_moded-udev.o:\
 	src/usb_moded-control.h\
 	src/usb_moded-dbus-private.h\
 	src/usb_moded-dbus.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
-	src/usb_moded-modes.h\
 	src/usb_moded-udev.h\
 	src/usb_moded.h\
 
@@ -500,9 +418,7 @@ src/usb_moded-udev.pic.o:\
 	src/usb_moded-control.h\
 	src/usb_moded-dbus-private.h\
 	src/usb_moded-dbus.h\
-	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
-	src/usb_moded-modes.h\
 	src/usb_moded-udev.h\
 	src/usb_moded.h\
 
@@ -563,7 +479,6 @@ src/usb_moded.o:\
 	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
 	src/usb_moded-mac.h\
-	src/usb_moded-modes.h\
 	src/usb_moded-modesetting.h\
 	src/usb_moded-modules.h\
 	src/usb_moded-network.h\
@@ -591,7 +506,6 @@ src/usb_moded.pic.o:\
 	src/usb_moded-dyn-config.h\
 	src/usb_moded-log.h\
 	src/usb_moded-mac.h\
-	src/usb_moded-modes.h\
 	src/usb_moded-modesetting.h\
 	src/usb_moded-modules.h\
 	src/usb_moded-network.h\
diff --git a/Makefile.custom b/Makefile.custom
index d8eae83..8f3be87 100644
--- a/Makefile.custom
+++ b/Makefile.custom
@@ -339,3 +339,19 @@ clean::
 
 distclean::
 	$(RM) -r RPMS installroot
+
+.SUFFIXES: %.trim
+.PRECIOUS: %.trim
+
+include_trim:: include_trim_headers include_trim_sources
+
+%.trim : %
+	find_unneeded_includes.py $(CPPFLAGS) $(CFLAGS) -- $<
+	touch $@
+
+include_trim_headers: $(patsubst %,%.trim,$(ALL_HEADERS))
+
+include_trim_sources: $(patsubst %,%.trim,$(ALL_SOURCES))
+
+distclean::
+	$(RM) *.trim */*.trim
diff --git a/src/usb_moded-android.c b/src/usb_moded-android.c
index 551b8a9..d903291 100644
--- a/src/usb_moded-android.c
+++ b/src/usb_moded-android.c
@@ -21,19 +21,17 @@
  * 02110-1301 USA
  */
 
-#include <stdio.h>
-#include <glib.h>
-
-#include "usb_moded.h"
 #include "usb_moded-android.h"
-#include "usb_moded-log.h"
-#include "usb_moded-modesetting.h"
+
 #include "usb_moded-config-private.h"
+#include "usb_moded-log.h"
 #include "usb_moded-mac.h"
+#include "usb_moded-modesetting.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
 
 /* ========================================================================= *
  * Functions
diff --git a/src/usb_moded-android.h b/src/usb_moded-android.h
index b9a92b2..be33870 100644
--- a/src/usb_moded-android.h
+++ b/src/usb_moded-android.h
@@ -25,6 +25,7 @@
 # define USB_MODED_ANDROID_H_
 
 # include <stdbool.h>
+# include <glib.h>
 
 /* ========================================================================= *
  * Constants
diff --git a/src/usb_moded-appsync-dbus-private.h b/src/usb_moded-appsync-dbus-private.h
index 0d72fd7..1df7ef4 100644
--- a/src/usb_moded-appsync-dbus-private.h
+++ b/src/usb_moded-appsync-dbus-private.h
@@ -25,7 +25,9 @@
 #ifndef  USB_MODED_APPSYNC_DBUS_PRIVATE_H_
 # define USB_MODED_APPSYNC_DBUS_PRIVATE_H_
 
-#include "usb_moded-appsync-dbus.h"
+# include "usb_moded-appsync-dbus.h" // NOTRIM
+
+# include <glib.h>
 
 /* ========================================================================= *
  * Prototypes
diff --git a/src/usb_moded-appsync-dbus.c b/src/usb_moded-appsync-dbus.c
index 075acd5..042f4c5 100644
--- a/src/usb_moded-appsync-dbus.c
+++ b/src/usb_moded-appsync-dbus.c
@@ -25,20 +25,14 @@
  * 02110-1301 USA
  */
 
-#include <stdio.h>
+#include "usb_moded-appsync-dbus-private.h"
+
+#include "usb_moded-appsync.h"
+#include "usb_moded-log.h"
+
 #include <string.h>
 
 #include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-
-#include "usb_moded-dbus-private.h"
-#include "usb_moded.h"
-#include "usb_moded-log.h"
-#include "usb_moded-modes.h"
-#include "usb_moded-config-private.h"
-#include "usb_moded-appsync.h"
-#include "usb_moded-appsync-dbus-private.h"
 
 /* ========================================================================= *
  * Prototypes
@@ -183,7 +177,7 @@ static DBusHandlerResult dbusappsync_msg_handler(DBusConnection *const connectio
                 // could not parse method call args
                 reply = dbus_message_new_error(msg, DBUS_ERROR_INVALID_ARGS, member);
             }
-            else if( appsync_mark_active(use) < 0 )
+            else if( appsync_mark_active(use, 1) < 0 )
             {
                 // name could not be marked active
                 reply = dbus_message_new_error(msg, DBUS_ERROR_INVALID_ARGS, member);
diff --git a/src/usb_moded-appsync.c b/src/usb_moded-appsync.c
index e9401e0..6a3b80c 100644
--- a/src/usb_moded-appsync.c
+++ b/src/usb_moded-appsync.c
@@ -26,23 +26,16 @@
  * 02110-1301 USA
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/time.h>
-
-#include <glib.h>
-#include <glib/gstdio.h>
-
 #include "usb_moded-appsync.h"
-#include "usb_moded-appsync-dbus-private.h"
-#include "usb_moded-modesetting.h"
+
 #include "usb_moded-log.h"
 #include "usb_moded-systemd.h"
 
+#include <sys/time.h>
+
+#include <stdlib.h>
+#include <string.h>
+
 /* ========================================================================= *
  * Prototypes
  * ========================================================================= */
diff --git a/src/usb_moded-appsync.h b/src/usb_moded-appsync.h
index f96a665..a971838 100644
--- a/src/usb_moded-appsync.h
+++ b/src/usb_moded-appsync.h
@@ -26,6 +26,8 @@
 #ifndef  USB_MODED_APPSYNC_H_
 # define USB_MODED_APPSYNC_H_
 
+# include <glib.h>
+
 /* ========================================================================= *
  * Constants
  * ========================================================================= */
diff --git a/src/usb_moded-common.c b/src/usb_moded-common.c
index e963809..3477eef 100644
--- a/src/usb_moded-common.c
+++ b/src/usb_moded-common.c
@@ -3,8 +3,16 @@
 #include "usb_moded.h"
 #include "usb_moded-config-private.h"
 #include "usb_moded-dbus-private.h"
+#include "usb_moded-dyn-config.h"
 #include "usb_moded-log.h"
 #include "usb_moded-modes.h"
+#include "usb_moded-worker.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
 
 /* ========================================================================= *
  * Types
diff --git a/src/usb_moded-common.h b/src/usb_moded-common.h
index 81c48b8..c14a5f9 100644
--- a/src/usb_moded-common.h
+++ b/src/usb_moded-common.h
@@ -1,6 +1,7 @@
 #ifndef  USB_MODED_COMMON_H_
 # define USB_MODED_COMMON_H_
 
+# include <stdio.h>
 # include <glib.h>
 
 /* ========================================================================= *
diff --git a/src/usb_moded-config.c b/src/usb_moded-config.c
index 5a75bf7..3cea3f8 100644
--- a/src/usb_moded-config.c
+++ b/src/usb_moded-config.c
@@ -31,33 +31,27 @@
  * 02110-1301 USA
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-#include <fcntl.h>
-
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <glib.h>
-#include <glob.h>
-
-#include "usb_moded.h"
-#include "usb_moded-config.h"
 #include "usb_moded-config-private.h"
+
+#include "usb_moded-control.h"
+#include "usb_moded-dbus-private.h"
+#include "usb_moded-dyn-config.h"
 #include "usb_moded-log.h"
 #include "usb_moded-modes.h"
-#include "usb_moded-modesetting.h"
-#include "usb_moded-dbus-private.h"
 #include "usb_moded-worker.h"
-#include "usb_moded-control.h"
-#include "usb_moded-common.h"
 
 #ifdef USE_MER_SSU
 # include "usb_moded-ssu.h"
 #endif
 
+#include <sys/stat.h>
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <fcntl.h>
+#include <glob.h>
+
 /* ========================================================================= *
  * Prototypes
  * ========================================================================= */
diff --git a/src/usb_moded-configfs.c b/src/usb_moded-configfs.c
index ef7d563..5c458a8 100644
--- a/src/usb_moded-configfs.c
+++ b/src/usb_moded-configfs.c
@@ -22,21 +22,20 @@
 
 #include "usb_moded-configfs.h"
 
-#include <sys/types.h>
-
-#include <stdio.h>
-#include <dirent.h>
-#include <errno.h>
-
-#include <glib.h>
-
 #include "usb_moded.h"
 #include "usb_moded-android.h"
-#include "usb_moded-log.h"
-#include "usb_moded-modesetting.h"
+#include "usb_moded-common.h"
 #include "usb_moded-config-private.h"
+#include "usb_moded-log.h"
 #include "usb_moded-mac.h"
-#include "usb_moded-common.h"
+
+#include <sys/stat.h>
+
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
 
 /* ========================================================================= *
  * Constants
diff --git a/src/usb_moded-control.c b/src/usb_moded-control.c
index b7c1ef4..9b326ec 100644
--- a/src/usb_moded-control.c
+++ b/src/usb_moded-control.c
@@ -23,14 +23,15 @@
 
 #include "usb_moded-control.h"
 
-#include "usb_moded.h"
-
 #include "usb_moded-config-private.h"
 #include "usb_moded-dbus-private.h"
+#include "usb_moded-dyn-config.h"
 #include "usb_moded-log.h"
 #include "usb_moded-modes.h"
 #include "usb_moded-worker.h"
-#include "usb_moded-common.h"
+
+#include <string.h>
+#include <stdlib.h>
 
 /* ========================================================================= *
  * Prototypes
diff --git a/src/usb_moded-dbus-private.h b/src/usb_moded-dbus-private.h
index 837b8f0..cf55720 100644
--- a/src/usb_moded-dbus-private.h
+++ b/src/usb_moded-dbus-private.h
@@ -27,7 +27,7 @@
 #ifndef  USB_MODED_DBUS_PRIVATE_H_
 # define USB_MODED_DBUS_PRIVATE_H_
 
-# include "usb_moded-dbus.h"
+# include "usb_moded-dbus.h" // NOTRIM
 
 # include <dbus/dbus.h>
 # include <glib.h>
diff --git a/src/usb_moded-dbus.c b/src/usb_moded-dbus.c
index 1ef14a3..688670b 100644
--- a/src/usb_moded-dbus.c
+++ b/src/usb_moded-dbus.c
@@ -30,24 +30,18 @@
  * 02110-1301 USA
  */
 
-#include <stdio.h>
-#include <string.h>
-
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-
 #include "usb_moded-dbus-private.h"
-#include "usb_moded-appsync-dbus-private.h"
-#include "usb_moded.h"
-#include "usb_moded-modes.h"
-#include "usb_moded-modesetting.h"
-#include "usb_moded-config.h"
+
 #include "usb_moded-config-private.h"
-#include "usb_moded-network.h"
-#include "usb_moded-log.h"
 #include "usb_moded-control.h"
-#include "usb_moded-common.h"
+#include "usb_moded-log.h"
+#include "usb_moded-modes.h"
+#include "usb_moded-network.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <dbus/dbus-glib-lowlevel.h>
 
 /* ========================================================================= *
  * Constants
diff --git a/src/usb_moded-devicelock.c b/src/usb_moded-devicelock.c
index c9be76e..54a8da9 100644
--- a/src/usb_moded-devicelock.c
+++ b/src/usb_moded-devicelock.c
@@ -32,17 +32,13 @@
  * Interacts with the devicelock to know if we can expose the system contents or not
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib-lowlevel.h>
-
 #include "usb_moded-devicelock.h"
-#include "usb_moded-log.h"
-#include "usb_moded.h"
-#include "usb_moded-modes.h"
-#include "usb_moded-dbus-private.h"
+
 #include "usb_moded-control.h"
+#include "usb_moded-dbus-private.h"
+#include "usb_moded-log.h"
+
+#include <string.h>
 
 /* ========================================================================= *
  * Types
diff --git a/src/usb_moded-dsme.c b/src/usb_moded-dsme.c
index d9547fe..ddf278c 100644
--- a/src/usb_moded-dsme.c
+++ b/src/usb_moded-dsme.c
@@ -22,16 +22,15 @@
  * 02110-1301 USA
  */
 
-#include <stdbool.h>
-
-#include <dbus/dbus.h>
-
-#include "usb_moded.h"
 #include "usb_moded-dsme.h"
-#include "usb_moded-modesetting.h"
+
+#include "usb_moded-control.h"
 #include "usb_moded-dbus-private.h"
 #include "usb_moded-log.h"
-#include "usb_moded-control.h"
+#include "usb_moded-modesetting.h"
+
+#include <stdlib.h>
+#include <unistd.h>
 
 #include <dsme/state.h>
 #include <dsme/protocol.h>
@@ -134,7 +133,7 @@ static const struct
 } dsme_states[] =
 {
 #define DSME_STATE(NAME, VALUE) { #NAME, DSME_STATE_##NAME },
-#include <dsme/state_states.h>
+#include <dsme/state_states.h> // NOTRIM
 #undef  DSME_STATE
 };
 
diff --git a/src/usb_moded-dsme.h b/src/usb_moded-dsme.h
index 9f21c8b..11c3ff8 100644
--- a/src/usb_moded-dsme.h
+++ b/src/usb_moded-dsme.h
@@ -22,12 +22,14 @@
  */
 
 #ifndef MEEGOLOCK
-# warning usb_moded-dsme.h included without enabling MEEGOLOCK
+# warning usb_moded-dsme.h used without enabling MEEGOLOCK
 #endif
 
 #ifndef  USB_MODED_DSME_H_
 # define USB_MODED_DSME_H_
 
+# include <glib.h>
+
 /* ========================================================================= *
  * Prototypes
  * ========================================================================= */
diff --git a/src/usb_moded-dyn-config.c b/src/usb_moded-dyn-config.c
index 2380257..c568956 100644
--- a/src/usb_moded-dyn-config.c
+++ b/src/usb_moded-dyn-config.c
@@ -26,17 +26,12 @@
  * 02110-1301 USA
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-
-#include <glib.h>
-#include <glib/gstdio.h>
-
 #include "usb_moded-dyn-config.h"
+
 #include "usb_moded-log.h"
 
+#include <stdlib.h>
+
 /* ========================================================================= *
  * Prototypes
  * ========================================================================= */
diff --git a/src/usb_moded-dyn-config.h b/src/usb_moded-dyn-config.h
index 099574a..f380d29 100644
--- a/src/usb_moded-dyn-config.h
+++ b/src/usb_moded-dyn-config.h
@@ -30,6 +30,8 @@
 #ifndef  USB_MODED_DYN_CONFIG_H_
 # define USB_MODED_DYN_CONFIG_H_
 
+# include <glib.h>
+
 /* ========================================================================= *
  * Constants
  * ========================================================================= */
diff --git a/src/usb_moded-log.c b/src/usb_moded-log.c
index dd72bee..b86cf77 100644
--- a/src/usb_moded-log.c
+++ b/src/usb_moded-log.c
@@ -25,15 +25,12 @@
  * 02110-1301 USA
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
+#include "usb_moded-log.h"
+
 #include <sys/time.h>
-#include <errno.h>
-#include <ctype.h>
 
-#include "usb_moded-log.h"
+#include <stdio.h>
+#include <errno.h>
 
 /* ========================================================================= *
  * Prototypes
diff --git a/src/usb_moded-log.h b/src/usb_moded-log.h
index 85d0d42..0b37a38 100644
--- a/src/usb_moded-log.h
+++ b/src/usb_moded-log.h
@@ -24,10 +24,6 @@
 # define USB_MODED_LOG_H_
 
 # include <stdbool.h>
-# include <stdlib.h>
-# include <unistd.h>
-# include <stdio.h>
-# include <string.h>
 # include <stdarg.h>
 # include <syslog.h>
 
@@ -47,6 +43,12 @@ enum
     LOG_TO_SYSLOG, // log to syslog
 };
 
+enum
+{
+    LOG_MIN_LEVEL = LOG_CRIT,
+    LOG_MAX_LEVEL = LOG_DEBUG,
+};
+
 /* ========================================================================= *
  * Prototypes
  * ========================================================================= */
diff --git a/src/usb_moded-mac.c b/src/usb_moded-mac.c
index e7f788d..7f36644 100644
--- a/src/usb_moded-mac.c
+++ b/src/usb_moded-mac.c
@@ -21,10 +21,14 @@
  * 02110-1301 USA
  */
 
-#include <stdio.h>
 #include "usb_moded-mac.h"
+
 #include "usb_moded-log.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 /* ========================================================================= *
  * Prototypes
  * ========================================================================= */
diff --git a/src/usb_moded-modesetting.c b/src/usb_moded-modesetting.c
index 4e85da0..33c8342 100644
--- a/src/usb_moded-modesetting.c
+++ b/src/usb_moded-modesetting.c
@@ -28,29 +28,26 @@
  * 02110-1301 USA
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <sys/stat.h>
-#include <limits.h>
-
-#include <glib.h>
+#include "usb_moded-modesetting.h"
 
 #include "usb_moded.h"
-#include "usb_moded-modules.h"
-#include "usb_moded-modes.h"
-#include "usb_moded-log.h"
-#include "usb_moded-dbus-private.h"
+
+#include "usb_moded-android.h"
 #include "usb_moded-appsync.h"
+#include "usb_moded-common.h"
 #include "usb_moded-config-private.h"
-#include "usb_moded-modesetting.h"
-#include "usb_moded-network.h"
-#include "usb_moded-android.h"
 #include "usb_moded-configfs.h"
+#include "usb_moded-dbus-private.h"
+#include "usb_moded-log.h"
+#include "usb_moded-modules.h"
+#include "usb_moded-network.h"
 #include "usb_moded-worker.h"
-#include "usb_moded-common.h"
+
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
 
 /* ========================================================================= *
  * Prototypes
diff --git a/src/usb_moded-modesetting.h b/src/usb_moded-modesetting.h
index d3eabbe..4ae9c46 100644
--- a/src/usb_moded-modesetting.h
+++ b/src/usb_moded-modesetting.h
@@ -29,8 +29,6 @@
 #ifndef  USB_MODED_MODESETTING_H_
 # define USB_MODED_MODESETTING_H_
 
-# include "usb_moded-dyn-config.h"
-
 # include <stdbool.h>
 
 /* ========================================================================= *
diff --git a/src/usb_moded-modules.c b/src/usb_moded-modules.c
index aae64d8..3124f92 100644
--- a/src/usb_moded-modules.c
+++ b/src/usb_moded-modules.c
@@ -27,23 +27,16 @@
  * 02110-1301 USA
  */
 
+#include "usb_moded-modules.h"
+
+#include "usb_moded-log.h"
+
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
-#include <stdio.h>
-
-#include <glib.h>
-#include <glib/gprintf.h>
 
 #include <libkmod.h>
 
-#include "usb_moded.h"
-#include "usb_moded-modules.h"
-#include "usb_moded-log.h"
-#include "usb_moded-config.h"
-#include "usb_moded-dbus-private.h"
-#include "usb_moded-modesetting.h"
-#include "usb_moded-modes.h"
+#include <glib.h>
 
 /* ========================================================================= *
  * Prototypes
diff --git a/src/usb_moded-network.c b/src/usb_moded-network.c
index 76af80a..611ccb0 100644
--- a/src/usb_moded-network.c
+++ b/src/usb_moded-network.c
@@ -28,29 +28,22 @@
 
 /*============================================================================= */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <glib.h>
-
-#include "usb_moded.h"
 #include "usb_moded-network.h"
+
 #include "usb_moded-config-private.h"
+#include "usb_moded-control.h"
 #include "usb_moded-log.h"
 #include "usb_moded-modesetting.h"
 #include "usb_moded-worker.h"
-#include "usb_moded-control.h"
-#include "usb_moded-common.h"
+
+#include <sys/stat.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #if CONNMAN || OFONO
 # include <dbus/dbus.h>
-# include <dbus/dbus-glib.h>
-# include <dbus/dbus-glib-lowlevel.h>
 #endif
 
 /* ========================================================================= *
diff --git a/src/usb_moded-sigpipe.c b/src/usb_moded-sigpipe.c
index 8800d6d..45c5e0c 100644
--- a/src/usb_moded-sigpipe.c
+++ b/src/usb_moded-sigpipe.c
@@ -29,8 +29,6 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include <glib.h>
-
 /* ========================================================================= *
  * Prototypes
  * ========================================================================= */
diff --git a/src/usb_moded-ssu.c b/src/usb_moded-ssu.c
index 7f62b2a..e46c147 100644
--- a/src/usb_moded-ssu.c
+++ b/src/usb_moded-ssu.c
@@ -20,11 +20,15 @@
  * 02110-1301 USA
  */
 
-#include <glib.h>
-#include <ssusysinfo.h>
 #include "usb_moded-ssu.h"
+
 #include "usb_moded-log.h"
 
+#include <stdlib.h>
+#include <string.h>
+
+#include <ssusysinfo.h>
+
 /* ========================================================================= *
  * Prototypes
  * ========================================================================= */
diff --git a/src/usb_moded-ssu.h b/src/usb_moded-ssu.h
index 77080e8..81ab749 100644
--- a/src/usb_moded-ssu.h
+++ b/src/usb_moded-ssu.h
@@ -23,6 +23,8 @@
 #ifndef  USB_MODED_SSU_H_
 # define USB_MODED_SSU_H_
 
+# include <glib.h>
+
 /* ========================================================================= *
  * Prototypes
  * ========================================================================= */
diff --git a/src/usb_moded-systemd.c b/src/usb_moded-systemd.c
index 026fe44..e09980f 100644
--- a/src/usb_moded-systemd.c
+++ b/src/usb_moded-systemd.c
@@ -22,17 +22,10 @@
  * 02110-1301 USA
  */
 
-#include <stdio.h>
-#include <string.h>
-
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
+#include "usb_moded-systemd.h"
 
 #include "usb_moded-dbus-private.h"
-#include "usb_moded.h"
 #include "usb_moded-log.h"
-#include "usb_moded-systemd.h"
 
 /* ========================================================================= *
  * Constants
diff --git a/src/usb_moded-systemd.h b/src/usb_moded-systemd.h
index a69f441..d8c2a7e 100644
--- a/src/usb_moded-systemd.h
+++ b/src/usb_moded-systemd.h
@@ -22,6 +22,8 @@
 #ifndef  USB_MODED_SYSTEMD_H_
 # define USB_MODED_SYSTEMD_H_
 
+# include <glib.h>
+
 /* ========================================================================= *
  * Constants
  * ========================================================================= */
diff --git a/src/usb_moded-trigger.c b/src/usb_moded-trigger.c
index 05acfae..9a25760 100644
--- a/src/usb_moded-trigger.c
+++ b/src/usb_moded-trigger.c
@@ -25,27 +25,16 @@
  * 02110-1301 USA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <locale.h>
-#include <unistd.h>
-
-#include <poll.h>
-
-#include <libudev.h>
-
-#include <glib.h>
+#include "usb_moded-trigger.h"
 
-#include "usb_moded.h"
-#include "usb_moded-log.h"
 #include "usb_moded-config-private.h"
-#include "usb_moded-udev.h"
-#include "usb_moded-modesetting.h"
-#include "usb_moded-trigger.h"
 #include "usb_moded-control.h"
-#if defined MEEGOLOCK
-# include "usb_moded-devicelock.h"
-#endif /* MEEGOLOCK */
+#include "usb_moded-log.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <libudev.h>
 
 /* ========================================================================= *
  * Prototypes
diff --git a/src/usb_moded-trigger.h b/src/usb_moded-trigger.h
index 30603f9..6a15980 100644
--- a/src/usb_moded-trigger.h
+++ b/src/usb_moded-trigger.h
@@ -25,6 +25,8 @@
 #ifndef  USB_MODED_TRIGGER_H_
 # define USB_MODED_TRIGGER_H_
 
+# include <stdbool.h>
+
 /* ========================================================================= *
  * Prototypes
  * ========================================================================= */
diff --git a/src/usb_moded-udev.c b/src/usb_moded-udev.c
index fe88622..590c3d5 100644
--- a/src/usb_moded-udev.c
+++ b/src/usb_moded-udev.c
@@ -27,26 +27,16 @@
  * 02110-1301 USA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <locale.h>
-#include <unistd.h>
-
-#include <poll.h>
-
-#include <libudev.h>
-
-#include <glib.h>
+#include "usb_moded-udev.h"
 
-#include "usb_moded-log.h"
 #include "usb_moded-config-private.h"
-#include "usb_moded-udev.h"
-#include "usb_moded.h"
-#include "usb_moded-modes.h"
-#include "usb_moded-dbus-private.h"
 #include "usb_moded-control.h"
-#include "usb_moded-common.h"
+#include "usb_moded-dbus-private.h"
+#include "usb_moded-log.h"
+
+#include <string.h>
+
+#include <libudev.h>
 
 /* ========================================================================= *
  * Prototypes
diff --git a/src/usb_moded-util.c b/src/usb_moded-util.c
index 6c7c047..2e74838 100644
--- a/src/usb_moded-util.c
+++ b/src/usb_moded-util.c
@@ -23,14 +23,12 @@
  * 02110-1301 USA
  */
 
+#include "usb_moded-dbus-private.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>
-#include <unistd.h>
 #include <string.h>
-#include <dbus/dbus.h>
-
-#include "usb_moded-dbus-private.h"
 
 /* ========================================================================= *
  * Prototypes
diff --git a/src/usb_moded-worker.c b/src/usb_moded-worker.c
index 849e5c3..d2107fb 100644
--- a/src/usb_moded-worker.c
+++ b/src/usb_moded-worker.c
@@ -23,20 +23,22 @@
 
 #include "usb_moded-worker.h"
 
-#include "usb_moded.h"
 #include "usb_moded-android.h"
 #include "usb_moded-configfs.h"
+#include "usb_moded-control.h"
+#include "usb_moded-dyn-config.h"
 #include "usb_moded-log.h"
 #include "usb_moded-modes.h"
 #include "usb_moded-modesetting.h"
 #include "usb_moded-modules.h"
-#include "usb_moded-control.h"
-#include "usb_moded-common.h"
 
 #include <sys/eventfd.h>
 
-#include <pthread.h>
-#include <stdint.h>
+#include <pthread.h> // NOTRIM
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
 
 /* ========================================================================= *
  * Prototypes
diff --git a/src/usb_moded.c b/src/usb_moded.c
index 190edf9..e88865a 100644
--- a/src/usb_moded.c
+++ b/src/usb_moded.c
@@ -34,46 +34,40 @@
  * 02110-1301 USA
  */
 
-#include <getopt.h>
-#include <stdio.h>
-
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <signal.h>
-
-#include <libkmod.h>
-
-#ifdef SYSTEMD
-# include <systemd/sd-daemon.h>
-#endif
-
 #include "usb_moded.h"
-#include "usb_moded-modes.h"
+
+#include "usb_moded-android.h"
+#include "usb_moded-appsync.h"
+#include "usb_moded-config-private.h"
+#include "usb_moded-configfs.h"
+#include "usb_moded-control.h"
 #include "usb_moded-dbus-private.h"
-#include "usb_moded-udev.h"
-#include "usb_moded-modules.h"
-#include "usb_moded-log.h"
 #include "usb_moded-devicelock.h"
+#include "usb_moded-log.h"
+#include "usb_moded-mac.h"
 #include "usb_moded-modesetting.h"
 #include "usb_moded-modules.h"
-#include "usb_moded-appsync.h"
-#include "usb_moded-trigger.h"
-#include "usb_moded-config.h"
-#include "usb_moded-config-private.h"
 #include "usb_moded-network.h"
-#include "usb_moded-mac.h"
-#include "usb_moded-android.h"
-#include "usb_moded-configfs.h"
+#include "usb_moded-sigpipe.h"
 #include "usb_moded-systemd.h"
+#include "usb_moded-trigger.h"
+#include "usb_moded-udev.h"
 #include "usb_moded-worker.h"
-#include "usb_moded-control.h"
-#include "usb_moded-sigpipe.h"
-#include "usb_moded-common.h"
 
 #ifdef MEEGOLOCK
 # include "usb_moded-dsme.h"
 #endif
 
+#include <unistd.h>
+#include <getopt.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+
+#ifdef SYSTEMD
+# include <systemd/sd-daemon.h>
+#endif
+
 /* ========================================================================= *
  * Constants
  * ========================================================================= */
diff --git a/src/usb_moded.h b/src/usb_moded.h
index 86dab4e..f7dfb7b 100644
--- a/src/usb_moded.h
+++ b/src/usb_moded.h
@@ -27,26 +27,15 @@
 # define USB_MODED_H_
 
 # ifdef STATIC_CONFIG
-#  include "../config-static.h"
+#  include "../config-static.h" // NOTRIM
 # else
-#  include "../config.h"
+#  include "../config.h" // NOTRIM
 # endif
 
-# include <stdlib.h>
 # include <stdbool.h>
-# include <unistd.h>
 # include <stdio.h>
-# include <string.h>
-# include <errno.h>
-# include <fcntl.h>
 
-# include <sys/stat.h>
-# include <sys/wait.h>
-
-# include <glib-2.0/glib.h>
-# include <glib-object.h>
-
-# include "usb_moded-dyn-config.h"
+# include <glib.h>
 
 /* ========================================================================= *
  * Constants
diff --git a/utils/udev-search.c b/utils/udev-search.c
index 8fca6a6..679878c 100644
--- a/utils/udev-search.c
+++ b/utils/udev-search.c
@@ -30,12 +30,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <locale.h>
-#include <unistd.h>
 #include <string.h>
 
-#include <poll.h>
-
 #include <libudev.h>
 
 /* ========================================================================= *