diff --git a/interpreters/CMakeLists.txt b/interpreters/CMakeLists.txt
index 3141c6812..94592ab05 100644
--- a/interpreters/CMakeLists.txt
+++ b/interpreters/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/interpreters/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/interpreters/Make.defs b/interpreters/Make.defs
index 0ead58c3b..64c220bbd 100644
--- a/interpreters/Make.defs
+++ b/interpreters/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/Makefile b/interpreters/Makefile
index ec2e50c1c..63f027808 100644
--- a/interpreters/Makefile
+++ b/interpreters/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/bas/CMakeLists.txt b/interpreters/bas/CMakeLists.txt
index 18aa8cfc2..86219418a 100644
--- a/interpreters/bas/CMakeLists.txt
+++ b/interpreters/bas/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/interpreters/bas/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/interpreters/bas/Make.defs b/interpreters/bas/Make.defs
index 6cf5db783..e17fec9a6 100644
--- a/interpreters/bas/Make.defs
+++ b/interpreters/bas/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/bas/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/bas/Makefile b/interpreters/bas/Makefile
index 55edb4d70..332cb17df 100644
--- a/interpreters/bas/Makefile
+++ b/interpreters/bas/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/bas/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/bas/bas.c b/interpreters/bas/bas.c
index 46a5c85df..3ccaea3b9 100644
--- a/interpreters/bas/bas.c
+++ b/interpreters/bas/bas.c
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas.c
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas.h b/interpreters/bas/bas.h
index 4373ad7ad..eb4890d50 100644
--- a/interpreters/bas/bas.h
+++ b/interpreters/bas/bas.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas.h
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_auto.c b/interpreters/bas/bas_auto.c
index 13f4222a0..25d14a6cd 100644
--- a/interpreters/bas/bas_auto.c
+++ b/interpreters/bas/bas_auto.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_auto.c
- * BASIC file system interface.
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_auto.h b/interpreters/bas/bas_auto.h
index d608a575f..4aaa6878b 100644
--- a/interpreters/bas/bas_auto.h
+++ b/interpreters/bas/bas_auto.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_auto.h
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_autotypes.h b/interpreters/bas/bas_autotypes.h
index ac08d144f..b1dd547b9 100644
--- a/interpreters/bas/bas_autotypes.h
+++ b/interpreters/bas/bas_autotypes.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_autotypes.h
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_error.h b/interpreters/bas/bas_error.h
index 0d2697aeb..58fe4dd2d 100644
--- a/interpreters/bas/bas_error.h
+++ b/interpreters/bas/bas_error.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_error.h
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_fs.c b/interpreters/bas/bas_fs.c
index 1d0863bbe..199f41bb9 100644
--- a/interpreters/bas/bas_fs.c
+++ b/interpreters/bas/bas_fs.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_fs.c
- * BASIC file system interface.
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_fs.h b/interpreters/bas/bas_fs.h
index 54ffb22e5..38ddb1553 100644
--- a/interpreters/bas/bas_fs.h
+++ b/interpreters/bas/bas_fs.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_fs.h
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_global.c b/interpreters/bas/bas_global.c
index ef5b682cd..480ac47db 100644
--- a/interpreters/bas/bas_global.c
+++ b/interpreters/bas/bas_global.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_global.c
- * Global variables and functions.
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_global.h b/interpreters/bas/bas_global.h
index 197c51bc6..f51aae78d 100644
--- a/interpreters/bas/bas_global.h
+++ b/interpreters/bas/bas_global.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_global.h
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_main.c b/interpreters/bas/bas_main.c
index 986ac1d2f..4bb2d0f12 100644
--- a/interpreters/bas/bas_main.c
+++ b/interpreters/bas/bas_main.c
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_main.c
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_program.c b/interpreters/bas/bas_program.c
index 51fda65bd..4d281da63 100644
--- a/interpreters/bas/bas_program.c
+++ b/interpreters/bas/bas_program.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_program.c
- * Program storage.
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_program.h b/interpreters/bas/bas_program.h
index 3243e1023..712918af9 100644
--- a/interpreters/bas/bas_program.h
+++ b/interpreters/bas/bas_program.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_program.h
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_programtypes.h b/interpreters/bas/bas_programtypes.h
index 9174f6595..d328f5819 100644
--- a/interpreters/bas/bas_programtypes.h
+++ b/interpreters/bas/bas_programtypes.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_programtypes.h
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_statement.c b/interpreters/bas/bas_statement.c
index 5172bdfb3..b95a38a3c 100644
--- a/interpreters/bas/bas_statement.c
+++ b/interpreters/bas/bas_statement.c
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_statement.c
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_statement.h b/interpreters/bas/bas_statement.h
index 3421aab14..5b1fe9fcd 100644
--- a/interpreters/bas/bas_statement.h
+++ b/interpreters/bas/bas_statement.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/statement.h
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_str.c b/interpreters/bas/bas_str.c
index 421a10e79..1c68982dd 100644
--- a/interpreters/bas/bas_str.c
+++ b/interpreters/bas/bas_str.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_str.c
- * Dynamic strings.
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_str.h b/interpreters/bas/bas_str.h
index c9a49395a..e70fe8711 100644
--- a/interpreters/bas/bas_str.h
+++ b/interpreters/bas/bas_str.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_str.h
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_token.c b/interpreters/bas/bas_token.c
index 51448a018..f4c2fbd26 100644
--- a/interpreters/bas/bas_token.c
+++ b/interpreters/bas/bas_token.c
@@ -1,3 +1,24 @@
+/****************************************************************************
+ * apps/interpreters/bas/bas_token.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
 
 #line 3 "<stdout>"
 
diff --git a/interpreters/bas/bas_token.h b/interpreters/bas/bas_token.h
index ffe3fc4cd..7cb15d3a3 100644
--- a/interpreters/bas/bas_token.h
+++ b/interpreters/bas/bas_token.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_token.h
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_token.l b/interpreters/bas/bas_token.l
index d68fb900a..131544262 100644
--- a/interpreters/bas/bas_token.l
+++ b/interpreters/bas/bas_token.l
@@ -1,3 +1,25 @@
+/****************************************************************************
+ * apps/interpreters/bas/bas_token.l
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
 /* Tokens and token sequence arrays. */
 %{
 #include <nuttx/config.h>
diff --git a/interpreters/bas/bas_value.c b/interpreters/bas/bas_value.c
index 901eb55be..3c99281d0 100644
--- a/interpreters/bas/bas_value.c
+++ b/interpreters/bas/bas_value.c
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_value.c
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_value.h b/interpreters/bas/bas_value.h
index c60037c09..5a428bd5d 100644
--- a/interpreters/bas/bas_value.h
+++ b/interpreters/bas/bas_value.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_value.h
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_var.c b/interpreters/bas/bas_var.c
index a5cf9fe0f..1e26dca22 100644
--- a/interpreters/bas/bas_var.c
+++ b/interpreters/bas/bas_var.c
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_var.c
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_var.h b/interpreters/bas/bas_var.h
index 022d1422b..1f5f0444b 100644
--- a/interpreters/bas/bas_var.h
+++ b/interpreters/bas/bas_var.h
@@ -1,7 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_var.h
  *
- *   Copyright (c) 1999-2014 Michael Haardt
+ * SPDX-License-Identifier: MIT
+ * SPDX-FileCopyrightText: 1999-2014 Michael Haardt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/interpreters/bas/bas_vt100.c b/interpreters/bas/bas_vt100.c
index ebdd60b54..84410232d 100644
--- a/interpreters/bas/bas_vt100.c
+++ b/interpreters/bas/bas_vt100.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_vt100.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/bas/bas_vt100.h b/interpreters/bas/bas_vt100.h
index 45ade3d26..fc7b5d2c5 100644
--- a/interpreters/bas/bas_vt100.h
+++ b/interpreters/bas/bas_vt100.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/interpreters/bas/bas_vt100.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/duktape/Make.defs b/interpreters/duktape/Make.defs
index b9d4fbfd6..e0627acf7 100644
--- a/interpreters/duktape/Make.defs
+++ b/interpreters/duktape/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/duktape/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/duktape/Makefile b/interpreters/duktape/Makefile
index 37dacaaa4..c6a0a621e 100644
--- a/interpreters/duktape/Makefile
+++ b/interpreters/duktape/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/duktape/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/ficl/Make.defs b/interpreters/ficl/Make.defs
index fb76bd5a4..95cbe50b9 100644
--- a/interpreters/ficl/Make.defs
+++ b/interpreters/ficl/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/ficl/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/ficl/Makefile b/interpreters/ficl/Makefile
index 6b3308c6f..46d058e13 100644
--- a/interpreters/ficl/Makefile
+++ b/interpreters/ficl/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/ficl/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/ficl/configure.sh b/interpreters/ficl/configure.sh
index d84e0d4fc..d7e232d3a 100755
--- a/interpreters/ficl/configure.sh
+++ b/interpreters/ficl/configure.sh
@@ -1,4 +1,26 @@
 #!/usr/bin/env bash
+############################################################################
+# apps/interpreters/ficl/configure.sh
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
 
 USAGE="$0 <Ficl-dir>"
 
diff --git a/interpreters/ficl/src/nuttx.c b/interpreters/ficl/src/nuttx.c
index 5d01b8c84..86cc1712b 100644
--- a/interpreters/ficl/src/nuttx.c
+++ b/interpreters/ficl/src/nuttx.c
@@ -1,39 +1,31 @@
 /****************************************************************************
  * apps/interpreters/ficl/src/nuttx.c
  *
- *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ***************************************************************************/
+
+/****************************************************************************
  *
  * This file was taken from Mini Basic, versino 1.0 developed by Malcolm
  * McLean, Leeds University.  Mini Basic version 1.0 was released the
  * Creative Commons Attribution license which, from my reading, appears to
- * be compatible with the NuttX BSD-style license:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * be compatible with the NuttX license.
  *
  ****************************************************************************/
 
diff --git a/interpreters/ficl/src/nuttx.h b/interpreters/ficl/src/nuttx.h
index 87887e757..d1b94a170 100644
--- a/interpreters/ficl/src/nuttx.h
+++ b/interpreters/ficl/src/nuttx.h
@@ -1,6 +1,8 @@
 /***************************************************************************
  * apps/interpreters/ficl/src/nuttx.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/lua/CMakeLists.txt b/interpreters/lua/CMakeLists.txt
index ace2c604b..8083a605d 100644
--- a/interpreters/lua/CMakeLists.txt
+++ b/interpreters/lua/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/interpreters/lua/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/interpreters/lua/Make.defs b/interpreters/lua/Make.defs
index 52f0b68df..a0cf323ab 100644
--- a/interpreters/lua/Make.defs
+++ b/interpreters/lua/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/lua/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/lua/Makefile b/interpreters/lua/Makefile
index 6f9dbfcee..86e446667 100644
--- a/interpreters/lua/Makefile
+++ b/interpreters/lua/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/lua/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/lua/Module.mk b/interpreters/lua/Module.mk
index 675ef51bd..52e9023c0 100644
--- a/interpreters/lua/Module.mk
+++ b/interpreters/lua/Module.mk
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/lua/Module.mk
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/lua/nuttx_linit.c b/interpreters/lua/nuttx_linit.c
index c15b1ab8c..3e47a9c99 100644
--- a/interpreters/lua/nuttx_linit.c
+++ b/interpreters/lua/nuttx_linit.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/interpreters/lua/nuttx_linit.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/luajit/0001-luajit-armv7m-nuttx.patch b/interpreters/luajit/0001-luajit-armv7m-nuttx.patch
index fda4d7505..d6c20879e 100644
--- a/interpreters/luajit/0001-luajit-armv7m-nuttx.patch
+++ b/interpreters/luajit/0001-luajit-armv7m-nuttx.patch
@@ -18,9 +18,9 @@ index 00000000..8f94ba40
 +++ b/dynasm/dasm_armv7m.h
 @@ -0,0 +1,563 @@
 +/*
-+** DynASM ARM encoding engine.
-+** Copyright (C) 2018 Jernej Turnsek. All rights reserved.
-+** Copyright (C) 2005-2017 Mike Pall. All rights reserved.
++** SPDX-License-Identifier: MIT
++** SPDX-FileCopyrightText: 2018 Jernej Turnsek. All rights reserved.
++** SPDX-FileCopyrightText: 2005-2017 Mike Pall. All rights reserved.
 +** Released under the MIT license. See dynasm.lua for full copyright notice.
 +*/
 +
diff --git a/interpreters/luajit/Make.defs b/interpreters/luajit/Make.defs
index 066d3922f..c9957001c 100644
--- a/interpreters/luajit/Make.defs
+++ b/interpreters/luajit/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/luajit/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/luajit/Makefile b/interpreters/luajit/Makefile
index 778d0ed4a..1d7f2dfb4 100644
--- a/interpreters/luajit/Makefile
+++ b/interpreters/luajit/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/luajit/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/luamodules/CMakeLists.txt b/interpreters/luamodules/CMakeLists.txt
index 92f6b8d5f..9ac42149c 100644
--- a/interpreters/luamodules/CMakeLists.txt
+++ b/interpreters/luamodules/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/interpreters/luamodules/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/interpreters/luamodules/Make.defs b/interpreters/luamodules/Make.defs
index 224a325c5..1dd614d13 100644
--- a/interpreters/luamodules/Make.defs
+++ b/interpreters/luamodules/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/luamodules/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/luamodules/Makefile b/interpreters/luamodules/Makefile
index 2943f21ea..b18df0fb3 100644
--- a/interpreters/luamodules/Makefile
+++ b/interpreters/luamodules/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/luamodules/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/luamodules/cjson/Make.defs b/interpreters/luamodules/cjson/Make.defs
index ef9e639c2..863ba0ba4 100644
--- a/interpreters/luamodules/cjson/Make.defs
+++ b/interpreters/luamodules/cjson/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/luamodules/cjson/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/luamodules/cjson/Makefile b/interpreters/luamodules/cjson/Makefile
index 2fd741157..f9986df4d 100644
--- a/interpreters/luamodules/cjson/Makefile
+++ b/interpreters/luamodules/cjson/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/luamodules/cjson/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/luamodules/lfs/Make.defs b/interpreters/luamodules/lfs/Make.defs
index 868d80cdd..0ce0cadff 100644
--- a/interpreters/luamodules/lfs/Make.defs
+++ b/interpreters/luamodules/lfs/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/luamodules/lfs/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/luamodules/lfs/Makefile b/interpreters/luamodules/lfs/Makefile
index 2987ff3c2..f41313aac 100644
--- a/interpreters/luamodules/lfs/Makefile
+++ b/interpreters/luamodules/lfs/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/luamodules/lfs/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/luamodules/luasyslog/CMakeLists.txt b/interpreters/luamodules/luasyslog/CMakeLists.txt
index 9f6bf0b0a..6f1fc2e11 100644
--- a/interpreters/luamodules/luasyslog/CMakeLists.txt
+++ b/interpreters/luamodules/luasyslog/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/interpreters/luamodules/luasyslog/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/interpreters/luamodules/luasyslog/Make.defs b/interpreters/luamodules/luasyslog/Make.defs
index 6b1d99078..7861da2e2 100644
--- a/interpreters/luamodules/luasyslog/Make.defs
+++ b/interpreters/luamodules/luasyslog/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/luamodules/luasyslog/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/luamodules/luasyslog/Makefile b/interpreters/luamodules/luasyslog/Makefile
index 52f188d35..2421472f8 100644
--- a/interpreters/luamodules/luasyslog/Makefile
+++ b/interpreters/luamodules/luasyslog/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/luamodules/luasyslog/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/luamodules/luv/Make.defs b/interpreters/luamodules/luv/Make.defs
index c1af97de2..2f1a4ae50 100644
--- a/interpreters/luamodules/luv/Make.defs
+++ b/interpreters/luamodules/luv/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/luamodules/luv/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/luamodules/luv/Makefile b/interpreters/luamodules/luv/Makefile
index 9eb011163..8f4c25357 100644
--- a/interpreters/luamodules/luv/Makefile
+++ b/interpreters/luamodules/luv/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/luamodules/luv/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/minibasic/CMakeLists.txt b/interpreters/minibasic/CMakeLists.txt
index cead0f358..7c1e1401d 100644
--- a/interpreters/minibasic/CMakeLists.txt
+++ b/interpreters/minibasic/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/interpreters/minibasic/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/interpreters/minibasic/Make.defs b/interpreters/minibasic/Make.defs
index da9cb2bfe..518bfb561 100644
--- a/interpreters/minibasic/Make.defs
+++ b/interpreters/minibasic/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/minibasic/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/minibasic/Makefile b/interpreters/minibasic/Makefile
index ced37e100..40f597750 100644
--- a/interpreters/minibasic/Makefile
+++ b/interpreters/minibasic/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/minibasic/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/minibasic/basic.c b/interpreters/minibasic/basic.c
index 8a3a404a4..791463a30 100644
--- a/interpreters/minibasic/basic.c
+++ b/interpreters/minibasic/basic.c
@@ -1,39 +1,31 @@
 /****************************************************************************
  * apps/interpreters/minibasic/basic.c
  *
- *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
  *
  * This file was taken from Mini Basic, versino 1.0 developed by Malcolm
  * McLean, Leeds University.  Mini Basic version 1.0 was released the
  * Creative Commons Attribution license which, from my reading, appears to
- * be compatible with the NuttX BSD-style license:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * be compatible with the NuttX license:
  *
  ****************************************************************************/
 
diff --git a/interpreters/minibasic/script.c b/interpreters/minibasic/script.c
index 1710433b6..af3b668f9 100644
--- a/interpreters/minibasic/script.c
+++ b/interpreters/minibasic/script.c
@@ -1,41 +1,32 @@
 /****************************************************************************
  * apps/interpreters/minibasic/script.c
- * Driver file for MiniBasic.
  *
- *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
  *
  * This file was taken from Mini Basic, versino 1.0 developed by Malcolm
  * McLean, Leeds University.  Mini Basic version 1.0 was released the
  * Creative Commons Attribution license which, from my reading, appears to
  * be compatible with the NuttX BSD-style license:
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/interpreters/python/Make.defs b/interpreters/python/Make.defs
index a1aecbdb4..39472e7a1 100644
--- a/interpreters/python/Make.defs
+++ b/interpreters/python/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/python/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/python/Makefile b/interpreters/python/Makefile
index e3cda75df..4b6c42eac 100644
--- a/interpreters/python/Makefile
+++ b/interpreters/python/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/python/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/python/mount_modules.c b/interpreters/python/mount_modules.c
index 89a7bc377..681031579 100644
--- a/interpreters/python/mount_modules.c
+++ b/interpreters/python/mount_modules.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/interpreters/python/mount_modules.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/quickjs/CMakeLists.txt b/interpreters/quickjs/CMakeLists.txt
index eae0b3763..38c4b26e8 100644
--- a/interpreters/quickjs/CMakeLists.txt
+++ b/interpreters/quickjs/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/interpreters/quickjs/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/interpreters/quickjs/Make.defs b/interpreters/quickjs/Make.defs
index d08b683fa..8a39b8523 100644
--- a/interpreters/quickjs/Make.defs
+++ b/interpreters/quickjs/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/quickjs/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/quickjs/Makefile b/interpreters/quickjs/Makefile
index 52d38c5c7..fb522ebcb 100644
--- a/interpreters/quickjs/Makefile
+++ b/interpreters/quickjs/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/quickjs/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/quickjs/qjsmini.c b/interpreters/quickjs/qjsmini.c
index 18957f939..d7932b81c 100644
--- a/interpreters/quickjs/qjsmini.c
+++ b/interpreters/quickjs/qjsmini.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/interpreters/quickjs/qjsmini.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/toywasm/Make.defs b/interpreters/toywasm/Make.defs
index 70dcf9673..08f1857c5 100644
--- a/interpreters/toywasm/Make.defs
+++ b/interpreters/toywasm/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/toywasm/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/toywasm/Makefile b/interpreters/toywasm/Makefile
index 4ed98d4c6..6a012b808 100644
--- a/interpreters/toywasm/Makefile
+++ b/interpreters/toywasm/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/toywasm/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/toywasm/include/toywasm_config.h b/interpreters/toywasm/include/toywasm_config.h
index 26db93dab..022a0fa58 100644
--- a/interpreters/toywasm/include/toywasm_config.h
+++ b/interpreters/toywasm/include/toywasm_config.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/interpreters/toywasm/include/toywasm_config.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/toywasm/include/toywasm_version.h b/interpreters/toywasm/include/toywasm_version.h
index d3d302592..903f6778f 100644
--- a/interpreters/toywasm/include/toywasm_version.h
+++ b/interpreters/toywasm/include/toywasm_version.h
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/interpreters/toywasm/include/toywasm_version.h
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/toywasm/regen.sh b/interpreters/toywasm/regen.sh
index 091484cd0..927666be6 100755
--- a/interpreters/toywasm/regen.sh
+++ b/interpreters/toywasm/regen.sh
@@ -1,4 +1,25 @@
 #! /bin/sh
+############################################################################
+# apps/interpreters/toywasm/regen.sh
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
 
 # A script to generate a few files for nuttx-apps build.
 
diff --git a/interpreters/toywasm/src/toywasm_config.c b/interpreters/toywasm/src/toywasm_config.c
index 0f89af964..2877e824c 100644
--- a/interpreters/toywasm/src/toywasm_config.c
+++ b/interpreters/toywasm/src/toywasm_config.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/interpreters/toywasm/src/toywasm_config.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/toywasm/tmpl/c-sections.in b/interpreters/toywasm/tmpl/c-sections.in
index 46a331512..723a3f7b4 100644
--- a/interpreters/toywasm/tmpl/c-sections.in
+++ b/interpreters/toywasm/tmpl/c-sections.in
@@ -1,3 +1,23 @@
+/****************************************************************************
+ * apps/interpreters/toywasm/tmpl/c-sections.in
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
diff --git a/interpreters/toywasm/tmpl/license.in b/interpreters/toywasm/tmpl/license.in
index 90da07e10..97d002a84 100644
--- a/interpreters/toywasm/tmpl/license.in
+++ b/interpreters/toywasm/tmpl/license.in
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/interpreters/toywasm/FILENAME
+ * apps/interpreters/toywasm/tmpl/license.in
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/interpreters/wamr/CMakeLists.txt b/interpreters/wamr/CMakeLists.txt
index 827f13af0..f155e61bf 100644
--- a/interpreters/wamr/CMakeLists.txt
+++ b/interpreters/wamr/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/interpreters/wamr/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this
diff --git a/interpreters/wamr/Make.defs b/interpreters/wamr/Make.defs
index 0c53a3614..a7e45544b 100644
--- a/interpreters/wamr/Make.defs
+++ b/interpreters/wamr/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/wamr/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/wamr/Makefile b/interpreters/wamr/Makefile
index f52d5adaa..4e78fa7bd 100644
--- a/interpreters/wamr/Makefile
+++ b/interpreters/wamr/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/wamr/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/wamr/Module.mk b/interpreters/wamr/Module.mk
index b30eb6c87..4e7de6334 100644
--- a/interpreters/wamr/Module.mk
+++ b/interpreters/wamr/Module.mk
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/wamr/Module.mk
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/wamr/Toolchain.defs b/interpreters/wamr/Toolchain.defs
index 98a848618..c0a6c5b36 100644
--- a/interpreters/wamr/Toolchain.defs
+++ b/interpreters/wamr/Toolchain.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/wamr/Toolchain.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/wamr/wamr_custom_init.c b/interpreters/wamr/wamr_custom_init.c
index 1c4dd4303..9c895e0a2 100644
--- a/interpreters/wamr/wamr_custom_init.c
+++ b/interpreters/wamr/wamr_custom_init.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/interpreters/wamr/wamr_custom_init.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/wasm3/Make.defs b/interpreters/wasm3/Make.defs
index db0e96c8c..a78510e7a 100644
--- a/interpreters/wasm3/Make.defs
+++ b/interpreters/wasm3/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/wasm3/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/interpreters/wasm3/Makefile b/interpreters/wasm3/Makefile
index eeb9aa3d4..2c87f9988 100644
--- a/interpreters/wasm3/Makefile
+++ b/interpreters/wasm3/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/interpreters/wasm3/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The