diff --git a/src/usb_moded-dsme.h b/src/usb_moded-dsme.h
index 33d87cf..d521eeb 100644
--- a/src/usb_moded-dsme.h
+++ b/src/usb_moded-dsme.h
@@ -21,6 +21,10 @@
   02110-1301 USA
 */
 
+#ifndef MEEGOLOCK
+# warning usb_moded-dsme.h included without enabling MEEGOLOCK
+#endif
+
 gboolean is_in_user_state(void);
 gboolean dsme_listener_start(void);
 void dsme_listener_stop(void);
diff --git a/src/usb_moded-network.c b/src/usb_moded-network.c
index 6dc6252..b6527e9 100644
--- a/src/usb_moded-network.c
+++ b/src/usb_moded-network.c
@@ -53,10 +53,15 @@
 #define UDHCP_CONFIG_LINK	"/etc/udhcpd.conf"
 
 const char default_interface[] = "usb0";
+
+/** IP forwarding configuration block */
 typedef struct ipforward_data
 {
+	/** Address of primary DNS */
 	char *dns1;
+	/** Address of secondary DNS */
 	char *dns2;
+	/** Interface from which packets should be forwarded */
 	char *nat_interface;
 }ipforward_data;
 
diff --git a/src/usb_moded-udev.c b/src/usb_moded-udev.c
index f02d39f..8706fdd 100644
--- a/src/usb_moded-udev.c
+++ b/src/usb_moded-udev.c
@@ -50,8 +50,11 @@ static int cleanup = 0;
 static int cable = 0, charger = 0;
 static guint cable_connection_timeout_id = 0;
 
+/** Bookkeeping data for power supply locating heuristics */
 typedef struct power_device {
+        /** Device path used by udev */
         const char *syspath;
+        /** Likelyhood of being power supply */
         int score;
 } power_device;
 
diff --git a/src/usb_moded.c b/src/usb_moded.c
index 0a1fbcd..ea28553 100644
--- a/src/usb_moded.c
+++ b/src/usb_moded.c
@@ -32,13 +32,13 @@
 #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-dsme.h"
 #include "usb_moded-dbus.h"
 #include "usb_moded-dbus-private.h"
 #include "usb_moded-hw-ab.h"
@@ -55,6 +55,7 @@
 #include "usb_moded-mac.h"
 #include "usb_moded-android.h"
 #include "usb_moded-systemd.h"
+
 #ifdef MEEGOLOCK
 #include "usb_moded-dsme.h"
 #endif
@@ -280,10 +281,12 @@ rethink_usb_charging_fallback(void)
 
     /* Device must be in USER state or in rescue mode
      */
+#ifdef MEEGOLOCK
     if( !is_in_user_state() && !rescue_mode ) {
         log_notice("device is not in USER mode; stay in %s", usb_mode);
         goto EXIT;
     }
+#endif
 
     log_debug("attempt to leave %s", usb_mode);
     set_usb_connected_state();