diff --git a/common/Makefile.am b/common/Makefile.am
index b8b26d9f79260166ad34e908982fe5fdaf53ce7e..80a9fc08ed1bcaaff3ef42ac4ea0f580d6627b9f 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -2,8 +2,6 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"libpanel-common\" \
-	-DLIBXFCE4PANEL_COMPILATION \
-	-DHELPDIR=\"$(docdir)/html\" \
 	$(PLATFORM_CPPFLAGS)
 
 noinst_LTLIBRARIES = \
diff --git a/common/panel-xfconf.c b/common/panel-xfconf.c
index 081f20e0f4e53309827fc6f8d5c4dd8594d29dc3..b0e5bb4161c9d170773e9a33b9a20d796726887a 100644
--- a/common/panel-xfconf.c
+++ b/common/panel-xfconf.c
@@ -23,7 +23,7 @@
 #include "panel-private.h"
 #include "panel-xfconf.h"
 
-#include "libxfce4panel/xfce-panel-macros.h"
+#include "libxfce4panel/libxfce4panel.h"
 
 
 
diff --git a/libxfce4panel/Makefile.am b/libxfce4panel/Makefile.am
index 8d74895d58515b930b204f3f757a06d938b8d9a4..03af44c4f0d360782840325df523089c6c543b76 100644
--- a/libxfce4panel/Makefile.am
+++ b/libxfce4panel/Makefile.am
@@ -29,7 +29,6 @@ libxfce4panel_headers = \
 	xfce-panel-convenience.h \
 	xfce-panel-macros.h \
 	xfce-panel-plugin.h \
-	xfce-panel-plugin-provider.h \
 	xfce-panel-image.h
 
 libxfce4panel_includedir = \
@@ -47,6 +46,7 @@ libxfce4panel_2_0_la_SOURCES = \
 	xfce-panel-convenience.c \
 	xfce-panel-plugin.c \
 	xfce-panel-plugin-provider.c \
+	xfce-panel-plugin-provider.h \
 	xfce-panel-image.c
 
 libxfce4panel_2_0_la_CFLAGS =	 \
@@ -96,7 +96,7 @@ libxfce4panel-visibility.c: libxfce4panel.symbols Makefile
 
 libxfce4panel-enum-types.h: $(libxfce4panel_headers) Makefile
 	$(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \
-		--fhead "#ifndef __LIBXFCE4PANEL_ENUM_TYPES_H__\n#define __LIBXFCE4PANEL_ENUM_TYPES_H__\n#include <glib-object.h>\nG_BEGIN_DECLS\n" \
+		--fhead "#if !defined(_LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H) && !defined(LIBXFCE4PANEL_COMPILATION)\n#error \"Only <libxfce4panel/libxfce4panel.h> can be included directly, this file may disappear or change contents\"\n#endif\n\n#ifndef __LIBXFCE4PANEL_ENUM_TYPES_H__\n#define __LIBXFCE4PANEL_ENUM_TYPES_H__\n#include <glib-object.h>\nG_BEGIN_DECLS\n" \
 		--fprod "/* enumerations from \"@filename@\" */\n" \
 		--vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define XFCE_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
 		--ftail "G_END_DECLS\n\n#endif /* !__LIBXFCE4PANEL_ENUM_TYPES_H__ */" \
diff --git a/libxfce4panel/libxfce4panel-enums.h b/libxfce4panel/libxfce4panel-enums.h
index e803e48cef574d55b1b89553d9ee5cb1a67a84b4..b13634f8a7686b696964c47cba51a794a6560b07 100644
--- a/libxfce4panel/libxfce4panel-enums.h
+++ b/libxfce4panel/libxfce4panel-enums.h
@@ -19,6 +19,10 @@
 
 
 
+#if !defined(_LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H) && !defined(LIBXFCE4PANEL_COMPILATION)
+#error "Only <libxfce4panel/libxfce4panel.h> can be included directly, this file may disappear or change contents"
+#endif
+
 #ifndef __LIBXFCE4PANEL_ENUMS_H__
 #define __LIBXFCE4PANEL_ENUMS_H__
 
diff --git a/libxfce4panel/xfce-arrow-button.h b/libxfce4panel/xfce-arrow-button.h
index 0a0f4f08ddadd1c6519067096ffb9d7cbf9bf003..1c620b5e941410828d963d495ae8dc8330f9bd01 100644
--- a/libxfce4panel/xfce-arrow-button.h
+++ b/libxfce4panel/xfce-arrow-button.h
@@ -19,6 +19,10 @@
 
 
 
+#if !defined(_LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H) && !defined(LIBXFCE4PANEL_COMPILATION)
+#error "Only <libxfce4panel/libxfce4panel.h> can be included directly, this file may disappear or change contents"
+#endif
+
 #ifndef __XFCE_ARROW_BUTTON_H__
 #define __XFCE_ARROW_BUTTON_H__
 
diff --git a/libxfce4panel/xfce-panel-convenience.h b/libxfce4panel/xfce-panel-convenience.h
index 8dc931b45300b54e8e49c3ae741842b984aa357f..0ac562ee3bf65d2b61f9f54f501e13b58f623ed2 100644
--- a/libxfce4panel/xfce-panel-convenience.h
+++ b/libxfce4panel/xfce-panel-convenience.h
@@ -19,6 +19,10 @@
 
 
 
+#if !defined(_LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H) && !defined(LIBXFCE4PANEL_COMPILATION)
+#error "Only <libxfce4panel/libxfce4panel.h> can be included directly, this file may disappear or change contents"
+#endif
+
 #ifndef __XFCE_PANEL_CONVENIENCE_H__
 #define __XFCE_PANEL_CONVENIENCE_H__
 
diff --git a/libxfce4panel/xfce-panel-macros.h b/libxfce4panel/xfce-panel-macros.h
index 52b998e8c450392bf56910cb08b2d1db86ecf0ab..1a3ed7fad9abc4a0cafbc0ad2cb83090d00fd961 100644
--- a/libxfce4panel/xfce-panel-macros.h
+++ b/libxfce4panel/xfce-panel-macros.h
@@ -18,6 +18,10 @@
 
 
 
+#if !defined(_LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H) && !defined(LIBXFCE4PANEL_COMPILATION)
+#error "Only <libxfce4panel/libxfce4panel.h> can be included directly, this file may disappear or change contents"
+#endif
+
 #ifndef __XFCE_PANEL_MACROS_H__
 #define __XFCE_PANEL_MACROS_H__
 
diff --git a/libxfce4panel/xfce-panel-plugin.h b/libxfce4panel/xfce-panel-plugin.h
index 293602c4ad900da4540ad61079c656f7e9161208..c86640886a81771539f07b95a5ef9b95c043a5a0 100644
--- a/libxfce4panel/xfce-panel-plugin.h
+++ b/libxfce4panel/xfce-panel-plugin.h
@@ -18,6 +18,10 @@
 
 
 
+#if !defined(_LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H) && !defined(LIBXFCE4PANEL_COMPILATION)
+#error "Only <libxfce4panel/libxfce4panel.h> can be included directly, this file may disappear or change contents"
+#endif
+
 #ifndef __XFCE_PANEL_PLUGIN_H__
 #define __XFCE_PANEL_PLUGIN_H__
 
diff --git a/migrate/main.c b/migrate/main.c
index 01810890d906357ed53870451524395e9654028b..423b7806dcc1f6f6c20cea1b08c3a971fe09b352 100644
--- a/migrate/main.c
+++ b/migrate/main.c
@@ -24,7 +24,7 @@
 #include "migrate-default.h"
 
 #include "common/panel-private.h"
-#include "libxfce4panel/xfce-panel-macros.h"
+#include "libxfce4panel/libxfce4panel.h"
 
 #include <gtk/gtk.h>
 #include <libxfce4ui/libxfce4ui.h>
diff --git a/migrate/migrate-default.c b/migrate/migrate-default.c
index c6003bbb4044cb30ded0d0e4e3cc4223abda1d1f..cfecc162bb5476f571b9b0fe1551ae11a7a49b2e 100644
--- a/migrate/migrate-default.c
+++ b/migrate/migrate-default.c
@@ -22,7 +22,7 @@
 
 #include "migrate-default.h"
 
-#include "libxfce4panel/xfce-panel-macros.h"
+#include "libxfce4panel/libxfce4panel.h"
 
 #include <gtk/gtk.h>
 #include <libxfce4util/libxfce4util.h>
diff --git a/panel/Makefile.am b/panel/Makefile.am
index 31ae45dd1e646f4aeb957d867ecf4a75b3b57cd2..0f6dc9b6edba024f6b1133882ac69b716c576458 100644
--- a/panel/Makefile.am
+++ b/panel/Makefile.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
 	-DLIBDIR=\"$(libdir)\" \
 	-DHELPERDIR=\"$(HELPER_PATH_PREFIX)/xfce4/panel\" \
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-	-DDBUS_API_SUBJECT_TO_CHANGE \
 	$(PLATFORM_CPPFLAGS)
 
 bin_PROGRAMS = \
diff --git a/plugins/launcher/Makefile.am b/plugins/launcher/Makefile.am
index 9aa0535bc25f293c586d525cd20f85da88eecb67..8b7ef2dd9c2c552c360201d6a7d774fdfe6879c1 100644
--- a/plugins/launcher/Makefile.am
+++ b/plugins/launcher/Makefile.am
@@ -2,7 +2,6 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"liblauncher\" \
-	-DSN_API_NOT_YET_FROZEN \
 	$(PLATFORM_CPPFLAGS)
 
 plugindir = $(libdir)/xfce4/panel/plugins
diff --git a/plugins/systray/sn-config.h b/plugins/systray/sn-config.h
index c5401fb3ac3b640122b8501297d6b607d2d47eb0..bc7337e912a0eeacaf6317e9b10cf16b78aa7812 100644
--- a/plugins/systray/sn-config.h
+++ b/plugins/systray/sn-config.h
@@ -20,7 +20,7 @@
 #ifndef __SN_CONFIG_H__
 #define __SN_CONFIG_H__
 
-#include "libxfce4panel/xfce-panel-plugin.h"
+#include "libxfce4panel/libxfce4panel.h"
 
 #include <gtk/gtk.h>