diff --git a/mysql-test/suite/sys_vars/inc/sysvars_server.inc b/mysql-test/suite/sys_vars/inc/sysvars_server.inc
index cb06b40f8c9..76d35f0fd55 100644
--- a/mysql-test/suite/sys_vars/inc/sysvars_server.inc
+++ b/mysql-test/suite/sys_vars/inc/sysvars_server.inc
@@ -1,3 +1,4 @@
+--source include/have_perfschema.inc
 --source include/word_size.inc
 --vertical_results
 
diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
index 5f8893b3e28..4f9bee7019f 100644
--- a/storage/innobase/include/srv0srv.h
+++ b/storage/innobase/include/srv0srv.h
@@ -620,6 +620,9 @@ do {								\
 do {								\
 	PSI_THREAD_CALL(delete_current_thread)();		\
 } while (0)
+# else
+#  define pfs_register_thread(key)
+#  define pfs_delete_thread()
 # endif /* UNIV_PFS_THREAD */
 
 #ifdef HAVE_PSI_STAGE_INTERFACE
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i
index 6907bfec583..f885bd2191f 100644
--- a/storage/innobase/include/univ.i
+++ b/storage/innobase/include/univ.i
@@ -122,6 +122,7 @@ support cross-platform development and expose comonly used SQL names. */
 #include <unistd.h>
 #endif
 
+#include "my_pthread.h"
 /* Following defines are to enable performance schema
 instrumentation in each of five InnoDB modules if
 HAVE_PSI_INTERFACE is defined. */
@@ -159,7 +160,6 @@ be excluded from instrumentation. */
 #include "pfs_thread_provider.h"
 #endif
 
-#include "my_pthread.h"
 #include "mysql/psi/mysql_thread.h"
 /* For PSI_FILE_CALL(). */
 /* JAN: TODO: missing 5.7 header */
diff --git a/storage/innobase/include/ut0ut.h b/storage/innobase/include/ut0ut.h
index c5355fd9d5c..087f175db50 100644
--- a/storage/innobase/include/ut0ut.h
+++ b/storage/innobase/include/ut0ut.h
@@ -30,6 +30,7 @@ Created 1/20/1994 Heikki Tuuri
 
 #include <ostream>
 #include <sstream>
+#include <string.h>
 
 #ifndef UNIV_INNOCHECKSUM