diff --git a/static_lib/static_lib.gradle b/static_lib/static_lib.gradle
index dacbca9..753c44c 100644
--- a/static_lib/static_lib.gradle
+++ b/static_lib/static_lib.gradle
@@ -1,26 +1,16 @@
-//import dev.nokee.language.cpp.CppHeaderSet
-//import dev.nokee.language.c.CHeaderSet
-import dev.nokee.language.nativebase.NativeHeaderSet
-
 plugins {
-    id 'dev.nokee.native-library'
     id 'dev.nokee.cpp-language'
     id 'dev.nokee.c-language'
+    id 'dev.nokee.native-library'
 }
 
 library(Configure.withDefaultLibraryConfiguration())
 library { lib->
     targetLinkages = [linkages.static]
 
-    sources {
-        //cpp { from(fileTree(dir: '.', include: '*.cpp')) }
-        //c { from(fileTree(dir: '.', include: '*.c')) }
-        configureEach(CppSourceSet) { from(fileTree(dir: '.', include: '*.cpp')) }
-        //c { from(fileTree(dir: '.', include: '*.c')) }
-        //configureEach(CppHeaderSet) { from(isolatedFileTree(dir: projectDir, include: '*.h')) }
-        //configureEach(CHeaderSet) { from(isolatedFileTree(dir: projectDir, include: '*.h')) }
-        configureEach(NativeHeaderSet) { from(isolatedFileTree(dir: projectDir, include: '*.h')) }
-    }
+    cppSources.from(fileTree(dir: '.', include: '*.cpp'))
+    cSources.from(fileTree(dir: '.', include: '*.c'))
+    privateHeaders.from(isolatedFileTree(dir: projectDir, include: '*.h'))
 
      dependencies {
          implementation 'system.Crypto:libcrypto:current'
diff --git a/subsystem_a/util_1/util_1.gradle b/subsystem_a/util_1/util_1.gradle
index 78e8a98..379d1ef 100644
--- a/subsystem_a/util_1/util_1.gradle
+++ b/subsystem_a/util_1/util_1.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id 'dev.nokee.native-application'
     id 'dev.nokee.cpp-language'
     id 'dev.nokee.c-language'
+    id 'dev.nokee.native-application'
     id 'glm.windows-subsystem'
     id 'glm.installation-manifest-base'
 }
@@ -12,9 +12,6 @@ if(isWindows) {
     println "Turning off code signing for ${project.getPath()}, not yet supported on Linux."
 }
 
-//import dev.nokee.language.c.CHeaderSet
-//import dev.nokee.language.cpp.CppHeaderSet
-
 ext {
     windowsSubsystem = 'console'
 }
@@ -27,12 +24,9 @@ application { app->
     baseName = 'util_1'
     
     // Add *.cpp/*.c to the project
-    sources {
-        //cpp { from(fileTree(dir: '.', include: '*.cpp')) }
-        //c { from(fileTree(dir: '.', include: '*.c')) }
-        //configureEach(CppHeaderSet) { from(isolatedFileTree(dir: projectDir, include: '*.h')) }
-        //configureEach(CHeaderSet) { from(isolatedFileTree(dir: projectDir, include: '*.h')) }
-    }
+    cppSources.from(fileTree(dir: '.', include: '*.cpp'))
+    cSources.from(fileTree(dir: '.', include: '*.c'))
+    privateHeaders.from(isolatedFileTree(dir: projectDir, include: '*.h'))
 
     // Example of adding a project specific linker command line option.
     // This should cause the following output in build\tmp\linkDebug\output.txt: