12 files changed, 45 insertions, 13 deletions
diff --git a/libpeas/libpeas.h b/libpeas/libpeas.h
index f730797..de7f389 100644
--- a/libpeas/libpeas.h
+++ b/libpeas/libpeas.h
@@ -21,12 +21,14 @@
 
 #pragma once
 
-#include "peas-autocleanups.h"
-#include "peas-engine.h"
-#include "peas-extension.h"
-#include "peas-extension-base.h"
-#include "peas-extension-set.h"
-#include "peas-object-module.h"
-#include "peas-plugin-info.h"
-#include "peas-version.h"
-#include "peas-version-macros.h"
+#define LIBPEAS_INSIDE
+# include "peas-autocleanups.h"
+# include "peas-engine.h"
+# include "peas-extension.h"
+# include "peas-extension-base.h"
+# include "peas-extension-set.h"
+# include "peas-object-module.h"
+# include "peas-plugin-info.h"
+# include "peas-version.h"
+# include "peas-version-macros.h"
+#undef LIBPEAS_INSIDE
diff --git a/libpeas/meson.build b/libpeas/meson.build
index a5eaa99..ecd7fb1 100644
--- a/libpeas/meson.build
+++ b/libpeas/meson.build
@@ -91,8 +91,8 @@ libpeas_sha = library(
   darwin_versions: lib_version_osx,
   include_directories: [rootdir, libpeas_srcdir],
   dependencies: libpeas_deps,
-  c_args: project_c_args + libpeas_c_args + hidden_visibility_args,
-  objc_args: project_c_args + libpeas_c_args,
+  c_args: libpeas_c_args + hidden_visibility_args,
+  objc_args: libpeas_c_args,
   link_args: libpeas_link_args,
   install: true,
 )
diff --git a/libpeas/peas-engine.h b/libpeas/peas-engine.h
index c512660..09e8a78 100644
--- a/libpeas/peas-engine.h
+++ b/libpeas/peas-engine.h
@@ -23,6 +23,10 @@
 
 #pragma once
 
+#if !defined (LIBPEAS_INSIDE) && !defined (LIBPEAS_COMPILATION)
+# error "Only <libpeas.h> can be included directly."
+#endif
+
 #include <glib.h>
 
 #include "peas-plugin-info.h"
diff --git a/libpeas/peas-extension-base.h b/libpeas/peas-extension-base.h
index 559e47d..cc8df5a 100644
--- a/libpeas/peas-extension-base.h
+++ b/libpeas/peas-extension-base.h
@@ -23,6 +23,10 @@
 
 #pragma once
 
+#if !defined (LIBPEAS_INSIDE) && !defined (LIBPEAS_COMPILATION)
+# error "Only <libpeas.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 
 #include "peas-plugin-info.h"
diff --git a/libpeas/peas-extension-set.h b/libpeas/peas-extension-set.h
index a5b801b..99d9767 100644
--- a/libpeas/peas-extension-set.h
+++ b/libpeas/peas-extension-set.h
@@ -23,6 +23,10 @@
 
 #pragma once
 
+#if !defined (LIBPEAS_INSIDE) && !defined (LIBPEAS_COMPILATION)
+# error "Only <libpeas.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 
 #include "peas-engine.h"
diff --git a/libpeas/peas-extension.h b/libpeas/peas-extension.h
index f3bc291..6449880 100644
--- a/libpeas/peas-extension.h
+++ b/libpeas/peas-extension.h
@@ -23,6 +23,10 @@
 
 #pragma once
 
+#if !defined (LIBPEAS_INSIDE) && !defined (LIBPEAS_COMPILATION)
+# error "Only <libpeas.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 #include <girepository.h>
 
diff --git a/libpeas/peas-object-module.h b/libpeas/peas-object-module.h
index dd97ad6..ce8ef53 100644
--- a/libpeas/peas-object-module.h
+++ b/libpeas/peas-object-module.h
@@ -26,6 +26,10 @@
 
 #pragma once
 
+#if !defined (LIBPEAS_INSIDE) && !defined (LIBPEAS_COMPILATION)
+# error "Only <libpeas.h> can be included directly."
+#endif
+
 #include <glib-object.h>
 #include <gmodule.h>
 
diff --git a/libpeas/peas-plugin-info.h b/libpeas/peas-plugin-info.h
index 5e06fe4..e7ce150 100644
--- a/libpeas/peas-plugin-info.h
+++ b/libpeas/peas-plugin-info.h
@@ -24,6 +24,10 @@
 
 #pragma once
 
+#if !defined (LIBPEAS_INSIDE) && !defined (LIBPEAS_COMPILATION)
+# error "Only <libpeas.h> can be included directly."
+#endif
+
 #include <gio/gio.h>
 
 #include "peas-version-macros.h"
diff --git a/libpeas/peas-version-macros.h b/libpeas/peas-version-macros.h
index 2d43d84..7ce7173 100644
--- a/libpeas/peas-version-macros.h
+++ b/libpeas/peas-version-macros.h
@@ -21,6 +21,10 @@
 
 #pragma once
 
+#if !defined (LIBPEAS_INSIDE) && !defined (LIBPEAS_COMPILATION)
+# error "Only <libpeas.h> can be included directly."
+#endif
+
 #include <glib.h>
 
 #include "peas-version.h"
diff --git a/loaders/lua5.1/meson.build b/loaders/lua5.1/meson.build
index 6f9f4bb..93e836d 100644
--- a/loaders/lua5.1/meson.build
+++ b/loaders/lua5.1/meson.build
@@ -32,7 +32,7 @@ lua51_loader_sha = shared_module(
   lua51_loader_c + lua51_loader_res,
   include_directories: rootdir,
   dependencies: lua51_loader_deps,
-  c_args: project_c_args + lua51_loader_c_args,
+  c_args: lua51_loader_c_args,
   install: true,
   install_dir: join_paths(
     pkglibdir,
diff --git a/loaders/python/meson.build b/loaders/python/meson.build
index 2edbe17..2676481 100644
--- a/loaders/python/meson.build
+++ b/loaders/python/meson.build
@@ -35,7 +35,7 @@ python3_loader_sha = shared_module(
   python3_loader_c + python3_loader_res,
   include_directories: rootdir,
   dependencies: python3_loader_deps,
-  c_args: project_c_args + python3_loader_c_args,
+  c_args: python3_loader_c_args,
   install: true,
   install_dir: join_paths(
     pkglibdir,
diff --git a/meson.build b/meson.build
index 8a1b38b..64b5918 100644
--- a/meson.build
+++ b/meson.build
@@ -204,7 +204,9 @@ glib_minor_version = glib_version_arr[1]
 project_c_args = [
   '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_@0@_@1@'.format(glib_major_version, glib_minor_version),
   '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_@0@_@1@'.format(glib_major_version, glib_minor_version),
+  '-DLIBPEAS_COMPILATION',
 ]
+add_project_arguments(project_c_args, language: 'c')
 
 global_c_args = []
 test_c_args = [