diff --git a/.gitignore b/.gitignore
index 7bb03ac9ef30bc741fc5902ad1ce83eadf19ba28..202ac33242205c08f7d20fafac35d38ee6024f83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,9 +9,21 @@
 *.war
 *.ear
 
+# C/C++
+*.so
+*.dylib
+*.dSYM
+*.dll
+*.jnilib
+
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
-/bin/
+
+# Directories
+**/bin/
+**/classes/
+**/dist/
+**/include/
diff --git a/com.amd.aparapi/.gitignore b/com.amd.aparapi/.gitignore
deleted file mode 100644
index 840e7d3120ee3206168d49bf62df2c269c38e17e..0000000000000000000000000000000000000000
--- a/com.amd.aparapi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/classes/