build: chain up new 0.6 API and link against libmm-common

Also removed the MMSerialError implementation from `src/mm-errors.[h|c]', as it
is now included in the new `include/ModemManager-errors.h' header file. All the
other enums and errors without clashing names will be ported afterwards to the
new base code.

7 files changed, 40 insertions, 348 deletions

diff --git a/include/ModemManager.h b/include/ModemManager.h
index ebddb24b..d4376867 100644
--- a/include/ModemManager.h
+++ b/include/ModemManager.h
@@ -24,55 +24,8 @@
 #ifndef _MODEM_MANAGER_H_
 #define _MODEM_MANAGER_H_
 
-#define MM_DBUS_PATH    "/org/freedesktop/ModemManager"
-#define MM_DBUS_SERVICE "org.freedesktop.ModemManager"
-
-/**************
- * Interfaces *
- **************/
-
-#define MM_DBUS_INTERFACE "org.freedesktop.ModemManager"
-#define MM_DBUS_INTERFACE_MODEM "org.freedesktop.ModemManager.Modem"
-#define MM_DBUS_INTERFACE_MODEM_SIMPLE "org.freedesktop.ModemManager.Modem.Simple"
-#define MM_DBUS_INTERFACE_MODEM_FIRMWARE "org.freedesktop.ModemManager.Modem.Firmware"
-#define MM_DBUS_INTERFACE_MODEM_LOCATION "org.freedesktop.ModemManager.Modem.Location"
-#define MM_DBUS_INTERFACE_MODEM_CDMA "org.freedesktop.ModemManager.Modem.Cdma"
-#define MM_DBUS_INTERFACE_MODEM_GSM "org.freedesktop.ModemManager.Modem.Gsm"
-#define MM_DBUS_INTERFACE_MODEM_GSM_CARD "org.freedesktop.ModemManager.Modem.Gsm.Card"
-#define MM_DBUS_INTERFACE_MODEM_GSM_CONTACTS "org.freedesktop.ModemManager.Modem.Gsm.Contacts"
-#define MM_DBUS_INTERFACE_MODEM_GSM_NETWORK "org.freedesktop.ModemManager.Modem.Gsm.Network"
-#define MM_DBUS_INTERFACE_MODEM_GSM_SMS "org.freedesktop.ModemManager.Modem.Gsm.SMS"
-#define MM_DBUS_INTERFACE_MODEM_GSM_HSO "org.freedesktop.ModemManager.Modem.Gsm.Hso"
-#define MM_DBUS_INTERFACE_MODEM_GSM_USSD "org.freedesktop.ModemManager.Modem.Gsm.Ussd"
-
-/***********************
- * Methods/Enums/Flags *
- ***********************/
-
-/*
- * Interface org.freedesktop.ModemManager
- */
-
-#define MM_MANAGER_METHOD_ENUMERATEDEVICES "EnumerateDevices"
-#define MM_MANAGER_METHOD_SCANDEVICES "ScanDevices"
-#define MM_MANAGER_METHOD_SETLOGGING "SetLogging"
-
-#define MM_MANAGER_SIGNAL_DEVICEADDED "DeviceAdded"
-#define MM_MANAGER_SIGNAL_DEVICEREMOVED "DeviceRemoved"
-
-/*
- * Interface org.freedesktop.ModemManager.Modem
- */
-
-#define MM_MODEM_METHOD_ENABLE "Enable"
-#define MM_MODEM_METHOD_CONNECT "Connect"
-#define MM_MODEM_METHOD_DISCONNECT "Disconnect"
-#define MM_MODEM_METHOD_GETIP4CONFIG "GetIP4Config"
-#define MM_MODEM_METHOD_GETINFO "GetInfo"
-#define MM_MODEM_METHOD_RESET "Reset"
-#define MM_MODEM_METHOD_FACTORYRESET "FactoryReset"
-
-#define MM_MODEM_SIGNAL_STATECHANGED "StateChanged"
+/* Temporarily include the new header in order to resolve conflicts */
+#include "ModemManager1.h"
 
 /* MM_MODEM_TYPE enum values */
 
@@ -90,21 +43,6 @@ typedef enum {
     MM_MODEM_IP_METHOD_DHCP = 2,
 } MMModemIpMethod;
 
-/* MM_MODEM_STATE enum values */
-
-typedef enum {
-    MM_MODEM_STATE_UNKNOWN = 0,
-    MM_MODEM_STATE_DISABLED = 10,
-    MM_MODEM_STATE_DISABLING = 20,
-    MM_MODEM_STATE_ENABLING = 30,
-    MM_MODEM_STATE_ENABLED = 40,
-    MM_MODEM_STATE_SEARCHING = 50,
-    MM_MODEM_STATE_REGISTERED = 60,
-    MM_MODEM_STATE_DISCONNECTING = 70,
-    MM_MODEM_STATE_CONNECTING = 80,
-    MM_MODEM_STATE_CONNECTED = 90,
-} MMModemState;
-
 /* MM_MODEM_STATE_REASON enum values */
 
 typedef enum {
@@ -113,28 +51,6 @@ typedef enum {
     MM_MODEM_STATE_REASON_SUSPEND = 2,
 } MMModemStateReason;
 
-/*
- * Interface org.freedesktop.ModemManager.Modem.Simple
- */
-
-#define MM_MODEM_SIMPLE_METHOD_CONNECT "Connect"
-#define MM_MODEM_SIMPLE_METHOD_GETSTATUS "GetStatus"
-
-/*
- * Interface org.freedesktop.ModemManager.Modem.Firmware
- */
-
-#define MM_MODEM_FIRMWARE_METHOD_LIST "List"
-#define MM_MODEM_FIRMWARE_METHOD_SELECT "Select"
-#define MM_MODEM_FIRMWARE_METHOD_INSTALL "Install"
-
-/*
- * Interface org.freedesktop.ModemManager.Modem.Location
- */
-
-#define MM_MODEM_LOCATION_METHOD_ENABLE "Enable"
-#define MM_MODEM_LOCATION_METHOD_GETLOCATION "GetLocation"
-
 /* MM_MODEM_LOCATION_CAPABILITIES flag values */
 
 typedef enum {
@@ -144,57 +60,6 @@ typedef enum {
     MM_MODEM_LOCATION_CAPABILITY_GPS_RAW = 0x4,
 } MMModemLocationCapabilities;
 
-/*
- * Interface org.freedesktop.ModemManager.Modem.Cdma
- */
-
-#define MM_MODEM_CDMA_METHOD_ACTIVATE "Activate"
-#define MM_MODEM_CDMA_METHOD_ACTIVATEMANUAL "ActivateManual"
-#define MM_MODEM_CDMA_METHOD_GETSIGNALQUALITY "GetSignalQuality"
-#define MM_MODEM_CDMA_METHOD_GETESN "GetEsn"
-#define MM_MODEM_CDMA_METHOD_GETSERVINGSYSTEM "GetServingSystem"
-#define MM_MODEM_CDMA_METHOD_GETREGISTRATIONSTATE "GetRegistrationState"
-
-#define MM_MODEM_CDMA_SIGNAL_ACTIVATIONSTATECHANGED "ActivationStateChanged"
-#define MM_MODEM_CDMA_SIGNAL_SIGNALQUALITY "SignalQuality"
-#define MM_MODEM_CDMA_SIGNAL_REGISTRATIONSTATECHANGED "RegistrationStateChanged"
-
-/* MM_MODEM_CDMA_REGISTRATION_STATE enum values */
-
-typedef enum {
-    MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN = 0,
-    MM_MODEM_CDMA_REGISTRATION_STATE_REGISTERED = 1,
-    MM_MODEM_CDMA_REGISTRATION_STATE_HOME = 2,
-    MM_MODEM_CDMA_REGISTRATION_STATE_ROAMING = 3,
-} MMModemCdmaRegistrationState;
-
-/* MM_MODEM_CDMA_ACTIVATION_STATE enum values */
-
-typedef enum {
-    MM_MODEM_CDMA_ACTIVATION_STATE_NOT_ACTIVATED = 0,
-    MM_MODEM_CDMA_ACTIVATION_STATE_ACTIVATING = 1,
-    MM_MODEM_CDMA_ACTIVATION_STATE_PARTIALLY_ACTIVATED = 2,
-    MM_MODEM_CDMA_ACTIVATION_STATE_ACTIVATED = 3,
-} MMModemCdmaActivationState;
-
-/* MM_MODEM_CDMA_ACTIVATION_ERROR enum values */
-
-typedef enum {
-    MM_MODEM_CDMA_ACTIVATION_ERROR_NO_ERROR = 0,
-    MM_MODEM_CDMA_ACTIVATION_ERROR_ROAMING = 1,
-    MM_MODEM_CDMA_ACTIVATION_ERROR_WRONG_RADIO_INTERFACE = 2,
-    MM_MODEM_CDMA_ACTIVATION_ERROR_COULD_NOT_CONNECT = 3,
-    MM_MODEM_CDMA_ACTIVATION_ERROR_SECURITY_AUTHENTICATION_FAILED = 4,
-    MM_MODEM_CDMA_ACTIVATION_ERROR_PROVISIONING_FAILED = 5,
-    MM_MODEM_CDMA_ACTIVATION_ERROR_NO_SIGNAL = 6,
-    MM_MODEM_CDMA_ACTIVATION_ERROR_UNKNOWN = 7,
-    MM_MODEM_CDMA_ACTIVATION_ERROR_TIMED_OUT = 8,
-    MM_MODEM_CDMA_ACTIVATION_ERROR_START_FAILED = 9,
-} MMModemCdmaActivationError;
-
-/*
- * Interface org.freedesktop.ModemManager.Modem.Gsm
- */
 
 /* MM_MODEM_GSM_ALLOWED_MODE enum values */
 
@@ -275,49 +140,6 @@ typedef enum {
     MM_MODEM_GSM_FACILITY_CORP_PERS = 0x80,
 } MMModemGsmFacility;
 
-/*
- * Interface org.freedesktop.ModemManager.Modem.Gsm.Card
- */
-
-#define MM_MODEM_GSM_CARD_METHOD_GETIMEI "GetImei"
-#define MM_MODEM_GSM_CARD_METHOD_GETIMSI "GetImsi"
-#define MM_MODEM_GSM_CARD_METHOD_GETOPERATORID "GetOperatorId"
-#define MM_MODEM_GSM_CARD_METHOD_GETSPN "GetSpn"
-#define MM_MODEM_GSM_CARD_METHOD_SENDPUK "SendPuk"
-#define MM_MODEM_GSM_CARD_METHOD_SENDPIN "SendPin"
-#define MM_MODEM_GSM_CARD_METHOD_ENABLEPIN "EnablePin"
-#define MM_MODEM_GSM_CARD_METHOD_CHANGEPIN "ChangePin"
-
-/*
- * Interface org.freedesktop.ModemManager.Modem.Gsm.Contacts
- */
-
-#define MM_MODEM_GSM_CONTACTS_METHOD_ADD "Add"
-#define MM_MODEM_GSM_CONTACTS_METHOD_DELETE "Delete"
-#define MM_MODEM_GSM_CONTACTS_METHOD_GET "Get"
-#define MM_MODEM_GSM_CONTACTS_METHOD_LIST "List"
-#define MM_MODEM_GSM_CONTACTS_METHOD_FIND "Find"
-#define MM_MODEM_GSM_CONTACTS_METHOD_GETCOUNT "GetCount"
-
-/*
- * Interface org.freedesktop.ModemManager.Modem.Gsm.Network
- */
-
-#define MM_MODEM_GSM_NETWORK_METHOD_REGISTER "Register"
-#define MM_MODEM_GSM_NETWORK_METHOD_SCAN "Scan"
-#define MM_MODEM_GSM_NETWORK_METHOD_SETAPN "SetApn"
-#define MM_MODEM_GSM_NETWORK_METHOD_GETSIGNALQUALITY "GetSignalQuality"
-#define MM_MODEM_GSM_NETWORK_METHOD_SETBAND "SetBand"
-#define MM_MODEM_GSM_NETWORK_METHOD_GETBAND "GetBand"
-#define MM_MODEM_GSM_NETWORK_METHOD_SETNETWORKMODE "SetNetworkMode"
-#define MM_MODEM_GSM_NETWORK_METHOD_GETNETWORKMODE "GetNetworkMode"
-#define MM_MODEM_GSM_NETWORK_METHOD_GETREGISTRATIONINFO "GetRegistrationInfo"
-#define MM_MODEM_GSM_NETWORK_METHOD_SETALLOWEDMODE "SetAllowedMode"
-
-#define MM_MODEM_GSM_NETWORK_SIGNAL_SIGNALQUALITY "SignalQuality"
-#define MM_MODEM_GSM_NETWORK_SIGNAL_REGISTRATIONINFO "RegistrationInfo"
-#define MM_MODEM_GSM_NETWORK_SIGNAL_NETWORKMODE "NetworkMode"
-
 /* MM_MODEM_GSM_NETWORK_REG_STATUS enum values */
 
 typedef enum {
@@ -345,116 +167,6 @@ typedef enum {
     MM_MODEM_GSM_NETWORK_DEPRECATED_MODE_HSPA = 10,
 } MMModemGsmNetworkDeprecatedMode;
 
-/*
- * Interface org.freedesktop.ModemManager.Modem.Gsm.SMS
- */
-
-#define MM_MODEM_GSM_SMS_METHOD_DELETE "Delete"
-#define MM_MODEM_GSM_SMS_METHOD_GET "Get"
-#define MM_MODEM_GSM_SMS_METHOD_GETFORMAT "GetFormat"
-#define MM_MODEM_GSM_SMS_METHOD_SETFORMAT "SetFormat"
-#define MM_MODEM_GSM_SMS_METHOD_GETSMSC "GetSmsc"
-#define MM_MODEM_GSM_SMS_METHOD_SETSMSC "SetSmsc"
-#define MM_MODEM_GSM_SMS_METHOD_LIST "List"
-#define MM_MODEM_GSM_SMS_METHOD_SAVE "Save"
-#define MM_MODEM_GSM_SMS_METHOD_SEND "Send"
-#define MM_MODEM_GSM_SMS_METHOD_SENDFROMSTORAGE "SendFromStorage"
-#define MM_MODEM_GSM_SMS_METHOD_SETINDICATION "SetIndication"
-
-#define MM_MODEM_GSM_SMS_SIGNAL_SMSRECEIVED "SmsReceived"
-#define MM_MODEM_GSM_SMS_SIGNAL_COMPLETED "Completed"
-
-/*
- * Interface org.freedesktop.ModemManager.Modem.Gsm.Hso
- */
-
-#define MM_MODEM_GSM_HSO_METHOD_AUTHENTICATE "Authenticate"
-
-/*
- * Interface org.freedesktop.ModemManager.Modem.Gsm.Ussd
- */
-
-#define MM_MODEM_GSM_USSD_METHOD_INITIATE "Initiate"
-#define MM_MODEM_GSM_USSD_METHOD_RESPOND "Respond"
-#define MM_MODEM_GSM_USSD_METHOD_CANCEL "Cancel"
-
-/*
- * Interface org.freedesktop.DBus.Properties
- */
-
-#define MM_MANAGER_SIGNAL_MMPROPERTIESCHANGED "MmPropertiesChanged"
-#define MM_MANAGER_SIGNAL_PROPERTIESCHANGED "PropertiesChanged"
-
-
-/**********
- * Errors *
- **********/
-
-#define MM_ERROR_MODEM_SERIALOPENFAILED "SerialOpenFailed"
-#define MM_ERROR_MODEM_SERIALSENDFAILED "SerialSendFailed"
-#define MM_ERROR_MODEM_SERIALRESPONSETIMEOUT "SerialResponseTimeout"
-#define MM_ERROR_MODEM_GENERAL "General"
-#define MM_ERROR_MODEM_OPERATIONNOTSUPPORTED "OperationNotSupported"
-#define MM_ERROR_MODEM_CONNECTED "Connected"
-#define MM_ERROR_MODEM_DISCONNECTED "Disconnected"
-#define MM_ERROR_MODEM_OPERATIONINPROGRESS "OperationInProgress"
-#define MM_ERROR_MODEM_NOCARRIER "NoCarrier"
-#define MM_ERROR_MODEM_NODIALTONE "NoDialtone"
-#define MM_ERROR_MODEM_BUSY "Busy"
-#define MM_ERROR_MODEM_NOANSWER "NoAnswer"
-#define MM_ERROR_MODEM_GSM_PHONEFAILURE "PhoneFailure"
-#define MM_ERROR_MODEM_GSM_NOCONNECTION "NoConnection"
-#define MM_ERROR_MODEM_GSM_LINKRESERVED "LinkReserved"
-#define MM_ERROR_MODEM_GSM_OPERATIONNOTALLOWED "OperationNotAllowed"
-#define MM_ERROR_MODEM_GSM_OPERATIONNOTSUPPORTED "OperationNotSupported"
-#define MM_ERROR_MODEM_GSM_PHSIMPINREQUIRED "PhSimPinRequired"
-#define MM_ERROR_MODEM_GSM_PHFSIMPINREQUIRED "PhFSimPinRequired"
-#define MM_ERROR_MODEM_GSM_PHFSIMPUKREQUIRED "PhFSimPukRequired"
-#define MM_ERROR_MODEM_GSM_SIMNOTINSERTED "SimNotInserted"
-#define MM_ERROR_MODEM_GSM_SIMPINREQUIRED "SimPinRequired"
-#define MM_ERROR_MODEM_GSM_SIMPUKREQUIRED "SimPukRequired"
-#define MM_ERROR_MODEM_GSM_SIMFAILURE "SimFailure"
-#define MM_ERROR_MODEM_GSM_SIMBUSY "SimBusy"
-#define MM_ERROR_MODEM_GSM_SIMWRONG "SimWrong"
-#define MM_ERROR_MODEM_GSM_INCORRECTPASSWORD "IncorrectPassword"
-#define MM_ERROR_MODEM_GSM_SIMPIN2REQUIRED "SimPin2Required"
-#define MM_ERROR_MODEM_GSM_SIMPUK2REQUIRED "SimPuk2Required"
-#define MM_ERROR_MODEM_GSM_MEMORYFULL "MemoryFull"
-#define MM_ERROR_MODEM_GSM_INVALIDINDEX "InvalidIndex"
-#define MM_ERROR_MODEM_GSM_NOTFOUND "NotFound"
-#define MM_ERROR_MODEM_GSM_MEMORYFAILURE "MemoryFailure"
-#define MM_ERROR_MODEM_GSM_TEXTTOOLONG "TextTooLong"
-#define MM_ERROR_MODEM_GSM_INVALIDCHARS "InvalidChars"
-#define MM_ERROR_MODEM_GSM_DIALSTRINGTOOLONG "DialStringTooLong"
-#define MM_ERROR_MODEM_GSM_INVALIDDIALSTRING "InvalidDialString"
-#define MM_ERROR_MODEM_GSM_NONETWORK "NoNetwork"
-#define MM_ERROR_MODEM_GSM_NETWORKTIMEOUT "NetworkTimeout"
-#define MM_ERROR_MODEM_GSM_NETWORKNOTALLOWED "NetworkNotAllowed"
-#define MM_ERROR_MODEM_GSM_NETWORKPINREQUIRED "NetworkPinRequired"
-#define MM_ERROR_MODEM_GSM_NETWORKPUKREQUIRED "NetworkPukRequired"
-#define MM_ERROR_MODEM_GSM_NETWORKSUBSETPINREQUIRED "NetworkSubsetPinRequired"
-#define MM_ERROR_MODEM_GSM_NETWORKSUBSETPUKREQUIRED "NetworkSubsetPukRequired"
-#define MM_ERROR_MODEM_GSM_SERVICEPINREQUIRED "ServicePinRequired"
-#define MM_ERROR_MODEM_GSM_SERVICEPUKREQUIRED "ServicePukRequired"
-#define MM_ERROR_MODEM_GSM_CORPORATEPINREQUIRED "CorporatePinRequired"
-#define MM_ERROR_MODEM_GSM_CORPORATEPUKREQUIRED "CorporatePukRequired"
-#define MM_ERROR_MODEM_GSM_HIDDENKEYREQUIRED "HiddenKeyRequired"
-#define MM_ERROR_MODEM_GSM_EAPMETHODNOTSUPPORTED "EapMethodNotSupported"
-#define MM_ERROR_MODEM_GSM_INCORRECTPARAMS "IncorrectParams"
-#define MM_ERROR_MODEM_GSM_UNKNOWN "Unknown"
-#define MM_ERROR_MODEM_GSM_GPRSILLEGALMS "GprsIllegalMs"
-#define MM_ERROR_MODEM_GSM_GPRSILLEGALME "GprsIllegalMe"
-#define MM_ERROR_MODEM_GSM_GPRSSERVICENOTALLOWED "GprsServiceNotAllowed"
-#define MM_ERROR_MODEM_GSM_GPRSPLMNNOTALLOWED "GprsPlmnNotAllowed"
-#define MM_ERROR_MODEM_GSM_GPRSLOCATIONNOTALLOWED "GprsLocationNotAllowed"
-#define MM_ERROR_MODEM_GSM_GPRSROAMINGNOTALLOWED "GprsRoamingNotAllowed"
-#define MM_ERROR_MODEM_GSM_GPRSOPTIONNOTSUPPORTED "GprsOptionNotSupported"
-#define MM_ERROR_MODEM_GSM_GPRSNOTSUBSCRIBED "GprsNotSubscribed"
-#define MM_ERROR_MODEM_GSM_GPRSOUTOFORDER "GprsOutOfOrder"
-#define MM_ERROR_MODEM_GSM_GPRSPDPAUTHFAILURE "GprsPdpAuthFailure"
-#define MM_ERROR_MODEM_GSM_GPRSUNSPECIFIED "GprsUnspecified"
-#define MM_ERROR_MODEM_GSM_GPRSINVALIDCLASS "GprsInvalidClass"
-
 #endif /*  _MODEM_MANAGER_H_ */
 
 
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 3b197efd..d8a8851c 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -6,7 +6,10 @@ PLUGIN_COMMON_COMPILER_FLAGS = \
 	$(GUDEV_CFLAGS)	\
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/libmm-common \
+	-I$(top_builddir)/libmm-common
 
 PLUGIN_COMMON_LINKER_FLAGS = \
 	$(GUDEV_LDFLAGS) \
diff --git a/src/Makefile.am b/src/Makefile.am
index 77e059da..62555bd5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,14 @@ noinst_LTLIBRARIES = libmodem-helpers.la libserial.la
 
 libmodem_helpers_la_CPPFLAGS = \
 	$(MM_CFLAGS) \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/libmm-common \
+	-I$(top_builddir)/libmm-common
+
+libmodem_helpers_la_LIBADD = \
+	$(top_builddir)/libmm-common/libmm-common.la
 
 libmodem_helpers_la_SOURCES = \
 	mm-errors.c \
@@ -30,7 +37,11 @@ libmodem_helpers_la_SOURCES = \
 
 libserial_la_CPPFLAGS = \
 	$(MM_CFLAGS) \
-	-I$(top_srcdir)
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/libmm-common \
+	-I$(top_builddir)/libmm-common
 
 libserial_la_SOURCES = \
 	mm-port.c \
@@ -49,6 +60,9 @@ modem_manager_CPPFLAGS = \
 	$(GUDEV_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/libmm-common \
+	-I$(top_builddir)/libmm-common \
 	-I${top_builddir}/marshallers \
 	-DPLUGINDIR=\"$(pkglibdir)\"
 
diff --git a/src/mm-errors.c b/src/mm-errors.c
index 841ad0fa..ba74d015 100644
--- a/src/mm-errors.c
+++ b/src/mm-errors.c
@@ -22,39 +22,6 @@
 #define ENUM_ENTRY(NAME, DESC) { NAME, "" #NAME "", DESC }
 
 GQuark
-mm_serial_error_quark (void)
-{
-    static GQuark ret = 0;
-
-    if (ret == 0)
-        ret = g_quark_from_static_string ("mm_serial_error");
-
-    return ret;
-}
-
-GType
-mm_serial_error_get_type (void)
-{
-    static GType etype = 0;
-
-    if (etype == 0) {
-        static const GEnumValue values[] = {
-            ENUM_ENTRY (MM_SERIAL_ERROR_OPEN_FAILED,           "SerialOpenFailed"),
-            ENUM_ENTRY (MM_SERIAL_ERROR_SEND_FAILED,           "SerialSendfailed"),
-            ENUM_ENTRY (MM_SERIAL_ERROR_RESPONSE_TIMEOUT,      "SerialResponseTimeout"),
-            ENUM_ENTRY (MM_SERIAL_ERROR_OPEN_FAILED_NO_DEVICE, "SerialOpenFailedNoDevice"),
-            ENUM_ENTRY (MM_SERIAL_ERROR_FLASH_FAILED,          "SerialFlashFailed"),
-            ENUM_ENTRY (MM_SERIAL_ERROR_NOT_OPEN,              "SerialNotOpen"),
-            { 0, 0, 0 }
-        };
-
-        etype = g_enum_register_static ("MMSerialError", values);
-    }
-
-    return etype;
-}
-
-GQuark
 mm_modem_error_quark (void)
 {
     static GQuark ret = 0;
diff --git a/src/mm-errors.h b/src/mm-errors.h
index dd11fdc5..a183b70b 100644
--- a/src/mm-errors.h
+++ b/src/mm-errors.h
@@ -19,21 +19,8 @@
 
 #include <glib-object.h>
 
-enum {
-    MM_SERIAL_ERROR_OPEN_FAILED = 0,
-    MM_SERIAL_ERROR_SEND_FAILED = 1,
-    MM_SERIAL_ERROR_RESPONSE_TIMEOUT = 2,
-    MM_SERIAL_ERROR_OPEN_FAILED_NO_DEVICE = 3,
-    MM_SERIAL_ERROR_FLASH_FAILED = 4,
-    MM_SERIAL_ERROR_NOT_OPEN = 5,
-};
-
-#define MM_SERIAL_ERROR (mm_serial_error_quark ())
-#define MM_TYPE_SERIAL_ERROR (mm_serial_error_get_type ())
-
-GQuark mm_serial_error_quark    (void);
-GType  mm_serial_error_get_type (void);
-
+#include <ModemManager-errors.h>
+#include <mm-errors-types.h>
 
 enum {
     MM_MODEM_ERROR_GENERAL = 0,
diff --git a/src/mm-manager.h b/src/mm-manager.h
index c6a64bd6..b1b4b159 100644
--- a/src/mm-manager.h
+++ b/src/mm-manager.h
@@ -28,9 +28,6 @@
 #define MM_IS_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), MM_TYPE_MANAGER))
 #define MM_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_MANAGER, MMManagerClass))
 
-#define MM_DBUS_SERVICE "org.freedesktop.ModemManager"
-#define MM_DBUS_PATH "/org/freedesktop/ModemManager"
-
 typedef struct {
     GObject parent;
 } MMManager;
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index df7157e4..2bcfeb0b 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -13,7 +13,10 @@ test_modem_helpers_CPPFLAGS = \
 	$(MM_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/libmm-common \
+	-I$(top_builddir)/libmm-common
 
 test_modem_helpers_LDADD = \
 	$(top_builddir)/src/libmodem-helpers.la \
@@ -26,7 +29,10 @@ test_charsets_CPPFLAGS = \
 	$(MM_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/libmm-common \
+	-I$(top_builddir)/libmm-common
 
 test_charsets_LDADD = \
 	$(top_builddir)/src/libmodem-helpers.la \
@@ -39,7 +45,10 @@ test_qcdm_serial_port_CPPFLAGS = \
 	$(MM_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/libmm-common \
+	-I$(top_builddir)/libmm-common
 
 test_qcdm_serial_port_LDADD = \
 	$(MM_LIBS) \
@@ -69,7 +78,10 @@ test_sms_CPPFLAGS = \
 	$(MM_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/libmm-common \
+	-I$(top_builddir)/libmm-common
 
 test_sms_LDADD = \
 	$(top_builddir)/src/libmodem-helpers.la \