diff --git a/samples/cpp/measurement/measurement_read/src/measurement_read.cpp b/samples/cpp/measurement/measurement_read/src/measurement_read.cpp
index 1b776752f5..fad96fa02e 100644
--- a/samples/cpp/measurement/measurement_read/src/measurement_read.cpp
+++ b/samples/cpp/measurement/measurement_read/src/measurement_read.cpp
@@ -17,7 +17,7 @@
  * ========================= eCAL LICENSE =================================
 */
 
-#include <ecal/msg/proto/message.h>
+#include <ecal/msg/protobuf/common_message.h>
 #include <ecal/measurement/imeasurement.h>
 
 #include <iostream>
diff --git a/samples/cpp/measurement/measurement_write/src/measurement_write.cpp b/samples/cpp/measurement/measurement_write/src/measurement_write.cpp
index d6fa5f9ef0..fa368053b7 100644
--- a/samples/cpp/measurement/measurement_write/src/measurement_write.cpp
+++ b/samples/cpp/measurement/measurement_write/src/measurement_write.cpp
@@ -17,7 +17,7 @@
  * ========================= eCAL LICENSE =================================
 */
 
-#include <ecal/msg/proto/message.h>
+#include <ecal/msg/protobuf/common_message.h>
 #include <ecal/msg/string/message.h>
 #include <ecal/measurement/omeasurement.h>
 
diff --git a/serialization/protobuf/protobuf/CMakeLists.txt b/serialization/protobuf/protobuf/CMakeLists.txt
index 4fd765f06b..be7464b53c 100644
--- a/serialization/protobuf/protobuf/CMakeLists.txt
+++ b/serialization/protobuf/protobuf/CMakeLists.txt
@@ -80,8 +80,9 @@ target_sources(protobuf_core
       include/ecal/msg/protobuf/client_instance.h
       include/ecal/msg/protobuf/client_protobuf_types.h
       include/ecal/msg/protobuf/client_protobuf_utils.h
-	  include/ecal/msg/protobuf/client_untyped.h
-	  include/ecal/msg/protobuf/client_untyped_instance.h
+      include/ecal/msg/protobuf/client_untyped.h
+      include/ecal/msg/protobuf/client_untyped_instance.h
+      include/ecal/msg/protobuf/common_message.h
       include/ecal/msg/protobuf/dynamic_json_subscriber.h
       include/ecal/msg/protobuf/dynamic_publisher.h
       include/ecal/msg/protobuf/dynamic_subscriber.h
diff --git a/serialization/protobuf/protobuf/include/ecal/msg/proto/message.h b/serialization/protobuf/protobuf/include/ecal/msg/protobuf/common_message.h
similarity index 100%
rename from serialization/protobuf/protobuf/include/ecal/msg/proto/message.h
rename to serialization/protobuf/protobuf/include/ecal/msg/protobuf/common_message.h