diff --git a/.gitignore b/.gitignore
index 9f1a629..be07a4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -191,35 +191,12 @@
 /lib/dart/**/packages
 /lib/dart/**/.pub/
 /lib/dart/**/pubspec.lock
-/lib/delphi/src/*.dcu
-/lib/delphi/test/*.identcache
-/lib/delphi/test/*.local
-/lib/delphi/test/*.dcu
-/lib/delphi/test/*.2007
-/lib/delphi/test/*.dproj
-/lib/delphi/test/*.dproj
-/lib/delphi/test/codegen/*.bat
-/lib/delphi/test/skip/*.local
-/lib/delphi/test/skip/*.identcache
-/lib/delphi/test/skip/*.identcache
-/lib/delphi/test/skip/*.dproj
-/lib/delphi/test/skip/*.dproj
-/lib/delphi/test/skip/*.2007
-/lib/delphi/test/serializer/*.identcache
-/lib/delphi/test/serializer/*.dproj
-/lib/delphi/test/serializer/*.local
-/lib/delphi/test/serializer/*.2007
-/lib/delphi/test/serializer/*.dcu
-/lib/delphi/test/multiplexed/*.dproj
-/lib/delphi/test/multiplexed/*.2007
-/lib/delphi/test/multiplexed/*.local
-/lib/delphi/test/multiplexed/*.identcache
-/lib/delphi/test/multiplexed/*.dcu
-/lib/delphi/test/typeregistry/*.2007
-/lib/delphi/test/typeregistry/*.dproj
-/lib/delphi/test/typeregistry/*.identcache
-/lib/delphi/test/typeregistry/*.local
-/lib/delphi/test/typeregistry/*.dcu
+/lib/delphi/**/*.identcache
+/lib/delphi/**/*.local
+/lib/delphi/**/*.dcu
+/lib/delphi/**/*.2007
+/lib/delphi/**/*.dproj
+/lib/delphi/**/codegen/*.bat
 /lib/erl/.eunit
 /lib/erl/.generated
 /lib/erl/.rebar/
@@ -367,15 +344,12 @@
 /tutorial/dart/**/packages
 /tutorial/dart/**/.pub/
 /tutorial/dart/**/pubspec.lock
-/tutorial/delphi/*.dsk
-/tutorial/delphi/*.local
-/tutorial/delphi/*.tvsconfig
-/tutorial/delphi/DelphiClient/dcu
-/tutorial/delphi/DelphiServer/dcu
-/tutorial/delphi/DelphiClient/*.local
-/tutorial/delphi/DelphiClient/*.identcache
-/tutorial/delphi/DelphiServer/*.identcache
-/tutorial/delphi/DelphiServer/*.local
+/tutorial/delphi/**/*.dsk
+/tutorial/delphi/**/*.local
+/tutorial/delphi/**/*.tvsconfig
+/tutorial/delphi/**/dcu
+/tutorial/delphi/**/*.local
+/tutorial/delphi/**/*.identcache
 /tutorial/go/gopath
 /tutorial/go/go-tutorial
 /tutorial/go/calculator-remote