diff --git a/include/ModemManager-enums.h b/include/ModemManager-enums.h
index 226b267e..19cbee18 100644
--- a/include/ModemManager-enums.h
+++ b/include/ModemManager-enums.h
@@ -17,6 +17,10 @@
 #ifndef _MODEMMANAGER_ENUMS_H_
 #define _MODEMMANAGER_ENUMS_H_
 
+#if !defined (__MODEM_MANAGER_H_INSIDE__)
+#error "Only <ModemManager.h> can be included directly."
+#endif
+
 /**
  * SECTION:mm-enums
  * @short_description: Common enumerations and types in the API.
diff --git a/include/ModemManager-errors.h b/include/ModemManager-errors.h
index 36f882cf..0be24abb 100644
--- a/include/ModemManager-errors.h
+++ b/include/ModemManager-errors.h
@@ -17,6 +17,10 @@
 #ifndef _MODEMMANAGER_ERRORS_H_
 #define _MODEMMANAGER_ERRORS_H_
 
+#if !defined (__MODEM_MANAGER_H_INSIDE__)
+#error "Only <ModemManager.h> can be included directly."
+#endif
+
 #include <ModemManager-names.h>
 
 /**
diff --git a/include/ModemManager.h b/include/ModemManager.h
index feda9660..5a30ebc6 100644
--- a/include/ModemManager.h
+++ b/include/ModemManager.h
@@ -25,6 +25,8 @@
 #ifndef _MODEM_MANAGER_H_
 #define _MODEM_MANAGER_H_
 
+#define __MODEM_MANAGER_H_INSIDE__
+
 /* Public header with DBus Interface, Method, Signal and Property names */
 #include <ModemManager-names.h>
 
diff --git a/libmm-glib/generated/Makefile.am b/libmm-glib/generated/Makefile.am
index 0eea84c7..16dd4138 100644
--- a/libmm-glib/generated/Makefile.am
+++ b/libmm-glib/generated/Makefile.am
@@ -41,7 +41,7 @@ BUILT_SOURCES = $(GENERATED_H) $(GENERATED_C) $(GENERATED_DOC)
 # Enum types
 mm-enums-types.h: Makefile.am $(top_srcdir)/include/ModemManager-enums.h $(top_srcdir)/build-aux/mm-enums-template.h
 	$(AM_V_GEN) $(GLIB_MKENUMS) \
-		--fhead "#include <ModemManager-enums.h>\n#ifndef __MM_ENUMS_TYPES_H__\n#define __MM_ENUMS_TYPES_H__\n" \
+		--fhead "#include <ModemManager.h>\n#ifndef __MM_ENUMS_TYPES_H__\n#define __MM_ENUMS_TYPES_H__\n" \
 		--template $(top_srcdir)/build-aux/mm-enums-template.h \
 		--ftail "#endif /* __MM_ENUMS_TYPES_H__ */\n" \
 		$(top_srcdir)/include/ModemManager-enums.h > $@
@@ -62,13 +62,13 @@ mm-errors-types.h: Makefile.am $(top_srcdir)/include/ModemManager-errors.h $(top
 
 mm-errors-types.c: Makefile.am $(top_srcdir)/include/ModemManager-errors.h $(top_srcdir)/build-aux/mm-errors-template.c mm-errors-types.h
 	$(AM_V_GEN) $(GLIB_MKENUMS) \
-		--fhead "#include <ModemManager-errors.h>\n#include \"mm-errors-types.h\"\n" \
+		--fhead "#include <ModemManager.h>\n#include \"mm-errors-types.h\"\n" \
 		--template $(top_srcdir)/build-aux/mm-errors-template.c \
 		$(top_srcdir)/include/ModemManager-errors.h > $@
 
 mm-errors-quarks.c: Makefile.am $(top_srcdir)/include/ModemManager-errors.h $(top_srcdir)/build-aux/mm-errors-quarks-template.c $(top_srcdir)/include/ModemManager-names.h mm-errors-types.h
 	$(AM_V_GEN) $(GLIB_MKENUMS) \
-		--fhead "#include <ModemManager-errors.h>\n#include \"mm-errors-types.h\"\n" \
+		--fhead "#include <ModemManager.h>\n#include \"mm-errors-types.h\"\n" \
 		--template $(top_srcdir)/build-aux/mm-errors-quarks-template.c \
 		$(top_srcdir)/include/ModemManager-errors.h > $@
 
diff --git a/libmm-glib/mm-common-helpers.h b/libmm-glib/mm-common-helpers.h
index eb631048..316388ff 100644
--- a/libmm-glib/mm-common-helpers.h
+++ b/libmm-glib/mm-common-helpers.h
@@ -16,7 +16,7 @@
  */
 
 #include <glib.h>
-#include <ModemManager-enums.h>
+#include <ModemManager.h>
 
 #if !defined (__LIBMM_GLIB_H_INSIDE__) && !defined (LIBMM_GLIB_COMPILATION)
 #error "Only <libmm-glib.h> can be included directly."
diff --git a/src/mm-broadband-modem.h b/src/mm-broadband-modem.h
index 395fed81..481665ac 100644
--- a/src/mm-broadband-modem.h
+++ b/src/mm-broadband-modem.h
@@ -21,8 +21,9 @@
 #include <glib.h>
 #include <glib-object.h>
 
+#include <ModemManager.h>
+
 #include "mm-base-modem.h"
-#include "ModemManager-enums.h"
 
 #define MM_TYPE_BROADBAND_MODEM            (mm_broadband_modem_get_type ())
 #define MM_BROADBAND_MODEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BROADBAND_MODEM, MMBroadbandModem))
diff --git a/src/mm-error-helpers.h b/src/mm-error-helpers.h
index 035ac6c1..379afb24 100644
--- a/src/mm-error-helpers.h
+++ b/src/mm-error-helpers.h
@@ -20,8 +20,8 @@
 
 #include <glib-object.h>
 
-#include <ModemManager-errors.h>
-#include <mm-errors-types.h>
+#include <ModemManager.h>
+#include <libmm-glib.h>
 
 GError *mm_connection_error_for_code         (MMConnectionError code);
 GError *mm_mobile_equipment_error_for_code   (MMMobileEquipmentError code);