diff --git a/.gitignore b/.gitignore
index 52a77fc01..debae2d23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,37 +1,9 @@
-*.a
-*.o
-*.d
-*.gcno
-*.gcda
-*.gcov
 *.pyc
 *~
-.config
 tests/hwsim/logs
 tests/remote/logs
 wpaspy/build
-wpa_supplicant/eapol_test
-wpa_supplicant/nfc_pw_token
-wpa_supplicant/preauth_test
-wpa_supplicant/wpa_cli
-wpa_supplicant/wpa_passphrase
-wpa_supplicant/wpa_supplicant
-wpa_supplicant/wpa_priv
-wpa_supplicant/wpa_gui/Makefile
-wpa_supplicant/wpa_gui/wpa_gui
-wpa_supplicant/wpa_gui-qt4/Makefile
-wpa_supplicant/wpa_gui-qt4/wpa_gui
-wpa_supplicant/libwpa_test1
-wpa_supplicant/libwpa_test2
-hostapd/hostapd
-hostapd/hostapd_cli
-hostapd/hlr_auc_gw
-hostapd/nt_password_hash
 mac80211_hwsim/tools/hwsim_test
-wlantest/libwlantest.a
-wlantest/test_vectors
-wlantest/wlantest
-wlantest/wlantest_cli
 **/parallel-vm.log
 tags
 build/
diff --git a/hostapd/.gitignore b/hostapd/.gitignore
new file mode 100644
index 000000000..857f3dc41
--- /dev/null
+++ b/hostapd/.gitignore
@@ -0,0 +1,5 @@
+.config
+hostapd
+hostapd_cli
+hlr_auc_gw
+nt_password_hash
diff --git a/src/crypto/.gitignore b/src/crypto/.gitignore
deleted file mode 100644
index ee606048c..000000000
--- a/src/crypto/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libcrypto.a
diff --git a/src/drivers/.gitignore b/src/drivers/.gitignore
deleted file mode 100644
index 1d9e0e661..000000000
--- a/src/drivers/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.wpa_supplicant
-build.hostapd
diff --git a/src/radius/.gitignore b/src/radius/.gitignore
deleted file mode 100644
index a89a1f927..000000000
--- a/src/radius/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libradius.a
diff --git a/src/tls/.gitignore b/src/tls/.gitignore
deleted file mode 100644
index d43242d73..000000000
--- a/src/tls/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libtls.a
diff --git a/src/utils/.gitignore b/src/utils/.gitignore
deleted file mode 100644
index 833734f88..000000000
--- a/src/utils/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libutils.a
diff --git a/wlantest/.gitignore b/wlantest/.gitignore
new file mode 100644
index 000000000..7ffabe601
--- /dev/null
+++ b/wlantest/.gitignore
@@ -0,0 +1,4 @@
+libwlantest.a
+test_vectors
+wlantest
+wlantest_cli
diff --git a/wpa_supplicant/.gitignore b/wpa_supplicant/.gitignore
index 0e3ad1b06..ff741201e 100644
--- a/wpa_supplicant/.gitignore
+++ b/wpa_supplicant/.gitignore
@@ -1 +1,15 @@
+.config
 *.service
+eapol_test
+nfc_pw_token
+preauth_test
+wpa_cli
+wpa_passphrase
+wpa_supplicant
+wpa_priv
+wpa_gui/Makefile
+wpa_gui/wpa_gui
+wpa_gui-qt4/Makefile
+wpa_gui-qt4/wpa_gui
+libwpa_test1
+libwpa_test2