Merge pull request #442 from ApexAI/iox-#252-rename-api-folder

Iox #252 Move new API files
eclipse-iceoryx · Dec 17, 2020 · e9f837f · e9f837f
2 parents e858108 + a9db29b
commit e9f837f
Show file tree

Hide file tree

Showing 46 changed files with 58 additions and 58 deletions.
diff --git a/GOVERNANCE.md b/GOVERNANCE.md
@@ -18,7 +18,7 @@ You can join by using this Zoom link: https://eclipse.zoom.us/j/95918504483?pwd=
 16:00 GMT
 17:00 CET (GMT + 1)
 21:30 IST (GMT + 5.5)
-23:00 CST (GMT + 7)
+00:00 CST (GMT + 8)
 ```
 
 ### Topics

diff --git a/iceoryx_dds/include/iceoryx_dds/gateway/dds_to_iox.hpp b/iceoryx_dds/include/iceoryx_dds/gateway/dds_to_iox.hpp
@@ -19,7 +19,7 @@
 #include "iceoryx_posh/gateway/channel.hpp"
 #include "iceoryx_posh/gateway/gateway_config.hpp"
 #include "iceoryx_posh/gateway/gateway_generic.hpp"
-#include "iceoryx_posh/popo/modern_api/untyped_publisher.hpp"
+#include "iceoryx_posh/popo/untyped_publisher.hpp"
 
 namespace iox
 {

diff --git a/iceoryx_dds/include/iceoryx_dds/gateway/iox_to_dds.hpp b/iceoryx_dds/include/iceoryx_dds/gateway/iox_to_dds.hpp
@@ -18,7 +18,7 @@
 #include "iceoryx_dds/dds/dds_types.hpp"
 #include "iceoryx_posh/gateway/channel.hpp"
 #include "iceoryx_posh/gateway/gateway_generic.hpp"
-#include "iceoryx_posh/popo/modern_api/untyped_subscriber.hpp"
+#include "iceoryx_posh/popo/untyped_subscriber.hpp"
 
 namespace iox
 {

diff --git a/iceoryx_dds/test/mocks/google_mocks.hpp b/iceoryx_dds/test/mocks/google_mocks.hpp
@@ -20,8 +20,8 @@
 #include "iceoryx_posh/gateway/channel.hpp"
 #include "iceoryx_posh/gateway/gateway_generic.hpp"
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
-#include "iceoryx_posh/popo/modern_api/base_publisher.hpp"
-#include "iceoryx_posh/popo/modern_api/base_subscriber.hpp"
+#include "iceoryx_posh/popo/base_publisher.hpp"
+#include "iceoryx_posh/popo/base_subscriber.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
 #include "iceoryx_utils/cxx/function_ref.hpp"
 #include "iceoryx_utils/cxx/optional.hpp"

diff --git a/iceoryx_examples/ice_multi_publisher/ice_multi_publisher.cpp b/iceoryx_examples/ice_multi_publisher/ice_multi_publisher.cpp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "iceoryx_posh/capro/service_description.hpp"
-#include "iceoryx_posh/popo/modern_api/publisher.hpp"
+#include "iceoryx_posh/popo/publisher.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 #include "topic_data.hpp"
 

diff --git a/iceoryx_examples/ice_multi_publisher/ice_resubscriber.cpp b/iceoryx_examples/ice_multi_publisher/ice_resubscriber.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/typed_subscriber.hpp"
+#include "iceoryx_posh/popo/typed_subscriber.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 #include "topic_data.hpp"
 

diff --git a/iceoryx_examples/ice_multi_publisher/ice_subscriber.cpp b/iceoryx_examples/ice_multi_publisher/ice_subscriber.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/typed_subscriber.hpp"
+#include "iceoryx_posh/popo/typed_subscriber.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 #include "topic_data.hpp"
 

diff --git a/iceoryx_examples/icedelivery/iox_publisher_typed_modern.cpp b/iceoryx_examples/icedelivery/iox_publisher_typed_modern.cpp
@@ -14,7 +14,7 @@
 
 #include "topic_data.hpp"
 
-#include "iceoryx_posh/popo/modern_api/publisher.hpp"
+#include "iceoryx_posh/popo/publisher.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 
 #include <chrono>

diff --git a/iceoryx_examples/icedelivery/iox_publisher_untyped_modern.cpp b/iceoryx_examples/icedelivery/iox_publisher_untyped_modern.cpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/untyped_publisher.hpp"
+#include "iceoryx_posh/popo/untyped_publisher.hpp"
 #include "topic_data.hpp"
 
-#include "iceoryx_posh/popo/modern_api/publisher.hpp"
+#include "iceoryx_posh/popo/publisher.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 
 #include <chrono>

diff --git a/iceoryx_examples/icedelivery/iox_subscriber_typed_modern.cpp b/iceoryx_examples/icedelivery/iox_subscriber_typed_modern.cpp
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/base_subscriber.hpp"
-#include "iceoryx_posh/popo/modern_api/typed_subscriber.hpp"
-#include "iceoryx_posh/popo/modern_api/untyped_subscriber.hpp"
+#include "iceoryx_posh/popo/base_subscriber.hpp"
+#include "iceoryx_posh/popo/typed_subscriber.hpp"
+#include "iceoryx_posh/popo/untyped_subscriber.hpp"
 #include "iceoryx_posh/popo/user_trigger.hpp"
 #include "iceoryx_posh/popo/wait_set.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"

diff --git a/iceoryx_examples/icedelivery/iox_subscriber_untyped_modern.cpp b/iceoryx_examples/icedelivery/iox_subscriber_untyped_modern.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/subscriber.hpp"
+#include "iceoryx_posh/popo/subscriber.hpp"
 #include "iceoryx_posh/popo/user_trigger.hpp"
 #include "iceoryx_posh/popo/wait_set.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"

diff --git a/iceoryx_examples/iceperf/iceoryx.hpp b/iceoryx_examples/iceperf/iceoryx.hpp
@@ -16,8 +16,8 @@
 
 #include "base.hpp"
 #include "iceoryx_posh/capro/service_description.hpp"
-#include "iceoryx_posh/popo/modern_api/untyped_publisher.hpp"
-#include "iceoryx_posh/popo/modern_api/untyped_subscriber.hpp"
+#include "iceoryx_posh/popo/untyped_publisher.hpp"
+#include "iceoryx_posh/popo/untyped_subscriber.hpp"
 
 class Iceoryx : public IcePerfBase
 {

diff --git a/iceoryx_examples/singleprocess/single_process.cpp b/iceoryx_examples/singleprocess/single_process.cpp
@@ -15,8 +15,8 @@
 #include "iceoryx_posh/iceoryx_posh_config.hpp"
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
 #include "iceoryx_posh/internal/roudi/roudi.hpp"
-#include "iceoryx_posh/popo/modern_api/typed_publisher.hpp"
-#include "iceoryx_posh/popo/modern_api/typed_subscriber.hpp"
+#include "iceoryx_posh/popo/typed_publisher.hpp"
+#include "iceoryx_posh/popo/typed_subscriber.hpp"
 #include "iceoryx_posh/roudi/iceoryx_roudi_components.hpp"
 #include "iceoryx_posh/runtime/posh_runtime_single_process.hpp"
 #include "iceoryx_utils/log/logmanager.hpp"

diff --git a/iceoryx_examples/waitset/ice_waitset_gateway.cpp b/iceoryx_examples/waitset/ice_waitset_gateway.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/untyped_subscriber.hpp"
+#include "iceoryx_posh/popo/untyped_subscriber.hpp"
 #include "iceoryx_posh/popo/user_trigger.hpp"
 #include "iceoryx_posh/popo/wait_set.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"

diff --git a/iceoryx_examples/waitset/ice_waitset_grouping.cpp b/iceoryx_examples/waitset/ice_waitset_grouping.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/untyped_subscriber.hpp"
+#include "iceoryx_posh/popo/untyped_subscriber.hpp"
 #include "iceoryx_posh/popo/user_trigger.hpp"
 #include "iceoryx_posh/popo/wait_set.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"

diff --git a/iceoryx_examples/waitset/ice_waitset_individual.cpp b/iceoryx_examples/waitset/ice_waitset_individual.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/typed_subscriber.hpp"
+#include "iceoryx_posh/popo/typed_subscriber.hpp"
 #include "iceoryx_posh/popo/user_trigger.hpp"
 #include "iceoryx_posh/popo/wait_set.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"

diff --git a/iceoryx_examples/waitset/ice_waitset_publisher.cpp b/iceoryx_examples/waitset/ice_waitset_publisher.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/publisher.hpp"
+#include "iceoryx_posh/popo/publisher.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 #include "topic_data.hpp"
 

diff --git a/iceoryx_examples/waitset/ice_waitset_sync.cpp b/iceoryx_examples/waitset/ice_waitset_sync.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/typed_subscriber.hpp"
+#include "iceoryx_posh/popo/typed_subscriber.hpp"
 #include "iceoryx_posh/popo/user_trigger.hpp"
 #include "iceoryx_posh/popo/wait_set.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"

diff --git a/...ternal/popo/modern_api/base_publisher.inl → ...ryx_posh/internal/popo/base_publisher.inl b/...ternal/popo/modern_api/base_publisher.inl → ...ryx_posh/internal/popo/base_publisher.inl
diff --git a/...ernal/popo/modern_api/base_subscriber.inl → ...yx_posh/internal/popo/base_subscriber.inl b/...ernal/popo/modern_api/base_subscriber.inl → ...yx_posh/internal/popo/base_subscriber.inl
diff --git a/..._posh/internal/popo/modern_api/sample.inl → ...ude/iceoryx_posh/internal/popo/sample.inl b/..._posh/internal/popo/modern_api/sample.inl → ...ude/iceoryx_posh/internal/popo/sample.inl
diff --git a/...ernal/popo/modern_api/typed_publisher.inl → ...yx_posh/internal/popo/typed_publisher.inl b/...ernal/popo/modern_api/typed_publisher.inl → ...yx_posh/internal/popo/typed_publisher.inl
diff --git a/...rnal/popo/modern_api/typed_subscriber.inl → ...x_posh/internal/popo/typed_subscriber.inl b/...rnal/popo/modern_api/typed_subscriber.inl → ...x_posh/internal/popo/typed_subscriber.inl
diff --git a/...nal/popo/modern_api/untyped_publisher.inl → ..._posh/internal/popo/untyped_publisher.inl b/...nal/popo/modern_api/untyped_publisher.inl → ..._posh/internal/popo/untyped_publisher.inl
diff --git a/...al/popo/modern_api/untyped_subscriber.inl → ...posh/internal/popo/untyped_subscriber.inl b/...al/popo/modern_api/untyped_subscriber.inl → ...posh/internal/popo/untyped_subscriber.inl
diff --git a/...x_posh/popo/modern_api/base_publisher.hpp → ...lude/iceoryx_posh/popo/base_publisher.hpp b/...x_posh/popo/modern_api/base_publisher.hpp → ...lude/iceoryx_posh/popo/base_publisher.hpp
@@ -16,7 +16,7 @@
 #define IOX_POSH_POPO_BASE_PUBLISHER_HPP
 
 #include "iceoryx_posh/internal/popo/ports/publisher_port_user.hpp"
-#include "iceoryx_posh/popo/modern_api/sample.hpp"
+#include "iceoryx_posh/popo/sample.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
 #include "iceoryx_utils/cxx/optional.hpp"
 
@@ -148,6 +148,6 @@ class BasePublisher : public PublisherInterface<T>
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/internal/popo/modern_api/base_publisher.inl"
+#include "iceoryx_posh/internal/popo/base_publisher.inl"
 
 #endif // IOX_POSH_POPO_BASE_PUBLISHER_HPP
diff --git a/..._posh/popo/modern_api/base_subscriber.hpp → ...ude/iceoryx_posh/popo/base_subscriber.hpp b/..._posh/popo/modern_api/base_subscriber.hpp → ...ude/iceoryx_posh/popo/base_subscriber.hpp
@@ -16,7 +16,7 @@
 #define IOX_POSH_POPO_BASE_SUBSCRIBER_HPP
 
 #include "iceoryx_posh/internal/popo/ports/subscriber_port_user.hpp"
-#include "iceoryx_posh/popo/modern_api/sample.hpp"
+#include "iceoryx_posh/popo/sample.hpp"
 #include "iceoryx_posh/popo/wait_set.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
@@ -174,6 +174,6 @@ class BaseSubscriber
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/internal/popo/modern_api/base_subscriber.inl"
+#include "iceoryx_posh/internal/popo/base_subscriber.inl"
 
 #endif // IOX_POSH_POPO_BASE_SUBSCRIBER_HPP
diff --git a/...ceoryx_posh/popo/modern_api/publisher.hpp → ...h/include/iceoryx_posh/popo/publisher.hpp b/...ceoryx_posh/popo/modern_api/publisher.hpp → ...h/include/iceoryx_posh/popo/publisher.hpp
@@ -15,7 +15,7 @@
 #ifndef IOX_POSH_POPO_PUBLISHER_HPP
 #define IOX_POSH_POPO_PUBLISHER_HPP
 
-#include "iceoryx_posh/popo/modern_api/typed_publisher.hpp"
-#include "iceoryx_posh/popo/modern_api/untyped_publisher.hpp"
+#include "iceoryx_posh/popo/typed_publisher.hpp"
+#include "iceoryx_posh/popo/untyped_publisher.hpp"
 
 #endif // IOX_POSH_POPO_PUBLISHER_HPP
diff --git a/...e/iceoryx_posh/popo/modern_api/sample.hpp → ...posh/include/iceoryx_posh/popo/sample.hpp b/...e/iceoryx_posh/popo/modern_api/sample.hpp → ...posh/include/iceoryx_posh/popo/sample.hpp
@@ -106,6 +106,6 @@ class Sample<const T>
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/internal/popo/modern_api/sample.inl"
+#include "iceoryx_posh/internal/popo/sample.inl"
 
 #endif // IOX_POSH_POPO_SAMPLE_HPP
diff --git a/...eoryx_posh/popo/modern_api/subscriber.hpp → .../include/iceoryx_posh/popo/subscriber.hpp b/...eoryx_posh/popo/modern_api/subscriber.hpp → .../include/iceoryx_posh/popo/subscriber.hpp
@@ -15,7 +15,7 @@
 #ifndef IOX_POSH_POPO_SUBSCRIBER_HPP
 #define IOX_POSH_POPO_SUBSCRIBER_HPP
 
-#include "iceoryx_posh/popo/modern_api/typed_subscriber.hpp"
-#include "iceoryx_posh/popo/modern_api/untyped_subscriber.hpp"
+#include "iceoryx_posh/popo/typed_subscriber.hpp"
+#include "iceoryx_posh/popo/untyped_subscriber.hpp"
 
 #endif // IOX_POSH_POPO_SUBSCRIBER_HPP
diff --git a/..._posh/popo/modern_api/typed_publisher.hpp → ...ude/iceoryx_posh/popo/typed_publisher.hpp b/..._posh/popo/modern_api/typed_publisher.hpp → ...ude/iceoryx_posh/popo/typed_publisher.hpp
@@ -15,8 +15,8 @@
 #ifndef IOX_POSH_POPO_TYPED_PUBLISHER_HPP
 #define IOX_POSH_POPO_TYPED_PUBLISHER_HPP
 
-#include "iceoryx_posh/popo/modern_api/base_publisher.hpp"
-#include "iceoryx_posh/popo/modern_api/sample.hpp"
+#include "iceoryx_posh/popo/base_publisher.hpp"
+#include "iceoryx_posh/popo/sample.hpp"
 #include "iceoryx_utils/cxx/type_traits.hpp"
 
 namespace iox
@@ -66,6 +66,6 @@ class TypedPublisher : public base_publisher_t
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/internal/popo/modern_api/typed_publisher.inl"
+#include "iceoryx_posh/internal/popo/typed_publisher.inl"
 
 #endif // IOX_POSH_POPO_TYPED_PUBLISHER_HPP
diff --git a/...posh/popo/modern_api/typed_subscriber.hpp → ...de/iceoryx_posh/popo/typed_subscriber.hpp b/...posh/popo/modern_api/typed_subscriber.hpp → ...de/iceoryx_posh/popo/typed_subscriber.hpp
@@ -15,7 +15,7 @@
 #ifndef IOX_POSH_POPO_TYPED_SUBSCRIBER_HPP
 #define IOX_POSH_POPO_TYPED_SUBSCRIBER_HPP
 
-#include "iceoryx_posh/popo/modern_api/base_subscriber.hpp"
+#include "iceoryx_posh/popo/base_subscriber.hpp"
 
 namespace iox
 {
@@ -52,6 +52,6 @@ class TypedSubscriber : public base_subscriber_t<T, TypedSubscriber<T, base_subs
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/internal/popo/modern_api/typed_subscriber.inl"
+#include "iceoryx_posh/internal/popo/typed_subscriber.inl"
 
 #endif // IOX_POSH_POPO_TYPED_SUBSCRIBER_HPP
diff --git a/...osh/popo/modern_api/untyped_publisher.hpp → ...e/iceoryx_posh/popo/untyped_publisher.hpp b/...osh/popo/modern_api/untyped_publisher.hpp → ...e/iceoryx_posh/popo/untyped_publisher.hpp
@@ -15,8 +15,8 @@
 #ifndef IOX_POSH_POPO_UNTYPED_PUBLISHER_HPP
 #define IOX_POSH_POPO_UNTYPED_PUBLISHER_HPP
 
-#include "iceoryx_posh/popo/modern_api/base_publisher.hpp"
-#include "iceoryx_posh/popo/modern_api/sample.hpp"
+#include "iceoryx_posh/popo/base_publisher.hpp"
+#include "iceoryx_posh/popo/sample.hpp"
 
 namespace iox
 {
@@ -56,6 +56,6 @@ using UntypedPublisher = UntypedPublisherImpl<>;
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/internal/popo/modern_api/untyped_publisher.inl"
+#include "iceoryx_posh/internal/popo/untyped_publisher.inl"
 
 #endif // IOX_POSH_POPO_UNTYPED_PUBLISHER_HPP
diff --git a/...sh/popo/modern_api/untyped_subscriber.hpp → .../iceoryx_posh/popo/untyped_subscriber.hpp b/...sh/popo/modern_api/untyped_subscriber.hpp → .../iceoryx_posh/popo/untyped_subscriber.hpp
@@ -17,7 +17,7 @@
 
 #include "iceoryx_posh/capro/service_description.hpp"
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
-#include "iceoryx_posh/popo/modern_api/base_subscriber.hpp"
+#include "iceoryx_posh/popo/base_subscriber.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
 #include "iceoryx_utils/cxx/unique_ptr.hpp"
 
@@ -63,6 +63,6 @@ using UntypedSubscriber = UntypedSubscriberImpl<>;
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/internal/popo/modern_api/untyped_subscriber.inl"
+#include "iceoryx_posh/internal/popo/untyped_subscriber.inl"
 
 #endif // IOX_POSH_POPO_UNTYPED_SUBSCRIBER_HPP
diff --git a/iceoryx_posh/test/mocks/publisher_mock.hpp b/iceoryx_posh/test/mocks/publisher_mock.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/base_publisher.hpp"
-#include "iceoryx_posh/popo/modern_api/sample.hpp"
+#include "iceoryx_posh/popo/base_publisher.hpp"
+#include "iceoryx_posh/popo/sample.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
 
 #include "test.hpp"

diff --git a/iceoryx_posh/test/mocks/subscriber_mock.hpp b/iceoryx_posh/test/mocks/subscriber_mock.hpp
@@ -14,8 +14,8 @@
 
 #include "iceoryx_posh/capro/service_description.hpp"
 #include "iceoryx_posh/mepoo/chunk_header.hpp"
-#include "iceoryx_posh/popo/modern_api/base_subscriber.hpp"
-#include "iceoryx_posh/popo/modern_api/sample.hpp"
+#include "iceoryx_posh/popo/base_subscriber.hpp"
+#include "iceoryx_posh/popo/sample.hpp"
 #include "iceoryx_posh/popo/trigger.hpp"
 #include "iceoryx_posh/popo/wait_set.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"

diff --git a/iceoryx_posh/test/moduletests/test_popo_base_publisher.cpp b/iceoryx_posh/test/moduletests/test_popo_base_publisher.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/base_publisher.hpp"
+#include "iceoryx_posh/popo/base_publisher.hpp"
 #include "mocks/chunk_mock.hpp"
 #include "mocks/publisher_mock.hpp"
 

diff --git a/iceoryx_posh/test/moduletests/test_popo_base_subscriber.cpp b/iceoryx_posh/test/moduletests/test_popo_base_subscriber.cpp
@@ -14,7 +14,7 @@
 
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
 #include "iceoryx_posh/internal/popo/building_blocks/condition_variable_data.hpp"
-#include "iceoryx_posh/popo/modern_api/base_subscriber.hpp"
+#include "iceoryx_posh/popo/base_subscriber.hpp"
 #include "iceoryx_posh/popo/wait_set.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
 #include "iceoryx_utils/cxx/optional.hpp"

diff --git a/iceoryx_posh/test/moduletests/test_popo_sample.cpp b/iceoryx_posh/test/moduletests/test_popo_sample.cpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/base_publisher.hpp"
-#include "iceoryx_posh/popo/modern_api/sample.hpp"
+#include "iceoryx_posh/popo/base_publisher.hpp"
+#include "iceoryx_posh/popo/sample.hpp"
 #include "iceoryx_utils/cxx/unique_ptr.hpp"
 #include "test.hpp"
 

diff --git a/iceoryx_posh/test/moduletests/test_popo_typed_publisher.cpp b/iceoryx_posh/test/moduletests/test_popo_typed_publisher.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/typed_publisher.hpp"
+#include "iceoryx_posh/popo/typed_publisher.hpp"
 #include "mocks/chunk_mock.hpp"
 #include "mocks/publisher_mock.hpp"
 

diff --git a/iceoryx_posh/test/moduletests/test_popo_typed_subscriber.cpp b/iceoryx_posh/test/moduletests/test_popo_typed_subscriber.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/typed_subscriber.hpp"
+#include "iceoryx_posh/popo/typed_subscriber.hpp"
 #include "mocks/subscriber_mock.hpp"
 
 #include "test.hpp"

diff --git a/iceoryx_posh/test/moduletests/test_popo_untyped_publisher.cpp b/iceoryx_posh/test/moduletests/test_popo_untyped_publisher.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/untyped_publisher.hpp"
+#include "iceoryx_posh/popo/untyped_publisher.hpp"
 #include "mocks/chunk_mock.hpp"
 #include "mocks/publisher_mock.hpp"
 

diff --git a/iceoryx_posh/test/moduletests/test_popo_untyped_subscriber.cpp b/iceoryx_posh/test/moduletests/test_popo_untyped_subscriber.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/popo/modern_api/untyped_subscriber.hpp"
+#include "iceoryx_posh/popo/untyped_subscriber.hpp"
 #include "mocks/subscriber_mock.hpp"
 
 #include "test.hpp"