diff --git a/arch/sparc64/console.c b/arch/sparc64/console.c
index 647f9ef..b5eaeff 100644
--- a/arch/sparc64/console.c
+++ b/arch/sparc64/console.c
@@ -14,19 +14,6 @@
 #include "sys_info.h"
 #include "boot.h"
 
-#define REGISTER_NAMED_NODE( name, path )   do { \
-	     bind_new_node( name##_flags_, name##_size_, \
-			path, name##_m, sizeof(name##_m)/sizeof(method_t)); \
-	} while(0)
-
-#define REGISTER_NODE_METHODS( name, path )   do {                      \
-        const char *paths[1];                                                  \
-                                                                        \
-        paths[0] = path;                                                \
-        bind_node( name##_flags_, name##_size_,                         \
-                   paths, 1, name##_m, sizeof(name##_m)/sizeof(method_t)); \
-    } while(0)
-
 /* ******************************************************************
  *                       serial console functions
  * ****************************************************************** */
diff --git a/arch/sparc64/openbios.c b/arch/sparc64/openbios.c
index e5d1e53..970b033 100644
--- a/arch/sparc64/openbios.c
+++ b/arch/sparc64/openbios.c
@@ -30,19 +30,6 @@
 #define BIOS_CFG_CMD  0x510
 #define BIOS_CFG_DATA 0x511
 
-#define REGISTER_NAMED_NODE( name, path )   do {                        \
-        bind_new_node( name##_flags_, name##_size_,                     \
-                       path, name##_m, sizeof(name##_m)/sizeof(method_t)); \
-    } while(0)
-
-#define REGISTER_NODE_METHODS( name, path )   do {                      \
-        const char *paths[1];                                           \
-                                                                        \
-        paths[0] = path;                                                \
-        bind_node( name##_flags_, name##_size_,                         \
-                   paths, 1, name##_m, sizeof(name##_m)/sizeof(method_t)); \
-    } while(0)
-
 static unsigned char intdict[256 * 1024];
 
 // XXX
diff --git a/drivers/esp.c b/drivers/esp.c
index 46f568d..9b6fc15 100644
--- a/drivers/esp.c
+++ b/drivers/esp.c
@@ -27,19 +27,6 @@
 
 #define BUFSIZE         4096
 
-#define REGISTER_NAMED_NODE( name, path )   do {                        \
-        bind_new_node( name##_flags_, name##_size_,                     \
-                       path, name##_m, sizeof(name##_m)/sizeof(method_t)); \
-    } while(0)
-
-#define REGISTER_NODE_METHODS( name, path )   do {                      \
-        const char *paths[1];                                                  \
-                                                                        \
-        paths[0] = path;                                                \
-        bind_node( name##_flags_, name##_size_,                         \
-                   paths, 1, name##_m, sizeof(name##_m)/sizeof(method_t)); \
-    } while(0)
-
 #ifdef CONFIG_DEBUG_ESP
 #define DPRINTF(fmt, args...)                   \
     do { printk(fmt , ##args); } while (0)
diff --git a/drivers/floppy.c b/drivers/floppy.c
index bdd686e..441446a 100644
--- a/drivers/floppy.c
+++ b/drivers/floppy.c
@@ -8,11 +8,6 @@
 
 #include "timer.h"
 
-#define REGISTER_NAMED_NODE( name, path )   do { \
-		bind_new_node( name##_flags_, name##_size_, \
-		path, name##_m, sizeof(name##_m)/sizeof(method_t)); \
-	} while(0)
-
 /* DECLARE data structures for the nodes.  */
 DECLARE_UNNAMED_NODE( ob_floppy, INSTALL_OPEN, 2*sizeof(int) );
 
diff --git a/drivers/ide.c b/drivers/ide.c
index 16d26fd..93ea925 100644
--- a/drivers/ide.c
+++ b/drivers/ide.c
@@ -29,12 +29,6 @@
 #include "hdreg.h"
 #include "timer.h"
 
-#define REGISTER_NAMED_NODE( name, path )   do { \
-	     bind_new_node( name##_flags_, name##_size_, \
-			path, name##_m, sizeof(name##_m)/sizeof(method_t)); \
-	} while(0)
-
-
 /* DECLARE data structures for the nodes.  */
 DECLARE_UNNAMED_NODE( ob_ide, INSTALL_OPEN, 2*sizeof(int) );
 DECLARE_UNNAMED_NODE( ob_ide_ctrl, INSTALL_OPEN, sizeof(int));
diff --git a/drivers/obio.c b/drivers/obio.c
index bc3f887..e375f70 100644
--- a/drivers/obio.c
+++ b/drivers/obio.c
@@ -24,19 +24,6 @@
 #define NO_QEMU_PROTOS
 #include "openbios/fw_cfg.h"
 
-#define REGISTER_NAMED_NODE( name, path )   do { \
-	     bind_new_node( name##_flags_, name##_size_, \
-			path, name##_m, sizeof(name##_m)/sizeof(method_t)); \
-	} while(0)
-
-#define REGISTER_NODE_METHODS( name, path )   do {                      \
-        const char *paths[1];                                                  \
-                                                                        \
-        paths[0] = path;                                                \
-        bind_node( name##_flags_, name##_size_,                         \
-                   paths, 1, name##_m, sizeof(name##_m)/sizeof(method_t)); \
-    } while(0)
-
 #define	PROMDEV_KBD	0		/* input from keyboard */
 #define	PROMDEV_SCREEN	0		/* output to screen */
 #define	PROMDEV_TTYA	1		/* in/out to ttya */
diff --git a/drivers/pci.c b/drivers/pci.c
index 7c142e7..714e987 100644
--- a/drivers/pci.c
+++ b/drivers/pci.c
@@ -23,11 +23,6 @@
 #include "timer.h"
 #include "pci.h"
 
-#define REGISTER_NAMED_NODE( name, path )   do { \
-	     bind_new_node( name##_flags_, name##_size_, \
-			path, name##_m, sizeof(name##_m)/sizeof(method_t)); \
-	} while(0)
-
 #define set_bool_property(ph, name) set_property(ph, name, NULL, 0);
 
 /* DECLARE data structures for the nodes.  */
diff --git a/include/openbios/bindings.h b/include/openbios/bindings.h
index 5c9e02a..bbcae4e 100644
--- a/include/openbios/bindings.h
+++ b/include/openbios/bindings.h
@@ -106,6 +106,19 @@ typedef struct {
 	void		*func;
 } method_t;
 
+#define REGISTER_NAMED_NODE( name, path )   do { \
+	bind_new_node( name##_flags_, name##_size_, \
+		path, name##_m, sizeof(name##_m)/sizeof(method_t)); \
+	} while(0)
+
+#define REGISTER_NODE_METHODS( name, path )   do {			\
+	const char *paths[1];						\
+									\
+	paths[0] = path;						\
+	bind_node( name##_flags_, name##_size_,				\
+	paths, 1, name##_m, sizeof(name##_m)/sizeof(method_t));		\
+    } while(0)
+
 #define DECLARE_UNNAMED_NODE( name, flags, size )	\
 static const int name##_flags_ = flags;	\
 static const int name##_size_ = size;