diff --git a/lang/gcc/4.9/Makefile b/lang/gcc/4.9/Makefile
index b6472aad724..ed9e4af1056 100644
--- a/lang/gcc/4.9/Makefile
+++ b/lang/gcc/4.9/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.66 2019/02/28 01:52:37 naddy Exp $
+# $OpenBSD: Makefile,v 1.67 2019/03/24 16:47:48 jca Exp $
 
 ONLY_FOR_ARCHS = ${GCC49_ARCHS}
 DPB_PROPERTIES = parallel
 
 V = 4.9.4
-REVISION = 17
+REVISION = 18
 FULL_VERSION = $V
 FULL_PKGVERSION = $V
 
diff --git a/lang/gcc/4.9/patches/patch-libstdc++-v3_include_c_global_cstddef b/lang/gcc/4.9/patches/patch-libstdc++-v3_include_c_global_cstddef
deleted file mode 100644
index 9fee8846db2..00000000000
--- a/lang/gcc/4.9/patches/patch-libstdc++-v3_include_c_global_cstddef
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libstdc++-v3_include_c_global_cstddef,v 1.1.1.1 2014/06/26 16:30:18 pascal Exp $
---- libstdc++-v3/include/c_global/cstddef.orig	Mon Dec  2 14:32:27 2013
-+++ libstdc++-v3/include/c_global/cstddef	Mon Dec  2 14:32:34 2013
-@@ -44,7 +44,7 @@
- #include <bits/c++config.h>
- #include <stddef.h>
- 
--#if __cplusplus >= 201103L
-+#if 0
- namespace std
- {
-   // We handle size_t, ptrdiff_t, and nullptr_t in c++config.h.
diff --git a/lang/gcc/4.9/patches/patch-libstdc++-v3_include_c_std_cstddef b/lang/gcc/4.9/patches/patch-libstdc++-v3_include_c_std_cstddef
deleted file mode 100644
index b4a77106ea9..00000000000
--- a/lang/gcc/4.9/patches/patch-libstdc++-v3_include_c_std_cstddef
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libstdc++-v3_include_c_std_cstddef,v 1.1.1.1 2014/06/26 16:30:18 pascal Exp $
---- libstdc++-v3/include/c_std/cstddef.orig	Mon Dec  2 13:55:12 2013
-+++ libstdc++-v3/include/c_std/cstddef	Mon Dec  2 13:55:25 2013
-@@ -44,7 +44,7 @@
- #include <bits/c++config.h>
- #include <stddef.h>
- 
--#if __cplusplus >= 201103L
-+#if 0
- namespace std
- {
-   // We handle size_t, ptrdiff_t, and nullptr_t in c++config.h.
diff --git a/lang/gcc/6/Makefile b/lang/gcc/6/Makefile
index e47b8d9940a..3e20bf8da5d 100644
--- a/lang/gcc/6/Makefile
+++ b/lang/gcc/6/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2018/12/29 10:11:20 pascal Exp $
+# $OpenBSD: Makefile,v 1.25 2019/03/24 16:47:48 jca Exp $
 
 ONLY_FOR_ARCHS = ${GCC49_ARCHS}
 DPB_PROPERTIES = parallel
@@ -6,7 +6,7 @@ DPB_PROPERTIES = parallel
 V = 6.5.0
 FULL_VERSION = $V
 FULL_PKGVERSION = $V
-REVISION = 0
+REVISION = 1
 
 ADASTRAP_LIBC-amd64 = 93.0
 ADASTRAP_LIBM-amd64 = 10.1
diff --git a/lang/gcc/6/patches/patch-libstdc++-v3_include_c_global_cstddef b/lang/gcc/6/patches/patch-libstdc++-v3_include_c_global_cstddef
deleted file mode 100644
index 43c800bb3d9..00000000000
--- a/lang/gcc/6/patches/patch-libstdc++-v3_include_c_global_cstddef
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libstdc++-v3_include_c_global_cstddef,v 1.1.1.1 2016/09/04 16:20:19 pascal Exp $
---- libstdc++-v3/include/c_global/cstddef.orig	Tue Feb 23 16:57:09 2016
-+++ libstdc++-v3/include/c_global/cstddef	Tue Aug 23 15:48:25 2016
-@@ -49,7 +49,7 @@
- #include <bits/c++config.h>
- #include <stddef.h>
- 
--#if __cplusplus >= 201103L
-+#if 0
- namespace std
- {
-   // We handle size_t, ptrdiff_t, and nullptr_t in c++config.h.
diff --git a/lang/gcc/6/patches/patch-libstdc++-v3_include_c_std_cstddef b/lang/gcc/6/patches/patch-libstdc++-v3_include_c_std_cstddef
deleted file mode 100644
index 5a87c07612b..00000000000
--- a/lang/gcc/6/patches/patch-libstdc++-v3_include_c_std_cstddef
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libstdc++-v3_include_c_std_cstddef,v 1.1.1.1 2016/09/04 16:20:19 pascal Exp $
---- libstdc++-v3/include/c_std/cstddef.orig	Mon Dec  2 13:55:12 2013
-+++ libstdc++-v3/include/c_std/cstddef	Mon Dec  2 13:55:25 2013
-@@ -44,7 +44,7 @@
- #include <bits/c++config.h>
- #include <stddef.h>
- 
--#if __cplusplus >= 201103L
-+#if 0
- namespace std
- {
-   // We handle size_t, ptrdiff_t, and nullptr_t in c++config.h.
diff --git a/lang/gcc/8/Makefile b/lang/gcc/8/Makefile
index a6659ecfd35..323b6524742 100644
--- a/lang/gcc/8/Makefile
+++ b/lang/gcc/8/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2019/02/28 01:52:37 naddy Exp $
+# $OpenBSD: Makefile,v 1.8 2019/03/24 16:47:48 jca Exp $
 
 BROKEN-i386 = ld: error: cp-demangle.c:(.debug_info+0x30115): has non-ABS relocation R_386_GOTOFF against symbol '.LC60'
 
@@ -13,7 +13,7 @@ DPB_PROPERTIES = parallel
 V = 8.2.0
 FULL_VERSION = $V
 FULL_PKGVERSION = $V
-REVISION = 2
+REVISION = 3
 
 ADASTRAP_LIBC-amd64 = 93.0
 ADASTRAP_LIBM-amd64 = 10.1
diff --git a/lang/gcc/8/patches/patch-libstdc++-v3_include_c_global_cstddef b/lang/gcc/8/patches/patch-libstdc++-v3_include_c_global_cstddef
deleted file mode 100644
index e52413ae1a3..00000000000
--- a/lang/gcc/8/patches/patch-libstdc++-v3_include_c_global_cstddef
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libstdc++-v3_include_c_global_cstddef,v 1.1.1.1 2019/01/04 15:50:40 pascal Exp $
---- libstdc++-v3/include/c_global/cstddef.orig	Tue Feb 23 16:57:09 2016
-+++ libstdc++-v3/include/c_global/cstddef	Tue Aug 23 15:48:25 2016
-@@ -49,7 +49,7 @@
- #include <bits/c++config.h>
- #include <stddef.h>
- 
--#if __cplusplus >= 201103L
-+#if 0
- namespace std
- {
-   // We handle size_t, ptrdiff_t, and nullptr_t in c++config.h.
diff --git a/lang/gcc/8/patches/patch-libstdc++-v3_include_c_std_cstddef b/lang/gcc/8/patches/patch-libstdc++-v3_include_c_std_cstddef
deleted file mode 100644
index de0b4b68614..00000000000
--- a/lang/gcc/8/patches/patch-libstdc++-v3_include_c_std_cstddef
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libstdc++-v3_include_c_std_cstddef,v 1.1.1.1 2019/01/04 15:50:40 pascal Exp $
---- libstdc++-v3/include/c_std/cstddef.orig	Mon Dec  2 13:55:12 2013
-+++ libstdc++-v3/include/c_std/cstddef	Mon Dec  2 13:55:25 2013
-@@ -44,7 +44,7 @@
- #include <bits/c++config.h>
- #include <stddef.h>
- 
--#if __cplusplus >= 201103L
-+#if 0
- namespace std
- {
-   // We handle size_t, ptrdiff_t, and nullptr_t in c++config.h.