diff --git a/devel/codeworker/Makefile b/devel/codeworker/Makefile
index b2800af4b75..3bcce8a28ee 100644
--- a/devel/codeworker/Makefile
+++ b/devel/codeworker/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.14 2018/10/28 09:02:40 bentley Exp $
+# $OpenBSD: Makefile,v 1.15 2019/01/01 18:01:34 landry Exp $
 
 COMMENT =		universal parsing tool & source code generator
 
 V =			4.5.4
 PKGNAME =		codeworker-${V}
-REVISION =		5
+REVISION =		6
 
 CATEGORIES =		devel
 
diff --git a/devel/codeworker/patches/patch-CGRuntime_h b/devel/codeworker/patches/patch-CGRuntime_h
new file mode 100644
index 00000000000..ae4d96b1fe1
--- /dev/null
+++ b/devel/codeworker/patches/patch-CGRuntime_h
@@ -0,0 +1,14 @@
+$OpenBSD: patch-CGRuntime_h,v 1.1 2019/01/01 18:01:34 landry Exp $
+Fix a lot of include errors with ports-gcc
+Index: CGRuntime.h
+--- CGRuntime.h.orig
++++ CGRuntime.h
+@@ -24,6 +24,8 @@ To contact the author: codeworker@free.fr
+ 
+ #include <string>
+ #include <list>
++#include <stdlib.h>
++#include <string.h>
+ 
+ #include "UtlException.h"
+ #include "CppParsingTree.h"
diff --git a/devel/codeworker/patches/patch-CppParsingTree_cpp b/devel/codeworker/patches/patch-CppParsingTree_cpp
new file mode 100644
index 00000000000..1a591d53654
--- /dev/null
+++ b/devel/codeworker/patches/patch-CppParsingTree_cpp
@@ -0,0 +1,13 @@
+$OpenBSD: patch-CppParsingTree_cpp,v 1.1 2019/01/01 18:01:34 landry Exp $
+CppParsingTree.cpp:113:22: error: 'atoi' was not declared in this scope
+Index: CppParsingTree.cpp
+--- CppParsingTree.cpp.orig
++++ CppParsingTree.cpp
+@@ -25,6 +25,7 @@ To contact the author: codeworker@free.fr
+ 
+ #ifndef WIN32
+ #	include <cstdio> // for Debian/gcc 2.95.4
++#	include <stdlib.h>
+ #endif
+ 
+ #include "ScpStream.h"
diff --git a/devel/codeworker/patches/patch-ScpStream_cpp b/devel/codeworker/patches/patch-ScpStream_cpp
new file mode 100644
index 00000000000..74931c9ff6a
--- /dev/null
+++ b/devel/codeworker/patches/patch-ScpStream_cpp
@@ -0,0 +1,14 @@
+$OpenBSD: patch-ScpStream_cpp,v 1.1 2019/01/01 18:01:34 landry Exp $
+Fix numerous include errors with ports-gcc
+Index: ScpStream.cpp
+--- ScpStream.cpp.orig
++++ ScpStream.cpp
+@@ -28,6 +28,8 @@ To contact the author: codeworker@free.fr
+ #	include <sys/stat.h>
+ 	// functions 'ntohl()' and 'htonl()'
+ #	include <netinet/in.h>
++#	include <string.h>
++#	include <stdlib.h>
+ #endif
+ 
+ #include "UtlException.h"
diff --git a/devel/codeworker/patches/patch-UtlDate_cpp b/devel/codeworker/patches/patch-UtlDate_cpp
new file mode 100644
index 00000000000..1a8f8ccad62
--- /dev/null
+++ b/devel/codeworker/patches/patch-UtlDate_cpp
@@ -0,0 +1,14 @@
+$OpenBSD: patch-UtlDate_cpp,v 1.1 2019/01/01 18:01:34 landry Exp $
+Fix several include errors with ports-gcc
+Index: UtlDate.cpp
+--- UtlDate.cpp.orig
++++ UtlDate.cpp
+@@ -26,6 +26,8 @@ To contact the author: codeworker@free.fr
+ #include <stdio.h>
+ #include <math.h>
+ #include <time.h>
++#include <string.h>
++#include <stdlib.h>
+ 
+ #ifdef WIN32
+ #	include <windows.h>
diff --git a/devel/codeworker/patches/patch-UtlDirectory_cpp b/devel/codeworker/patches/patch-UtlDirectory_cpp
new file mode 100644
index 00000000000..56a942a0988
--- /dev/null
+++ b/devel/codeworker/patches/patch-UtlDirectory_cpp
@@ -0,0 +1,14 @@
+$OpenBSD: patch-UtlDirectory_cpp,v 1.1 2019/01/01 18:01:34 landry Exp $
+fix various include errors with ports-gcc
+Index: UtlDirectory.cpp
+--- UtlDirectory.cpp.orig
++++ UtlDirectory.cpp
+@@ -30,6 +30,8 @@ To contact the author: codeworker@free.fr
+ #	include <sys/stat.h>
+ #	include <unistd.h>
+ #	include <glob.h>
++#	include <stdlib.h>
++#	include <string.h>
+ #endif
+ 
+ #include "UtlException.h"
diff --git a/devel/codeworker/patches/patch-UtlTrace_cpp b/devel/codeworker/patches/patch-UtlTrace_cpp
new file mode 100644
index 00000000000..4a598a9c1f8
--- /dev/null
+++ b/devel/codeworker/patches/patch-UtlTrace_cpp
@@ -0,0 +1,13 @@
+$OpenBSD: patch-UtlTrace_cpp,v 1.1 2019/01/01 18:01:34 landry Exp $
+fix several include errors with ports-gcc
+Index: UtlTrace.cpp
+--- UtlTrace.cpp.orig
++++ UtlTrace.cpp
+@@ -24,6 +24,7 @@ To contact the author: codeworker@free.fr
+ #endif
+ 
+ #include <stdarg.h>
++#include <string.h>
+ #include "ScpStream.h"
+ #include "UtlTrace.h"
+ 
diff --git a/devel/codeworker/patches/patch-UtlXMLStream_cpp b/devel/codeworker/patches/patch-UtlXMLStream_cpp
new file mode 100644
index 00000000000..d7323afb449
--- /dev/null
+++ b/devel/codeworker/patches/patch-UtlXMLStream_cpp
@@ -0,0 +1,13 @@
+$OpenBSD: patch-UtlXMLStream_cpp,v 1.1 2019/01/01 18:01:34 landry Exp $
+fix several include errors with ports-gcc
+Index: UtlXMLStream.cpp
+--- UtlXMLStream.cpp.orig
++++ UtlXMLStream.cpp
+@@ -28,6 +28,7 @@ To contact the author: codeworker@free.fr
+ #include "UtlException.h"
+ #include "ScpStream.h"
+ #include "UtlXMLStream.h"
++#include <string.h> 
+ 
+ namespace CodeWorker {
+ 	UtlXMLStream::UtlXMLStream(const std::string& sFileName, const bool bModeRead) : _bOwnerOfFileStream(true), _pInputStream(NULL), _pOutputStream(NULL) {