diff --git a/sdl/01-sdl2-init/build.gradle b/sdl/01-sdl2-init/build.gradle
index 1cedd18..c19d218 100644
--- a/sdl/01-sdl2-init/build.gradle
+++ b/sdl/01-sdl2-init/build.gradle
@@ -1,23 +1,12 @@
 apply plugin: 'c'
 apply plugin: 'visual-studio'
 
-sources {
-    main {
-        c {
-            source {
-                // Include just source, avoid including *.swp and other helper files
-                include "**/*.c"
-            }
-            exportedHeaders {
-                srcDir "../build/include"
-            }
-        }
+model {
+    components {
+        main(NativeExecutableSpec) {}
     }
-}
-
-executables {
-    main {
-        binaries.all {
+    binaries {
+         all {
             if (toolChain in VisualCpp) {
                 cCompiler.args "/MD"
                 linker.args "/SUBSYSTEM:CONSOLE", "/LIBPATH:../build/lib/", 
diff --git a/sdl/02-sdl2-video/build.gradle b/sdl/02-sdl2-video/build.gradle
index a349ebf..89953de 100644
--- a/sdl/02-sdl2-video/build.gradle
+++ b/sdl/02-sdl2-video/build.gradle
@@ -1,22 +1,12 @@
 apply plugin: 'c'
 apply plugin: 'visual-studio'
 
-sources {
-    main {
-        c {
-            source {
-                include "**/*.c"
-            }
-            exportedHeaders {
-                srcDir "../build/include/SDL2"
-            }
-        }
+model {
+    components {
+        main(NativeExecutableSpec) {}
     }
-}
-
-executables {
-    main {
-        binaries.all {
+    binaries {
+        all {
             if (toolChain in VisualCpp) {
                 cCompiler.args "/MD"
                 linker.args "/SUBSYSTEM:CONSOLE", "/LIBPATH:../build/lib/", "SDL2main.lib", "SDL2.lib"
diff --git a/sdl/02-sdl2-video/src/main/c/sdl2-video.c b/sdl/02-sdl2-video/src/main/c/sdl2-video.c
index ab7063f..0b70f7d 100644
--- a/sdl/02-sdl2-video/src/main/c/sdl2-video.c
+++ b/sdl/02-sdl2-video/src/main/c/sdl2-video.c
@@ -2,9 +2,7 @@
 //
 
 #include <stdio.h>
-#include "SDL.h"
-// Linux build will probably need little bit different include
-//#include "SDL2/SDL.h"
+#include "SDL2/SDL.h"
 
 int main(int argc, char* argv[]) {
     SDL_Window *win = NULL;
diff --git a/sdl/03-sdl2-linux-package/build.gradle b/sdl/03-sdl2-linux-package/build.gradle
deleted file mode 100644
index 522dd73..0000000
--- a/sdl/03-sdl2-linux-package/build.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-apply plugin: 'c'
-apply plugin: 'visual-studio'
-
-sources {
-    main {
-        c {
-            source {
-                include "**/*.c"
-            }
-            exportedHeaders {
-                srcDir "../build/include"
-            }
-        }
-    }
-}
-
-executables {
-    main {
-        binaries.all {
-            if (toolChain in VisualCpp) {
-                cCompiler.args "/MD"
-                linker.args "/SUBSYSTEM:CONSOLE", "/LIBPATH:../build/lib/", "SDL2main.lib", "SDL2.lib"
-            } else if (toolChain in Gcc) {
-                linker.args "-lSDL2"
-            }
-        }
-    }
-}
-
-task prepare(type: Copy) {
-    description "Copy DLL dependencies"
-    from "../build/lib/"
-    from "src/main/resources"
-    into "build/binaries/mainExecutable"
-}