diff --git a/.gitignore b/.gitignore
index 789f57ee0..11d91ee53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,9 @@ Coverage
 # generated by scripts/memory.sh
 massif-*
 
+# scripts/baremetal.sh --ram build artefacts:
+*.su
+
 # MSVC build artifacts:
 *.exe
 *.pdb
diff --git a/library/Makefile b/library/Makefile
index 45ed1485a..50faed9ca 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -200,7 +200,7 @@ libmbedcrypto.dll: $(OBJS_CRYPTO)
 
 clean:
 ifndef WINDOWS
-	rm -f *.o libmbed*
+	rm -f *.o *.su libmbed*
 else
-	del /Q /F *.o libmbed*
+	del /Q /F *.o *.su libmbed*
 endif
diff --git a/programs/Makefile b/programs/Makefile
index d09949bbf..9b01e45cd 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -298,8 +298,9 @@ ifndef WINDOWS
 	rm -f $(APPS)
 	-rm -f ssl/ssl_pthread_server$(EXEXT)
 	-rm -f test/cpp_dummy_build$(EXEXT)
+	-rm -f *.su
 else
-	del /S /Q /F *.o *.exe
+	del /S /Q /F *.o *.su *.exe
 endif
 
 list:
diff --git a/tests/Makefile b/tests/Makefile
index 0db496320..20a3fe4b7 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -114,9 +114,9 @@ $(BINARIES): %$(EXEXT): %.c $(DEP)
 
 clean:
 ifndef WINDOWS
-	rm -rf $(BINARIES) *.c *.datax TESTS
+	rm -rf $(BINARIES) *.c *.su *.datax TESTS
 else
-	del /Q /F *.c *.exe *.datax
+	del /Q /F *.c *.su *.exe *.datax
 ifneq ($(wildcard TESTS/.*),)
 	rmdir /Q /S TESTS
 endif