diff --git a/src/Mod/Robot/App/RobotAlgos.h b/src/Mod/Robot/App/RobotAlgos.h
index 1f24cdd0a0..173ea3c2b5 100644
--- a/src/Mod/Robot/App/RobotAlgos.h
+++ b/src/Mod/Robot/App/RobotAlgos.h
@@ -25,6 +25,8 @@
 
 #include <Base/Placement.h>
 #include <Base/Vector3D.h>
+#include <Mod/Robot/RobotGlobal.h>
+#include "kdl_cp/frames_io.hpp"
 
 
 namespace Robot
diff --git a/src/Mod/Robot/App/RobotObjectPyImp.cpp b/src/Mod/Robot/App/RobotObjectPyImp.cpp
index 50fd855f4a..086685286f 100644
--- a/src/Mod/Robot/App/RobotObjectPyImp.cpp
+++ b/src/Mod/Robot/App/RobotObjectPyImp.cpp
@@ -32,7 +32,7 @@ using namespace Robot;
 // returns a string which represents the object e.g. when printed in python
 std::string RobotObjectPy::representation() const
 {
-    return std::string("<RobotObject object>");
+    return {"<RobotObject object>"};
 }
 
 
diff --git a/src/Mod/Robot/App/Trajectory.cpp b/src/Mod/Robot/App/Trajectory.cpp
index ca91490a1f..1b1d1ed7cc 100644
--- a/src/Mod/Robot/App/Trajectory.cpp
+++ b/src/Mod/Robot/App/Trajectory.cpp
@@ -119,10 +119,9 @@ double Trajectory::getDuration(int n) const
 
 Placement Trajectory::getPosition(double time)const
 {
-    if(pcTrajectory)
+    if (pcTrajectory)
         return Placement(toPlacement(pcTrajectory->Pos(time)));
-    else
-        return Placement();
+    return {};
 }
 
 double Trajectory::getVelocity(double time)const
@@ -236,7 +235,7 @@ void Trajectory::generateTrajectory()
 std::string Trajectory::getUniqueWaypointName(const char *Name) const
 {
     if (!Name || *Name == '\0')
-        return std::string();
+        return {};
 
     // check for first character whether it's a digit
     std::string CleanName = Name;
diff --git a/src/Mod/Robot/App/WaypointPyImp.cpp b/src/Mod/Robot/App/WaypointPyImp.cpp
index 3f27fcaba1..7716b8c754 100644
--- a/src/Mod/Robot/App/WaypointPyImp.cpp
+++ b/src/Mod/Robot/App/WaypointPyImp.cpp
@@ -148,7 +148,7 @@ void  WaypointPy::setVelocity(Py::Float arg)
 
 Py::String WaypointPy::getName() const
 {
-    return Py::String(getWaypointPtr()->Name.c_str());
+    return {getWaypointPtr()->Name};
 }
 
 void WaypointPy::setName(Py::String arg)
@@ -202,7 +202,7 @@ void WaypointPy::setPos(Py::Object arg)
 
 Py::Boolean WaypointPy::getCont() const
 {
-    return Py::Boolean(getWaypointPtr()->Cont);
+    return {getWaypointPtr()->Cont};
 }
 
 void WaypointPy::setCont(Py::Boolean arg)
diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp
index 7e6be66a0d..6d041db056 100644
--- a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp
+++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp
@@ -60,5 +60,5 @@ void ViewProviderTrajectoryCompound::unsetEdit(int)
 
 std::vector<App::DocumentObject*> ViewProviderTrajectoryCompound::claimChildren()const
 {
-    return std::vector<App::DocumentObject*>(static_cast<Robot::TrajectoryCompound *>(getObject())->Source.getValues());
+    return static_cast<Robot::TrajectoryCompound *>(getObject())->Source.getValues();
 }