-extern int ospf_redistribute_set (struct ospf *, int, u_short, int, int);
-extern int ospf_redistribute_unset (struct ospf *, int, u_short);
-extern int ospf_redistribute_default_set (struct ospf *, int, int, int);
-extern int ospf_redistribute_default_unset (struct ospf *);
-extern int ospf_distribute_list_out_set (struct ospf *, int, const char *);
-extern int ospf_distribute_list_out_unset (struct ospf *, int, const char *);
-extern void ospf_routemap_set (struct ospf_redist *, const char *);
-extern void ospf_routemap_unset (struct ospf_redist *);
-extern int ospf_distance_set (struct vty *, struct ospf *, const char *,
- const char *, const char *);
-extern int ospf_distance_unset (struct vty *, struct ospf *, const char *,
- const char *, const char *);
-extern void ospf_zebra_init(struct thread_master *, u_short);
+extern int ospf_redistribute_set(struct ospf *, int, unsigned short, int, int);
+extern int ospf_redistribute_unset(struct ospf *, int, unsigned short);
+extern int ospf_redistribute_default_set(struct ospf *, int, int, int);
+extern int ospf_redistribute_default_unset(struct ospf *);
+extern int ospf_distribute_list_out_set(struct ospf *, int, const char *);
+extern int ospf_distribute_list_out_unset(struct ospf *, int, const char *);
+extern void ospf_routemap_set(struct ospf_redist *, const char *);
+extern void ospf_routemap_unset(struct ospf_redist *);
+extern int ospf_distance_set(struct vty *, struct ospf *, const char *,
+ const char *, const char *);
+extern int ospf_distance_unset(struct vty *, struct ospf *, const char *,
+ const char *, const char *);
+extern void ospf_zebra_init(struct thread_master *, unsigned short);
+extern void ospf_zebra_vrf_register(struct ospf *ospf);
+extern void ospf_zebra_vrf_deregister(struct ospf *ospf);