diff --git a/example/Makefile.inc b/example/Makefile.inc
index 56cbd9886..ebbd39685 100644
--- a/example/Makefile.inc
+++ b/example/Makefile.inc
@@ -280,8 +280,8 @@ a2dp_sink_demo: ${CORE_OBJ} ${COMMON_OBJ} ${CLASSIC_OBJ} ${SDP_CLIENT} ${SBC_ENC
 
 clean:
 	rm -f ${EXAMPLES}
-	rm -f  *.o *.out *.hex *.exe
-	rm -f  ancs_client_demo.h profile.h spp_and_le_counter.h le_counter.h le_streamer.h
+	rm -f  *.o *.out *.hex *.exe *.wav *.sbc
+	rm -f  ancs_client_demo.h profile.h spp_and_le_counter.h le_counter.h le_streamer.h 
 	rm -f  gatt_battery_query.h gatt_browser.h sm_pairing_peripheral.h
 	rm -rf *.dSYM
 	rm -rf ${BTSTACK_ROOT}/src/*.o
diff --git a/port/libusb/.gitignore b/port/libusb/.gitignore
index ea8d1bf00..71fe9de5f 100644
--- a/port/libusb/.gitignore
+++ b/port/libusb/.gitignore
@@ -1,5 +1,11 @@
+a2dp_sink_demo
 ancs_client_demo
 ancs_client_demo.h
+avdtp_sink.sbc
+avdtp_sink.sbc
+avdtp_sink.wav
+avdtp_sink_demo
+avdtp_source_demo
 ble_central_test
 ble_peripheral_test
 bnep_test
@@ -10,9 +16,12 @@ gap_inquiry_and_bond
 gap_le_advertisements
 gap_le_advertisements
 gatt_battery_query
+gatt_battery_query.h
 gatt_browser
+gatt_browser.h
 hfp_ag_demo
 hfp_hf_demo
+hid_keyboard_demo
 hsp_ag_demo
 hsp_hs_demo
 l2cap_test
@@ -21,9 +30,13 @@ le_counter.h
 le_streamer
 le_streamer
 le_streamer.h
+le_streamer_client
 led_counter
 panu_demo
+pbap_client_demo
 profile.h
+sco_input*
+sco_output*
 sdp_bnep_query
 sdp_general_query
 sdp_rfcomm_query
@@ -32,9 +45,9 @@ sm_pairing_peripheral
 sm_pairing_peripheral.h
 spp_and_le_counter
 spp_and_le_counter.h
+spp_and_le_streamer
+spp_and_le_streamer.h
 spp_counter
 spp_streamer
 spp_streamer
-sco_input*
-sco_output*
-le_streamer_client
\ No newline at end of file
+spp_streamer_client
\ No newline at end of file
diff --git a/test/avdtp/plot_sbc_buffer.py b/test/avdtp/plot_sbc_buffer.py
deleted file mode 100755
index 667575614..000000000
--- a/test/avdtp/plot_sbc_buffer.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env python
-
-import matplotlib.pyplot as plt
-import csv
-
-timestamp = list()
-storage = list()
-sbc_buffer_name = 'sbc_buffer.pdf'
-with open('sbc-buffer.csv', 'rb') as csvfile:
-	data = csv.reader(csvfile, delimiter=' ')
-	for row in data:
-		i = 0
-		for cell in row:
-			if i == 0:
-				timestamp.append(int(cell))
-				i = 1
-			elif i == 1:
-				storage.append(int(cell))
-				i = 2
-	
-t = len(timestamp)
-
-plt.plot(timestamp[0:t], storage[0:t], '.')
-plt.xlabel('Time [ms]')
-plt.ylabel('Queued SBC frames')
-#plt.show()
-plt.savefig(sbc_buffer_name)
-
-print("\nCreated figure \'%s\', audio duration %d seconds.\n" % (sbc_buffer_name, len(timestamp)/1000))
diff --git a/test/pts/.gitignore b/test/pts/.gitignore
index 20b93a30e..3862fd1cf 100644
--- a/test/pts/.gitignore
+++ b/test/pts/.gitignore
@@ -1,4 +1,7 @@
 ancs_client
+avdtp_sink_test
+avdtp_source_test
+avrcp_test
 ble_central_test
 ble_central_test.h
 ble_peripheral_test
@@ -9,11 +12,9 @@ hfp_ag_test
 hfp_hf_test
 hsp_ag_test
 hsp_hs_test
-l2cap_test
-profile.h
-sco_loopbackiopt
-sco_loopback
 iopt
+l2cap_test
 le_data_channel
-avdtp_sink_test
-avdtp_source_test
+profile.h
+sco_loopback
+sco_loopbackiopt
diff --git a/tool/.gitignore b/tool/.gitignore
new file mode 100644
index 000000000..7e99e367f
--- /dev/null
+++ b/tool/.gitignore
@@ -0,0 +1 @@
+*.pyc
\ No newline at end of file