diff --git a/.ci/daint.cscs.ch/ocl.build.sh b/.ci/daint.cscs.ch/ocl.build.sh
index 1e82258e0b8..0d45da31f68 100755
--- a/.ci/daint.cscs.ch/ocl.build.sh
+++ b/.ci/daint.cscs.ch/ocl.build.sh
@@ -27,7 +27,7 @@ if [ ! -d "${HOME}/libxsmm" ]; then
 fi
 cd "${HOME}/libxsmm"
 git fetch
-git checkout 775d367453256d1c514b809aeac0f07d3a3cdcef
+git checkout edc62775a227e23f789b78e7b5ca9d435184fa56
 make -j
 cd ..
 
diff --git a/src/acc/acc_bench_smm.c b/src/acc/acc_bench_smm.c
index 531f6e3b9f8..83467635bb9 100644
--- a/src/acc/acc_bench_smm.c
+++ b/src/acc/acc_bench_smm.c
@@ -17,7 +17,12 @@
 #    include <libxsmm_source.h>
 #  else
 #    include <libxsmm.h>
-#    include <libxsmm_sync.h>
+#    if !defined(LIBXSMM_TIMER_H)
+#      include <utils/libxsmm_timer.h>
+#    endif
+#    if !defined(LIBXSMM_SYNC_H)
+#      include <libxsmm_sync.h>
+#    endif
 #  endif
 #  if defined(LIBXSMM_VERSION_NUMBER) && LIBXSMM_VERSION4(1, 17, 0, 0) < LIBXSMM_VERSION_NUMBER
 #    define USE_LIBXSMM
diff --git a/src/acc/acc_bench_trans.c b/src/acc/acc_bench_trans.c
index 6a26b49d709..e124b8567c5 100644
--- a/src/acc/acc_bench_trans.c
+++ b/src/acc/acc_bench_trans.c
@@ -16,6 +16,12 @@
 #    include <libxsmm_source.h>
 #  else
 #    include <libxsmm.h>
+#    if !defined(LIBXSMM_TIMER_H)
+#      include <utils/libxsmm_timer.h>
+#    endif
+#    if !defined(LIBXSMM_SYNC_H)
+#      include <libxsmm_sync.h>
+#    endif
 #  endif
 #  if defined(LIBXSMM_VERSION_NUMBER) && LIBXSMM_VERSION4(1, 17, 0, 0) < LIBXSMM_VERSION_NUMBER
 #    define USE_LIBXSMM
diff --git a/src/acc/opencl/acc_opencl.h b/src/acc/opencl/acc_opencl.h
index 28e88d7a2bf..e0ce920d239 100644
--- a/src/acc/opencl/acc_opencl.h
+++ b/src/acc/opencl/acc_opencl.h
@@ -37,7 +37,12 @@
 
 #if defined(__LIBXSMM) && !defined(LIBXSMM_DEFAULT_CONFIG)
 #  include <libxsmm.h>
-#  include <libxsmm_sync.h>
+#  if !defined(LIBXSMM_TIMER_H)
+#    include <utils/libxsmm_timer.h>
+#  endif
+#  if !defined(LIBXSMM_SYNC_H)
+#    include <libxsmm_sync.h>
+#  endif
 #else
 /* OpenCL backend depends on LIBXSMM */
 #  include <libxsmm_source.h>