diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.h b/Demos/Device/ClassDriver/GenericHID/GenericHID.h
index 8fa0b9354a4b34049a136048adbc5c1caae5ab19..e61e9571fa99f280b053413fe445e8572eddb2ec 100644
--- a/Demos/Device/ClassDriver/GenericHID/GenericHID.h
+++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.h
@@ -74,7 +74,7 @@
 
 		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
 		                                         uint8_t* const ReportID,
-                                                 const uint8_t ReportType,
+		                                         const uint8_t ReportType,
 		                                         void* ReportData,
 		                                         uint16_t* const ReportSize);
 		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
diff --git a/Demos/Device/ClassDriver/Joystick/Joystick.h b/Demos/Device/ClassDriver/Joystick/Joystick.h
index fc06634ffcb6524aa3d13f630f1dd8121dbc92ed..a8151cdf1ed133308bedd7fa8ebb6435584114f0 100644
--- a/Demos/Device/ClassDriver/Joystick/Joystick.h
+++ b/Demos/Device/ClassDriver/Joystick/Joystick.h
@@ -87,7 +87,7 @@
 
 		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
 		                                         uint8_t* const ReportID,
-                                                 const uint8_t ReportType,
+		                                         const uint8_t ReportType,
 		                                         void* ReportData,
 		                                         uint16_t* const ReportSize);
 		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.h b/Demos/Device/ClassDriver/Keyboard/Keyboard.h
index 4c4e2d5d8278f94e8c80e929b4a623ac16afc5f5..fd7bf51988eef061d4a5b7801d2c43fd3612d707 100644
--- a/Demos/Device/ClassDriver/Keyboard/Keyboard.h
+++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.h
@@ -77,7 +77,7 @@
 
 		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
 		                                         uint8_t* const ReportID,
-                                                 const uint8_t ReportType,
+		                                         const uint8_t ReportType,
 		                                         void* ReportData,
 		                                         uint16_t* const ReportSize);
 		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h
index 9cbba7aaa1946b63ea71cd8e1ace24c9bc2d1fa5..5c385fd42f3ec4f7694888d618718a8bcc2bbfba 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h
+++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h
@@ -72,7 +72,7 @@
 
 		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
 		                                         uint8_t* const ReportID,
-                                                 const uint8_t ReportType,
+		                                         const uint8_t ReportType,
 		                                         void* ReportData,
 		                                         uint16_t* const ReportSize);
 		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.h b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.h
index 6e1a0836880948942d63f2a24ee3c906cb8070df..482969b937f6c0ea3a805f9ce1f98b7e1dde3363 100644
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.h
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.h
@@ -88,7 +88,7 @@
 
 		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
 		                                         uint8_t* const ReportID,
-                                                 const uint8_t ReportType,
+		                                         const uint8_t ReportType,
 		                                         void* ReportData,
 		                                         uint16_t* const ReportSize);
 		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
diff --git a/Demos/Device/ClassDriver/Mouse/Mouse.h b/Demos/Device/ClassDriver/Mouse/Mouse.h
index 9a3c6e55448a0fb374a028c50712fbac372a1e5e..48b129100aa1a68ccbd3e754621ee13d072eec77 100644
--- a/Demos/Device/ClassDriver/Mouse/Mouse.h
+++ b/Demos/Device/ClassDriver/Mouse/Mouse.h
@@ -78,7 +78,7 @@
 
 		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
 		                                         uint8_t* const ReportID,
-                                                 const uint8_t ReportType,
+		                                         const uint8_t ReportType,
 		                                         void* ReportData,
 		                                         uint16_t* const ReportSize);
 		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.h b/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.h
index 64ad52299f3db5fb40a00993bd2b9f57573d42c7..9081253eabbe4ba63add0b0d576851370d35f6f5 100644
--- a/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.h
+++ b/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.h
@@ -78,7 +78,7 @@
 
 		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
 		                                         uint8_t* const ReportID,
-                                                 const uint8_t ReportType,
+		                                         const uint8_t ReportType,
 		                                         void* ReportData,
 		                                         uint16_t* const ReportSize);
 		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.h b/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.h
index 5168dc8ef74f72eed09c676b7babaed86467732b..4b83b42cbebc0ffd679f2e4ba846b2c90559822f 100644
--- a/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.h
+++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.h
@@ -218,7 +218,7 @@
 			static bool ProcessNDISQuery(const uint32_t OId,
 			                             void* QueryData,
 			                             uint16_t QuerySize,
-										 void* ResponseData,
+			                             void* ResponseData,
 			                             uint16_t* ResponseSize);
 			static bool ProcessNDISSet(const uint32_t OId,
 			                           void* SetData,
diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.h b/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.h
index 984793e59bd89932edf143db795dafc3183acc4a..6656ac2d9c9f2dae761cab3b533d50e3b973baa7 100644
--- a/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.h
+++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.h
@@ -252,7 +252,7 @@
 		#if defined(INCLUDE_FROM_TCP_C)
 			static uint16_t TCP_Checksum16(void* TCPHeaderOutStart,
 			                               const IP_Address_t SourceAddress,
-										   const IP_Address_t DestinationAddress,
+			                               const IP_Address_t DestinationAddress,
 			                               uint16_t TCPOutSize);
 		#endif