diff --git a/Makefile.uk b/Makefile.uk
index 795a0ab..db405c0 100644
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -82,6 +82,7 @@ LIBLWIP_CFLAGS-y += -Wno-type-limits -Wno-unused-parameter
 LIBLWIP_CFLAGS-$(call have_clang) += -Wno-macro-redefined
 LIBLWIP_CFLAGS-$(CONFIG_LWIP_DEBUG) += -DUK_DEBUG
 LIBLWIP_CFLAGS-y   += -D__IN_LIBLWIP__
+LIBLWIP_CFLAGS-y   += -DWORKAROUND_NEWLIB
 LIBLWIP_CXXFLAGS-y += -D__IN_LIBLWIP__
 
 ################################################################################
@@ -94,7 +95,6 @@ LIBLWIP_SRCS-$(CONFIG_LWIP_THREADS) += $(LIBLWIP_BASE)/mailbox.c|unikraft
 LIBLWIP_SRCS-$(CONFIG_LWIP_THREADS) += $(LIBLWIP_BASE)/threads.c|unikraft
 LIBLWIP_SRCS-y += $(LIBLWIP_BASE)/init.c|unikraft
 LIBLWIP_SRCS-y += $(LIBLWIP_BASE)/time.c|unikraft
-LIBLWIP_SRCS-y += $(LIBLWIP_BASE)/sendfile.c|unikraft
 LIBLWIP_SRCS-$(CONFIG_LWIP_SOCKET) += $(LIBLWIP_BASE)/sockets.c|unikraft
 LIBLWIP_SOCKETS_FLAGS-$(call gcc_version_ge,8,0) += -Wno-cast-function-type
 LIBLWIP_SRCS-y += $(LIBLWIP_EXTRACTED)/core/init.c
diff --git a/include/netinet/tcp.h b/include/netinet/tcp.h
index 84b2549..4591f75 100644
--- a/include/netinet/tcp.h
+++ b/include/netinet/tcp.h
@@ -41,6 +41,13 @@ typedef	u_long	tcp_seq;
  * TCP header.
  * Per RFC 793, September, 1981.
  */
+
+#include <uk/config.h>
+
+#if ((defined CONFIG_ARCH_X86_64) || (defined CONFIG_ARCH_ARM_64))
+#include <endian.h>
+#endif
+
 struct tcphdr {
 	u_short	th_sport;		/* source port */
 	u_short	th_dport;		/* destination port */
diff --git a/sendfile.c b/sendfile.c
deleted file mode 100644
index cf6452d..0000000
--- a/sendfile.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  SPDX-License-Identifier: BSD-3-Clause */
-/*
- *  Authors: Mihai Pogonaru <pogonarumihai@gmail.com>
- *
- *  Copyright (c) 2019, University Politehnica of Bucharest. All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *  3. Neither the name of the copyright holder nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- *  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- *  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *  POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/sendfile.h>
-#include <uk/print.h>
-
-ssize_t sendfile(int out_fd, int in_fd, off_t *_offset, size_t count)
-{
-	WARN_STUBBED();
-	return 0;
-}