diff --git a/tt_metal/hw/inc/blackhole/eth_interface.h b/tt_metal/hw/inc/blackhole/eth_interface.h
new file mode 100644
index 00000000000..676ba847483
--- /dev/null
+++ b/tt_metal/hw/inc/blackhole/eth_interface.h
@@ -0,0 +1,7 @@
+// SPDX-FileCopyrightText: © 2023 Tenstorrent Inc.
+//
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include "tt_metal/third_party/umd/src/firmware/riscv/blackhole/eth_interface.h"
diff --git a/tt_metal/hw/inc/grayskull/eth_interface.h b/tt_metal/hw/inc/grayskull/eth_interface.h
new file mode 100644
index 00000000000..1f965f087db
--- /dev/null
+++ b/tt_metal/hw/inc/grayskull/eth_interface.h
@@ -0,0 +1,24 @@
+// SPDX-FileCopyrightText: © 2023 Tenstorrent Inc.
+//
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+const uint32_t ETH_RACK_COORD_WIDTH = 0;
+const uint32_t CMD_BUF_SIZE_MASK = 0;
+const uint32_t MAX_BLOCK_SIZE = 0;
+const uint32_t REQUEST_CMD_QUEUE_BASE = 0;
+const uint32_t RESPONSE_CMD_QUEUE_BASE = 0;
+const uint32_t CMD_COUNTERS_SIZE_BYTES = 0;
+const uint32_t REMOTE_UPDATE_PTR_SIZE_BYTES = 0;
+const uint32_t CMD_DATA_BLOCK = 0;
+const uint32_t CMD_WR_REQ = 0;
+const uint32_t CMD_WR_ACK = 0;
+const uint32_t CMD_RD_REQ = 0;
+const uint32_t CMD_RD_DATA = 0;
+const uint32_t CMD_BUF_SIZE = 0;
+const uint32_t CMD_DATA_BLOCK_DRAM = 0;
+const uint32_t ETH_ROUTING_DATA_BUFFER_ADDR = 0;
+const uint32_t REQUEST_ROUTING_CMD_QUEUE_BASE = 0;
+const uint32_t RESPONSE_ROUTING_CMD_QUEUE_BASE = 0;
+const uint32_t CMD_BUF_PTR_MASK = 0;
diff --git a/tt_metal/hw/inc/wormhole/eth_interface.h b/tt_metal/hw/inc/wormhole/eth_interface.h
new file mode 100644
index 00000000000..53285a9529e
--- /dev/null
+++ b/tt_metal/hw/inc/wormhole/eth_interface.h
@@ -0,0 +1,7 @@
+// SPDX-FileCopyrightText: © 2023 Tenstorrent Inc.
+//
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include "tt_metal/third_party/umd/src/firmware/riscv/wormhole/eth_interface.h"
diff --git a/tt_metal/llrt/tt_cluster.hpp b/tt_metal/llrt/tt_cluster.hpp
index bd9017461fb..dbfb493a2db 100644
--- a/tt_metal/llrt/tt_cluster.hpp
+++ b/tt_metal/llrt/tt_cluster.hpp
@@ -17,14 +17,10 @@
 #include "tt_metal/third_party/umd/device/tt_cluster_descriptor.h"
 #include "tt_metal/third_party/umd/device/tt_xy_pair.h"
 
-// XXXX
-// TODO(PGK): including wormhole in grayskull build is dangerous
-// Include noc/noc_parameters.h here so that including it from wormhole
-// doesn't pull in the wrong file!
 // clang-format off
 #include "dev_mem_map.h"
 #include "noc/noc_parameters.h"
-#include "tt_metal/third_party/umd/src/firmware/riscv/wormhole/eth_interface.h"
+#include "eth_interface.h"
 #include "dev_msgs.h"
 // clang-format on