diff --git a/Android.mk b/Android.mk
index 886c0e0..112f05c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,8 +4,8 @@
 LOCAL_SRC_FILES:=clatd.c dump.c checksum.c translate.c icmp.c ipv4.c ipv6.c config.c dns64.c logging.c getaddr.c getroute.c netlink_callbacks.c netlink_msg.c setif.c setroute.c mtu.c
 
 LOCAL_CFLAGS := -Wall -Werror
-LOCAL_C_INCLUDES := external/libnl/include
-LOCAL_STATIC_LIBRARIES := libnl
+LOCAL_C_INCLUDES := external/libnl-headers
+LOCAL_STATIC_LIBRARIES := libnl_2
 LOCAL_SHARED_LIBRARIES := libcutils liblog
 
 # The clat daemon.
diff --git a/translate.h b/translate.h
index 421d2a5..6d4f126 100644
--- a/translate.h
+++ b/translate.h
@@ -72,6 +72,11 @@
                               const struct iphdr *old_header);
 uint8_t parse_frag_header(const struct ip6_frag *frag_hdr, struct iphdr *ip_targ);
 
+// Deal with fragmented packets.
+size_t maybe_fill_frag_header(struct ip6_frag *frag_hdr, struct ip6_hdr *ip6_targ,
+                              const struct iphdr *old_header);
+uint8_t parse_frag_header(const struct ip6_frag *frag_hdr, struct iphdr *ip_targ);
+
 // Translate ICMP packets.
 int icmp_to_icmp6(clat_packet out, clat_packet_index pos, const struct icmphdr *icmp,
                   uint32_t checksum, const uint8_t *payload, size_t payload_size);