4 files changed, 8 insertions, 21 deletions
diff --git a/src/vnet/lisp-cp/lisp.api b/src/vnet/lisp-cp/lisp.api
index 708510cec87..604b34d815d 100644
--- a/src/vnet/lisp-cp/lisp.api
+++ b/src/vnet/lisp-cp/lisp.api
@@ -15,7 +15,7 @@
 
 option version = "1.0.0";
 
-typeonly manual_print manual_endian define local_locator
+typedef local_locator
 {
   u32 sw_if_index;
   u8 priority;
@@ -307,7 +307,7 @@ define show_lisp_map_request_mode_reply
   u8 mode;
 };
 
-typeonly manual_endian manual_print define remote_locator
+typedef remote_locator
 {
   u8 is_ip4;
   u8 priority;
@@ -559,7 +559,7 @@ define lisp_eid_table_dump
     @param reid_prefix_len - remote EID IP prefix length
     @param leid_prefix_len - local EID IP prefix length
   */
-typeonly manual_print manual_endian define lisp_adjacency
+typedef lisp_adjacency
 {
   u8 eid_type;
   u8 reid[16];
diff --git a/src/vnet/lisp-cp/lisp_api.c b/src/vnet/lisp-cp/lisp_api.c
index 5d426b6277c..8a0ffffd9cf 100644
--- a/src/vnet/lisp-cp/lisp_api.c
+++ b/src/vnet/lisp-cp/lisp_api.c
@@ -27,10 +27,6 @@
 
 #include <vnet/vnet_msg_enum.h>
 
-#define vl_api_remote_locator_t_endian vl_noop_handler
-#define vl_api_remote_locator_t_print vl_noop_handler
-#define vl_api_local_locator_t_endian vl_noop_handler
-#define vl_api_local_locator_t_print vl_noop_handler
 
 #define vl_api_lisp_add_del_locator_set_t_endian vl_noop_handler
 #define vl_api_lisp_add_del_locator_set_t_print vl_noop_handler
diff --git a/src/vnet/lisp-cp/one.api b/src/vnet/lisp-cp/one.api
index f02caf2be96..bc3f1b16221 100644
--- a/src/vnet/lisp-cp/one.api
+++ b/src/vnet/lisp-cp/one.api
@@ -15,7 +15,7 @@
 
 option version = "1.0.0";
 
-typeonly manual_print manual_endian define one_local_locator
+typedef one_local_locator
 {
   u32 sw_if_index;
   u8 priority;
@@ -355,7 +355,7 @@ define show_one_map_request_mode_reply
   u8 mode;
 };
 
-typeonly manual_endian manual_print define one_remote_locator
+typedef one_remote_locator
 {
   u8 is_ip4;
   u8 priority;
@@ -434,7 +434,7 @@ define one_l2_arp_entries_get
   u32 bd;
 };
 
-typeonly manual_print manual_endian define one_l2_arp_entry
+typedef one_l2_arp_entry
 {
   u8 mac[6];
   u32 ip4;
@@ -471,7 +471,7 @@ define one_ndp_entries_get
   u32 bd;
 };
 
-typeonly manual_print manual_endian define one_ndp_entry
+typedef one_ndp_entry
 {
   u8 mac[6];
   u8 ip6[16];
@@ -768,7 +768,7 @@ define one_eid_table_dump
     @param reid_prefix_len - remote EID IP prefix length
     @param leid_prefix_len - local EID IP prefix length
   */
-typeonly manual_print manual_endian define one_adjacency
+typedef one_adjacency
 {
   u8 eid_type;
   u8 reid[16];
diff --git a/src/vnet/lisp-cp/one_api.c b/src/vnet/lisp-cp/one_api.c
index fa67536c32d..447b68f377c 100644
--- a/src/vnet/lisp-cp/one_api.c
+++ b/src/vnet/lisp-cp/one_api.c
@@ -27,11 +27,6 @@
 
 #include <vnet/vnet_msg_enum.h>
 
-#define vl_api_one_remote_locator_t_endian vl_noop_handler
-#define vl_api_one_remote_locator_t_print vl_noop_handler
-#define vl_api_one_local_locator_t_endian vl_noop_handler
-#define vl_api_one_local_locator_t_print vl_noop_handler
-
 #define vl_api_one_add_del_locator_set_t_endian vl_noop_handler
 #define vl_api_one_add_del_locator_set_t_print vl_noop_handler
 #define vl_api_one_add_del_remote_mapping_t_endian vl_noop_handler
@@ -42,13 +37,9 @@
 #define vl_api_one_add_del_remote_mapping_t_endian vl_noop_handler
 #define vl_api_one_add_del_remote_mapping_t_print vl_noop_handler
 
-#define vl_api_one_l2_arp_entry_t_endian vl_noop_handler
-#define vl_api_one_l2_arp_entry_t_print vl_noop_handler
 #define vl_api_one_add_del_l2_arp_entry vl_noop_handler
 #define vl_api_one_l2_arp_bd_get vl_noop_handler
 
-#define vl_api_one_ndp_entry_t_endian vl_noop_handler
-#define vl_api_one_ndp_entry_t_print vl_noop_handler
 #define vl_api_one_ndp_entries_get_reply_t_endian vl_noop_handler
 #define vl_api_one_ndp_entries_get_reply_t_print vl_noop_handler