diff --git a/include/osmocom/vty/command.h b/include/osmocom/vty/command.h
index 89dc28f..4eb519f 100644
--- a/include/osmocom/vty/command.h
+++ b/include/osmocom/vty/command.h
@@ -92,7 +92,7 @@
  * configuration function pointer . */
 struct cmd_node {
 	/*! \brief Node index */
-	enum node_type node;
+	int node;
 
 	/*! \brief Prompt character at vty interface. */
 	const char *prompt;
@@ -334,15 +334,15 @@
 
 /* Prototypes. */
 void install_node(struct cmd_node *, int (*)(struct vty *));
-void install_default(enum node_type);
-void install_element(enum node_type, struct cmd_element *);
+void install_default(int node_type);
+void install_element(int node_type, struct cmd_element *);
 void install_element_ve(struct cmd_element *cmd);
 void sort_node(void);
 
 /* This is similar to install_default() but it also creates
  * 'exit' and 'end' commands.
  */
-void vty_install_default(enum node_type);
+void vty_install_default(int node_type);
 
 /* Concatenates argv[shift] through argv[argc-1] into a single NUL-terminated
    string with a space between each element (allocated using
diff --git a/include/osmocom/vty/vty.h b/include/osmocom/vty/vty.h
index 1dcc230..3684397 100644
--- a/include/osmocom/vty/vty.h
+++ b/include/osmocom/vty/vty.h
@@ -156,7 +156,7 @@
 	/*! \brief \ref talloc context */
 	void *tall_ctx;
 	/*! \brief call-back for returning to parent n ode */
-	enum node_type (*go_parent_cb)(struct vty *vty);
+	int (*go_parent_cb)(struct vty *vty);
 	/*! \brief call-back to determine if node is config node */
 	int (*is_config_node)(struct vty *vty, int node);
 	/*! \brief Check if the config is consistent before write */
@@ -184,7 +184,7 @@
 void vty_hello (struct vty *);
 void *vty_current_index(struct vty *);
 int vty_current_node(struct vty *vty);
-enum node_type vty_go_parent(struct vty *vty);
+int vty_go_parent(struct vty *vty);
 
 extern void *tall_vty_ctx;