vtd: Fix clang-tidy suggestions regarding includes

Author: cassava

optional/vtd/src/osi_ground_truth.cpp

@@ -22,9 +22,8 @@
 
 #include "osi_ground_truth.hpp"  // for OsiGroundTruth
 
-#include <cloe/simulator.hpp>  // for ModelError
-
 #include <osi3/osi_object.pb.h>  // for MovingObject
+#include <cloe/simulator.hpp>    // for ModelError
 
 namespace osii {
 

optional/vtd/src/osi_ground_truth.hpp

@@ -22,13 +22,13 @@
 
 #pragma once
 
-#include <Eigen/Geometry>  // for Vector3d
-
-#include <cloe/simulator.hpp>  // for ModelError
+#include <Eigen/Geometry>             // for Vector3d
 
 #include <osi3/osi_groundtruth.pb.h>  // for GroundTruth
 #include <osi3/osi_object.pb.h>       // for MovingObject
 
+#include <cloe/simulator.hpp>         // for ModelError
+
 #include "osi_utils.hpp"  // for osi_require, ..
 
 namespace osii {

optional/vtd/src/osi_omni_sensor.cpp

@@ -23,9 +23,7 @@
 #include "osi_omni_sensor.hpp"
 
 #include <math.h>     // for atan
-#include <algorithm>  // for max
 #include <cassert>    // for assert
-#include <map>        // for map<>
 
 #include <Eigen/Geometry>  // for Isometry3d, Vector3d
 

optional/vtd/src/osi_omni_sensor.hpp

@@ -22,10 +22,7 @@
 
 #pragma once
 
-#include <map>      // for map<>
 #include <memory>   // for shared_ptr<>, unique_ptr<>
-#include <string>   // for string
-#include <utility>  // for move
 
 #include <Eigen/Geometry>  // for Isometry3d, Vector3d
 
@@ -43,7 +40,6 @@
 
 #include "osi_ground_truth.hpp"  // for OsiGroundTruth
 #include "osi_transceiver.hpp"   // for OsiTransceiver
-#include "osi_utils.hpp"
 
 namespace osii {
 

optional/vtd/src/osi_transceiver.hpp

@@ -22,9 +22,6 @@
 
 #pragma once
 
-#include <memory>  // for shared_ptr<>
-#include <vector>  // for vector<>
-
 #include <cloe/core.hpp>  // for Json, Error
 
 #include <osi3/osi_sensordata.pb.h>  // for SensorData

optional/vtd/src/osi_transceiver_tcp.cpp

@@ -21,7 +21,6 @@
 
 #include "osi_transceiver_tcp.hpp"
 
-#include <cassert>  // for assert
 #include <cstdlib>  // for malloc, free
 #include <memory>   // for shared_ptr<>
 

optional/vtd/src/osi_transceiver_tcp.hpp

@@ -23,7 +23,6 @@
 #pragma once
 
 #include <memory>  // for shared_ptr<>
-#include <string>  // for string
 #include <vector>  // for vector<>
 
 #include <boost/asio.hpp>  // for streamsize

optional/vtd/src/osi_utils.hpp

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <string>
+#include <string>  // for string
 
 #include <Eigen/Geometry>  // for Isometry3d, Vector3d
 

optional/vtd/src/rdb_transceiver_tcp.hpp

@@ -24,7 +24,6 @@
 #pragma once
 
 #include <memory>  // for shared_ptr<>
-#include <string>  // for string
 #include <vector>  // for vector<>
 
 #include <boost/asio.hpp>  // for streamsize

optional/vtd/src/rdb_transceiver_tcp_test.cpp

@@ -21,7 +21,6 @@
  */
 
 #include <iostream>  // for cout
-#include <vector>    // for vector<>
 
 #include <boost/asio.hpp>  // for error_code, endpoint, io_service, ...
 

optional/vtd/src/scp_messages.cpp

@@ -24,8 +24,7 @@
 
 #include "scp_messages.hpp"  // NOLINT
 
-namespace vtd {
-namespace scp {
+namespace vtd::scp {
 // clang-format off
 
 const char* Start = "<SimCtrl><Start/></SimCtrl>";
@@ -188,5 +187,4 @@ std::string QueryScenario::to_scp() const {
 }
 
 // clang-format on
-}  // namespace scp
-}  // namespace vtd
+}  // namespace vtd::scp

optional/vtd/src/scp_messages.hpp

@@ -31,8 +31,7 @@
 
 #include "scp_transceiver.hpp"  // for ScpMessage
 
-namespace vtd {
-namespace scp {
+namespace vtd::scp {
 
 extern const char* Start;
 extern const char* Stop;
@@ -98,5 +97,4 @@ struct QueryScenario : public ScpMessage {
   std::string to_scp() const override;
 };
 
-}  // namespace scp
-}  // namespace vtd
+}  // namespace vtd::scp

optional/vtd/src/vtd_conf.hpp

@@ -28,7 +28,8 @@
 
 #include <cloe/core.hpp>                            // for Conf, Schema
 #include <cloe/utility/tcp_transceiver_config.hpp>  // for TcpTransceiverConfiguration, ...
-#include "osi_omni_sensor.hpp"                      // for SensorMockLevel
+
+#include "osi_omni_sensor.hpp"  // for SensorMockLevel
 
 // Connection / Initialization
 #define VTD_DEFAULT_SCP_PORT 48179

optional/vtd/src/vtd_osi_test.cpp

@@ -38,7 +38,6 @@
 
 #include "osi_omni_sensor.hpp"
 #include "osi_sensor_component.hpp"  // for transform_...
-#include "osi_transceiver_tcp.hpp"
 
 struct VehicleData {
   uint64_t id;