diff --git a/.gitignore b/.gitignore
index 8a28c09329..fddd715cb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ pom-jna-platform.xml.asc
 /contrib/platform/nbproject/private/
 /nbproject/private/
 /native/.ccls-cache/
+/contrib/ntservice/nbproject/private/
diff --git a/build.xml b/build.xml
index 343941d0f9..ed104c2121 100644
--- a/build.xml
+++ b/build.xml
@@ -768,6 +768,8 @@ osname=macosx;processor=aarch64
       <property name="file.reference.jna.build" location="${build}"/>
       <property name="file.reference.jna.jar" location="${build}/${jar}"/>
       <property name="libs.junit.classpath" refid="test.libs"/>
+      <property name="javac.source" value="${compatibility}" />
+      <property name="javac.target" value="${compatibility}" />
       <fileset dir="${contrib}" includes="*/build.xml" excludes="platform/build.xml"/>
     </subant>
   </target>
diff --git a/contrib/alphamaskdemo/build.xml b/contrib/alphamaskdemo/build.xml
index a9bead9eab..2186daaddd 100644
--- a/contrib/alphamaskdemo/build.xml
+++ b/contrib/alphamaskdemo/build.xml
@@ -2,14 +2,15 @@
 <project name="jnacontrib.alphamaskdemo" default="jar" basedir=".">
     <description>Builds, tests, and runs the project jnacontrib.alphamaskdemo.</description>
     <!-- Locations -->
-    <property name="src"                location="."/>
-    <property name="build"              location="build"/>
-    <property name="jna-dist"           location="../../dist"/>
-
-    <property name="classes"       location="${build}/classes"/>
-    <property name="jar"           location="${build}/demo-alphamask.jar"/>
+    <property name="src"                    location="."/>
+    <property name="build"                  location="build"/>
+    <property name="jna-dist"               location="../../dist"/>
+    <property name="classes"                location="${build}/classes"/>
+    <property name="jar"                    location="${build}/demo-alphamask.jar"/>
     <property name="file.reference.jna.jar" location="../../build/jna.jar"/>
-    <property name="main-class"			value="com.sun.jna.contrib.demo.AlphaMaskDemo" />
+    <property name="main-class"	            value="com.sun.jna.contrib.demo.AlphaMaskDemo" />
+    <property name="javac.target"           value="1.6" />
+    <property name="javac.source"           value="1.6" />
 
     <path id="classpath">
         <fileset file="${file.reference.jna.jar}"/>
@@ -37,7 +38,8 @@
     <target name="compile">
         <mkdir dir="${classes}"/>
         <!-- Compile the project. -->
-        <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
+        <javac srcdir="${src}" destdir="${classes}"
+               target="${javac.target}" source="${javac.source}"
                encoding="UTF-8" debug="on" includeantruntime="false">
             <classpath>
                 <path refid="classpath"/>
diff --git a/contrib/balloonmanagerdemo/build.xml b/contrib/balloonmanagerdemo/build.xml
index 7f53f329e2..e9cba2c7ba 100644
--- a/contrib/balloonmanagerdemo/build.xml
+++ b/contrib/balloonmanagerdemo/build.xml
@@ -2,14 +2,15 @@
 <project name="jnacontrib.balloonmanagerdemo" default="jar" basedir=".">
     <description>Builds, tests, and runs the project jnacontrib.balloonmanagerdemo.</description>
     <!-- Locations -->
-    <property name="src"                location="."/>
-    <property name="build"              location="build"/>
-    <property name="jna-dist"           location="../../dist"/>
-
-    <property name="classes"       location="${build}/classes"/>
-    <property name="jar"           location="${build}/demo-balloonmanager.jar"/>
+    <property name="src"                    location="."/>
+    <property name="build"                  location="build"/>
+    <property name="jna-dist"               location="../../dist"/>
+    <property name="classes"                location="${build}/classes"/>
+    <property name="jar"                    location="${build}/demo-balloonmanager.jar"/>
     <property name="file.reference.jna.jar" location="../../build/jna.jar"/>
-    <property name="main-class"			value="com.sun.jna.contrib.demo.BalloonManagerDemo" />
+    <property name="main-class"             value="com.sun.jna.contrib.demo.BalloonManagerDemo" />
+    <property name="javac.target"           value="1.6" />
+    <property name="javac.source"           value="1.6" />
 
     <path id="classpath">
         <fileset file="${file.reference.jna.jar}"/>
@@ -37,7 +38,8 @@
     <target name="compile">
         <mkdir dir="${classes}"/>
         <!-- Compile the project. -->
-        <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
+        <javac srcdir="${src}" destdir="${classes}"
+               target="${javac.target}" source="${javac.source}"
                encoding="UTF-8" debug="on" includeantruntime="false">
             <classpath>
                 <path refid="classpath"/>
diff --git a/contrib/balloontips/build.xml b/contrib/balloontips/build.xml
index 594b65f95e..e5b64b11d0 100644
--- a/contrib/balloontips/build.xml
+++ b/contrib/balloontips/build.xml
@@ -2,14 +2,15 @@
 <project name="jnacontrib.balloontipsdemo" default="jar" basedir=".">
     <description>Builds, tests, and runs the project jnacontrib.balloontipsdemo.</description>
     <!-- Locations -->
-    <property name="src"                location="."/>
-    <property name="build"              location="build"/>
-    <property name="jna-dist"           location="../../dist"/>
-
-    <property name="classes"       location="${build}/classes"/>
-    <property name="jar"           location="${build}/demo-balloontips.jar"/>
+    <property name="src"                    location="."/>
+    <property name="build"                  location="build"/>
+    <property name="jna-dist"               location="../../dist"/>
+    <property name="classes"                location="${build}/classes"/>
+    <property name="jar"                    location="${build}/demo-balloontips.jar"/>
     <property name="file.reference.jna.jar" location="../../build/jna.jar"/>
-    <property name="main-class"		value="com.sun.jna.contrib.demo.FilteredTextField" />
+    <property name="main-class"		    value="com.sun.jna.contrib.demo.FilteredTextField" />
+    <property name="javac.target"           value="1.6" />
+    <property name="javac.source"           value="1.6" />
 
     <path id="classpath">
         <fileset file="${file.reference.jna.jar}"/>
@@ -37,8 +38,9 @@
     <target name="compile">
         <mkdir dir="${classes}"/>
         <!-- Compile the project. -->
-        <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
-               encoding="UTF-8" debug="on" includeantruntime="false"> 
+        <javac srcdir="${src}" destdir="${classes}"
+               target="${javac.target}" source="${javac.source}"
+               encoding="UTF-8" debug="on" includeantruntime="false">
             <classpath>
                 <path refid="classpath"/>
             </classpath>
diff --git a/contrib/dnddemo/build.xml b/contrib/dnddemo/build.xml
index 4fab70a831..1feacb3a9b 100644
--- a/contrib/dnddemo/build.xml
+++ b/contrib/dnddemo/build.xml
@@ -2,14 +2,15 @@
 <project name="jnacontrib.dnddemo" default="jar" basedir=".">
     <description>Builds, tests, and runs the project jnacontrib.dnddemo.</description>
     <!-- Locations -->
-    <property name="src"                location="."/>
-    <property name="build"              location="build"/>
-    <property name="jna-dist"           location="../../dist"/>
-
-    <property name="classes"       location="${build}/classes"/>
-    <property name="jar"           location="${build}/demo-dnd.jar"/>
+    <property name="src"                    location="."/>
+    <property name="build"                  location="build"/>
+    <property name="jna-dist"               location="../../dist"/>
+    <property name="classes"                location="${build}/classes"/>
+    <property name="jar"                    location="${build}/demo-dnd.jar"/>
     <property name="file.reference.jna.jar" location="../../build/jna.jar"/>
-    <property name="main-class"			value="com.sun.jna.contrib.demo.GhostedDragImageDemo" />
+    <property name="main-class"             value="com.sun.jna.contrib.demo.GhostedDragImageDemo" />
+    <property name="javac.target"           value="1.6" />
+    <property name="javac.source"           value="1.6" />
 
     <path id="classpath">
         <fileset file="${file.reference.jna.jar}"/>
@@ -37,7 +38,8 @@
     <target name="compile">
         <mkdir dir="${classes}"/>
         <!-- Compile the project. -->
-        <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
+        <javac srcdir="${src}" destdir="${classes}"
+               target="${javac.target}" source="${javac.source}"
                encoding="UTF-8" debug="on" includeantruntime="false">
             <classpath>
                 <path refid="classpath"/>
diff --git a/contrib/monitordemo/build.xml b/contrib/monitordemo/build.xml
index cb5ad9e77f..6e7a5c1b58 100644
--- a/contrib/monitordemo/build.xml
+++ b/contrib/monitordemo/build.xml
@@ -2,14 +2,15 @@
 <project name="jnacontrib.monitordemo" default="jar" basedir=".">
     <description>Builds, tests, and runs the project jnacontrib.monitordemo.</description>
     <!-- Locations -->
-    <property name="src"                location="./src"/>
-    <property name="build"              location="build"/>
-    <property name="jna-dist"           location="../../dist"/>
-
-    <property name="classes"       location="${build}/classes"/>
-    <property name="jar"           location="${build}/demo-monitordemo.jar"/>
+    <property name="src"                    location="./src"/>
+    <property name="build"                  location="build"/>
+    <property name="jna-dist"               location="../../dist"/>
+    <property name="classes"                location="${build}/classes"/>
+    <property name="jar"                    location="${build}/demo-monitordemo.jar"/>
     <property name="file.reference.jna.jar" location="../../build/jna.jar"/>
-    <property name="main-class"			value="com.sun.jna.contrib.demo.MonitorInfoDemo" />
+    <property name="main-class"             value="com.sun.jna.contrib.demo.MonitorInfoDemo" />
+    <property name="javac.target"           value="1.6" />
+    <property name="javac.source"           value="1.6" />
 
     <path id="classpath">
         <fileset file="${file.reference.jna.jar}"/>
@@ -37,7 +38,8 @@
     <target name="compile">
         <mkdir dir="${classes}"/>
         <!-- Compile the project. -->
-        <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
+        <javac srcdir="${src}" destdir="${classes}"
+               target="${javac.target}" source="${javac.source}"
                encoding="UTF-8" debug="on" includeantruntime="false">
             <classpath>
                 <path refid="classpath"/>
diff --git a/contrib/msoffice/build.xml b/contrib/msoffice/build.xml
index 50452b0847..fa0387b61c 100644
--- a/contrib/msoffice/build.xml
+++ b/contrib/msoffice/build.xml
@@ -2,14 +2,15 @@
 <project name="jnacontrib.msoffice" default="jar" basedir=".">
     <description>Builds, tests, and runs the project jnacontrib.msoffice.</description>
     <!-- Locations -->
-    <property name="src"                location="./src"/>
-    <property name="build"              location="build"/>
-    <property name="jna-dist"           location="../../dist"/>
-
-    <property name="classes"       location="${build}/classes"/>
-    <property name="jar"           location="${build}/demo-msoffice.jar"/>
+    <property name="src"                    location="./src"/>
+    <property name="build"                  location="build"/>
+    <property name="jna-dist"               location="../../dist"/>
+    <property name="classes"                location="${build}/classes"/>
+    <property name="jar"                    location="${build}/demo-msoffice.jar"/>
     <property name="file.reference.jna.jar" location="../../build/jna.jar"/>
-    <property name="main-class"			value="" />
+    <property name="main-class"             value="" />
+    <property name="javac.target"           value="1.6" />
+    <property name="javac.source"           value="1.6" />
 
     <path id="classpath">
         <fileset file="${file.reference.jna.jar}"/>
@@ -37,7 +38,8 @@
     <target name="compile">
         <mkdir dir="${classes}"/>
         <!-- Compile the project. -->
-        <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
+        <javac srcdir="${src}" destdir="${classes}"
+               target="${javac.target}" source="${javac.source}"
                encoding="UTF-8" debug="on" includeantruntime="false">
             <classpath>
                 <path refid="classpath"/>
diff --git a/contrib/native_window_msg/build.xml b/contrib/native_window_msg/build.xml
index 15bdb95b6e..19e99db685 100644
--- a/contrib/native_window_msg/build.xml
+++ b/contrib/native_window_msg/build.xml
@@ -9,6 +9,8 @@
     <property name="jar"                    location="${build}/demo-nativewindowmsg.jar"/>
     <property name="file.reference.jna.jar" location="../../build/jna.jar"/>
     <property name="main-class"             value="com.sun.jna.platform.win32.Win32WindowDemo" />
+    <property name="javac.target"           value="1.6" />
+    <property name="javac.source"           value="1.6" />
 
     <path id="classpath">
         <fileset file="${file.reference.jna.jar}"/>
@@ -36,7 +38,8 @@
     <target name="compile">
         <mkdir dir="${classes}"/>
         <!-- Compile the project. -->
-        <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
+        <javac srcdir="${src}" destdir="${classes}"
+               target="${javac.target}" source="${javac.source}"
                encoding="UTF-8" debug="on" includeantruntime="false">
             <classpath>
                 <path refid="classpath"/>
diff --git a/contrib/shapedwindowdemo/build.xml b/contrib/shapedwindowdemo/build.xml
index cbcb1eea59..24c25b5ccb 100644
--- a/contrib/shapedwindowdemo/build.xml
+++ b/contrib/shapedwindowdemo/build.xml
@@ -2,14 +2,15 @@
 <project name="jnacontrib.shapedwindowdemo" default="jar" basedir=".">
     <description>Builds, tests, and runs the project jnacontrib.shapedwindowdemo.</description>
     <!-- Locations -->
-    <property name="src"                location="."/>
-    <property name="build"              location="build"/>
-    <property name="jna-dist"           location="../../../dist"/>
-
-    <property name="classes"       location="${build}/classes"/>
-    <property name="jar"           location="${build}/demo-shapedwindow.jar"/>
+    <property name="src"                    location="."/>
+    <property name="build"                  location="build"/>
+    <property name="jna-dist"               location="../../../dist"/>
+    <property name="classes"                location="${build}/classes"/>
+    <property name="jar"                    location="${build}/demo-shapedwindow.jar"/>
     <property name="file.reference.jna.jar" location="../../build/jna.jar"/>
-    <property name="main-class"		value="com.sun.jna.contrib.demo.ShapedWindowDemo" />
+    <property name="main-class"             value="com.sun.jna.contrib.demo.ShapedWindowDemo" />
+    <property name="javac.target"           value="1.6" />
+    <property name="javac.source"           value="1.6" />
 
     <path id="classpath">
         <fileset file="${file.reference.jna.jar}"/>
@@ -37,7 +38,8 @@
     <target name="compile">
         <mkdir dir="${classes}"/>
         <!-- Compile the project. -->
-        <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
+        <javac srcdir="${src}" destdir="${classes}"
+               target="${javac.target}" source="${javac.source}"
                encoding="UTF-8" debug="on" includeantruntime="false">
             <classpath>
                 <path refid="classpath"/>
diff --git a/contrib/w32printing/build.xml b/contrib/w32printing/build.xml
index 5ac1fca8a8..0af971a820 100644
--- a/contrib/w32printing/build.xml
+++ b/contrib/w32printing/build.xml
@@ -2,14 +2,15 @@
 <project name="jnacontrib.w32printing" default="jar" basedir=".">
     <description>Builds, tests, and runs the project jnacontrib.w32printing.</description>
     <!-- Locations -->
-    <property name="src"                location="./src"/>
-    <property name="build"              location="build"/>
-    <property name="jna-dist"           location="../../dist"/>
-
-    <property name="classes"       location="${build}/classes"/>
-    <property name="jar"           location="${build}/demo-w32printing.jar"/>
+    <property name="src"                    location="./src"/>
+    <property name="build"                  location="build"/>
+    <property name="jna-dist"               location="../../dist"/>
+    <property name="classes"                location="${build}/classes"/>
+    <property name="jar"                    location="${build}/demo-w32printing.jar"/>
     <property name="file.reference.jna.jar" location="../../build/jna.jar"/>
-    <property name="main-class"			value="com.sun.jna.platform.win32.Win32SpoolMonitor" />
+    <property name="main-class"             value="com.sun.jna.platform.win32.Win32SpoolMonitor" />
+    <property name="javac.target"           value="1.6" />
+    <property name="javac.source"           value="1.6" />
 
     <path id="classpath">
         <fileset file="${file.reference.jna.jar}"/>
@@ -27,7 +28,8 @@
     <target name="compile">
         <mkdir dir="${classes}"/>
         <!-- Compile the project. -->
-        <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
+        <javac srcdir="${src}" destdir="${classes}"
+               target="${javac.target}" source="${javac.source}"
                encoding="UTF-8" debug="on" includeantruntime="false">
             <classpath>
                 <path refid="classpath"/>
diff --git a/contrib/w32windowhooks/build.xml b/contrib/w32windowhooks/build.xml
index cc77d70ebc..668d22daa2 100644
--- a/contrib/w32windowhooks/build.xml
+++ b/contrib/w32windowhooks/build.xml
@@ -2,14 +2,15 @@
 <project name="jnacontrib.w32windowhooks" default="jar" basedir=".">
     <description>Builds, tests, and runs the project jnacontrib.w32windowhooks.</description>
     <!-- Locations -->
-    <property name="src"                location="."/>
-    <property name="build"              location="build"/>
-    <property name="jna-dist"           location="../../../dist"/>
-
-    <property name="classes"       location="${build}/classes"/>
-    <property name="jar"           location="${build}/demo-w32windowhooks.jar"/>
+    <property name="src"                    location="."/>
+    <property name="build"                  location="build"/>
+    <property name="jna-dist"               location="../../../dist"/>
+    <property name="classes"                location="${build}/classes"/>
+    <property name="jar"                    location="${build}/demo-w32windowhooks.jar"/>
     <property name="file.reference.jna.jar" location="../../build/jna.jar"/>
-    <property name="main-class"		value="com.sun.jna.contrib.demo.WindowHooks" />
+    <property name="main-class"		    value="com.sun.jna.contrib.demo.WindowHooks" />
+    <property name="javac.target"           value="1.6" />
+    <property name="javac.source"           value="1.6" />
 
     <path id="classpath">
         <fileset file="${file.reference.jna.jar}"/>
@@ -37,7 +38,8 @@
     <target name="compile">
         <mkdir dir="${classes}"/>
         <!-- Compile the project. -->
-        <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
+        <javac srcdir="${src}" destdir="${classes}"
+               target="${javac.target}" source="${javac.source}"
                encoding="UTF-8" debug="on" includeantruntime="false">
             <classpath>
                 <path refid="classpath"/>
diff --git a/contrib/x11/build.xml b/contrib/x11/build.xml
index 6f93186818..ecf2ae5f9b 100644
--- a/contrib/x11/build.xml
+++ b/contrib/x11/build.xml
@@ -2,13 +2,15 @@
 <project name="jnacontrib.x11" default="jar" basedir=".">
     <description>Builds, tests, and runs the project jnacontrib.x11.</description>
     <!-- Locations -->
-    <property name="src"                location="src"/>
-    <property name="build"              location="build"/>
-    <property name="jna-src"            location="../../src"/>
-    <property name="jna-dist"           location="../../dist"/>
-    <property name="classes"       location="${build}/classes"/>
-    <property name="jar"           location="${build}/demo-x11.jar"/>
+    <property name="src"                    location="src"/>
+    <property name="build"                  location="build"/>
+    <property name="jna-src"                location="../../src"/>
+    <property name="jna-dist"               location="../../dist"/>
+    <property name="classes"                location="${build}/classes"/>
+    <property name="jar"                    location="${build}/demo-x11.jar"/>
     <property name="file.reference.jna.jar" location="../../build/jna.jar"/>
+    <property name="javac.target"           value="1.6" />
+    <property name="javac.source"           value="1.6" />
 
     <path id="classpath">
         <fileset file="${file.reference.jna.jar}"/>
@@ -46,7 +48,8 @@
     <target name="compile">
         <mkdir dir="${classes}"/>
         <!-- Compile the project. -->
-        <javac srcdir="${src}" destdir="${classes}" target="1.6" source="1.6"
+        <javac srcdir="${src}" destdir="${classes}"
+               target="${javac.target}" source="${javac.source}"
                encoding="UTF-8" debug="on" includeantruntime="false">
             <classpath>
                 <path refid="classpath"/>