diff --git a/samples/modules/tflite-micro/hello_world/src/assert.cc b/samples/modules/tflite-micro/hello_world/src/assert.cpp
similarity index 100%
rename from samples/modules/tflite-micro/hello_world/src/assert.cc
rename to samples/modules/tflite-micro/hello_world/src/assert.cpp
diff --git a/samples/modules/tflite-micro/hello_world/src/main_functions.cc b/samples/modules/tflite-micro/hello_world/src/main_functions.cpp
similarity index 98%
rename from samples/modules/tflite-micro/hello_world/src/main_functions.cc
rename to samples/modules/tflite-micro/hello_world/src/main_functions.cpp
index e0b24d2a1935..7ebfea59c7c7 100644
--- a/samples/modules/tflite-micro/hello_world/src/main_functions.cc
+++ b/samples/modules/tflite-micro/hello_world/src/main_functions.cpp
@@ -18,8 +18,8 @@
 
 #include <tensorflow/lite/micro/all_ops_resolver.h>
 #include "constants.h"
-#include "model.h"
-#include "output_handler.h"
+#include "model.hpp"
+#include "output_handler.hpp"
 #include <tensorflow/lite/micro/micro_error_reporter.h>
 #include <tensorflow/lite/micro/micro_interpreter.h>
 #include <tensorflow/lite/micro/system_setup.h>
diff --git a/samples/modules/tflite-micro/hello_world/src/model.cc b/samples/modules/tflite-micro/hello_world/src/model.cpp
similarity index 99%
rename from samples/modules/tflite-micro/hello_world/src/model.cc
rename to samples/modules/tflite-micro/hello_world/src/model.cpp
index 313abb80a91a..9cdfa9fd063c 100644
--- a/samples/modules/tflite-micro/hello_world/src/model.cc
+++ b/samples/modules/tflite-micro/hello_world/src/model.cpp
@@ -24,7 +24,7 @@
  * See train/README.md for a full description of the creation process.
  */
 
-#include "model.h"
+#include "model.hpp"
 
 /* Keep model aligned to 8 bytes to guarantee aligned 64-bit accesses. */
 alignas(8) const unsigned char g_model[] = {
diff --git a/samples/modules/tflite-micro/hello_world/src/model.h b/samples/modules/tflite-micro/hello_world/src/model.hpp
similarity index 100%
rename from samples/modules/tflite-micro/hello_world/src/model.h
rename to samples/modules/tflite-micro/hello_world/src/model.hpp
diff --git a/samples/modules/tflite-micro/hello_world/src/output_handler.cc b/samples/modules/tflite-micro/hello_world/src/output_handler.cpp
similarity index 96%
rename from samples/modules/tflite-micro/hello_world/src/output_handler.cc
rename to samples/modules/tflite-micro/hello_world/src/output_handler.cpp
index 31778c3da7ce..c26f6a019fe5 100644
--- a/samples/modules/tflite-micro/hello_world/src/output_handler.cc
+++ b/samples/modules/tflite-micro/hello_world/src/output_handler.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "output_handler.h"
+#include "output_handler.hpp"
 
 void HandleOutput(tflite::ErrorReporter *error_reporter, float x_value,
 		  float y_value)
diff --git a/samples/modules/tflite-micro/hello_world/src/output_handler.h b/samples/modules/tflite-micro/hello_world/src/output_handler.hpp
similarity index 100%
rename from samples/modules/tflite-micro/hello_world/src/output_handler.h
rename to samples/modules/tflite-micro/hello_world/src/output_handler.hpp
diff --git a/samples/modules/tflite-micro/magic_wand/src/accelerometer_handler.cc b/samples/modules/tflite-micro/magic_wand/src/accelerometer_handler.cpp
similarity index 98%
rename from samples/modules/tflite-micro/magic_wand/src/accelerometer_handler.cc
rename to samples/modules/tflite-micro/magic_wand/src/accelerometer_handler.cpp
index 0de6b733371e..e29c986d8bec 100644
--- a/samples/modules/tflite-micro/magic_wand/src/accelerometer_handler.cc
+++ b/samples/modules/tflite-micro/magic_wand/src/accelerometer_handler.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "accelerometer_handler.h"
+#include "accelerometer_handler.hpp"
 
 #include <device.h>
 #include <drivers/sensor.h>
diff --git a/samples/modules/tflite-micro/magic_wand/src/accelerometer_handler.h b/samples/modules/tflite-micro/magic_wand/src/accelerometer_handler.hpp
similarity index 100%
rename from samples/modules/tflite-micro/magic_wand/src/accelerometer_handler.h
rename to samples/modules/tflite-micro/magic_wand/src/accelerometer_handler.hpp
diff --git a/samples/modules/tflite-micro/magic_wand/src/assert.cc b/samples/modules/tflite-micro/magic_wand/src/assert.cpp
similarity index 100%
rename from samples/modules/tflite-micro/magic_wand/src/assert.cc
rename to samples/modules/tflite-micro/magic_wand/src/assert.cpp
diff --git a/samples/modules/tflite-micro/magic_wand/src/constants.h b/samples/modules/tflite-micro/magic_wand/src/constants.hpp
similarity index 100%
rename from samples/modules/tflite-micro/magic_wand/src/constants.h
rename to samples/modules/tflite-micro/magic_wand/src/constants.hpp
diff --git a/samples/modules/tflite-micro/magic_wand/src/gesture_predictor.cc b/samples/modules/tflite-micro/magic_wand/src/gesture_predictor.cpp
similarity index 97%
rename from samples/modules/tflite-micro/magic_wand/src/gesture_predictor.cc
rename to samples/modules/tflite-micro/magic_wand/src/gesture_predictor.cpp
index e69703601d9f..17c8ce4517c0 100644
--- a/samples/modules/tflite-micro/magic_wand/src/gesture_predictor.cc
+++ b/samples/modules/tflite-micro/magic_wand/src/gesture_predictor.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "gesture_predictor.h"
+#include "gesture_predictor.hpp"
 
-#include "constants.h"
+#include "constants.hpp"
 
 namespace {
 	/* State for the averaging algorithm we're using. */
diff --git a/samples/modules/tflite-micro/magic_wand/src/gesture_predictor.h b/samples/modules/tflite-micro/magic_wand/src/gesture_predictor.hpp
similarity index 100%
rename from samples/modules/tflite-micro/magic_wand/src/gesture_predictor.h
rename to samples/modules/tflite-micro/magic_wand/src/gesture_predictor.hpp
diff --git a/samples/modules/tflite-micro/magic_wand/src/magic_wand_model_data.cc b/samples/modules/tflite-micro/magic_wand/src/magic_wand_model_data.cpp
similarity index 99%
rename from samples/modules/tflite-micro/magic_wand/src/magic_wand_model_data.cc
rename to samples/modules/tflite-micro/magic_wand/src/magic_wand_model_data.cpp
index c01250596970..f0503b51f67a 100644
--- a/samples/modules/tflite-micro/magic_wand/src/magic_wand_model_data.cc
+++ b/samples/modules/tflite-micro/magic_wand/src/magic_wand_model_data.cpp
@@ -19,7 +19,7 @@
  * See the README for a full description of the creation process.
  */
 
-#include "magic_wand_model_data.h"
+#include "magic_wand_model_data.hpp"
 
 /* Keep model aligned to 8 bytes to guarantee aligned 64-bit accesses. */
 alignas(8) const unsigned char g_magic_wand_model_data[] = {
diff --git a/samples/modules/tflite-micro/magic_wand/src/magic_wand_model_data.h b/samples/modules/tflite-micro/magic_wand/src/magic_wand_model_data.hpp
similarity index 100%
rename from samples/modules/tflite-micro/magic_wand/src/magic_wand_model_data.h
rename to samples/modules/tflite-micro/magic_wand/src/magic_wand_model_data.hpp
diff --git a/samples/modules/tflite-micro/magic_wand/src/main.cc b/samples/modules/tflite-micro/magic_wand/src/main.cpp
similarity index 97%
rename from samples/modules/tflite-micro/magic_wand/src/main.cc
rename to samples/modules/tflite-micro/magic_wand/src/main.cpp
index 19f0c06b34db..4ce2989ebe29 100644
--- a/samples/modules/tflite-micro/magic_wand/src/main.cc
+++ b/samples/modules/tflite-micro/magic_wand/src/main.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "main_functions.h"
+#include "main_functions.hpp"
 
 /* This is the default main used on systems that have the standard C entry
  * point. Other devices (for example FreeRTOS or ESP32) that have different
diff --git a/samples/modules/tflite-micro/magic_wand/src/main_functions.cc b/samples/modules/tflite-micro/magic_wand/src/main_functions.cpp
similarity index 95%
rename from samples/modules/tflite-micro/magic_wand/src/main_functions.cc
rename to samples/modules/tflite-micro/magic_wand/src/main_functions.cpp
index 12ceaada8448..6c8f9e234008 100644
--- a/samples/modules/tflite-micro/magic_wand/src/main_functions.cc
+++ b/samples/modules/tflite-micro/magic_wand/src/main_functions.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include "main_functions.h"
+#include "main_functions.hpp"
 
-#include "accelerometer_handler.h"
-#include "constants.h"
-#include "gesture_predictor.h"
-#include "magic_wand_model_data.h"
-#include "output_handler.h"
+#include "accelerometer_handler.hpp"
+#include "constants.hpp"
+#include "gesture_predictor.hpp"
+#include "magic_wand_model_data.hpp"
+#include "output_handler.hpp"
 #include <tensorflow/lite/micro/micro_error_reporter.h>
 #include <tensorflow/lite/micro/micro_interpreter.h>
 #include <tensorflow/lite/micro/micro_mutable_op_resolver.h>
diff --git a/samples/modules/tflite-micro/magic_wand/src/main_functions.h b/samples/modules/tflite-micro/magic_wand/src/main_functions.hpp
similarity index 100%
rename from samples/modules/tflite-micro/magic_wand/src/main_functions.h
rename to samples/modules/tflite-micro/magic_wand/src/main_functions.hpp
diff --git a/samples/modules/tflite-micro/magic_wand/src/output_handler.cc b/samples/modules/tflite-micro/magic_wand/src/output_handler.cpp
similarity index 97%
rename from samples/modules/tflite-micro/magic_wand/src/output_handler.cc
rename to samples/modules/tflite-micro/magic_wand/src/output_handler.cpp
index 3d5b1d748c34..d00aeaf46c8a 100644
--- a/samples/modules/tflite-micro/magic_wand/src/output_handler.cc
+++ b/samples/modules/tflite-micro/magic_wand/src/output_handler.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "output_handler.h"
+#include "output_handler.hpp"
 
 void HandleOutput(tflite::ErrorReporter *error_reporter, int kind)
 {
diff --git a/samples/modules/tflite-micro/magic_wand/src/output_handler.h b/samples/modules/tflite-micro/magic_wand/src/output_handler.hpp
similarity index 100%
rename from samples/modules/tflite-micro/magic_wand/src/output_handler.h
rename to samples/modules/tflite-micro/magic_wand/src/output_handler.hpp