diff --git a/meson.build b/meson.build
new file mode 100644
index 0000000..ab552ad
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,42 @@
+# Copyright (c) 2025, Postgres Professional
+
+# Does not support the PGXS infrastructure at this time. Please, compile as part
+# of the contrib source tree.
+
+vops_sources = files(
+  'deparse.c',
+  'vops.c',
+  'vops_fdw.c',
+)
+
+if host_system == 'windows'
+  vops_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
+    '--NAME', '_int',
+    '--FILEDESC', 'VOPS - vectorized operations for PostgreSQL',])
+endif
+
+vops = shared_module('vops',
+  vops_sources,
+  kwargs: contrib_mod_args + {
+    'dependencies': contrib_mod_args['dependencies'] + [libpq],
+  },
+)
+contrib_targets += vops
+
+install_data(
+  'vops.control',
+  'vops--1.0--1.1.sql',
+  'vops--1.1.sql',
+  kwargs: contrib_data_args,
+)
+
+tests += {
+  'name': 'vops',
+  'sd': meson.current_source_dir(),
+  'bd': meson.current_build_dir(),
+  'regress': {
+    'sql': [
+      'test',
+    ],
+  },
+}
diff --git a/vops.c b/vops.c
index 8f3952d..0722b6d 100644
--- a/vops.c
+++ b/vops.c
@@ -2772,7 +2772,7 @@ vops_last_combine(PG_FUNCTION_ARGS)
 }
 
 
-const size_t vops_sizeof[] =
+static const size_t vops_sizeof[] =
 {
 	sizeof(vops_bool),
 	sizeof(vops_char),
diff --git a/vops_fdw.c b/vops_fdw.c
index e84e790..187fade 100644
--- a/vops_fdw.c
+++ b/vops_fdw.c
@@ -440,9 +440,12 @@ postgresGetForeignPaths(PlannerInfo *root,
 								   fpinfo->rows,
 								   fpinfo->startup_cost,
 								   fpinfo->total_cost,
-								   NIL, /* no pathkeys */
+								   NIL,			/* no pathkeys */
 								   NULL,		/* no outer rel either */
 								   NULL,		/* no extra plan */
+#if PG_VERSION_NUM>=170000
+								   NIL,			/* no fdw_restrictinfo list */
+#endif
 								   NIL);		/* no fdw_private list */
 	add_path(baserel, (Path *) path);
 }
@@ -1411,8 +1414,11 @@ add_foreign_grouping_paths(PlannerInfo *root, RelOptInfo *input_rel,
 										  startup_cost,
 										  total_cost,
 										  NIL,	/* no pathkeys */
-										  NULL,
-										  NIL); /* no fdw_private */
+										  NULL,	/* no extra plan */
+#if PG_VERSION_NUM>=170000
+										  NIL,	/* no fdw_restrictinfo list */
+#endif
+										  NIL); /* no fdw_private list */
 #else
 	grouppath = create_foreignscan_path(root,
 										grouped_rel,
@@ -1422,8 +1428,11 @@ add_foreign_grouping_paths(PlannerInfo *root, RelOptInfo *input_rel,
 										total_cost,
 										NIL,	/* no pathkeys */
 										grouped_rel->lateral_relids,
-										NULL,
-										NIL);	/* no fdw_private */
+										NULL,	/* no extra plan */
+#if PG_VERSION_NUM>=170000
+										NIL,	/* no fdw_restrictinfo list */
+#endif
+										NIL);	/* no fdw_private list */
 #endif
 
 	/* Add generated path into grouped_rel by add_path(). */