diff --git a/ports/esp32/modesp.c b/ports/esp32/modesp.c
index 8a7f025754..8c94e0cf41 100644
--- a/ports/esp32/modesp.c
+++ b/ports/esp32/modesp.c
@@ -143,4 +143,3 @@ const mp_obj_module_t esp_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&esp_module_globals,
 };
-
diff --git a/ports/nrf/mphalport.h b/ports/nrf/mphalport.h
index 5900559b5d..1ba4b6e70f 100644
--- a/ports/nrf/mphalport.h
+++ b/ports/nrf/mphalport.h
@@ -78,4 +78,3 @@ mp_uint_t mp_hal_ticks_ms(void);
 #define mp_hal_ticks_cpu() (0)
 
 #endif
-
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index e615f69112..d0b89c8d6d 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -227,4 +227,3 @@ const char rp2_help_text[] =
     "For further help on a specific object, type help(obj)\n"
     "For a list of available modules, type help('modules')\n"
 ;
-
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index d663767bf3..32167cf4e9 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -1123,4 +1123,3 @@ const mp_obj_type_t machine_i2s_type = {
 };
 
 #endif // MICROPY_HW_ENABLE_I2S
-
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 1df6cbc47d..92b80b3652 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -468,4 +468,3 @@ const mp_obj_module_t machine_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
-
diff --git a/ports/stm32/pin_defs_stm32.c b/ports/stm32/pin_defs_stm32.c
index a3f9d039d6..070005d217 100644
--- a/ports/stm32/pin_defs_stm32.c
+++ b/ports/stm32/pin_defs_stm32.c
@@ -28,4 +28,3 @@ uint32_t pin_get_pull(const pin_obj_t *pin) {
 uint32_t pin_get_af(const pin_obj_t *pin) {
     return (pin->gpio->AFR[pin->pin >> 3] >> ((pin->pin & 7) * 4)) & 0xf;
 }
-
diff --git a/ports/stm32/pin_defs_stm32.h b/ports/stm32/pin_defs_stm32.h
index d90ef1bb6d..20faab4e03 100644
--- a/ports/stm32/pin_defs_stm32.h
+++ b/ports/stm32/pin_defs_stm32.h
@@ -136,4 +136,3 @@ enum {
 };
 
 typedef GPIO_TypeDef pin_gpio_t;
-
diff --git a/tools/uncrustify.cfg b/tools/uncrustify.cfg
index 80542b903e..88127112e8 100644
--- a/tools/uncrustify.cfg
+++ b/tools/uncrustify.cfg
@@ -1409,11 +1409,11 @@ nl_start_of_file                = ignore   # ignore/add/remove/force
 nl_start_of_file_min            = 0        # unsigned number
 
 # Add or remove newline at the end of the file.
-nl_end_of_file                  = ignore   # ignore/add/remove/force
+nl_end_of_file                  = force    # ignore/add/remove/force
 
 # The minimum number of newlines at the end of the file (only used if
 # nl_end_of_file is 'add' or 'force').
-nl_end_of_file_min              = 0        # unsigned number
+nl_end_of_file_min              = 1        # unsigned number
 
 # Add or remove newline between '=' and '{'.
 nl_assign_brace                 = ignore   # ignore/add/remove/force