Index: /src/adapters/compiler/gcc-plugin/scorep_plugin_tree-flow.h
===================================================================
--- /src/adapters/compiler/gcc-plugin/scorep_plugin_tree-flow.h	(revision 8827)
+++ /src/adapters/compiler/gcc-plugin/scorep_plugin_tree-flow.h	(revision 12570)
@@ -24,4 +24,9 @@
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
+
+#if SCOREP_GCC_PLUGIN_TARGET_VERSION >= 7000
+#include "tree-vrp.h"
+#endif
+
 #include "tree-ssanames.h"
 #include "internal-fn.h"
Index: /src/adapters/compiler/gcc-plugin/scorep_plugin_inst_descriptor.inc.c
===================================================================
--- /src/adapters/compiler/gcc-plugin/scorep_plugin_inst_descriptor.inc.c	(revision 10166)
+++ /src/adapters/compiler/gcc-plugin/scorep_plugin_inst_descriptor.inc.c	(revision 12570)
@@ -195,5 +195,5 @@
 
     /* Align the struct generously, so that it works for 32 and 64 bit */
-    DECL_ALIGN( region_descr_var )      = 64 * BITS_PER_UNIT;
+    SET_DECL_ALIGN( region_descr_var, 64 * BITS_PER_UNIT );
     DECL_USER_ALIGN( region_descr_var ) = 1;
 
Index: /src/adapters/compiler/gcc-plugin/scorep_plugin_gcc_version_compatibility.h
===================================================================
--- /src/adapters/compiler/gcc-plugin/scorep_plugin_gcc_version_compatibility.h	(revision 10118)
+++ /src/adapters/compiler/gcc-plugin/scorep_plugin_gcc_version_compatibility.h	(revision 12570)
@@ -40,2 +40,6 @@
 #define GIMPLE gimple *
 #endif
+
+#if SCOREP_GCC_PLUGIN_TARGET_VERSION < 7000
+#define SET_DECL_ALIGN( decl, x ) DECL_ALIGN( decl ) = ( x )
+#endif
Index: /OPEN_ISSUES
===================================================================
--- /OPEN_ISSUES	(revision 12484)
+++ /OPEN_ISSUES	(revision 12570)
@@ -140,5 +140,5 @@
   - Due to constant changes in the plug-in API of the GNU compiler
     infrastructure, it is unlikely that the Score-P instrumentation
-    plug-in builds with versions newer than GCC 6.
+    plug-in builds with versions newer than GCC 7.
 
   - The pgCC compiler versions 13.9 and higher preinclude omp.h for