From 8890182d7adb48901f1a8adad80619bb193544b3 Mon Sep 17 00:00:00 2001
From: Andre Maroneze <andre.oliveiramaroneze@cea.fr>
Date: Tue, 4 Dec 2018 10:54:58 +0100
Subject: [PATCH] [Libc] remove empty headers

---
 Makefile                               |  4 +---
 headers/header_spec.txt                | 14 +------------
 share/libc/libintl.h                   | 26 ------------------------
 share/libc/linux/fs.h                  | 28 --------------------------
 share/libc/linux/if_addr.h             | 26 ------------------------
 share/libc/linux/if_netlink.h          | 27 -------------------------
 share/libc/linux/netlink.h             | 28 --------------------------
 share/libc/linux/rtnetlink.h           | 28 --------------------------
 share/libc/netinet/in_systm.h          | 26 ------------------------
 share/libc/netinet/ip.h                | 26 ------------------------
 share/libc/netinet/ip_icmp.h           | 27 -------------------------
 share/libc/sys/param.h                 | 28 --------------------------
 share/libc/sys/sysctl.h                | 22 --------------------
 share/libc/uchar.h                     | 27 -------------------------
 tests/libc/fc_libc.c                   | 12 -----------
 tests/libc/oracle/fc_libc.0.res.oracle |  8 ++++----
 tests/libc/oracle/fc_libc.2.res.oracle | 12 -----------
 tests/spec/clash_double_file_bts1598.c |  1 -
 18 files changed, 6 insertions(+), 364 deletions(-)
 delete mode 100644 share/libc/libintl.h
 delete mode 100644 share/libc/linux/fs.h
 delete mode 100644 share/libc/linux/if_addr.h
 delete mode 100644 share/libc/linux/if_netlink.h
 delete mode 100644 share/libc/linux/netlink.h
 delete mode 100644 share/libc/linux/rtnetlink.h
 delete mode 100644 share/libc/netinet/in_systm.h
 delete mode 100644 share/libc/netinet/ip.h
 delete mode 100644 share/libc/netinet/ip_icmp.h
 delete mode 100644 share/libc/sys/param.h
 delete mode 100644 share/libc/sys/sysctl.h
 delete mode 100644 share/libc/uchar.h

diff --git a/Makefile b/Makefile
index 62da0160b06..5c8a9a2b9f1 100644
--- a/Makefile
+++ b/Makefile
@@ -188,7 +188,7 @@ THEME_ICONS_FLAT:= \
   $(addprefix share/theme/flat/,$(THEME_ICON_NAMES))
 
 ROOT_LIBC_DIR:= share/libc
-LIBC_SUBDIRS:= sys netinet linux net arpa
+LIBC_SUBDIRS:= sys netinet net arpa
 LIBC_DIR:= $(ROOT_LIBC_DIR) $(addprefix $(ROOT_LIBC_DIR)/,$(LIBC_SUBDIRS))
 LIBC_FILES:= \
 	$(wildcard share/*.h share/*.c) \
@@ -1874,7 +1874,6 @@ install:: install-lib
 	$(MKDIR) $(FRAMAC_DATADIR)/theme/flat
 	$(MKDIR) $(FRAMAC_DATADIR)/libc/sys
 	$(MKDIR) $(FRAMAC_DATADIR)/libc/netinet
-	$(MKDIR) $(FRAMAC_DATADIR)/libc/linux
 	$(MKDIR) $(FRAMAC_DATADIR)/libc/net
 	$(MKDIR) $(FRAMAC_DATADIR)/libc/arpa
 	$(PRINT_INSTALL) shared files
@@ -1917,7 +1916,6 @@ install:: install-lib
 	$(CP) share/libc/arpa/*.[ch] $(FRAMAC_DATADIR)/libc/arpa
 	$(CP) share/libc/net/*.[ch] $(FRAMAC_DATADIR)/libc/net
 	$(CP) share/libc/netinet/*.[ch] $(FRAMAC_DATADIR)/libc/netinet
-	$(CP) share/libc/linux/*.[ch] $(FRAMAC_DATADIR)/libc/linux
 	$(PRINT_INSTALL) binaries
 	$(CP) bin/toplevel.$(OCAMLBEST) $(BINDIR)/frama-c$(EXE)
 	$(CP) bin/toplevel.byte$(EXE) $(BINDIR)/frama-c.byte$(EXE)
diff --git a/headers/header_spec.txt b/headers/header_spec.txt
index 80fdaba048b..43be8eb708a 100644
--- a/headers/header_spec.txt
+++ b/headers/header_spec.txt
@@ -224,13 +224,7 @@ share/libc/inttypes.c: CEA_LGPL
 share/libc/inttypes.h: CEA_LGPL
 share/libc/iso646.h: CEA_LGPL
 share/libc/libgen.h: CEA_LGPL
-share/libc/libintl.h: CEA_LGPL
 share/libc/limits.h: CEA_LGPL
-share/libc/linux/fs.h: CEA_LGPL
-share/libc/linux/if_addr.h: CEA_LGPL
-share/libc/linux/if_netlink.h: CEA_LGPL
-share/libc/linux/netlink.h: CEA_LGPL
-share/libc/linux/rtnetlink.h: CEA_LGPL
 share/libc/locale.c: CEA_LGPL
 share/libc/locale.h: CEA_LGPL
 share/libc/malloc.h: CEA_LGPL
@@ -243,9 +237,6 @@ share/libc/net/if.h: CEA_LGPL
 share/libc/netdb.c: CEA_LGPL
 share/libc/netdb.h: CEA_LGPL
 share/libc/netinet/in.h: CEA_LGPL
-share/libc/netinet/in_systm.h: CEA_LGPL
-share/libc/netinet/ip.h: CEA_LGPL
-share/libc/netinet/ip_icmp.h: CEA_LGPL
 share/libc/netinet/tcp.h: CEA_LGPL
 share/libc/nl_types.h: CEA_LGPL
 share/libc/poll.h: CEA_LGPL
@@ -273,7 +264,6 @@ share/libc/sys/file.h: CEA_LGPL
 share/libc/sys/ioctl.h: CEA_LGPL
 share/libc/sys/ipc.h: CEA_LGPL
 share/libc/sys/mman.h: CEA_LGPL
-share/libc/sys/param.h: CEA_LGPL
 share/libc/sys/random.h: CEA_LGPL
 share/libc/sys/resource.h: CEA_LGPL
 share/libc/sys/select.h: CEA_LGPL
@@ -281,7 +271,6 @@ share/libc/sys/shm.h: CEA_LGPL
 share/libc/sys/signal.h: CEA_LGPL
 share/libc/sys/socket.h: CEA_LGPL
 share/libc/sys/stat.h: CEA_LGPL
-share/libc/sys/sysctl.h: CEA_LGPL
 share/libc/sys/time.h: CEA_LGPL
 share/libc/sys/times.h: CEA_LGPL
 share/libc/sys/timex.h: CEA_LGPL
@@ -293,9 +282,8 @@ share/libc/sys/wait.h: CEA_LGPL
 share/libc/syslog.h: CEA_LGPL
 share/libc/termios.h: CEA_LGPL
 share/libc/tgmath.h: CEA_LGPL
-share/libc/time.h: CEA_LGPL
 share/libc/time.c: CEA_LGPL
-share/libc/uchar.h: CEA_LGPL
+share/libc/time.h: CEA_LGPL
 share/libc/unistd.h: CEA_LGPL
 share/libc/utime.h: CEA_LGPL
 share/libc/utmpx.h: CEA_LGPL
diff --git a/share/libc/libintl.h b/share/libc/libintl.h
deleted file mode 100644
index f79f14d0fcf..00000000000
--- a/share/libc/libintl.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/*  This file is part of Frama-C.                                         */
-/*                                                                        */
-/*  Copyright (C) 2007-2019                                               */
-/*    CEA (Commissariat à l'énergie atomique et aux énergies              */
-/*         alternatives)                                                  */
-/*                                                                        */
-/*  you can redistribute it and/or modify it under the terms of the GNU   */
-/*  Lesser General Public License as published by the Free Software       */
-/*  Foundation, version 2.1.                                              */
-/*                                                                        */
-/*  It is distributed in the hope that it will be useful,                 */
-/*  but WITHOUT ANY WARRANTY; without even the implied warranty of        */
-/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         */
-/*  GNU Lesser General Public License for more details.                   */
-/*                                                                        */
-/*  See the GNU Lesser General Public License version 2.1                 */
-/*  for more details (enclosed in the file licenses/LGPLv2.1).            */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef __FC_LIBINTL_H
-#define __FC_LIBINTL_H
-
-#endif
diff --git a/share/libc/linux/fs.h b/share/libc/linux/fs.h
deleted file mode 100644
index c0b6d361f2d..00000000000
--- a/share/libc/linux/fs.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/*  This file is part of Frama-C.                                         */
-/*                                                                        */
-/*  Copyright (C) 2007-2019                                               */
-/*    CEA (Commissariat à l'énergie atomique et aux énergies              */
-/*         alternatives)                                                  */
-/*                                                                        */
-/*  you can redistribute it and/or modify it under the terms of the GNU   */
-/*  Lesser General Public License as published by the Free Software       */
-/*  Foundation, version 2.1.                                              */
-/*                                                                        */
-/*  It is distributed in the hope that it will be useful,                 */
-/*  but WITHOUT ANY WARRANTY; without even the implied warranty of        */
-/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         */
-/*  GNU Lesser General Public License for more details.                   */
-/*                                                                        */
-/*  See the GNU Lesser General Public License version 2.1                 */
-/*  for more details (enclosed in the file licenses/LGPLv2.1).            */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef __FC_LINUX_FS_H
-#define __FC_LINUX_FS_H
-/* TODO */
-
-#endif
-
diff --git a/share/libc/linux/if_addr.h b/share/libc/linux/if_addr.h
deleted file mode 100644
index 51efee090ac..00000000000
--- a/share/libc/linux/if_addr.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/*  This file is part of Frama-C.                                         */
-/*                                                                        */
-/*  Copyright (C) 2007-2019                                               */
-/*    CEA (Commissariat à l'énergie atomique et aux énergies              */
-/*         alternatives)                                                  */
-/*                                                                        */
-/*  you can redistribute it and/or modify it under the terms of the GNU   */
-/*  Lesser General Public License as published by the Free Software       */
-/*  Foundation, version 2.1.                                              */
-/*                                                                        */
-/*  It is distributed in the hope that it will be useful,                 */
-/*  but WITHOUT ANY WARRANTY; without even the implied warranty of        */
-/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         */
-/*  GNU Lesser General Public License for more details.                   */
-/*                                                                        */
-/*  See the GNU Lesser General Public License version 2.1                 */
-/*  for more details (enclosed in the file licenses/LGPLv2.1).            */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef __FC_LINUX_IF_ADDR_H
-#define __FC_LINUX_IF_ADDR_H
-
-#endif
diff --git a/share/libc/linux/if_netlink.h b/share/libc/linux/if_netlink.h
deleted file mode 100644
index 276d067832a..00000000000
--- a/share/libc/linux/if_netlink.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/*  This file is part of Frama-C.                                         */
-/*                                                                        */
-/*  Copyright (C) 2007-2019                                               */
-/*    CEA (Commissariat à l'énergie atomique et aux énergies              */
-/*         alternatives)                                                  */
-/*                                                                        */
-/*  you can redistribute it and/or modify it under the terms of the GNU   */
-/*  Lesser General Public License as published by the Free Software       */
-/*  Foundation, version 2.1.                                              */
-/*                                                                        */
-/*  It is distributed in the hope that it will be useful,                 */
-/*  but WITHOUT ANY WARRANTY; without even the implied warranty of        */
-/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         */
-/*  GNU Lesser General Public License for more details.                   */
-/*                                                                        */
-/*  See the GNU Lesser General Public License version 2.1                 */
-/*  for more details (enclosed in the file licenses/LGPLv2.1).            */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef __FC_IF_NETLINK_H
-#define __FC_IF_NETLINK_H     
-
-#endif
-
diff --git a/share/libc/linux/netlink.h b/share/libc/linux/netlink.h
deleted file mode 100644
index 1ddd191ab29..00000000000
--- a/share/libc/linux/netlink.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/*  This file is part of Frama-C.                                         */
-/*                                                                        */
-/*  Copyright (C) 2007-2019                                               */
-/*    CEA (Commissariat à l'énergie atomique et aux énergies              */
-/*         alternatives)                                                  */
-/*                                                                        */
-/*  you can redistribute it and/or modify it under the terms of the GNU   */
-/*  Lesser General Public License as published by the Free Software       */
-/*  Foundation, version 2.1.                                              */
-/*                                                                        */
-/*  It is distributed in the hope that it will be useful,                 */
-/*  but WITHOUT ANY WARRANTY; without even the implied warranty of        */
-/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         */
-/*  GNU Lesser General Public License for more details.                   */
-/*                                                                        */
-/*  See the GNU Lesser General Public License version 2.1                 */
-/*  for more details (enclosed in the file licenses/LGPLv2.1).            */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef __FC_LINUX_NETLINK_H
-#define __FC_LINUX_NETLINK_H
-
-
-
-#endif
diff --git a/share/libc/linux/rtnetlink.h b/share/libc/linux/rtnetlink.h
deleted file mode 100644
index 7ea2a119e9f..00000000000
--- a/share/libc/linux/rtnetlink.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/*  This file is part of Frama-C.                                         */
-/*                                                                        */
-/*  Copyright (C) 2007-2019                                               */
-/*    CEA (Commissariat à l'énergie atomique et aux énergies              */
-/*         alternatives)                                                  */
-/*                                                                        */
-/*  you can redistribute it and/or modify it under the terms of the GNU   */
-/*  Lesser General Public License as published by the Free Software       */
-/*  Foundation, version 2.1.                                              */
-/*                                                                        */
-/*  It is distributed in the hope that it will be useful,                 */
-/*  but WITHOUT ANY WARRANTY; without even the implied warranty of        */
-/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         */
-/*  GNU Lesser General Public License for more details.                   */
-/*                                                                        */
-/*  See the GNU Lesser General Public License version 2.1                 */
-/*  for more details (enclosed in the file licenses/LGPLv2.1).            */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef __FC_LINUX_RTNETLINK_H
-#define __FC_LINUX_RTNETLINK_H
-
-
-#endif
-
diff --git a/share/libc/netinet/in_systm.h b/share/libc/netinet/in_systm.h
deleted file mode 100644
index 1beabb1cae1..00000000000
--- a/share/libc/netinet/in_systm.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/*  This file is part of Frama-C.                                         */
-/*                                                                        */
-/*  Copyright (C) 2007-2019                                               */
-/*    CEA (Commissariat à l'énergie atomique et aux énergies              */
-/*         alternatives)                                                  */
-/*                                                                        */
-/*  you can redistribute it and/or modify it under the terms of the GNU   */
-/*  Lesser General Public License as published by the Free Software       */
-/*  Foundation, version 2.1.                                              */
-/*                                                                        */
-/*  It is distributed in the hope that it will be useful,                 */
-/*  but WITHOUT ANY WARRANTY; without even the implied warranty of        */
-/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         */
-/*  GNU Lesser General Public License for more details.                   */
-/*                                                                        */
-/*  See the GNU Lesser General Public License version 2.1                 */
-/*  for more details (enclosed in the file licenses/LGPLv2.1).            */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef __FC_NETINET_SYSTM_H
-#define __FC_NETINET_SYSTM_H
-
-#endif
diff --git a/share/libc/netinet/ip.h b/share/libc/netinet/ip.h
deleted file mode 100644
index 0c469cede75..00000000000
--- a/share/libc/netinet/ip.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/*  This file is part of Frama-C.                                         */
-/*                                                                        */
-/*  Copyright (C) 2007-2019                                               */
-/*    CEA (Commissariat à l'énergie atomique et aux énergies              */
-/*         alternatives)                                                  */
-/*                                                                        */
-/*  you can redistribute it and/or modify it under the terms of the GNU   */
-/*  Lesser General Public License as published by the Free Software       */
-/*  Foundation, version 2.1.                                              */
-/*                                                                        */
-/*  It is distributed in the hope that it will be useful,                 */
-/*  but WITHOUT ANY WARRANTY; without even the implied warranty of        */
-/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         */
-/*  GNU Lesser General Public License for more details.                   */
-/*                                                                        */
-/*  See the GNU Lesser General Public License version 2.1                 */
-/*  for more details (enclosed in the file licenses/LGPLv2.1).            */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef __FC_NETINET_IP_H
-#define __FC_NETINET_IP_H
-
-#endif
diff --git a/share/libc/netinet/ip_icmp.h b/share/libc/netinet/ip_icmp.h
deleted file mode 100644
index 78e895961d9..00000000000
--- a/share/libc/netinet/ip_icmp.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/*  This file is part of Frama-C.                                         */
-/*                                                                        */
-/*  Copyright (C) 2007-2019                                               */
-/*    CEA (Commissariat à l'énergie atomique et aux énergies              */
-/*         alternatives)                                                  */
-/*                                                                        */
-/*  you can redistribute it and/or modify it under the terms of the GNU   */
-/*  Lesser General Public License as published by the Free Software       */
-/*  Foundation, version 2.1.                                              */
-/*                                                                        */
-/*  It is distributed in the hope that it will be useful,                 */
-/*  but WITHOUT ANY WARRANTY; without even the implied warranty of        */
-/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         */
-/*  GNU Lesser General Public License for more details.                   */
-/*                                                                        */
-/*  See the GNU Lesser General Public License version 2.1                 */
-/*  for more details (enclosed in the file licenses/LGPLv2.1).            */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef __FC_NETINET_IP_ICMP_H
-#define __FC_NETINET_IP_ICMP_H
-
-#endif
-
diff --git a/share/libc/sys/param.h b/share/libc/sys/param.h
deleted file mode 100644
index 93e55b1606c..00000000000
--- a/share/libc/sys/param.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/*  This file is part of Frama-C.                                         */
-/*                                                                        */
-/*  Copyright (C) 2007-2019                                               */
-/*    CEA (Commissariat à l'énergie atomique et aux énergies              */
-/*         alternatives)                                                  */
-/*                                                                        */
-/*  you can redistribute it and/or modify it under the terms of the GNU   */
-/*  Lesser General Public License as published by the Free Software       */
-/*  Foundation, version 2.1.                                              */
-/*                                                                        */
-/*  It is distributed in the hope that it will be useful,                 */
-/*  but WITHOUT ANY WARRANTY; without even the implied warranty of        */
-/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         */
-/*  GNU Lesser General Public License for more details.                   */
-/*                                                                        */
-/*  See the GNU Lesser General Public License version 2.1                 */
-/*  for more details (enclosed in the file licenses/LGPLv2.1).            */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef __FC_SYS_PARAM_H__
-#define __FC_SYS_PARAM_H__
-/* Only deprecated programs use this header. Add whatever is needed 
-   for this program to compile. */ 
-
-#endif
diff --git a/share/libc/sys/sysctl.h b/share/libc/sys/sysctl.h
deleted file mode 100644
index bd14e7820b7..00000000000
--- a/share/libc/sys/sysctl.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/*  This file is part of Frama-C.                                         */
-/*                                                                        */
-/*  Copyright (C) 2007-2019                                               */
-/*    CEA (Commissariat à l'énergie atomique et aux énergies              */
-/*         alternatives)                                                  */
-/*                                                                        */
-/*  you can redistribute it and/or modify it under the terms of the GNU   */
-/*  Lesser General Public License as published by the Free Software       */
-/*  Foundation, version 2.1.                                              */
-/*                                                                        */
-/*  It is distributed in the hope that it will be useful,                 */
-/*  but WITHOUT ANY WARRANTY; without even the implied warranty of        */
-/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         */
-/*  GNU Lesser General Public License for more details.                   */
-/*                                                                        */
-/*  See the GNU Lesser General Public License version 2.1                 */
-/*  for more details (enclosed in the file licenses/LGPLv2.1).            */
-/*                                                                        */
-/**************************************************************************/
-
diff --git a/share/libc/uchar.h b/share/libc/uchar.h
deleted file mode 100644
index 61011a2d979..00000000000
--- a/share/libc/uchar.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/*  This file is part of Frama-C.                                         */
-/*                                                                        */
-/*  Copyright (C) 2007-2019                                               */
-/*    CEA (Commissariat à l'énergie atomique et aux énergies              */
-/*         alternatives)                                                  */
-/*                                                                        */
-/*  you can redistribute it and/or modify it under the terms of the GNU   */
-/*  Lesser General Public License as published by the Free Software       */
-/*  Foundation, version 2.1.                                              */
-/*                                                                        */
-/*  It is distributed in the hope that it will be useful,                 */
-/*  but WITHOUT ANY WARRANTY; without even the implied warranty of        */
-/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         */
-/*  GNU Lesser General Public License for more details.                   */
-/*                                                                        */
-/*  See the GNU Lesser General Public License version 2.1                 */
-/*  for more details (enclosed in the file licenses/LGPLv2.1).            */
-/*                                                                        */
-/**************************************************************************/
-
-/* ISO C: 7.24 */
-#ifndef __FC_UCHAR
-#define __FC_UCHAR
-
-#endif
diff --git a/tests/libc/fc_libc.c b/tests/libc/fc_libc.c
index 298bc1b0374..5688d0e6e4f 100644
--- a/tests/libc/fc_libc.c
+++ b/tests/libc/fc_libc.c
@@ -85,13 +85,7 @@
 #include "inttypes.h"
 #include "iso646.h"
 #include "libgen.h"
-#include "libintl.h"
 #include "limits.h"
-#include "linux/fs.h"
-#include "linux/if_addr.h"
-#include "linux/if_netlink.h"
-#include "linux/netlink.h"
-#include "linux/rtnetlink.h"
 #include "locale.h"
 #include "malloc.h"
 #include "math.h"
@@ -99,9 +93,6 @@
 #include "netdb.h"
 #include "net/if.h"
 #include "netinet/in.h"
-#include "netinet/in_systm.h"
-#include "netinet/ip.h"
-#include "netinet/ip_icmp.h"
 #include "netinet/tcp.h"
 #include "nl_types.h"
 #include "poll.h"
@@ -127,7 +118,6 @@
 #include "sys/ipc.h"
 #include "syslog.h"
 #include "sys/mman.h"
-#include "sys/param.h"
 #include "sys/random.h"
 #include "sys/resource.h"
 #include "sys/select.h"
@@ -135,7 +125,6 @@
 #include "sys/signal.h"
 #include "sys/socket.h"
 #include "sys/stat.h"
-#include "sys/sysctl.h"
 #include "sys/time.h"
 #include "sys/times.h"
 #include "sys/timex.h"
@@ -147,7 +136,6 @@
 #include "termios.h"
 #include "tgmath.h"
 #include "time.h"
-#include "uchar.h"
 #include "unistd.h"
 #include "utime.h"
 #include "utmpx.h"
diff --git a/tests/libc/oracle/fc_libc.0.res.oracle b/tests/libc/oracle/fc_libc.0.res.oracle
index c1ea9b1264b..972a6cb610b 100644
--- a/tests/libc/oracle/fc_libc.0.res.oracle
+++ b/tests/libc/oracle/fc_libc.0.res.oracle
@@ -4,10 +4,10 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] tests/libc/fc_libc.c:160: assertion got status valid.
-[eva] tests/libc/fc_libc.c:161: assertion got status valid.
-[eva] tests/libc/fc_libc.c:162: assertion got status valid.
-[eva] tests/libc/fc_libc.c:163: assertion got status valid.
+[eva] tests/libc/fc_libc.c:148: assertion got status valid.
+[eva] tests/libc/fc_libc.c:149: assertion got status valid.
+[eva] tests/libc/fc_libc.c:150: assertion got status valid.
+[eva] tests/libc/fc_libc.c:151: assertion got status valid.
 [eva] Recording results for main
 [eva] done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/libc/oracle/fc_libc.2.res.oracle b/tests/libc/oracle/fc_libc.2.res.oracle
index 6b9a23013e8..6650a34b1f8 100644
--- a/tests/libc/oracle/fc_libc.2.res.oracle
+++ b/tests/libc/oracle/fc_libc.2.res.oracle
@@ -63,13 +63,7 @@ skipping share/libc/complex.h
 [kernel] Parsing share/libc/inttypes.h (with preprocessing)
 [kernel] Parsing share/libc/iso646.h (with preprocessing)
 [kernel] Parsing share/libc/libgen.h (with preprocessing)
-[kernel] Parsing share/libc/libintl.h (with preprocessing)
 [kernel] Parsing share/libc/limits.h (with preprocessing)
-[kernel] Parsing share/libc/linux/fs.h (with preprocessing)
-[kernel] Parsing share/libc/linux/if_addr.h (with preprocessing)
-[kernel] Parsing share/libc/linux/if_netlink.h (with preprocessing)
-[kernel] Parsing share/libc/linux/netlink.h (with preprocessing)
-[kernel] Parsing share/libc/linux/rtnetlink.h (with preprocessing)
 [kernel] Parsing share/libc/locale.h (with preprocessing)
 [kernel] Parsing share/libc/malloc.h (with preprocessing)
 [kernel] Parsing share/libc/math.h (with preprocessing)
@@ -77,9 +71,6 @@ skipping share/libc/complex.h
 [kernel] Parsing share/libc/net/if.h (with preprocessing)
 [kernel] Parsing share/libc/netdb.h (with preprocessing)
 [kernel] Parsing share/libc/netinet/in.h (with preprocessing)
-[kernel] Parsing share/libc/netinet/in_systm.h (with preprocessing)
-[kernel] Parsing share/libc/netinet/ip.h (with preprocessing)
-[kernel] Parsing share/libc/netinet/ip_icmp.h (with preprocessing)
 [kernel] Parsing share/libc/netinet/tcp.h (with preprocessing)
 [kernel] Parsing share/libc/nl_types.h (with preprocessing)
 [kernel] Parsing share/libc/poll.h (with preprocessing)
@@ -104,7 +95,6 @@ skipping share/libc/complex.h
 [kernel] Parsing share/libc/sys/ioctl.h (with preprocessing)
 [kernel] Parsing share/libc/sys/ipc.h (with preprocessing)
 [kernel] Parsing share/libc/sys/mman.h (with preprocessing)
-[kernel] Parsing share/libc/sys/param.h (with preprocessing)
 [kernel] Parsing share/libc/sys/random.h (with preprocessing)
 [kernel] Parsing share/libc/sys/resource.h (with preprocessing)
 [kernel] Parsing share/libc/sys/select.h (with preprocessing)
@@ -112,7 +102,6 @@ skipping share/libc/complex.h
 [kernel] Parsing share/libc/sys/signal.h (with preprocessing)
 [kernel] Parsing share/libc/sys/socket.h (with preprocessing)
 [kernel] Parsing share/libc/sys/stat.h (with preprocessing)
-[kernel] Parsing share/libc/sys/sysctl.h (with preprocessing)
 [kernel] Parsing share/libc/sys/time.h (with preprocessing)
 [kernel] Parsing share/libc/sys/times.h (with preprocessing)
 [kernel] Parsing share/libc/sys/timex.h (with preprocessing)
@@ -125,7 +114,6 @@ skipping share/libc/complex.h
 [kernel] Parsing share/libc/termios.h (with preprocessing)
 skipping share/libc/tgmath.h
 [kernel] Parsing share/libc/time.h (with preprocessing)
-[kernel] Parsing share/libc/uchar.h (with preprocessing)
 [kernel] Parsing share/libc/unistd.h (with preprocessing)
 [kernel] Parsing share/libc/utime.h (with preprocessing)
 [kernel] Parsing share/libc/utmpx.h (with preprocessing)
diff --git a/tests/spec/clash_double_file_bts1598.c b/tests/spec/clash_double_file_bts1598.c
index 9903d9ed17f..ca549981a5b 100644
--- a/tests/spec/clash_double_file_bts1598.c
+++ b/tests/spec/clash_double_file_bts1598.c
@@ -28,6 +28,5 @@ OPT: @PTEST_FILE@ -cpp-extra-args " -Ishare/libc -nostdinc" -print -then -ocode
 #include "string.h"
 //#include "tgmath.h"
 #include "time.h"
-#include "uchar.h"
 #include "wchar.h"
 #include "wctype.h"
-- 
GitLab