Fix imports and includes

Author: randhid

src/viam/sdk/registry/registry.cpp

@@ -43,7 +43,7 @@
 #include <viam/sdk/resource/resource.hpp>
 #include <viam/sdk/resource/resource_api.hpp>
 #include <viam/sdk/services/private/discovery_client.hpp>
-#include <viam/sdk/services/private/discovery_service.hpp>
+#include <viam/sdk/services/private/discovery_server.hpp>
 #include <viam/sdk/services/private/generic_client.hpp>
 #include <viam/sdk/services/private/generic_server.hpp>
 #include <viam/sdk/services/private/mlmodel_client.hpp>

src/viam/sdk/services/discovery.cpp

@@ -1,8 +1,12 @@
 #include <viam/sdk/services/discovery.hpp>
 
+#include <viam/sdk/common/utils.hpp>
+
 namespace viam {
 namespace sdk {
 
+Discovery::Discovery(std::string name) : Service(std::move(name)) {}
+
 API Discovery::api() const {
     return API::get<Discovery>();
 }
@@ -11,7 +15,5 @@ API::traits<Discovery>::api() {
     return {kRDK, kService, "discovery"};
 }
 
-Discovery::Discovery(std::string name) : Service(std::move(name)) {}
-
 }  // namespace sdk
 }  // namespace viam

src/viam/sdk/services/discovery.hpp

@@ -6,7 +6,9 @@
 
 #include <string>
 
+#include <viam/sdk/common/utils.hpp>
 #include <viam/sdk/config/resource.hpp>
+#include <viam/sdk/services/service.hpp>
 
 namespace viam {
 namespace sdk {