diff --git a/core/include/gz/plugin.hh b/core/include/gz/plugin.hh
new file mode 100644
index 0000000..29b4920
--- /dev/null
+++ b/core/include/gz/plugin.hh
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2022 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <ignition/plugin.hh>
+#include <ignition/plugin/config.hh>
diff --git a/core/include/gz/plugin/Export.hh b/core/include/gz/plugin/Export.hh
new file mode 100644
index 0000000..febd518
--- /dev/null
+++ b/core/include/gz/plugin/Export.hh
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2022 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <ignition/plugin/Export.hh>
+#include <ignition/plugin/config.hh>
diff --git a/core/include/gz/plugin/config.hh b/core/include/gz/plugin/config.hh
new file mode 100644
index 0000000..958fadd
--- /dev/null
+++ b/core/include/gz/plugin/config.hh
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2022 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef GZ_PLUGIN__CONFIG_HH_
+#define GZ_PLUGIN__CONFIG_HH_
+
+#include <ignition/plugin/config.hh>
+
+/* Version number */
+#define GZ_PLUGIN_MAJOR_VERSION IGNITION_PLUGIN_MAJOR_VERSION
+#define GZ_PLUGIN_MINOR_VERSION IGNITION_PLUGIN_MINOR_VERSION
+#define GZ_PLUGIN_PATCH_VERSION IGNITION_PLUGIN_PATCH_VERSION
+
+#define GZ_PLUGIN_VERSION IGNITION_PLUGIN_VERSION
+#define GZ_PLUGIN_VERSION_FULL IGNITION_PLUGIN_VERSION_FULL
+
+#define GZ_PLUGIN_VERSION_HEADER IGNITION_PLUGIN_VERSION_HEADER
+
+#endif
+
+namespace ignition
+{
+}
+
+namespace gz
+{
+  using namespace ignition;
+}
+
+
+#endif
diff --git a/loader/include/gz/plugin/loader/Export.hh b/loader/include/gz/plugin/loader/Export.hh
new file mode 100644
index 0000000..451c439
--- /dev/null
+++ b/loader/include/gz/plugin/loader/Export.hh
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2022 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <ignition/plugin/loader/Export.hh>
+#include <ignition/plugin/config.hh>