diff --git a/Cargo.toml b/Cargo.toml
index e5c1a4ff5..aef47f1b5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["cli", "node", "node-wasm", "proto", "rpc", "grpc", "types"]
+members = ["cli", "grpc", "grpc/grpc-macros", "node", "node-wasm", "proto", "rpc", "types", ]
 
 [workspace.dependencies]
 blockstore = "0.7.0"
diff --git a/grpc/src/types/auth.rs b/grpc/src/types/auth.rs
index 8099dc008..8d543088d 100644
--- a/grpc/src/types/auth.rs
+++ b/grpc/src/types/auth.rs
@@ -16,7 +16,6 @@ use crate::Error;
 
 /// Enum representing different types of account
 #[derive(Debug, PartialEq)]
-#[non_exhaustive]
 pub enum Account {
     /// Base account type
     Base(BaseAccount),
diff --git a/proto/src/lib.rs b/proto/src/lib.rs
index 0bbd3ce06..fc4fec3b9 100644
--- a/proto/src/lib.rs
+++ b/proto/src/lib.rs
@@ -6,8 +6,4 @@
 
 pub mod serializers;
 
-#[cfg(not(feature = "tonic"))]
 include!(concat!(env!("OUT_DIR"), "/mod.rs"));
-
-#[cfg(feature = "tonic")]
-::tonic::include_proto!("mod");