12 files changed, 20 insertions, 22 deletions
diff --git a/gshadow/Makefile b/gshadow/Makefile
index 5d0e5e74ed..e10a57f416 100644
--- a/gshadow/Makefile
+++ b/gshadow/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -28,12 +28,12 @@ routines	= getsgent getsgnam sgetsgent fgetsgent putsgent \
 
 tests = tst-gshadow tst-putsgent
 
-CFLAGS-getsgent_r.c = -fexceptions
-CFLAGS-getsgent.c = -fexceptions
-CFLAGS-fgetsgent.c = -fexceptions
-CFLAGS-fgetsgent_r.c = -fexceptions $(libio-mtsafe)
-CFLAGS-putsgent.c = -fexceptions $(libio-mtsafe)
-CFLAGS-getsgnam.c = -fexceptions
-CFLAGS-getsgnam_r.c = -fexceptions
+CFLAGS-getsgent_r.c += -fexceptions
+CFLAGS-getsgent.c += -fexceptions
+CFLAGS-fgetsgent.c += -fexceptions
+CFLAGS-fgetsgent_r.c += -fexceptions $(libio-mtsafe)
+CFLAGS-putsgent.c += -fexceptions $(libio-mtsafe)
+CFLAGS-getsgnam.c += -fexceptions
+CFLAGS-getsgnam_r.c += -fexceptions
 
 include ../Rules
diff --git a/gshadow/fgetsgent.c b/gshadow/fgetsgent.c
index 670cb8e74d..4b4af524c7 100644
--- a/gshadow/fgetsgent.c
+++ b/gshadow/fgetsgent.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2016 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2018 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/gshadow/fgetsgent_r.c b/gshadow/fgetsgent_r.c
index b70f6fad40..13a5b181cb 100644
--- a/gshadow/fgetsgent_r.c
+++ b/gshadow/fgetsgent_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2016 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2018 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/gshadow/getsgent.c b/gshadow/getsgent.c
index 3f23d95651..54eebd6ca0 100644
--- a/gshadow/getsgent.c
+++ b/gshadow/getsgent.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2016 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2018 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2009.
 
diff --git a/gshadow/getsgent_r.c b/gshadow/getsgent_r.c
index 75eac7dbe9..82f6671456 100644
--- a/gshadow/getsgent_r.c
+++ b/gshadow/getsgent_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2016 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2018 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2009.
 
diff --git a/gshadow/getsgnam.c b/gshadow/getsgnam.c
index cc1b989272..e9decf9549 100644
--- a/gshadow/getsgnam.c
+++ b/gshadow/getsgnam.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2016 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2018 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2009.
 
diff --git a/gshadow/getsgnam_r.c b/gshadow/getsgnam_r.c
index 102621ccb0..5c88ee7b56 100644
--- a/gshadow/getsgnam_r.c
+++ b/gshadow/getsgnam_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2016 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2018 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2009.
 
diff --git a/gshadow/gshadow.h b/gshadow/gshadow.h
index 2afd8bd25e..4d9709bcf0 100644
--- a/gshadow/gshadow.h
+++ b/gshadow/gshadow.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2016 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2018 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -21,11 +21,9 @@
 #define _GSHADOW_H	1
 
 #include <features.h>
-
 #include <paths.h>
+#include <bits/types/FILE.h>
 
-#define	__need_FILE
-#include <stdio.h>
 #define __need_size_t
 #include <stddef.h>
 
diff --git a/gshadow/putsgent.c b/gshadow/putsgent.c
index 03f9d105ec..262aea2891 100644
--- a/gshadow/putsgent.c
+++ b/gshadow/putsgent.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2016 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2018 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/gshadow/sgetsgent.c b/gshadow/sgetsgent.c
index 1e95ac4f7f..b9a0390e9a 100644
--- a/gshadow/sgetsgent.c
+++ b/gshadow/sgetsgent.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2016 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2018 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/gshadow/sgetsgent_r.c b/gshadow/sgetsgent_r.c
index 11f7a2a577..9d120a88a8 100644
--- a/gshadow/sgetsgent_r.c
+++ b/gshadow/sgetsgent_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2016 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2018 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/gshadow/tst-putsgent.c b/gshadow/tst-putsgent.c
index 53ecb18bb9..424b66e896 100644
--- a/gshadow/tst-putsgent.c
+++ b/gshadow/tst-putsgent.c
@@ -1,5 +1,5 @@
 /* Test for processing of invalid gshadow entries.  [BZ #18724]
-   Copyright (C) 2015-2016 Free Software Foundation, Inc.
+   Copyright (C) 2015-2018 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or