diff --git a/IntelUndiPkg/GigUndiDxe/AdapterInformation.c b/IntelUndiPkg/GigUndiDxe/AdapterInformation.c
index 8268f0da5e9b..b0320b11839b 100644
--- a/IntelUndiPkg/GigUndiDxe/AdapterInformation.c
+++ b/IntelUndiPkg/GigUndiDxe/AdapterInformation.c
@@ -409,4 +409,3 @@ EFI_ADAPTER_INFORMATION_PROTOCOL gUndiAdapterInfo = {
   SetInformation,
   GetSupportedTypes
 };
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/AdapterInformation.h b/IntelUndiPkg/GigUndiDxe/AdapterInformation.h
index 72d08a891d06..3b2039bc5cb2 100644
--- a/IntelUndiPkg/GigUndiDxe/AdapterInformation.h
+++ b/IntelUndiPkg/GigUndiDxe/AdapterInformation.h
@@ -101,4 +101,3 @@ UninstallAdapterInformationProtocol (
 
 #endif /* ADAPTER_INFORMATION_H_ */
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/Brand.c b/IntelUndiPkg/GigUndiDxe/Brand.c
index 2aba217eb4c5..b29ebce16c71 100644
--- a/IntelUndiPkg/GigUndiDxe/Brand.c
+++ b/IntelUndiPkg/GigUndiDxe/Brand.c
@@ -213,4 +213,3 @@ BRAND_STRUCT mBrandingTable[] = {
 };
 
 UINTN mBrandingTableSize = (sizeof (mBrandingTable) / sizeof (mBrandingTable[0]));
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/ComponentName.c b/IntelUndiPkg/GigUndiDxe/ComponentName.c
index 6ee0dd991505..1473bfbed0af 100644
--- a/IntelUndiPkg/GigUndiDxe/ComponentName.c
+++ b/IntelUndiPkg/GigUndiDxe/ComponentName.c
@@ -272,4 +272,3 @@ EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL gUndiSupportedEfiVersion = {
   sizeof (EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL),
   EFI_2_70_SYSTEM_TABLE_REVISION
 };
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/ComponentName.h b/IntelUndiPkg/GigUndiDxe/ComponentName.h
index e3a386ea66f3..5a3d414c6970 100644
--- a/IntelUndiPkg/GigUndiDxe/ComponentName.h
+++ b/IntelUndiPkg/GigUndiDxe/ComponentName.h
@@ -72,4 +72,3 @@ ComponentNameGetDriverName (
   );
 
 #endif /* COMPONENT_NAME_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/Decode.c b/IntelUndiPkg/GigUndiDxe/Decode.c
index f858abe10785..88e8be315bd1 100644
--- a/IntelUndiPkg/GigUndiDxe/Decode.c
+++ b/IntelUndiPkg/GigUndiDxe/Decode.c
@@ -1866,4 +1866,3 @@ BadCdb:
   CdbPtr->StatFlags = PXE_STATFLAGS_COMMAND_FAILED;
   CdbPtr->StatCode  = PXE_STATCODE_INVALID_CDB;
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/Decode.h b/IntelUndiPkg/GigUndiDxe/Decode.h
index b00670f4d290..fb01267d0b2f 100644
--- a/IntelUndiPkg/GigUndiDxe/Decode.h
+++ b/IntelUndiPkg/GigUndiDxe/Decode.h
@@ -46,4 +46,3 @@ E1000UndiApiEntry (
   );
 
 #endif /* DECODE_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/DeviceSupport.c b/IntelUndiPkg/GigUndiDxe/DeviceSupport.c
index 47c2a07a0f16..3ffc25d58a3f 100644
--- a/IntelUndiPkg/GigUndiDxe/DeviceSupport.c
+++ b/IntelUndiPkg/GigUndiDxe/DeviceSupport.c
@@ -189,4 +189,3 @@ IsDeviceIdSupported (
   }
   return FALSE;
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/DeviceSupport.h b/IntelUndiPkg/GigUndiDxe/DeviceSupport.h
index a0d6b613285d..f309044d9b9d 100644
--- a/IntelUndiPkg/GigUndiDxe/DeviceSupport.h
+++ b/IntelUndiPkg/GigUndiDxe/DeviceSupport.h
@@ -81,4 +81,3 @@ IsDeviceIdSupported (
   UINT16 DeviceId
   );
 #endif /* DEVICE_SUPPORT_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/Dma.c b/IntelUndiPkg/GigUndiDxe/Dma.c
index 7f32361ef678..76a3fcf69601 100644
--- a/IntelUndiPkg/GigUndiDxe/Dma.c
+++ b/IntelUndiPkg/GigUndiDxe/Dma.c
@@ -282,4 +282,3 @@ UndiDmaUnmapMemory (
   return Status;
 }
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/Dma.h b/IntelUndiPkg/GigUndiDxe/Dma.h
index 6763c83dca39..3422acd500de 100644
--- a/IntelUndiPkg/GigUndiDxe/Dma.h
+++ b/IntelUndiPkg/GigUndiDxe/Dma.h
@@ -132,4 +132,3 @@ UndiDmaUnmapMemory (
   );
 
 #endif /* _DMA_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/DriverConfiguration.c b/IntelUndiPkg/GigUndiDxe/DriverConfiguration.c
index 9aec9422f1d6..118c1b2b9b04 100644
--- a/IntelUndiPkg/GigUndiDxe/DriverConfiguration.c
+++ b/IntelUndiPkg/GigUndiDxe/DriverConfiguration.c
@@ -571,4 +571,3 @@ EFI_DRIVER_CONFIGURATION_PROTOCOL gGigUndiDriverConfiguration = {
   GigUndiDriverConfigurationForceDefaults,
   "eng"
 };
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/DriverConfiguration.h b/IntelUndiPkg/GigUndiDxe/DriverConfiguration.h
index 9464cddbb756..a15a3a0a2745 100644
--- a/IntelUndiPkg/GigUndiDxe/DriverConfiguration.h
+++ b/IntelUndiPkg/GigUndiDxe/DriverConfiguration.h
@@ -38,4 +38,3 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define MENU_EXIT     6
 
 #endif /* DRIVER_CONFIGURATION_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/DriverDiagnostics.c b/IntelUndiPkg/GigUndiDxe/DriverDiagnostics.c
index 19b63b6059f6..a9f176ce5324 100644
--- a/IntelUndiPkg/GigUndiDxe/DriverDiagnostics.c
+++ b/IntelUndiPkg/GigUndiDxe/DriverDiagnostics.c
@@ -1548,4 +1548,3 @@ EFI_DRIVER_DIAGNOSTICS2_PROTOCOL gGigUndiDriverDiagnostics2 = {
   (EFI_DRIVER_DIAGNOSTICS2_RUN_DIAGNOSTICS) GigUndiDriverDiagnosticsRunDiagnostics,
   "en-US"
 };
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/DriverDiagnostics.h b/IntelUndiPkg/GigUndiDxe/DriverDiagnostics.h
index 2a3fe772e80a..c0f984953065 100644
--- a/IntelUndiPkg/GigUndiDxe/DriverDiagnostics.h
+++ b/IntelUndiPkg/GigUndiDxe/DriverDiagnostics.h
@@ -82,4 +82,3 @@ typedef struct {
 #pragma pack()
 
 #endif /* DRIVER_DIAGNOSTICS_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/DriverHealth.c b/IntelUndiPkg/GigUndiDxe/DriverHealth.c
index 83de9e89ab66..b1af371e06db 100644
--- a/IntelUndiPkg/GigUndiDxe/DriverHealth.c
+++ b/IntelUndiPkg/GigUndiDxe/DriverHealth.c
@@ -134,4 +134,3 @@ EFI_DRIVER_HEALTH_PROTOCOL gUndiDriverHealthProtocol = {
   GetHealthStatus,
   Repair
 };
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/E1000.c b/IntelUndiPkg/GigUndiDxe/E1000.c
index 842778a70d01..fad20d988441 100644
--- a/IntelUndiPkg/GigUndiDxe/E1000.c
+++ b/IntelUndiPkg/GigUndiDxe/E1000.c
@@ -2455,4 +2455,3 @@ WaitForEnter (
     gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
   } while (Key.UnicodeChar != 0xD);
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/E1000.h b/IntelUndiPkg/GigUndiDxe/E1000.h
index 38e88f0fd56d..71fe4591af05 100644
--- a/IntelUndiPkg/GigUndiDxe/E1000.h
+++ b/IntelUndiPkg/GigUndiDxe/E1000.h
@@ -1212,4 +1212,3 @@ WaitForEnter (
 #endif /* E1000_H_ */
 
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/E1000_osdep.c b/IntelUndiPkg/GigUndiDxe/E1000_osdep.c
index 4761e7dde99e..0d0047a93048 100644
--- a/IntelUndiPkg/GigUndiDxe/E1000_osdep.c
+++ b/IntelUndiPkg/GigUndiDxe/E1000_osdep.c
@@ -639,4 +639,3 @@ e1000_pci_clear_mwi (
 }
 
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/E1000_osdep.h b/IntelUndiPkg/GigUndiDxe/E1000_osdep.h
index 2b5562f21e47..01c0843a2c9a 100644
--- a/IntelUndiPkg/GigUndiDxe/E1000_osdep.h
+++ b/IntelUndiPkg/GigUndiDxe/E1000_osdep.h
@@ -575,4 +575,3 @@ typedef BOOLEAN boolean_t;
 
 #endif /* E1000_OSDEP_H_ */
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/EepromConfig.c b/IntelUndiPkg/GigUndiDxe/EepromConfig.c
index 8a5cb62190f9..19d867ee58af 100644
--- a/IntelUndiPkg/GigUndiDxe/EepromConfig.c
+++ b/IntelUndiPkg/GigUndiDxe/EepromConfig.c
@@ -861,4 +861,3 @@ EepromUpdateChecksum (
   return EFI_SUCCESS;
 }
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/EepromConfig.h b/IntelUndiPkg/GigUndiDxe/EepromConfig.h
index bd9fa5c0afb2..e0d31f6a151d 100644
--- a/IntelUndiPkg/GigUndiDxe/EepromConfig.h
+++ b/IntelUndiPkg/GigUndiDxe/EepromConfig.h
@@ -204,4 +204,3 @@ EepromUpdateChecksum (
   );
 
 #endif /* EEPROM_CONFIG_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf b/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf
index e52a78723cbf..2d2d0707a686 100644
--- a/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf
+++ b/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf
@@ -163,4 +163,3 @@ wol\wol_1G.c
   gEfiIfrTianoGuid                              ## CONSUMES ## Guid
   gEfiEventExitBootServicesGuid        			## PRODUCES ## Event
   gEfiEventVirtualAddressChangeGuid    			## PRODUCES ## Event
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/Hii.c b/IntelUndiPkg/GigUndiDxe/Hii.c
index 85818fe964c5..43c184cb03c8 100644
--- a/IntelUndiPkg/GigUndiDxe/Hii.c
+++ b/IntelUndiPkg/GigUndiDxe/Hii.c
@@ -1238,4 +1238,3 @@ EFI_HII_CONFIG_ACCESS_PROTOCOL gUndiHiiConfigAccess = {
   RouteConfig,
   DriverCallback
 };
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/Hii.h b/IntelUndiPkg/GigUndiDxe/Hii.h
index aa39eae7faea..5afdfc8cd174 100644
--- a/IntelUndiPkg/GigUndiDxe/Hii.h
+++ b/IntelUndiPkg/GigUndiDxe/Hii.h
@@ -90,4 +90,3 @@ HiiUnload (
   );
 
 #endif /* HII_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/HiiInternalLib.c b/IntelUndiPkg/GigUndiDxe/HiiInternalLib.c
index 21ec03193e26..2aacb63ca158 100644
--- a/IntelUndiPkg/GigUndiDxe/HiiInternalLib.c
+++ b/IntelUndiPkg/GigUndiDxe/HiiInternalLib.c
@@ -485,4 +485,3 @@ AsciiStrToUnicodeStrWrapper (
     return EFI_BUFFER_TOO_SMALL;
   }
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/HiiInternalLib.h b/IntelUndiPkg/GigUndiDxe/HiiInternalLib.h
index 49abbd280c01..28298652403a 100644
--- a/IntelUndiPkg/GigUndiDxe/HiiInternalLib.h
+++ b/IntelUndiPkg/GigUndiDxe/HiiInternalLib.h
@@ -162,4 +162,3 @@ AsciiStrToUnicodeStrWrapper (
   );
 
 #endif /* HII_INTERNAL_LIB_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/Init.c b/IntelUndiPkg/GigUndiDxe/Init.c
index dad31a5f0844..47ed03eb0849 100644
--- a/IntelUndiPkg/GigUndiDxe/Init.c
+++ b/IntelUndiPkg/GigUndiDxe/Init.c
@@ -1876,4 +1876,3 @@ EFI_DRIVER_BINDING_PROTOCOL gUndiDriverBinding = {
   NULL,                   // ImageHandle
   NULL                    // Driver Binding Handle
 };
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/Init.h b/IntelUndiPkg/GigUndiDxe/Init.h
index 308f003ce038..409cb7082340 100644
--- a/IntelUndiPkg/GigUndiDxe/Init.h
+++ b/IntelUndiPkg/GigUndiDxe/Init.h
@@ -45,4 +45,3 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define MAC_ADDRESS_SIZE_IN_BYTES 6
   
 #endif /* INIT_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/Inventory.vfr b/IntelUndiPkg/GigUndiDxe/Inventory.vfr
index 2c59c380fc09..a6cacaff4e17 100644
--- a/IntelUndiPkg/GigUndiDxe/Inventory.vfr
+++ b/IntelUndiPkg/GigUndiDxe/Inventory.vfr
@@ -370,4 +370,3 @@ formset
 
 endformset;
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/NVDataStruc.h b/IntelUndiPkg/GigUndiDxe/NVDataStruc.h
index 50945f37437c..bd7d4defc9a3 100644
--- a/IntelUndiPkg/GigUndiDxe/NVDataStruc.h
+++ b/IntelUndiPkg/GigUndiDxe/NVDataStruc.h
@@ -136,4 +136,3 @@ typedef struct {
 #define       QUESTION_ID_TMP_SUPPORT_ALT_MAC_ADDR              0x1407
 #define       QUESTION_ID_TMP_SUPPORT_LINK_SPD_STATUS           0x1408
 #endif /* NV_DATA_STRUC_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/StartStop.c b/IntelUndiPkg/GigUndiDxe/StartStop.c
index 8b17507ebf4d..10ab4e51bf44 100644
--- a/IntelUndiPkg/GigUndiDxe/StartStop.c
+++ b/IntelUndiPkg/GigUndiDxe/StartStop.c
@@ -103,4 +103,3 @@ EFI_DRIVER_STOP_PROTOCOL gUndiDriverStop = {
   StopDriver,
   StartDriver
 };
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/StartStop.h b/IntelUndiPkg/GigUndiDxe/StartStop.h
index fdc0d5b6c1f6..24304d6cc3a7 100644
--- a/IntelUndiPkg/GigUndiDxe/StartStop.h
+++ b/IntelUndiPkg/GigUndiDxe/StartStop.h
@@ -67,4 +67,3 @@ struct EFI_DRIVER_STOP_PROTOCOL_S {
 };
 
 #endif /* START_STOP_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/Version.h b/IntelUndiPkg/GigUndiDxe/Version.h
index 11d9a607c4fa..b3019889634b 100644
--- a/IntelUndiPkg/GigUndiDxe/Version.h
+++ b/IntelUndiPkg/GigUndiDxe/Version.h
@@ -29,4 +29,3 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define MAJORVERSION 4 /* GigUndi major version */ 
 #define MINORVERSION 9 /* GigUndi minor version */ 
 #define BUILDNUMBER 99 /* GigUndi build version */ 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_80003es2lan.c b/IntelUndiPkg/GigUndiDxe/e1000_80003es2lan.c
index c1ffc814236e..4264f2470f02 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_80003es2lan.c
+++ b/IntelUndiPkg/GigUndiDxe/e1000_80003es2lan.c
@@ -1532,4 +1532,3 @@ STATIC void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw)
 	E1000_READ_REG(hw, E1000_ICTXQMTC);
 	E1000_READ_REG(hw, E1000_ICRXDMTC);
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_80003es2lan.h b/IntelUndiPkg/GigUndiDxe/e1000_80003es2lan.h
index a37545399c97..df2c53318ce5 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_80003es2lan.h
+++ b/IntelUndiPkg/GigUndiDxe/e1000_80003es2lan.h
@@ -93,4 +93,3 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define GG82563_ICR_DIS_PADDING			0x0010 /* Disable Padding */
 
 #endif
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_82571.c b/IntelUndiPkg/GigUndiDxe/e1000_82571.c
index 463e8c6eaa87..d970ce7292b8 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_82571.c
+++ b/IntelUndiPkg/GigUndiDxe/e1000_82571.c
@@ -2079,4 +2079,3 @@ STATIC void e1000_clear_hw_cntrs_82571(struct e1000_hw *hw)
 	E1000_READ_REG(hw, E1000_ICTXQMTC);
 	E1000_READ_REG(hw, E1000_ICRXDMTC);
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_82571.h b/IntelUndiPkg/GigUndiDxe/e1000_82571.h
index 8862e3e17dce..3df568892529 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_82571.h
+++ b/IntelUndiPkg/GigUndiDxe/e1000_82571.h
@@ -60,4 +60,3 @@ bool e1000_get_laa_state_82571(struct e1000_hw *hw);
 void e1000_set_laa_state_82571(struct e1000_hw *hw, bool state);
 
 #endif
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_82575.c b/IntelUndiPkg/GigUndiDxe/e1000_82575.c
index f6ad91d4a2d5..b052a38f5d80 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_82575.c
+++ b/IntelUndiPkg/GigUndiDxe/e1000_82575.c
@@ -3342,4 +3342,3 @@ void e1000_write_vfta_i350(struct e1000_hw *hw, u32 offset, u32 value)
 }
 
 #endif /* NO_82580_SUPPORT */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_82575.h b/IntelUndiPkg/GigUndiDxe/e1000_82575.h
index 39c1b38324ed..5e6be621ec13 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_82575.h
+++ b/IntelUndiPkg/GigUndiDxe/e1000_82575.h
@@ -433,4 +433,3 @@ s32 e1000_initialize_M88E1512_phy(struct e1000_hw *hw);
 s32 e1000_initialize_M88E1543_phy(struct e1000_hw *hw);
 #endif /* NO_82580_SUPPORT */
 #endif /* _E1000_82575_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_api.c b/IntelUndiPkg/GigUndiDxe/e1000_api.c
index 1a8e45a2e86f..195992d46a34 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_api.c
+++ b/IntelUndiPkg/GigUndiDxe/e1000_api.c
@@ -1280,4 +1280,3 @@ void e1000_shutdown_fiber_serdes_link(struct e1000_hw *hw)
 }
 
 #endif /* NO_82575_SUPPORT */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_api.h b/IntelUndiPkg/GigUndiDxe/e1000_api.h
index c35c366f5e91..6a75ec899a07 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_api.h
+++ b/IntelUndiPkg/GigUndiDxe/e1000_api.h
@@ -176,4 +176,3 @@ s32 e1000_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer, u16 length);
 #define E1000_DIVIDE_ROUND_UP(a, b)	(((a) + (b) - 1) / (b)) /* ceil(a/b) */
 #endif
 #endif /* _E1000_API_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_defines.h b/IntelUndiPkg/GigUndiDxe/e1000_defines.h
index 5052b7925c3b..1d07d30aa18e 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_defines.h
+++ b/IntelUndiPkg/GigUndiDxe/e1000_defines.h
@@ -1636,4 +1636,3 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define ERROR_REPORT(fmt)	do { } while (0)
 #endif /* ERROR_REPORT */
 #endif /* _E1000_DEFINES_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_hw.h b/IntelUndiPkg/GigUndiDxe/e1000_hw.h
index 86d163e57906..27e34f5ae824 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_hw.h
+++ b/IntelUndiPkg/GigUndiDxe/e1000_hw.h
@@ -969,4 +969,3 @@ void e1000_write_pci_cfg(struct e1000_hw *hw, u32 reg, u16 *value);
 #endif
 
 #endif
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_i210.c b/IntelUndiPkg/GigUndiDxe/e1000_i210.c
index b485e739a434..5d05e3853361 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_i210.c
+++ b/IntelUndiPkg/GigUndiDxe/e1000_i210.c
@@ -869,4 +869,3 @@ s32 e1000_init_hw_i210(struct e1000_hw *hw)
 	ret_val = e1000_init_hw_82575(hw);
 	return ret_val;
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_i210.h b/IntelUndiPkg/GigUndiDxe/e1000_i210.h
index 3532126852b1..bde07d357ed6 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_i210.h
+++ b/IntelUndiPkg/GigUndiDxe/e1000_i210.h
@@ -97,4 +97,3 @@ enum E1000_INVM_STRUCTURE_TYPE {
 #define E1000_INVM_PLL_WO_VAL		0x0010
 
 #endif
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_ich8lan.c b/IntelUndiPkg/GigUndiDxe/e1000_ich8lan.c
index e3a3606f8527..7669630a5c03 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_ich8lan.c
+++ b/IntelUndiPkg/GigUndiDxe/e1000_ich8lan.c
@@ -5684,4 +5684,3 @@ release:
 	}
 }
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_ich8lan.h b/IntelUndiPkg/GigUndiDxe/e1000_ich8lan.h
index 26fe0200e5a4..a435418078d2 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_ich8lan.h
+++ b/IntelUndiPkg/GigUndiDxe/e1000_ich8lan.h
@@ -290,4 +290,3 @@ s32 e1000_read_emi_reg_locked(struct e1000_hw *hw, u16 addr, u16 *data);
 s32 e1000_write_emi_reg_locked(struct e1000_hw *hw, u16 addr, u16 data);
 s32 e1000_set_eee_pchlan(struct e1000_hw *hw);
 #endif /* _E1000_ICH8LAN_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_mac.c b/IntelUndiPkg/GigUndiDxe/e1000_mac.c
index a0a13da26316..f3727b9bc0de 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_mac.c
+++ b/IntelUndiPkg/GigUndiDxe/e1000_mac.c
@@ -2293,4 +2293,3 @@ s32 e1000_write_8bit_ctrl_reg_generic(struct e1000_hw *hw, u32 reg,
 	return E1000_SUCCESS;
 }
 #endif /* NO_82575_SUPPORT */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_mac.h b/IntelUndiPkg/GigUndiDxe/e1000_mac.h
index 95fb00f3dc87..b8990d908b45 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_mac.h
+++ b/IntelUndiPkg/GigUndiDxe/e1000_mac.h
@@ -97,4 +97,3 @@ void e1000_update_adaptive_generic(struct e1000_hw *hw);
 void e1000_write_vfta_generic(struct e1000_hw *hw, u32 offset, u32 value);
 
 #endif
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_manage.c b/IntelUndiPkg/GigUndiDxe/e1000_manage.c
index 4bf703b2de4a..5fc7fa5704ac 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_manage.c
+++ b/IntelUndiPkg/GigUndiDxe/e1000_manage.c
@@ -582,4 +582,3 @@ s32 e1000_load_firmware(struct e1000_hw *hw, u8 *buffer, u32 length)
 
 #endif /* NO_I210_SUPPORT */
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_manage.h b/IntelUndiPkg/GigUndiDxe/e1000_manage.h
index c9002a244a46..090a9a25de63 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_manage.h
+++ b/IntelUndiPkg/GigUndiDxe/e1000_manage.h
@@ -100,4 +100,3 @@ enum e1000_mng_mode {
 #define E1000_IAMT_SIGNATURE		0x544D4149
 
 #endif
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_nvm.c b/IntelUndiPkg/GigUndiDxe/e1000_nvm.c
index 26244874f4e3..e46130186223 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_nvm.c
+++ b/IntelUndiPkg/GigUndiDxe/e1000_nvm.c
@@ -1310,4 +1310,3 @@ STATIC void e1000_reload_nvm_generic(struct e1000_hw *hw)
 }
 
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_nvm.h b/IntelUndiPkg/GigUndiDxe/e1000_nvm.h
index 06a668f5e912..ef84c51dbeb9 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_nvm.h
+++ b/IntelUndiPkg/GigUndiDxe/e1000_nvm.h
@@ -92,4 +92,3 @@ void e1000_release_nvm_generic(struct e1000_hw *hw);
 #define E1000_STM_OPCODE	0xDB00
 
 #endif
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_phy.c b/IntelUndiPkg/GigUndiDxe/e1000_phy.c
index b1c66d263183..765fcf387d7e 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_phy.c
+++ b/IntelUndiPkg/GigUndiDxe/e1000_phy.c
@@ -4465,4 +4465,3 @@ s32 e1000_write_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr, u16 data)
 						false);
 }
 #endif /* NO_XMDIO_SUPPORT */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_phy.h b/IntelUndiPkg/GigUndiDxe/e1000_phy.h
index de82fde1f035..3efc73b006ee 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_phy.h
+++ b/IntelUndiPkg/GigUndiDxe/e1000_phy.h
@@ -349,4 +349,3 @@ struct sfp_e1000_flags {
 
 #endif /* NO_82575_SUPPORT */
 #endif
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_regs.h b/IntelUndiPkg/GigUndiDxe/e1000_regs.h
index 8568edc310a5..d6c66b92e94e 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_regs.h
+++ b/IntelUndiPkg/GigUndiDxe/e1000_regs.h
@@ -772,4 +772,3 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif /* NO_I210_SUPPORT */
 
 #endif
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/wol/wol.c b/IntelUndiPkg/GigUndiDxe/wol/wol.c
index 79100219b85b..74ffeafd787a 100644
--- a/IntelUndiPkg/GigUndiDxe/wol/wol.c
+++ b/IntelUndiPkg/GigUndiDxe/wol/wol.c
@@ -341,4 +341,3 @@ WolEnableWakeOnLanEx(
   return WolGetWakeOnLanStatusEx(Handle);
 }
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/wol/wol.h b/IntelUndiPkg/GigUndiDxe/wol/wol.h
index 5ac38d6a3602..4f3140e152f8 100644
--- a/IntelUndiPkg/GigUndiDxe/wol/wol.h
+++ b/IntelUndiPkg/GigUndiDxe/wol/wol.h
@@ -84,4 +84,3 @@ WolEnableApmPme(
 
 #endif /* __WOL_H */
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/wol/wol_1G.c b/IntelUndiPkg/GigUndiDxe/wol/wol_1G.c
index bba2393d6ff3..02eff0957976 100644
--- a/IntelUndiPkg/GigUndiDxe/wol/wol_1G.c
+++ b/IntelUndiPkg/GigUndiDxe/wol/wol_1G.c
@@ -183,4 +183,3 @@ WOL_STATUS _WolEnableLaser(WOL_ADAPTER_HANDLE_TYPE Handle, BOOLEAN Enable)
   return WOL_FEATURE_NOT_SUPPORTED;
 }
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/wol/wolfamily.c b/IntelUndiPkg/GigUndiDxe/wol/wolfamily.c
index 49d901defd4d..2c35be00f36a 100644
--- a/IntelUndiPkg/GigUndiDxe/wol/wolfamily.c
+++ b/IntelUndiPkg/GigUndiDxe/wol/wolfamily.c
@@ -163,4 +163,3 @@ WOL_MAC_TYPE const WOL_LASER_TABLE[] = {
   0
 };
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/wol/wolimpl.c b/IntelUndiPkg/GigUndiDxe/wol/wolimpl.c
index a5d536ee99c2..311930372f8b 100644
--- a/IntelUndiPkg/GigUndiDxe/wol/wolimpl.c
+++ b/IntelUndiPkg/GigUndiDxe/wol/wolimpl.c
@@ -166,4 +166,3 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     return Handle->NicInfo.Function;
   }
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/wol/wolimpl.h b/IntelUndiPkg/GigUndiDxe/wol/wolimpl.h
index 84863eddc54e..ed2ffc427093 100644
--- a/IntelUndiPkg/GigUndiDxe/wol/wolimpl.h
+++ b/IntelUndiPkg/GigUndiDxe/wol/wolimpl.h
@@ -77,4 +77,3 @@ WOL_STATUS _WolEepromWrite16(WOL_ADAPTER_HANDLE_TYPE Handle, UINT16 Offset, UINT
 WOL_STATUS _WolEepromUpdateChecksum(WOL_ADAPTER_HANDLE_TYPE Handle);
 
 #endif /* __WOLIMPL_H */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/GigUndiDxe/wol/wolinfo.c b/IntelUndiPkg/GigUndiDxe/wol/wolinfo.c
index c99667a25f8e..4df14ce2abf6 100644
--- a/IntelUndiPkg/GigUndiDxe/wol/wolinfo.c
+++ b/IntelUndiPkg/GigUndiDxe/wol/wolinfo.c
@@ -334,4 +334,3 @@ _WOL_DEVICE_INFO_t const WOL_DEVICE_INFO_TABLE[] = {
  {      0,      0,      0,      0,   0 }  /* Last entry */
 };
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/AdapterInformation.c b/IntelUndiPkg/I40eUndiDxe/AdapterInformation.c
index 7b8b78daf29b..b2801a673d6e 100644
--- a/IntelUndiPkg/I40eUndiDxe/AdapterInformation.c
+++ b/IntelUndiPkg/I40eUndiDxe/AdapterInformation.c
@@ -410,4 +410,3 @@ EFI_ADAPTER_INFORMATION_PROTOCOL gUndiAdapterInfo = {
   SetInformation,
   GetSupportedTypes
 };
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/AdapterInformation.h b/IntelUndiPkg/I40eUndiDxe/AdapterInformation.h
index d5d5d52697c1..1401fbdb92fe 100644
--- a/IntelUndiPkg/I40eUndiDxe/AdapterInformation.h
+++ b/IntelUndiPkg/I40eUndiDxe/AdapterInformation.h
@@ -102,4 +102,3 @@ UninstallAdapterInformationProtocol (
 
 #endif /* ADAPTER_INFORMATION_H_ */
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/Brand.c b/IntelUndiPkg/I40eUndiDxe/Brand.c
index 250184d8b3ca..22629a933174 100644
--- a/IntelUndiPkg/I40eUndiDxe/Brand.c
+++ b/IntelUndiPkg/I40eUndiDxe/Brand.c
@@ -210,4 +210,3 @@ BRAND_STRUCT mBrandingTable[] = {
 
 UINTN mBrandingTableSize = (sizeof (mBrandingTable) / sizeof (mBrandingTable[0]));
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/ComponentName.c b/IntelUndiPkg/I40eUndiDxe/ComponentName.c
index cb83d3a79dd9..1241862adb81 100644
--- a/IntelUndiPkg/I40eUndiDxe/ComponentName.c
+++ b/IntelUndiPkg/I40eUndiDxe/ComponentName.c
@@ -275,4 +275,3 @@ EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL gUndiSupportedEfiVersion = {
   sizeof (EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL),
   EFI_2_70_SYSTEM_TABLE_REVISION
 };
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/ComponentName.h b/IntelUndiPkg/I40eUndiDxe/ComponentName.h
index ed26dcb81b5b..dca634039b66 100644
--- a/IntelUndiPkg/I40eUndiDxe/ComponentName.h
+++ b/IntelUndiPkg/I40eUndiDxe/ComponentName.h
@@ -73,4 +73,3 @@ ComponentNameGetDriverName (
   );
 
 #endif /* COMPONENT_NAME_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/Decode.c b/IntelUndiPkg/I40eUndiDxe/Decode.c
index d84255be0f6c..e47979e59126 100644
--- a/IntelUndiPkg/I40eUndiDxe/Decode.c
+++ b/IntelUndiPkg/I40eUndiDxe/Decode.c
@@ -1881,4 +1881,3 @@ BadCdb:
   CdbPtr->StatCode  = PXE_STATCODE_INVALID_CDB;
 }
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/Decode.h b/IntelUndiPkg/I40eUndiDxe/Decode.h
index 59f79e0abf5e..555d35620474 100644
--- a/IntelUndiPkg/I40eUndiDxe/Decode.h
+++ b/IntelUndiPkg/I40eUndiDxe/Decode.h
@@ -48,4 +48,3 @@ UndiApiEntry (
 
 #endif /* DECODE_H_ */
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/DeviceSupport.c b/IntelUndiPkg/I40eUndiDxe/DeviceSupport.c
index 4d1061a794e4..007d651d126f 100644
--- a/IntelUndiPkg/I40eUndiDxe/DeviceSupport.c
+++ b/IntelUndiPkg/I40eUndiDxe/DeviceSupport.c
@@ -202,4 +202,3 @@ IsDeviceIdSupported (
   }
   return FALSE;
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/DeviceSupport.h b/IntelUndiPkg/I40eUndiDxe/DeviceSupport.h
index b26f0ff0ec8c..b0de9f40c572 100644
--- a/IntelUndiPkg/I40eUndiDxe/DeviceSupport.h
+++ b/IntelUndiPkg/I40eUndiDxe/DeviceSupport.h
@@ -82,4 +82,3 @@ IsDeviceIdSupported (
   UINT16 DeviceId
   );
 #endif /* DEVICE_SUPPORT_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/Dma.c b/IntelUndiPkg/I40eUndiDxe/Dma.c
index 17f14bd043f1..9efa705cb6f0 100644
--- a/IntelUndiPkg/I40eUndiDxe/Dma.c
+++ b/IntelUndiPkg/I40eUndiDxe/Dma.c
@@ -283,4 +283,3 @@ UndiDmaUnmapMemory (
   return Status;
 }
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/Dma.h b/IntelUndiPkg/I40eUndiDxe/Dma.h
index 58a1f234b5df..d0d00463aa63 100644
--- a/IntelUndiPkg/I40eUndiDxe/Dma.h
+++ b/IntelUndiPkg/I40eUndiDxe/Dma.h
@@ -133,4 +133,3 @@ UndiDmaUnmapMemory (
   );
 
 #endif /* _DMA_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/DriverDiagnostics.c b/IntelUndiPkg/I40eUndiDxe/DriverDiagnostics.c
index 536ff7a65522..de07eb0f254f 100644
--- a/IntelUndiPkg/I40eUndiDxe/DriverDiagnostics.c
+++ b/IntelUndiPkg/I40eUndiDxe/DriverDiagnostics.c
@@ -1131,4 +1131,3 @@ EFI_DRIVER_DIAGNOSTICS2_PROTOCOL gUndiDriverDiagnostics2 = {
   "en-US"
 };
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/DriverDiagnostics.h b/IntelUndiPkg/I40eUndiDxe/DriverDiagnostics.h
index a6a725c33aa9..c3414f3897fe 100644
--- a/IntelUndiPkg/I40eUndiDxe/DriverDiagnostics.h
+++ b/IntelUndiPkg/I40eUndiDxe/DriverDiagnostics.h
@@ -80,4 +80,3 @@ typedef struct {
 
 #endif /* DRIVER_DIAGNOSTICS_H_ */
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/DriverHealth.c b/IntelUndiPkg/I40eUndiDxe/DriverHealth.c
index 500ca3685cfc..30df2f3ec7d0 100644
--- a/IntelUndiPkg/I40eUndiDxe/DriverHealth.c
+++ b/IntelUndiPkg/I40eUndiDxe/DriverHealth.c
@@ -161,4 +161,3 @@ EFI_DRIVER_HEALTH_PROTOCOL gUndiDriverHealthProtocol = {
   GetHealthStatus,
   Repair
 };
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/DriverHealthCommon.h b/IntelUndiPkg/I40eUndiDxe/DriverHealthCommon.h
index c32302879390..da1d22057dcb 100644
--- a/IntelUndiPkg/I40eUndiDxe/DriverHealthCommon.h
+++ b/IntelUndiPkg/I40eUndiDxe/DriverHealthCommon.h
@@ -35,4 +35,3 @@ typedef enum {
   MODULE_UNSUPPORTED,
 } MODULE_QUALIFICATION_STATUS;
 #endif /* DRIVER_HEALTH_COMMON_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/EepromConfig.c b/IntelUndiPkg/I40eUndiDxe/EepromConfig.c
index cc47e0437e80..4772715b3979 100644
--- a/IntelUndiPkg/I40eUndiDxe/EepromConfig.c
+++ b/IntelUndiPkg/I40eUndiDxe/EepromConfig.c
@@ -1254,4 +1254,3 @@ EepromReadPortnumValues (
 }
 
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/EepromConfig.h b/IntelUndiPkg/I40eUndiDxe/EepromConfig.h
index e547d88b82b4..97e8be1ae80e 100644
--- a/IntelUndiPkg/I40eUndiDxe/EepromConfig.h
+++ b/IntelUndiPkg/I40eUndiDxe/EepromConfig.h
@@ -556,4 +556,3 @@ EepromReadPortnumValues (
 
 #endif /* EEPROM_CONFIG_H_ */
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/Hii.c b/IntelUndiPkg/I40eUndiDxe/Hii.c
index e411f23d14ce..404e3672aa87 100644
--- a/IntelUndiPkg/I40eUndiDxe/Hii.c
+++ b/IntelUndiPkg/I40eUndiDxe/Hii.c
@@ -1254,4 +1254,3 @@ EFI_HII_CONFIG_ACCESS_PROTOCOL gUndiHiiConfigAccess = {
   RouteConfig,
   DriverCallback
 };
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/Hii.h b/IntelUndiPkg/I40eUndiDxe/Hii.h
index e8e916a5ee90..8ab5108e2c8b 100644
--- a/IntelUndiPkg/I40eUndiDxe/Hii.h
+++ b/IntelUndiPkg/I40eUndiDxe/Hii.h
@@ -91,4 +91,3 @@ HiiUnload (
   );
 
 #endif /* HII_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/HiiInternalLib.c b/IntelUndiPkg/I40eUndiDxe/HiiInternalLib.c
index 4e6e28fdb5c0..365ed7f2da80 100644
--- a/IntelUndiPkg/I40eUndiDxe/HiiInternalLib.c
+++ b/IntelUndiPkg/I40eUndiDxe/HiiInternalLib.c
@@ -486,4 +486,3 @@ AsciiStrToUnicodeStrWrapper (
     return EFI_BUFFER_TOO_SMALL;
   }
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/HiiInternalLib.h b/IntelUndiPkg/I40eUndiDxe/HiiInternalLib.h
index 16655f384db3..b5ee09c49c9b 100644
--- a/IntelUndiPkg/I40eUndiDxe/HiiInternalLib.h
+++ b/IntelUndiPkg/I40eUndiDxe/HiiInternalLib.h
@@ -163,4 +163,3 @@ AsciiStrToUnicodeStrWrapper (
   );
 
 #endif /* HII_INTERNAL_LIB_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/I40e.c b/IntelUndiPkg/I40eUndiDxe/I40e.c
index ecf83ebc86df..c2501e4222f5 100644
--- a/IntelUndiPkg/I40eUndiDxe/I40e.c
+++ b/IntelUndiPkg/I40eUndiDxe/I40e.c
@@ -3461,4 +3461,3 @@ I40eGetTxRxDescriptorsCount (
     return I40E_DEF_NUM_TX_RX_DESCRIPTORS;
   }
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/I40e.h b/IntelUndiPkg/I40eUndiDxe/I40e.h
index c5aabf6d7d69..9b994c5ec1c9 100644
--- a/IntelUndiPkg/I40eUndiDxe/I40e.h
+++ b/IntelUndiPkg/I40eUndiDxe/I40e.h
@@ -1504,4 +1504,3 @@ I40eGetTxRxDescriptorsCount (
   );
 
 #endif /* I40E_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/I40eUndiDxe.inf b/IntelUndiPkg/I40eUndiDxe/I40eUndiDxe.inf
index 76df7898bef1..caff5262f6e6 100644
--- a/IntelUndiPkg/I40eUndiDxe/I40eUndiDxe.inf
+++ b/IntelUndiPkg/I40eUndiDxe/I40eUndiDxe.inf
@@ -157,4 +157,3 @@ MSFT:*_*_*_CC_FLAGS = /FAcs
   gEfiIfrTianoGuid                   ## CONSUMES ## Guid
   gEfiEventExitBootServicesGuid      ## PRODUCES ## Event
   gEfiEventVirtualAddressChangeGuid  ## PRODUCES ## Event
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/I40e_osdep.h b/IntelUndiPkg/I40eUndiDxe/I40e_osdep.h
index 88a9547fc45b..ddd4449ad65c 100644
--- a/IntelUndiPkg/I40eUndiDxe/I40e_osdep.h
+++ b/IntelUndiPkg/I40eUndiDxe/I40e_osdep.h
@@ -601,4 +601,3 @@ DelayInMicroseconds (
 
 
 #endif /* I40E_OSDEP_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/Init.c b/IntelUndiPkg/I40eUndiDxe/Init.c
index d45d669887d8..68a1699b00ba 100644
--- a/IntelUndiPkg/I40eUndiDxe/Init.c
+++ b/IntelUndiPkg/I40eUndiDxe/Init.c
@@ -2300,4 +2300,3 @@ EFI_DRIVER_BINDING_PROTOCOL gUndiDriverBinding = {
   NULL,
   NULL
 };
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/Init.h b/IntelUndiPkg/I40eUndiDxe/Init.h
index 217ed75cd179..899eeda1e6df 100644
--- a/IntelUndiPkg/I40eUndiDxe/Init.h
+++ b/IntelUndiPkg/I40eUndiDxe/Init.h
@@ -87,4 +87,3 @@ UndiGetDriverHealthStatus (
   );
 
 #endif /* INIT_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/Inventory.vfr b/IntelUndiPkg/I40eUndiDxe/Inventory.vfr
index a64b9297291b..ea48aad2bc85 100644
--- a/IntelUndiPkg/I40eUndiDxe/Inventory.vfr
+++ b/IntelUndiPkg/I40eUndiDxe/Inventory.vfr
@@ -369,4 +369,3 @@ formset
 
 endformset;
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/NVDataStruc.h b/IntelUndiPkg/I40eUndiDxe/NVDataStruc.h
index 8387a99ae5bc..412cbf4833c7 100644
--- a/IntelUndiPkg/I40eUndiDxe/NVDataStruc.h
+++ b/IntelUndiPkg/I40eUndiDxe/NVDataStruc.h
@@ -138,4 +138,3 @@ typedef struct {
 #define       QUESTION_ID_TMP_SUPPORT_ALT_MAC_ADDR              0x1407
 #define       QUESTION_ID_TMP_SUPPORT_LINK_SPD_STATUS           0x1408
 #endif /* NV_DATA_STRUC_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/StartStop.c b/IntelUndiPkg/I40eUndiDxe/StartStop.c
index 32c9c5e09655..b375b52fe882 100644
--- a/IntelUndiPkg/I40eUndiDxe/StartStop.c
+++ b/IntelUndiPkg/I40eUndiDxe/StartStop.c
@@ -169,4 +169,3 @@ EFI_DRIVER_STOP_PROTOCOL gUndiDriverStop = {
   StartDriver
 };
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/StartStop.h b/IntelUndiPkg/I40eUndiDxe/StartStop.h
index 5ebf063e4913..d80fe79cbc3a 100644
--- a/IntelUndiPkg/I40eUndiDxe/StartStop.h
+++ b/IntelUndiPkg/I40eUndiDxe/StartStop.h
@@ -79,4 +79,3 @@ struct EFI_DRIVER_STOP_PROTOCOL_S {
 
 #endif /* START_STOP_H_ */
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/Version.h b/IntelUndiPkg/I40eUndiDxe/Version.h
index dfb94cedd04c..e5a47633ddf1 100644
--- a/IntelUndiPkg/I40eUndiDxe/Version.h
+++ b/IntelUndiPkg/I40eUndiDxe/Version.h
@@ -30,4 +30,3 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define MAJORVERSION 4 /* I40eUndi major version */ 
 #define MINORVERSION 9 /* I40eUndi minor version */ 
 #define BUILDNUMBER 99 /* I40eUndi build version */ 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/i40e_adminq.c b/IntelUndiPkg/I40eUndiDxe/i40e_adminq.c
index af443b398bb9..7d11d1ce4d6a 100644
--- a/IntelUndiPkg/I40eUndiDxe/i40e_adminq.c
+++ b/IntelUndiPkg/I40eUndiDxe/i40e_adminq.c
@@ -1095,4 +1095,3 @@ clean_arq_element_err:
 	return ret_code;
 }
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/i40e_adminq.h b/IntelUndiPkg/I40eUndiDxe/i40e_adminq.h
index d17fe42cae96..51f0af909516 100644
--- a/IntelUndiPkg/I40eUndiDxe/i40e_adminq.h
+++ b/IntelUndiPkg/I40eUndiDxe/i40e_adminq.h
@@ -118,4 +118,3 @@ void i40e_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc,
 				       u16 opcode);
 
 #endif /* _I40E_ADMINQ_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/i40e_adminq_cmd.h b/IntelUndiPkg/I40eUndiDxe/i40e_adminq_cmd.h
index 8c0c6665ee55..78ec00252201 100644
--- a/IntelUndiPkg/I40eUndiDxe/i40e_adminq_cmd.h
+++ b/IntelUndiPkg/I40eUndiDxe/i40e_adminq_cmd.h
@@ -2974,4 +2974,3 @@ struct i40e_aqc_debug_modify_internals {
 I40E_CHECK_CMD_LENGTH(i40e_aqc_debug_modify_internals);
 
 #endif /* _I40E_ADMINQ_CMD_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/i40e_alloc.h b/IntelUndiPkg/I40eUndiDxe/i40e_alloc.h
index 2f82f8dd72a5..51d83526207b 100644
--- a/IntelUndiPkg/I40eUndiDxe/i40e_alloc.h
+++ b/IntelUndiPkg/I40eUndiDxe/i40e_alloc.h
@@ -60,4 +60,3 @@ enum i40e_status_code i40e_free_virt_mem(struct i40e_hw *hw,
 					 struct i40e_virt_mem *mem);
 
 #endif /* _I40E_ALLOC_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/i40e_common.c b/IntelUndiPkg/I40eUndiDxe/i40e_common.c
index 01bcfeed279c..faa7b8d7483e 100644
--- a/IntelUndiPkg/I40eUndiDxe/i40e_common.c
+++ b/IntelUndiPkg/I40eUndiDxe/i40e_common.c
@@ -7631,4 +7631,3 @@ i40e_add_pinfo_to_list(struct i40e_hw *hw,
 				   track_id, &offset, &info, NULL);
 	return status;
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/i40e_devids.h b/IntelUndiPkg/I40eUndiDxe/i40e_devids.h
index 143c3b10c025..64aa672e0004 100644
--- a/IntelUndiPkg/I40eUndiDxe/i40e_devids.h
+++ b/IntelUndiPkg/I40eUndiDxe/i40e_devids.h
@@ -68,4 +68,3 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 					 (d) == I40E_DEV_ID_25G_SFP28)
 
 #endif /* _I40E_DEVIDS_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/i40e_diag.c b/IntelUndiPkg/I40eUndiDxe/i40e_diag.c
index f57fc65f60e0..62e8f8428aaa 100644
--- a/IntelUndiPkg/I40eUndiDxe/i40e_diag.c
+++ b/IntelUndiPkg/I40eUndiDxe/i40e_diag.c
@@ -193,4 +193,3 @@ enum i40e_status_code i40e_diag_fw_alive_test(struct i40e_hw *hw)
 	UNREFERENCED_1PARAMETER(hw);
 	return I40E_SUCCESS;
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/i40e_diag.h b/IntelUndiPkg/I40eUndiDxe/i40e_diag.h
index 322cefb45732..4cda8b3444e6 100644
--- a/IntelUndiPkg/I40eUndiDxe/i40e_diag.h
+++ b/IntelUndiPkg/I40eUndiDxe/i40e_diag.h
@@ -56,4 +56,3 @@ enum i40e_status_code i40e_diag_reg_test(struct i40e_hw *hw);
 enum i40e_status_code i40e_diag_eeprom_test(struct i40e_hw *hw);
 
 #endif /* _I40E_DIAG_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/i40e_hmc.c b/IntelUndiPkg/I40eUndiDxe/i40e_hmc.c
index 28ff0ace4680..b5c084bf3372 100644
--- a/IntelUndiPkg/I40eUndiDxe/i40e_hmc.c
+++ b/IntelUndiPkg/I40eUndiDxe/i40e_hmc.c
@@ -366,4 +366,3 @@ enum i40e_status_code i40e_remove_pd_page_new(struct i40e_hw *hw,
 
 	return i40e_free_dma_mem(hw, &(sd_entry->u.pd_table.pd_page_addr));
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/i40e_hmc.h b/IntelUndiPkg/I40eUndiDxe/i40e_hmc.h
index c7844edcb7ba..97ff0724729c 100644
--- a/IntelUndiPkg/I40eUndiDxe/i40e_hmc.h
+++ b/IntelUndiPkg/I40eUndiDxe/i40e_hmc.h
@@ -240,4 +240,3 @@ enum i40e_status_code i40e_remove_pd_page_new(struct i40e_hw *hw,
 					      u32 idx, bool is_pf);
 
 #endif /* _I40E_HMC_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/i40e_lan_hmc.c b/IntelUndiPkg/I40eUndiDxe/i40e_lan_hmc.c
index 93f477d0268d..4720d9f0cc83 100644
--- a/IntelUndiPkg/I40eUndiDxe/i40e_lan_hmc.c
+++ b/IntelUndiPkg/I40eUndiDxe/i40e_lan_hmc.c
@@ -1610,4 +1610,3 @@ enum i40e_status_code i40e_set_lan_rx_queue_context_directly(struct i40e_hw *hw,
 	return i40e_write_queue_context_directly(hw, queue, context_bytes,
 						 I40E_HMC_LAN_RX);
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/i40e_lan_hmc.h b/IntelUndiPkg/I40eUndiDxe/i40e_lan_hmc.h
index a5d59679af17..8842ac04470d 100644
--- a/IntelUndiPkg/I40eUndiDxe/i40e_lan_hmc.h
+++ b/IntelUndiPkg/I40eUndiDxe/i40e_lan_hmc.h
@@ -206,4 +206,3 @@ enum i40e_status_code i40e_delete_lan_hmc_object(struct i40e_hw *hw,
 				struct i40e_hmc_lan_delete_obj_info *info);
 
 #endif /* _I40E_LAN_HMC_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/i40e_nvm.c b/IntelUndiPkg/I40eUndiDxe/i40e_nvm.c
index ef1774c8cc2e..0187d6ecb522 100644
--- a/IntelUndiPkg/I40eUndiDxe/i40e_nvm.c
+++ b/IntelUndiPkg/I40eUndiDxe/i40e_nvm.c
@@ -758,4 +758,3 @@ enum i40e_status_code i40e_validate_nvm_checksum(struct i40e_hw *hw,
 
 	return ret_code;
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/i40e_prototype.h b/IntelUndiPkg/I40eUndiDxe/i40e_prototype.h
index a85d80093a61..3bf01eaf1f55 100644
--- a/IntelUndiPkg/I40eUndiDxe/i40e_prototype.h
+++ b/IntelUndiPkg/I40eUndiDxe/i40e_prototype.h
@@ -593,4 +593,3 @@ i40e_add_pinfo_to_list(struct i40e_hw *hw,
 		       struct i40e_profile_segment *profile,
 		       u8 *profile_info_sec, u32 track_id);
 #endif /* _I40E_PROTOTYPE_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/i40e_register.h b/IntelUndiPkg/I40eUndiDxe/i40e_register.h
index 0d8d1cfde13a..4eb955b8eeb5 100644
--- a/IntelUndiPkg/I40eUndiDxe/i40e_register.h
+++ b/IntelUndiPkg/I40eUndiDxe/i40e_register.h
@@ -5357,4 +5357,3 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define I40E_VFPE_WQEALLOC1_WQE_DESC_INDEX_MASK  I40E_MASK(0xFFF, I40E_VFPE_WQEALLOC1_WQE_DESC_INDEX_SHIFT)
 
 #endif /* _I40E_REGISTER_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/i40e_status.h b/IntelUndiPkg/I40eUndiDxe/i40e_status.h
index bd03a486d1ae..b5d9c71a37b0 100644
--- a/IntelUndiPkg/I40eUndiDxe/i40e_status.h
+++ b/IntelUndiPkg/I40eUndiDxe/i40e_status.h
@@ -103,4 +103,3 @@ enum i40e_status_code {
 };
 
 #endif /* _I40E_STATUS_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/i40e_type.h b/IntelUndiPkg/I40eUndiDxe/i40e_type.h
index 521315c5459e..a2114db104e6 100644
--- a/IntelUndiPkg/I40eUndiDxe/i40e_type.h
+++ b/IntelUndiPkg/I40eUndiDxe/i40e_type.h
@@ -1840,4 +1840,3 @@ struct i40e_profile_info {
 	u8 name[I40E_DDP_NAME_SIZE];
 };
 #endif /* _I40E_TYPE_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/I40eUndiDxe/i40e_virtchnl.h b/IntelUndiPkg/I40eUndiDxe/i40e_virtchnl.h
index 2c25a79ae96a..4fb7e2428f1a 100644
--- a/IntelUndiPkg/I40eUndiDxe/i40e_virtchnl.h
+++ b/IntelUndiPkg/I40eUndiDxe/i40e_virtchnl.h
@@ -28,4 +28,3 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/AdapterInformation.c b/IntelUndiPkg/XGigUndiDxe/AdapterInformation.c
index cb5c28b052f9..26556e284381 100644
--- a/IntelUndiPkg/XGigUndiDxe/AdapterInformation.c
+++ b/IntelUndiPkg/XGigUndiDxe/AdapterInformation.c
@@ -409,4 +409,3 @@ EFI_ADAPTER_INFORMATION_PROTOCOL gUndiAdapterInfo = {
   SetInformation,
   GetSupportedTypes
 };
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/AdapterInformation.h b/IntelUndiPkg/XGigUndiDxe/AdapterInformation.h
index 72d08a891d06..3b2039bc5cb2 100644
--- a/IntelUndiPkg/XGigUndiDxe/AdapterInformation.h
+++ b/IntelUndiPkg/XGigUndiDxe/AdapterInformation.h
@@ -101,4 +101,3 @@ UninstallAdapterInformationProtocol (
 
 #endif /* ADAPTER_INFORMATION_H_ */
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/Brand.c b/IntelUndiPkg/XGigUndiDxe/Brand.c
index 9c97bb063df9..c65e57345f22 100644
--- a/IntelUndiPkg/XGigUndiDxe/Brand.c
+++ b/IntelUndiPkg/XGigUndiDxe/Brand.c
@@ -173,4 +173,3 @@ BRAND_STRUCT  mBrandingTable[] = {
 };
 
 UINTN mBrandingTableSize = (sizeof (mBrandingTable) / sizeof (mBrandingTable[0]));
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/ComponentName.c b/IntelUndiPkg/XGigUndiDxe/ComponentName.c
index c136bd7fb436..2972c28bda4e 100644
--- a/IntelUndiPkg/XGigUndiDxe/ComponentName.c
+++ b/IntelUndiPkg/XGigUndiDxe/ComponentName.c
@@ -276,4 +276,3 @@ EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL gUndiSupportedEfiVersion = {
   sizeof (EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL),
   EFI_2_70_SYSTEM_TABLE_REVISION
 };
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/ComponentName.h b/IntelUndiPkg/XGigUndiDxe/ComponentName.h
index c538ea629e50..f63d58b8a18c 100644
--- a/IntelUndiPkg/XGigUndiDxe/ComponentName.h
+++ b/IntelUndiPkg/XGigUndiDxe/ComponentName.h
@@ -74,4 +74,3 @@ ComponentNameGetDriverName (
   );
 
 #endif /* COMPONENT_NAME_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/Decode.c b/IntelUndiPkg/XGigUndiDxe/Decode.c
index 675f0efca34a..70fbce64c64f 100644
--- a/IntelUndiPkg/XGigUndiDxe/Decode.c
+++ b/IntelUndiPkg/XGigUndiDxe/Decode.c
@@ -1851,4 +1851,3 @@ BadCdb:
   CdbPtr->StatFlags = PXE_STATFLAGS_COMMAND_FAILED;
   CdbPtr->StatCode  = PXE_STATCODE_INVALID_CDB;
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/Decode.h b/IntelUndiPkg/XGigUndiDxe/Decode.h
index c0a068716a8b..18cb4e4b1ecf 100644
--- a/IntelUndiPkg/XGigUndiDxe/Decode.h
+++ b/IntelUndiPkg/XGigUndiDxe/Decode.h
@@ -45,4 +45,3 @@ UndiApiEntry (
   );
   
 #endif /* DECODE_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/DeviceSupport.c b/IntelUndiPkg/XGigUndiDxe/DeviceSupport.c
index 65f35269eff1..c9878f997c96 100644
--- a/IntelUndiPkg/XGigUndiDxe/DeviceSupport.c
+++ b/IntelUndiPkg/XGigUndiDxe/DeviceSupport.c
@@ -189,4 +189,3 @@ IsDeviceIdSupported (
   }
   return FALSE;
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/DeviceSupport.h b/IntelUndiPkg/XGigUndiDxe/DeviceSupport.h
index e834201b5305..e997983ba3e7 100644
--- a/IntelUndiPkg/XGigUndiDxe/DeviceSupport.h
+++ b/IntelUndiPkg/XGigUndiDxe/DeviceSupport.h
@@ -81,4 +81,3 @@ IsDeviceIdSupported (
   UINT16 DeviceId
   );
 #endif /* DEVICE_SUPPORT_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/Dma.c b/IntelUndiPkg/XGigUndiDxe/Dma.c
index b8df5d387eb2..c8588df96ef5 100644
--- a/IntelUndiPkg/XGigUndiDxe/Dma.c
+++ b/IntelUndiPkg/XGigUndiDxe/Dma.c
@@ -282,4 +282,3 @@ UndiDmaUnmapMemory (
   return Status;
 }
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/Dma.h b/IntelUndiPkg/XGigUndiDxe/Dma.h
index 6763c83dca39..3422acd500de 100644
--- a/IntelUndiPkg/XGigUndiDxe/Dma.h
+++ b/IntelUndiPkg/XGigUndiDxe/Dma.h
@@ -132,4 +132,3 @@ UndiDmaUnmapMemory (
   );
 
 #endif /* _DMA_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c b/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c
index 348abc8a9b91..66dc67a5400e 100644
--- a/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c
+++ b/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.c
@@ -525,4 +525,3 @@ EFI_DRIVER_DIAGNOSTICS2_PROTOCOL gXgbeUndiDriverDiagnostics2 = {
   (EFI_DRIVER_DIAGNOSTICS2_RUN_DIAGNOSTICS) XgbeUndiDriverDiagnosticsRunDiagnostics,
   "en-US"
 };
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.h b/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.h
index aafd7e65344a..4da70b1c122b 100644
--- a/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.h
+++ b/IntelUndiPkg/XGigUndiDxe/DriverDiagnostics.h
@@ -46,4 +46,3 @@ typedef struct {
 #pragma pack()
 
 #endif /* DRIVER_DIAGNOSTICS_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/DriverHealth.c b/IntelUndiPkg/XGigUndiDxe/DriverHealth.c
index 31a9dfc9adad..df6cfdf8a123 100644
--- a/IntelUndiPkg/XGigUndiDxe/DriverHealth.c
+++ b/IntelUndiPkg/XGigUndiDxe/DriverHealth.c
@@ -160,4 +160,3 @@ EFI_DRIVER_HEALTH_PROTOCOL gUndiDriverHealthProtocol = {
   GetHealthStatus,
   Repair
 };
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/DriverHealthCommon.h b/IntelUndiPkg/XGigUndiDxe/DriverHealthCommon.h
index a1542333837f..6bc36d784d1e 100644
--- a/IntelUndiPkg/XGigUndiDxe/DriverHealthCommon.h
+++ b/IntelUndiPkg/XGigUndiDxe/DriverHealthCommon.h
@@ -34,4 +34,3 @@ typedef enum {
   MODULE_UNSUPPORTED,
 } MODULE_QUALIFICATION_STATUS;
 #endif /* DRIVER_HEALTH_COMMON_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/EepromConfig.c b/IntelUndiPkg/XGigUndiDxe/EepromConfig.c
index 4c8d8e0a70e4..deae76cab0e3 100644
--- a/IntelUndiPkg/XGigUndiDxe/EepromConfig.c
+++ b/IntelUndiPkg/XGigUndiDxe/EepromConfig.c
@@ -404,4 +404,3 @@ EepromUpdateChecksum (
   return EFI_SUCCESS;
 }
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/EepromConfig.h b/IntelUndiPkg/XGigUndiDxe/EepromConfig.h
index b1aa113eb4c8..0b53f86ddd69 100644
--- a/IntelUndiPkg/XGigUndiDxe/EepromConfig.h
+++ b/IntelUndiPkg/XGigUndiDxe/EepromConfig.h
@@ -209,4 +209,3 @@ EepromUpdateChecksum (
 
 #endif /* EEPROM_CONFIG_H_ */
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/Hii.c b/IntelUndiPkg/XGigUndiDxe/Hii.c
index 7a4f5489225f..857a475622f7 100644
--- a/IntelUndiPkg/XGigUndiDxe/Hii.c
+++ b/IntelUndiPkg/XGigUndiDxe/Hii.c
@@ -1199,4 +1199,3 @@ EFI_HII_CONFIG_ACCESS_PROTOCOL gUndiHiiConfigAccess = {
   RouteConfig,
   DriverCallback
 };
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/Hii.h b/IntelUndiPkg/XGigUndiDxe/Hii.h
index 1de4b1b3cc53..8dbc6ec854b4 100644
--- a/IntelUndiPkg/XGigUndiDxe/Hii.h
+++ b/IntelUndiPkg/XGigUndiDxe/Hii.h
@@ -90,4 +90,3 @@ HiiUnload (
   );
 
 #endif /* HII_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/HiiInternalLib.c b/IntelUndiPkg/XGigUndiDxe/HiiInternalLib.c
index 21ec03193e26..2aacb63ca158 100644
--- a/IntelUndiPkg/XGigUndiDxe/HiiInternalLib.c
+++ b/IntelUndiPkg/XGigUndiDxe/HiiInternalLib.c
@@ -485,4 +485,3 @@ AsciiStrToUnicodeStrWrapper (
     return EFI_BUFFER_TOO_SMALL;
   }
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/HiiInternalLib.h b/IntelUndiPkg/XGigUndiDxe/HiiInternalLib.h
index 49abbd280c01..28298652403a 100644
--- a/IntelUndiPkg/XGigUndiDxe/HiiInternalLib.h
+++ b/IntelUndiPkg/XGigUndiDxe/HiiInternalLib.h
@@ -162,4 +162,3 @@ AsciiStrToUnicodeStrWrapper (
   );
 
 #endif /* HII_INTERNAL_LIB_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/Init.c b/IntelUndiPkg/XGigUndiDxe/Init.c
index 4b03f0f72d5d..bffe3c165866 100644
--- a/IntelUndiPkg/XGigUndiDxe/Init.c
+++ b/IntelUndiPkg/XGigUndiDxe/Init.c
@@ -2173,4 +2173,3 @@ EFI_DRIVER_BINDING_PROTOCOL gUndiDriverBinding = {
   NULL,                     // ImageHandle
   NULL                      // Driver Binding Handle
 };
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/Init.h b/IntelUndiPkg/XGigUndiDxe/Init.h
index 591c5fabefc4..28efcd905379 100644
--- a/IntelUndiPkg/XGigUndiDxe/Init.h
+++ b/IntelUndiPkg/XGigUndiDxe/Init.h
@@ -77,4 +77,3 @@ UndiGetDriverHealthStatus (
   );
 
 #endif /* INIT_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/Inventory.vfr b/IntelUndiPkg/XGigUndiDxe/Inventory.vfr
index 3443f460caa3..45fc887d77cb 100644
--- a/IntelUndiPkg/XGigUndiDxe/Inventory.vfr
+++ b/IntelUndiPkg/XGigUndiDxe/Inventory.vfr
@@ -368,4 +368,3 @@ formset
 
 endformset;
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h b/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h
index c8cd6fc42779..e5e669681b07 100644
--- a/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h
+++ b/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h
@@ -137,4 +137,3 @@ typedef struct {
 #define       QUESTION_ID_TMP_SUPPORT_ALT_MAC_ADDR              0x1407
 #define       QUESTION_ID_TMP_SUPPORT_LINK_SPD_STATUS           0x1408
 #endif /* NV_DATA_STRUC_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/StartStop.c b/IntelUndiPkg/XGigUndiDxe/StartStop.c
index e49e6c7a92ae..156e927a35c6 100644
--- a/IntelUndiPkg/XGigUndiDxe/StartStop.c
+++ b/IntelUndiPkg/XGigUndiDxe/StartStop.c
@@ -113,4 +113,3 @@ EFI_DRIVER_STOP_PROTOCOL gUndiDriverStop = {
   StopDriver,
   StartDriver
 };
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/StartStop.h b/IntelUndiPkg/XGigUndiDxe/StartStop.h
index 97ab9f5da23e..03ad3dc9cecc 100644
--- a/IntelUndiPkg/XGigUndiDxe/StartStop.h
+++ b/IntelUndiPkg/XGigUndiDxe/StartStop.h
@@ -68,4 +68,3 @@ struct EFI_DRIVER_STOP_PROTOCOL_S {
 };
 
 #endif /* START_STOP_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/Version.h b/IntelUndiPkg/XGigUndiDxe/Version.h
index 0ddd9ed7b1ce..78cc7809a16a 100644
--- a/IntelUndiPkg/XGigUndiDxe/Version.h
+++ b/IntelUndiPkg/XGigUndiDxe/Version.h
@@ -29,4 +29,3 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define MAJORVERSION 4 /* XGigUndi major version */ 
 #define MINORVERSION 9 /* XGigUndi minor version */ 
 #define BUILDNUMBER 99 /* XGigUndi build version */ 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf b/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf
index 899310735fdf..9e0e4aff0885 100644
--- a/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf
+++ b/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf
@@ -152,4 +152,3 @@ UNLOAD_IMAGE         = UnloadXGigUndiDriver
   gEfiIfrTianoGuid                              ## CONSUMES ## Guid
   gEfiEventExitBootServicesGuid        			## PRODUCES ## Event
   gEfiEventVirtualAddressChangeGuid    			## PRODUCES ## Event
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/Xgbe.c b/IntelUndiPkg/XGigUndiDxe/Xgbe.c
index b8c4f6077ecc..9e3ee862fb4e 100644
--- a/IntelUndiPkg/XGigUndiDxe/Xgbe.c
+++ b/IntelUndiPkg/XGigUndiDxe/Xgbe.c
@@ -2401,4 +2401,3 @@ WaitForEnter (
   } while (Key.UnicodeChar != 0xD);
 }
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/Xgbe.h b/IntelUndiPkg/XGigUndiDxe/Xgbe.h
index 27ae1470d48c..5ab088362f90 100644
--- a/IntelUndiPkg/XGigUndiDxe/Xgbe.h
+++ b/IntelUndiPkg/XGigUndiDxe/Xgbe.h
@@ -1172,4 +1172,3 @@ WaitForEnter (
                         (BUILDNUMBER / 10 << 12) + (BUILDNUMBER % 10 << 8))
 
 #endif /* XGBE_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_82598.c b/IntelUndiPkg/XGigUndiDxe/ixgbe_82598.c
index e6828519e4f1..adb62177a272 100644
--- a/IntelUndiPkg/XGigUndiDxe/ixgbe_82598.c
+++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_82598.c
@@ -1536,4 +1536,3 @@ s32 ixgbe_enable_rx_dma_82598(struct ixgbe_hw *hw, u32 regval)
 
 	return IXGBE_SUCCESS;
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_82598.h b/IntelUndiPkg/XGigUndiDxe/ixgbe_82598.h
index 297d880c621c..75ca431239d2 100644
--- a/IntelUndiPkg/XGigUndiDxe/ixgbe_82598.h
+++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_82598.h
@@ -52,4 +52,3 @@ void ixgbe_set_lan_id_multi_port_pcie_82598(struct ixgbe_hw *hw);
 void ixgbe_set_pcie_completion_timeout(struct ixgbe_hw *hw);
 s32 ixgbe_enable_rx_dma_82598(struct ixgbe_hw *hw, u32 regval);
 #endif /* _IXGBE_82598_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_82599.c b/IntelUndiPkg/XGigUndiDxe/ixgbe_82599.c
index 34e9e5273b75..2fb101ea49f8 100644
--- a/IntelUndiPkg/XGigUndiDxe/ixgbe_82599.c
+++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_82599.c
@@ -2783,4 +2783,3 @@ release_i2c_access:
 
 	return status;
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_82599.h b/IntelUndiPkg/XGigUndiDxe/ixgbe_82599.h
index 3187c369acc7..aff0481f2612 100644
--- a/IntelUndiPkg/XGigUndiDxe/ixgbe_82599.h
+++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_82599.h
@@ -65,4 +65,3 @@ s32 ixgbe_get_protected_blocks_82599(struct ixgbe_hw *hw,
 s32 prot_autoc_read_82599(struct ixgbe_hw *hw, bool *locked, u32 *reg_val);
 s32 prot_autoc_write_82599(struct ixgbe_hw *hw, u32 reg_val, bool locked);
 #endif /* _IXGBE_82599_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_api.c b/IntelUndiPkg/XGigUndiDxe/ixgbe_api.c
index c026024d8e10..88e10ca9c49f 100644
--- a/IntelUndiPkg/XGigUndiDxe/ixgbe_api.c
+++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_api.c
@@ -1779,4 +1779,3 @@ void ixgbe_set_rate_select_speed(struct ixgbe_hw *hw, ixgbe_link_speed speed)
 	if (hw->mac.ops.set_rate_select_speed)
 		hw->mac.ops.set_rate_select_speed(hw, speed);
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_api.h b/IntelUndiPkg/XGigUndiDxe/ixgbe_api.h
index 10604eca92d0..6bcf5dc1ebc6 100644
--- a/IntelUndiPkg/XGigUndiDxe/ixgbe_api.h
+++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_api.h
@@ -242,4 +242,3 @@ s32 ixgbe_negotiate_fc(struct ixgbe_hw *hw, u32 adv_reg, u32 lp_reg,
 			u32 adv_sym, u32 adv_asm, u32 lp_sym, u32 lp_asm);
 
 #endif /* _IXGBE_API_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_common.c b/IntelUndiPkg/XGigUndiDxe/ixgbe_common.c
index 4c6c79c67a24..62bdde1e1f9e 100644
--- a/IntelUndiPkg/XGigUndiDxe/ixgbe_common.c
+++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_common.c
@@ -6064,4 +6064,3 @@ void ixgbe_set_soft_rate_select_speed(struct ixgbe_hw *hw,
 out:
 	return;
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_common.h b/IntelUndiPkg/XGigUndiDxe/ixgbe_common.h
index 8557565344f5..4444e8b1eb27 100644
--- a/IntelUndiPkg/XGigUndiDxe/ixgbe_common.h
+++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_common.h
@@ -238,4 +238,3 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
 void ixgbe_set_soft_rate_select_speed(struct ixgbe_hw *hw,
 				      ixgbe_link_speed speed);
 #endif /* IXGBE_COMMON */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_dcb.h b/IntelUndiPkg/XGigUndiDxe/ixgbe_dcb.h
index fbc75e3f37f9..291059da8f5b 100644
--- a/IntelUndiPkg/XGigUndiDxe/ixgbe_dcb.h
+++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_dcb.h
@@ -167,4 +167,3 @@ u8 ixgbe_dcb_get_tc_from_up(struct ixgbe_dcb_config *, int, u8);
 s32 ixgbe_dcb_hw_config(struct ixgbe_hw *, u16 *, u16 *, u8 *, u8 *, u8 *);
 s32 ixgbe_dcb_hw_config_cee(struct ixgbe_hw *, struct ixgbe_dcb_config *);
 #endif /* _IXGBE_DCB_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_dcb_82599.h b/IntelUndiPkg/XGigUndiDxe/ixgbe_dcb_82599.h
index 4aa05b8049e9..d5b4fc309f92 100644
--- a/IntelUndiPkg/XGigUndiDxe/ixgbe_dcb_82599.h
+++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_dcb_82599.h
@@ -146,4 +146,3 @@ s32 ixgbe_dcb_config_82599(struct ixgbe_hw *,
 s32 ixgbe_dcb_hw_config_82599(struct ixgbe_hw *, int, u16 *, u16 *, u8 *,
 			      u8 *, u8 *);
 #endif /* _IXGBE_DCB_82959_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h b/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h
index a7d4af9bcd6e..6fa0d1605c7c 100644
--- a/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h
+++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h
@@ -553,4 +553,3 @@ typedef BOOLEAN boolean_t;
 #define IXGBE_BE16_TO_CPU(a) IxgbeReverseWord (a)
 
 #endif /* IXGBE_OSDEP_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_phy.c b/IntelUndiPkg/XGigUndiDxe/ixgbe_phy.c
index 843ea3ce2856..5d748b0603f2 100644
--- a/IntelUndiPkg/XGigUndiDxe/ixgbe_phy.c
+++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_phy.c
@@ -2742,4 +2742,3 @@ s32 ixgbe_set_copper_phy_power(struct ixgbe_hw *hw, bool on)
 				       reg);
 	return status;
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_phy.h b/IntelUndiPkg/XGigUndiDxe/ixgbe_phy.h
index c317dfcb3e6b..f79d48b64c3f 100644
--- a/IntelUndiPkg/XGigUndiDxe/ixgbe_phy.h
+++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_phy.h
@@ -214,4 +214,3 @@ s32 ixgbe_read_i2c_combined_generic_int(struct ixgbe_hw *, u8 addr, u16 reg,
 s32 ixgbe_write_i2c_combined_generic_int(struct ixgbe_hw *, u8 addr, u16 reg,
 					 u16 val, bool lock);
 #endif /* _IXGBE_PHY_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_type.h b/IntelUndiPkg/XGigUndiDxe/ixgbe_type.h
index e11bf564dac4..e3bb1a8a313e 100644
--- a/IntelUndiPkg/XGigUndiDxe/ixgbe_type.h
+++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_type.h
@@ -4539,4 +4539,3 @@ struct ixgbe_hw {
 
 #endif /* IXGBE_OSDEP2 */
 #endif /* _IXGBE_TYPE_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_x540.c b/IntelUndiPkg/XGigUndiDxe/ixgbe_x540.c
index 6d89d8f4f440..f7f75ac52daf 100644
--- a/IntelUndiPkg/XGigUndiDxe/ixgbe_x540.c
+++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_x540.c
@@ -1147,4 +1147,3 @@ s32 ixgbe_get_protected_blocks_X540(struct ixgbe_hw *hw,
 
 	return status;
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_x540.h b/IntelUndiPkg/XGigUndiDxe/ixgbe_x540.h
index 40b6715ed37a..aa919940141f 100644
--- a/IntelUndiPkg/XGigUndiDxe/ixgbe_x540.h
+++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_x540.h
@@ -67,4 +67,3 @@ s32 ixgbe_get_protected_blocks_X540(struct ixgbe_hw *hw,
 				u16 *eeprom_buffer, u32 eeprom_size);
 #endif /* _IXGBE_X540_H_ */
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_x550.c b/IntelUndiPkg/XGigUndiDxe/ixgbe_x550.c
index 92df8322f1ed..d49eb94732c3 100644
--- a/IntelUndiPkg/XGigUndiDxe/ixgbe_x550.c
+++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_x550.c
@@ -4795,4 +4795,3 @@ s32 ixgbe_get_protected_blocks_X550(struct ixgbe_hw *hw,
 
 	return status;
 }
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_x550.h b/IntelUndiPkg/XGigUndiDxe/ixgbe_x550.h
index 45303564fd8d..209a2b5bec0f 100644
--- a/IntelUndiPkg/XGigUndiDxe/ixgbe_x550.h
+++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_x550.h
@@ -126,4 +126,3 @@ s32 ixgbe_get_protected_blocks_X550(struct ixgbe_hw *hw,
 				u16 *blocks_size, u32 block_type_mask,
 				u16 *eeprom_buffer, u32 eeprom_size);
 #endif /* _IXGBE_X550_H_ */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/wol/wol.c b/IntelUndiPkg/XGigUndiDxe/wol/wol.c
index 6baf345fb8ee..c4b708d56e46 100644
--- a/IntelUndiPkg/XGigUndiDxe/wol/wol.c
+++ b/IntelUndiPkg/XGigUndiDxe/wol/wol.c
@@ -316,4 +316,3 @@ WolEnableWakeOnLanEx(
   return WolGetWakeOnLanStatusEx(Handle);
 }
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/wol/wol.h b/IntelUndiPkg/XGigUndiDxe/wol/wol.h
index edcc250f3140..dfafbe6f4a1d 100644
--- a/IntelUndiPkg/XGigUndiDxe/wol/wol.h
+++ b/IntelUndiPkg/XGigUndiDxe/wol/wol.h
@@ -79,4 +79,3 @@ WolEnableApmPme(
 
 #endif /* __WOL_H */
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/wol/wol_10G.c b/IntelUndiPkg/XGigUndiDxe/wol/wol_10G.c
index c61de75970e9..6446ab0f7f77 100644
--- a/IntelUndiPkg/XGigUndiDxe/wol/wol_10G.c
+++ b/IntelUndiPkg/XGigUndiDxe/wol/wol_10G.c
@@ -69,4 +69,3 @@ BOOLEAN _WolGetInfoFromEeprom_10G(WOL_ADAPTER_HANDLE_TYPE Handle)
   return FALSE;
 }
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/wol/wolfamily.c b/IntelUndiPkg/XGigUndiDxe/wol/wolfamily.c
index 866a8330c0a1..4affb3aadb16 100644
--- a/IntelUndiPkg/XGigUndiDxe/wol/wolfamily.c
+++ b/IntelUndiPkg/XGigUndiDxe/wol/wolfamily.c
@@ -81,4 +81,3 @@ WOL_MAC_TYPE const WOL_LASER_TABLE[] = {
   0
 };
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/wol/wolimpl.c b/IntelUndiPkg/XGigUndiDxe/wol/wolimpl.c
index d00eb5d82820..f280f7adcbb7 100644
--- a/IntelUndiPkg/XGigUndiDxe/wol/wolimpl.c
+++ b/IntelUndiPkg/XGigUndiDxe/wol/wolimpl.c
@@ -83,4 +83,3 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     return Handle->NicInfo.Function;
   }
 
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/wol/wolimpl.h b/IntelUndiPkg/XGigUndiDxe/wol/wolimpl.h
index eaea7675138d..d3dc0e268bd3 100644
--- a/IntelUndiPkg/XGigUndiDxe/wol/wolimpl.h
+++ b/IntelUndiPkg/XGigUndiDxe/wol/wolimpl.h
@@ -76,4 +76,3 @@ WOL_STATUS _WolEepromWrite16(WOL_ADAPTER_HANDLE_TYPE Handle, UINT16 Offset, UINT
 WOL_STATUS _WolEepromUpdateChecksum(WOL_ADAPTER_HANDLE_TYPE Handle);
 
 #endif /* __WOLIMPL_H */
-
\ No newline at end of file
diff --git a/IntelUndiPkg/XGigUndiDxe/wol/wolinfo.c b/IntelUndiPkg/XGigUndiDxe/wol/wolinfo.c
index 7e49225c451d..ad12ddb1af37 100644
--- a/IntelUndiPkg/XGigUndiDxe/wol/wolinfo.c
+++ b/IntelUndiPkg/XGigUndiDxe/wol/wolinfo.c
@@ -175,4 +175,3 @@ _WOL_DEVICE_INFO_t const WOL_DEVICE_INFO_TABLE[] = {
  {      0,      0,      0,      0,   0 }  /* Last entry */
 };
 
-
\ No newline at end of file
