diff --git a/reflective-rapidjson/default/PKGBUILD b/reflective-rapidjson/default/PKGBUILD
index 2e48cac9..50859f9e 100644
--- a/reflective-rapidjson/default/PKGBUILD
+++ b/reflective-rapidjson/default/PKGBUILD
@@ -4,9 +4,9 @@
 # you also find the URL of a binary repository.
 
 _reponame=reflective-rapidjson
-_llvmver=7
+_llvmver=8
 pkgname=reflective-rapidjson
-pkgver=0.0.6
+pkgver=0.0.7
 pkgrel=1
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='Code generator for serializing/deserializing C++ objects to/from JSON using Clang and RapidJSON'
@@ -18,7 +18,7 @@ makedepends=('cmake' 'clang-tools-extra' 'llvm')
 checkdepends=('cppunit' 'boost')
 url="https://github.com/Martchus/${_reponame}"
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('4e0a30716d905840359c35edc2acf3933cbe9be2e81de80a28beb119c1163c53')
+sha256sums=('d10e21909b29f960a9dc5e8d925511597e35e2a8436b2732bc2e224acbd62b73')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
diff --git a/reflective-rapidjson/doc/PKGBUILD b/reflective-rapidjson/doc/PKGBUILD
index 613a6b93..d1ce7273 100644
--- a/reflective-rapidjson/doc/PKGBUILD
+++ b/reflective-rapidjson/doc/PKGBUILD
@@ -6,7 +6,7 @@
 _name=reflective-rapidjson
 _reponame=reflective-rapidjson
 pkgname=$_name-doc
-pkgver=0.0.6
+pkgver=0.0.7
 pkgrel=1
 arch=('any')
 pkgdesc='Code generator for serializing/deserializing C++ objects to/from JSON using Clang and RapidJSON (API documentation)'
@@ -14,7 +14,7 @@ license=('GPL')
 makedepends=('c++utilities' 'cmake' 'doxygen' 'dia' 'graphviz' 'clang' 'clang-tools-extra'  'llvm' 'rapidjson')
 url="https://github.com/Martchus/${_reponame}"
 source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('4e0a30716d905840359c35edc2acf3933cbe9be2e81de80a28beb119c1163c53')
+sha256sums=('d10e21909b29f960a9dc5e8d925511597e35e2a8436b2732bc2e224acbd62b73')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
diff --git a/reflective-rapidjson/git/PKGBUILD b/reflective-rapidjson/git/PKGBUILD
index b8899a1b..cb3ff58b 100644
--- a/reflective-rapidjson/git/PKGBUILD
+++ b/reflective-rapidjson/git/PKGBUILD
@@ -4,7 +4,7 @@
 # you also find the URL of a binary repository.
 
 _reponame=reflective-rapidjson
-_llvmver=7
+_llvmver=8
 pkgname=reflective-rapidjson-git
 _name=${pkgname%-git}
 pkgver=144.5835cd8
diff --git a/reflective-rapidjson/mingw-w64/PKGBUILD b/reflective-rapidjson/mingw-w64/PKGBUILD
index 74414af7..d626f07b 100644
--- a/reflective-rapidjson/mingw-w64/PKGBUILD
+++ b/reflective-rapidjson/mingw-w64/PKGBUILD
@@ -6,7 +6,7 @@
 _reponame=reflective-rapidjson
 pkgname=mingw-w64-reflective-rapidjson
 _name=${pkgname#mingw-w64-}
-pkgver=0.0.6
+pkgver=0.0.7
 pkgrel=1
 arch=('any')
 pkgdesc='Code generator for serializing/deserializing C++ objects to/from JSON using Clang and RapidJSON (mingw-w64)'
@@ -18,7 +18,7 @@ checkdepends=('mingw-w64-cppunit' 'mingw-w64-wine' 'mingw-w64-boost')
 makedepends=('mingw-w64-gcc' 'mingw-w64-cmake')
 url="https://github.com/Martchus/${_reponame}"
 source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('4e0a30716d905840359c35edc2acf3933cbe9be2e81de80a28beb119c1163c53')
+sha256sums=('d10e21909b29f960a9dc5e8d925511597e35e2a8436b2732bc2e224acbd62b73')
 options=(!buildflags staticlibs !strip !emptydirs)
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || _configurations='-DENABLE_STATIC_LIBS:BOOL=ON'
@@ -34,6 +34,10 @@ build() {
         -DNO_GENERATOR=ON \
         ${_configurations} \
         ../
+
+    # workaround issue https://gitlab.kitware.com/cmake/cmake/issues/19095
+    find -iname 'includes_CXX.rsp' -exec sed -i -e "s|-isystem /usr/$_arch/include ||" {} \;
+
     make
     popd
   done