undo the bad linting

Author: bhaney

src/viam/sdk/services/private/discovery_client.cpp

@@ -1,3 +1,5 @@
+#include <viam/sdk/services/private/discovery_client.hpp>
+
 #include <viam/api/service/discovery/v1/discovery.grpc.pb.h>
 #include <viam/api/service/discovery/v1/discovery.pb.h>
 
@@ -6,7 +8,6 @@
 #include <viam/sdk/common/proto_value.hpp>
 #include <viam/sdk/common/utils.hpp>
 #include <viam/sdk/services/discovery.hpp>
-#include <viam/sdk/services/private/discovery_client.hpp>
 
 namespace viam {
 namespace sdk {

src/viam/sdk/services/private/discovery_server.cpp

@@ -1,8 +1,9 @@
+#include <viam/sdk/services/private/discovery_client.hpp>
+
 #include <viam/sdk/common/private/repeated_ptr_convert.hpp>
 #include <viam/sdk/common/private/service_helper.hpp>
 #include <viam/sdk/common/proto_value.hpp>
 #include <viam/sdk/common/utils.hpp>
-#include <viam/sdk/services/private/discovery_client.hpp>
 #include <viam/sdk/services/private/discovery_server.hpp>
 
 namespace viam {

src/viam/sdk/services/private/generic_client.cpp

@@ -1,13 +1,15 @@
+#include <viam/sdk/services/private/generic_client.hpp>
+
+#include <utility>
+
 #include <viam/api/common/v1/common.pb.h>
 #include <viam/api/service/generic/v1/generic.grpc.pb.h>
 
-#include <utility>
 #include <viam/sdk/common/client_helper.hpp>
 #include <viam/sdk/common/proto_value.hpp>
 #include <viam/sdk/common/utils.hpp>
 #include <viam/sdk/config/resource.hpp>
 #include <viam/sdk/robot/client.hpp>
-#include <viam/sdk/services/private/generic_client.hpp>
 
 namespace viam {
 namespace sdk {

src/viam/sdk/services/private/generic_server.cpp

@@ -1,7 +1,8 @@
+#include <viam/sdk/services/private/generic_server.hpp>
+
 #include <viam/sdk/common/private/service_helper.hpp>
 #include <viam/sdk/rpc/server.hpp>
 #include <viam/sdk/services/generic.hpp>
-#include <viam/sdk/services/private/generic_server.hpp>
 
 namespace viam {
 namespace sdk {

src/viam/sdk/services/private/mlmodel.cpp

@@ -12,14 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <boost/variant/get.hpp>
+#include <viam/sdk/services/private/mlmodel.hpp>
+
 #include <memory>
 #include <stack>
 #include <stdexcept>
 #include <type_traits>
 #include <utility>
+
+#include <boost/variant/get.hpp>
+
 #include <viam/sdk/common/exception.hpp>
-#include <viam/sdk/services/private/mlmodel.hpp>
 
 namespace viam {
 namespace sdk {

src/viam/sdk/services/private/mlmodel_client.cpp

@@ -12,12 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <viam/sdk/services/private/mlmodel_client.hpp>
+
 #include <grpcpp/channel.h>
 
 #include <viam/sdk/common/client_helper.hpp>
-#include <viam/sdk/common/exception.hpp>
 #include <viam/sdk/services/private/mlmodel.hpp>
-#include <viam/sdk/services/private/mlmodel_client.hpp>
+
+#include <viam/sdk/common/exception.hpp>
 
 // As of proto version 27 (full version number 5.27) Arena::CreateMessage is deprecated in favor of
 // Arena::Create. We use this macro to accomodate earlier supported versions of proto where

src/viam/sdk/services/private/motion_client.cpp

@@ -1,5 +1,9 @@
-#include <grpcpp/support/status.h>
+#include <viam/sdk/services/private/motion_client.hpp>
+
 #include <math.h>
+
+#include <grpcpp/support/status.h>
+
 #include <viam/api/service/motion/v1/motion.grpc.pb.h>
 #include <viam/api/service/motion/v1/motion.pb.h>
 
@@ -8,7 +12,6 @@
 #include <viam/sdk/common/proto_value.hpp>
 #include <viam/sdk/common/utils.hpp>
 #include <viam/sdk/services/motion.hpp>
-#include <viam/sdk/services/private/motion_client.hpp>
 
 namespace viam {
 namespace sdk {

src/viam/sdk/services/private/motion_server.cpp

@@ -1,6 +1,7 @@
+#include <memory>
+
 #include <grpcpp/support/status.h>
 
-#include <memory>
 #include <viam/sdk/common/exception.hpp>
 #include <viam/sdk/common/pose.hpp>
 #include <viam/sdk/common/private/repeated_ptr_convert.hpp>

src/viam/sdk/services/private/navigation_client.cpp

@@ -1,5 +1,9 @@
-#include <grpcpp/support/status.h>
+#include <viam/sdk/services/private/navigation_client.hpp>
+
 #include <math.h>
+
+#include <grpcpp/support/status.h>
+
 #include <viam/api/service/navigation/v1/navigation.grpc.pb.h>
 #include <viam/api/service/navigation/v1/navigation.pb.h>
 
@@ -8,7 +12,6 @@
 #include <viam/sdk/common/proto_value.hpp>
 #include <viam/sdk/common/utils.hpp>
 #include <viam/sdk/services/navigation.hpp>
-#include <viam/sdk/services/private/navigation_client.hpp>
 
 namespace viam {
 namespace sdk {

src/viam/sdk/services/private/navigation_server.cpp

@@ -1,6 +1,7 @@
+#include <memory>
+
 #include <grpcpp/support/status.h>
 
-#include <memory>
 #include <viam/sdk/common/pose.hpp>
 #include <viam/sdk/common/private/repeated_ptr_convert.hpp>
 #include <viam/sdk/common/private/service_helper.hpp>