diff --git a/source/include/FreeRTOS_ARP.h b/source/include/FreeRTOS_ARP.h
index 21357b799..308283b05 100644
--- a/source/include/FreeRTOS_ARP.h
+++ b/source/include/FreeRTOS_ARP.h
@@ -28,10 +28,10 @@
 #ifndef FREERTOS_ARP_H
 #define FREERTOS_ARP_H
 
-/* Application level configuration options. */
-#include "FreeRTOSIPConfig.h"
-#include "FreeRTOSIPConfigDefaults.h"
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
 
+/* Core FreeRTOS+TCP Includes. */
 #include "FreeRTOS_IP.h"
 
 /* *INDENT-OFF* */
diff --git a/source/include/FreeRTOS_BitConfig.h b/source/include/FreeRTOS_BitConfig.h
index 952bfb714..5cb367d9c 100644
--- a/source/include/FreeRTOS_BitConfig.h
+++ b/source/include/FreeRTOS_BitConfig.h
@@ -35,6 +35,9 @@
 #ifndef FREERTOS_BITCONFIG_H
     #define FREERTOS_BITCONFIG_H
 
+/* Global Includes & Definitions. */
+    #include "FreeRTOS_IP_Common.h"
+
     #ifdef __cplusplus
     extern "C" {
     #endif
diff --git a/source/include/FreeRTOS_DHCP.h b/source/include/FreeRTOS_DHCP.h
index f5b6433c1..13886cff4 100644
--- a/source/include/FreeRTOS_DHCP.h
+++ b/source/include/FreeRTOS_DHCP.h
@@ -28,11 +28,10 @@
 #ifndef FREERTOS_DHCP_H
 #define FREERTOS_DHCP_H
 
-#include "FreeRTOS.h"
-
-/* Application level configuration options. */
-#include "FreeRTOSIPConfig.h"
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
 
+/* Core FreeRTOS+TCP Includes. */
 #include "FreeRTOS_Sockets.h"
 
 /* *INDENT-OFF* */
diff --git a/source/include/FreeRTOS_DHCPv6.h b/source/include/FreeRTOS_DHCPv6.h
index 0e2792c86..c10f6e27e 100644
--- a/source/include/FreeRTOS_DHCPv6.h
+++ b/source/include/FreeRTOS_DHCPv6.h
@@ -26,9 +26,11 @@
 #ifndef FREERTOS_DHCPV6_H
     #define FREERTOS_DHCPV6_H
 
-/* Application level configuration options. */
+/* Global Includes & Definitions. */
+    #include "FreeRTOS_IP_Common.h"
+
+/* Optional FreeRTOS+TCP Includes. */
     #include "FreeRTOS_DHCP.h"
-    #include "FreeRTOSIPConfig.h"
 
     #ifdef __cplusplus
     extern "C" {
diff --git a/source/include/FreeRTOS_DNS.h b/source/include/FreeRTOS_DNS.h
index 04daeb232..73a3f01c8 100644
--- a/source/include/FreeRTOS_DNS.h
+++ b/source/include/FreeRTOS_DNS.h
@@ -28,12 +28,13 @@
 #ifndef FREERTOS_DNS_H
 #define FREERTOS_DNS_H
 
-#include "FreeRTOS.h"
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
 
-/* Application level configuration options. */
-#include "FreeRTOS_DNS_Globals.h"
-#include "FreeRTOS_DNS_Callback.h"
+/* Optional FreeRTOS+TCP Includes. */
 #include "FreeRTOS_DNS_Cache.h"
+#include "FreeRTOS_DNS_Callback.h"
+#include "FreeRTOS_DNS_Globals.h"
 
 /* *INDENT-OFF* */
 #ifdef __cplusplus
diff --git a/source/include/FreeRTOS_DNS_Cache.h b/source/include/FreeRTOS_DNS_Cache.h
index 2dd6b19a3..b95ef28f0 100644
--- a/source/include/FreeRTOS_DNS_Cache.h
+++ b/source/include/FreeRTOS_DNS_Cache.h
@@ -28,14 +28,12 @@
 #ifndef FREERTOS_DNS_CACHE_H
 #define FREERTOS_DNS_CACHE_H
 
-/* FreeRTOS includes. */
-#include "FreeRTOS.h"
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
 
+/* Optional FreeRTOS+TCP Includes. */
 #include "FreeRTOS_DNS_Globals.h"
 
-/* Standard includes. */
-#include <stdint.h>
-
 #if ( ( ipconfigUSE_DNS_CACHE == 1 ) && ( ipconfigUSE_DNS != 0 ) )
 
 /**
diff --git a/source/include/FreeRTOS_DNS_Callback.h b/source/include/FreeRTOS_DNS_Callback.h
index 81b40960c..d67f5360e 100644
--- a/source/include/FreeRTOS_DNS_Callback.h
+++ b/source/include/FreeRTOS_DNS_Callback.h
@@ -29,17 +29,15 @@
 #ifndef FREERTOS_DNS_CALLBACK_H
 #define FREERTOS_DNS_CALLBACK_H
 
-/* FreeRTOS includes. */
-#include "FreeRTOS.h"
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
 
-/* FreeRTOS+TCP includes. */
+/* Core FreeRTOS+TCP Includes. */
 #include "FreeRTOS_IP.h"
 
+/* Optional FreeRTOS+TCP Includes. */
 #include "FreeRTOS_DNS_Globals.h"
 
-/* Standard includes. */
-#include <stdint.h>
-
 /* *INDENT-OFF* */
 #ifdef __cplusplus
     extern "C" {
diff --git a/source/include/FreeRTOS_DNS_Globals.h b/source/include/FreeRTOS_DNS_Globals.h
index d60c3a8e8..73974cd59 100644
--- a/source/include/FreeRTOS_DNS_Globals.h
+++ b/source/include/FreeRTOS_DNS_Globals.h
@@ -28,11 +28,10 @@
 #ifndef FREERTOS_DNS_GLOBALS_H
 #define FREERTOS_DNS_GLOBALS_H
 
-#include "FreeRTOS.h"
-
-#include "FreeRTOSIPConfig.h"
-#include "FreeRTOSIPConfigDefaults.h"
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
 
+/* Core FreeRTOS+TCP Includes. */
 #include "FreeRTOS_Sockets.h"
 
 #define dnsPARSE_ERROR              0UL
diff --git a/source/include/FreeRTOS_DNS_Networking.h b/source/include/FreeRTOS_DNS_Networking.h
index 7a2ede391..0061806c6 100644
--- a/source/include/FreeRTOS_DNS_Networking.h
+++ b/source/include/FreeRTOS_DNS_Networking.h
@@ -27,8 +27,14 @@
 #ifndef FREERTOS_DNS_NETWORKING_H
 #define FREERTOS_DNS_NETWORKING_H
 
+/* Global Includes & Definitions */
+#include "FreeRTOS_IP_Common.h"
+
+/* Core FreeRTOS+TCP Includes. */
 #include "FreeRTOS_IP.h"
 #include "FreeRTOS_Sockets.h"
+
+/* Optional FreeRTOS+TCP Includes. */
 #include "FreeRTOS_DNS_Globals.h"
 
 #if ( ipconfigUSE_DNS != 0 )
diff --git a/source/include/FreeRTOS_DNS_Parser.h b/source/include/FreeRTOS_DNS_Parser.h
index e45e61924..477b70bc7 100644
--- a/source/include/FreeRTOS_DNS_Parser.h
+++ b/source/include/FreeRTOS_DNS_Parser.h
@@ -28,17 +28,15 @@
 #ifndef FREERTOS_DNS_PARSER_H
 #define FREERTOS_DNS_PARSER_H
 
-/* FreeRTOS includes. */
-#include "FreeRTOS.h"
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
 
-/* FreeRTOS+TCP includes. */
+/* Core FreeRTOS+TCP Includes. */
 #include "FreeRTOS_IP.h"
 
+/* Optional FreeRTOS+TCP Includes. */
 #include "FreeRTOS_DNS_Globals.h"
 
-/* Standard includes. */
-#include <stdint.h>
-
 /* *INDENT-OFF* */
 #ifdef __cplusplus
     extern "C" {
diff --git a/source/include/FreeRTOS_ICMP.h b/source/include/FreeRTOS_ICMP.h
index 45eaf7963..275b0af12 100644
--- a/source/include/FreeRTOS_ICMP.h
+++ b/source/include/FreeRTOS_ICMP.h
@@ -33,7 +33,10 @@
 #ifndef FREERTOS_ICMP_H
 #define FREERTOS_ICMP_H
 
-/* FreeRTOS+TCP includes. */
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
+
+/* Core FreeRTOS+TCP Includes. */
 #include "FreeRTOS_IP.h"
 #include "FreeRTOS_IP_Private.h"
 
diff --git a/source/include/FreeRTOS_IP.h b/source/include/FreeRTOS_IP.h
index 766c18450..36750e3bc 100644
--- a/source/include/FreeRTOS_IP.h
+++ b/source/include/FreeRTOS_IP.h
@@ -28,12 +28,7 @@
 #ifndef FREERTOS_IP_H
 #define FREERTOS_IP_H
 
-#include "FreeRTOS.h"
-#include "task.h"
-
-/* Application level configuration options. */
-#include "FreeRTOSIPConfig.h"
-#include "FreeRTOSIPConfigDefaults.h"
+/* Global Includes & Definitions. */
 #include "FreeRTOS_IP_Common.h"
 
 /* *INDENT-OFF* */
@@ -485,11 +480,9 @@ extern NetworkBufferDescriptor_t * pxARPWaitingNetworkBuffer;
     #define vPrintResourceStats()    do {} while( ipFALSE_BOOL )     /**< ipconfigHAS_PRINTF is not defined. Define vPrintResourceStats to a do-while( 0 ). */
 #endif
 
+/* Core FreeRTOS+TCP Includes. */
 #include "FreeRTOS_IP_Utils.h" /*TODO can be moved after other 2 includes */
-
-
 #include "FreeRTOS_IPv4.h"
-
 #include "FreeRTOS_IPv6.h"
 
 /* *INDENT-OFF* */
diff --git a/source/include/FreeRTOS_IP_Common.h b/source/include/FreeRTOS_IP_Common.h
index e557fd07b..e8733f54c 100644
--- a/source/include/FreeRTOS_IP_Common.h
+++ b/source/include/FreeRTOS_IP_Common.h
@@ -28,6 +28,22 @@
 #ifndef FREERTOS_IP_COMMON_H
 #define FREERTOS_IP_COMMON_H
 
+/* Standard Includes. */
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+/* FreeRTOS Includes. */
+#include "FreeRTOS.h"
+#include "task.h"
+#include "queue.h"
+#include "semphr.h"
+#include "event_groups.h"
+
+/* Application Level Configuration Options. */
+#include "FreeRTOSIPConfig.h"
+#include "FreeRTOSIPConfigDefaults.h"
+
 /* *INDENT-OFF* */
 #ifdef __cplusplus
     extern "C" {
diff --git a/source/include/FreeRTOS_IP_Private.h b/source/include/FreeRTOS_IP_Private.h
index b594582fc..79ed92fcb 100644
--- a/source/include/FreeRTOS_IP_Private.h
+++ b/source/include/FreeRTOS_IP_Private.h
@@ -28,21 +28,17 @@
 #ifndef FREERTOS_IP_PRIVATE_H
 #define FREERTOS_IP_PRIVATE_H
 
-/* Application level configuration options. */
-#include "FreeRTOSIPConfig.h"
-#include "FreeRTOSIPConfigDefaults.h"
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
+
+/* Core FreeRTOS+TCP Includes. */
+#include "FreeRTOS_Routing.h"
 #include "FreeRTOS_Sockets.h"
 #include "FreeRTOS_Stream_Buffer.h"
-#include "FreeRTOS_Routing.h"
-
-#if ( ipconfigUSE_TCP == 1 )
-    #include "FreeRTOS_TCP_WIN.h"
-    #include "FreeRTOS_TCP_IP.h"
-#endif
-
-#include "semphr.h"
 
-#include "event_groups.h"
+/* Optional FreeRTOS+TCP Includes. */
+#include "FreeRTOS_TCP_WIN.h"
+#include "FreeRTOS_TCP_IP.h"
 
 /* *INDENT-OFF* */
 #ifdef __cplusplus
diff --git a/source/include/FreeRTOS_IP_Timers.h b/source/include/FreeRTOS_IP_Timers.h
index 8d7a84e26..e57e36111 100644
--- a/source/include/FreeRTOS_IP_Timers.h
+++ b/source/include/FreeRTOS_IP_Timers.h
@@ -33,26 +33,20 @@
 #ifndef FREERTOS_IP_TIMERS_H
 #define FREERTOS_IP_TIMERS_H
 
-/* Standard includes. */
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
-/* FreeRTOS includes. */
-#include "FreeRTOS.h"
-#include "task.h"
-#include "queue.h"
-#include "semphr.h"
-
-/* FreeRTOS+TCP includes. */
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
+
+/* Core FreeRTOS+TCP Includes. */
 #include "FreeRTOS_IP.h"
-#include "FreeRTOS_Sockets.h"
 #include "FreeRTOS_IP_Private.h"
-#include "FreeRTOS_ARP.h"
+#include "FreeRTOS_Sockets.h"
 #include "FreeRTOS_UDP_IP.h"
-#include "FreeRTOS_DHCP.h"
 #include "NetworkInterface.h"
 #include "NetworkBufferManagement.h"
+
+/* Optional FreeRTOS+TCP Includes. */
+#include "FreeRTOS_ARP.h"
+#include "FreeRTOS_DHCP.h"
 #include "FreeRTOS_DNS.h"
 
 /* *INDENT-OFF* */
diff --git a/source/include/FreeRTOS_IP_Utils.h b/source/include/FreeRTOS_IP_Utils.h
index 37b9bb4d3..7bc65ab9c 100644
--- a/source/include/FreeRTOS_IP_Utils.h
+++ b/source/include/FreeRTOS_IP_Utils.h
@@ -33,28 +33,21 @@
 #ifndef FREERTOS_IP_UTILS_H
 #define FREERTOS_IP_UTILS_H
 
-/* Standard includes. */
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
-/* FreeRTOS includes. */
-#include "FreeRTOS.h"
-#include "task.h"
-#include "queue.h"
-#include "semphr.h"
-
-/* FreeRTOS+TCP includes. */
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
+
+/* Core FreeRTOS+TCP Includes. */
 #include "FreeRTOS_IP.h"
-#include "FreeRTOS_Sockets.h"
-#include "FreeRTOS_Routing.h"
 #include "FreeRTOS_IP_Private.h"
+#include "FreeRTOS_Routing.h"
+#include "FreeRTOS_Sockets.h"
 #include "FreeRTOS_UDP_IP.h"
-#include "FreeRTOS_DHCP.h"
 #include "NetworkInterface.h"
 #include "NetworkBufferManagement.h"
-#include "FreeRTOS_DNS.h"
 
+/* Optional FreeRTOS+TCP Includes. */
+#include "FreeRTOS_DHCP.h"
+#include "FreeRTOS_DNS.h"
 #include "FreeRTOS_IPv4_Utils.h"
 #include "FreeRTOS_IPv6_Utils.h"
 
diff --git a/source/include/FreeRTOS_IPv4.h b/source/include/FreeRTOS_IPv4.h
index 233620d37..9d4ee0263 100644
--- a/source/include/FreeRTOS_IPv4.h
+++ b/source/include/FreeRTOS_IPv4.h
@@ -28,12 +28,8 @@
 #ifndef FREERTOS_IPV4_H
 #define FREERTOS_IPV4_H
 
-#include "FreeRTOS.h"
-#include "task.h"
-
-/* Application level configuration options. */
-#include "FreeRTOSIPConfig.h"
-#include "FreeRTOSIPConfigDefaults.h"
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
 
 /* *INDENT-OFF* */
 #ifdef __cplusplus
diff --git a/source/include/FreeRTOS_IPv4_Private.h b/source/include/FreeRTOS_IPv4_Private.h
index fd1cc922c..92f5341c5 100644
--- a/source/include/FreeRTOS_IPv4_Private.h
+++ b/source/include/FreeRTOS_IPv4_Private.h
@@ -28,6 +28,10 @@
 #ifndef FREERTOS_IPV4_PRIVATE_H
 #define FREERTOS_IPV4_PRIVATE_H
 
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
+
+/* Core FreeRTOS+TCP Includes. */
 #include "FreeRTOS_IP_Private.h"
 
 /* *INDENT-OFF* */
diff --git a/source/include/FreeRTOS_IPv4_Sockets.h b/source/include/FreeRTOS_IPv4_Sockets.h
index 0d6ef3221..209332b8d 100644
--- a/source/include/FreeRTOS_IPv4_Sockets.h
+++ b/source/include/FreeRTOS_IPv4_Sockets.h
@@ -28,11 +28,8 @@
 #ifndef FREERTOS_IPV4_SOCKETS_H
     #define FREERTOS_IPV4_SOCKETS_H
 
-/* Standard includes. */
-    #include <string.h>
-
-/* FreeRTOS includes. */
-    #include "FreeRTOS.h"
+/* Global Includes & Definitions. */
+    #include "FreeRTOS_IP_Common.h"
 
     #ifdef __cplusplus
     extern "C" {
diff --git a/source/include/FreeRTOS_IPv4_Utils.h b/source/include/FreeRTOS_IPv4_Utils.h
index 0ac2f66ce..a0058564e 100644
--- a/source/include/FreeRTOS_IPv4_Utils.h
+++ b/source/include/FreeRTOS_IPv4_Utils.h
@@ -33,14 +33,10 @@
  * @brief Implements the utility functions for FreeRTOS_IP.c
  */
 
-/* Standard includes. */
-#include <stdint.h>
-#include <stdio.h>
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
 
-/* FreeRTOS includes. */
-#include "FreeRTOS.h"
-
-/* FreeRTOS+TCP includes. */
+/* Core FreeRTOS+TCP Includes. */
 #include "FreeRTOS_IP.h"
 
 /* *INDENT-OFF* */
diff --git a/source/include/FreeRTOS_IPv6.h b/source/include/FreeRTOS_IPv6.h
index 0706a7dac..1acc23c51 100644
--- a/source/include/FreeRTOS_IPv6.h
+++ b/source/include/FreeRTOS_IPv6.h
@@ -26,11 +26,12 @@
 #ifndef FREERTOS_IPV6_H
 #define FREERTOS_IPV6_H
 
-#include "FreeRTOS.h"
-#include "task.h"
-#include "FreeRTOS_IP.h"
+/* Global Includes & Definitions. */
 #include "FreeRTOS_IP_Common.h"
 
+/* Core FreeRTOS+TCP Includes. */
+#include "FreeRTOS_IP.h"
+
 /* *INDENT-OFF* */
 #ifdef __cplusplus
     extern "C" {
diff --git a/source/include/FreeRTOS_IPv6_Private.h b/source/include/FreeRTOS_IPv6_Private.h
index c56c9b32b..4a09434ac 100644
--- a/source/include/FreeRTOS_IPv6_Private.h
+++ b/source/include/FreeRTOS_IPv6_Private.h
@@ -28,21 +28,19 @@
 #ifndef FREERTOS_IPV6_PRIVATE_H
 #define FREERTOS_IPV6_PRIVATE_H
 
-/* Application level configuration options. */
-#include "FreeRTOSIPConfig.h"
-#include "FreeRTOSIPConfigDefaults.h"
+/* Global Includes & Definitions */
 #include "FreeRTOS_IP_Common.h"
+
+/* Core FreeRTOS+TCP Includes. */
 #include "FreeRTOS_Sockets.h"
 #include "FreeRTOS_Stream_Buffer.h"
+
+/* Optional FreeRTOS+TCP Includes. */
 #if ( ipconfigUSE_TCP == 1 )
     #include "FreeRTOS_TCP_WIN.h"
     #include "FreeRTOS_TCP_IP.h"
 #endif
 
-#include "semphr.h"
-
-#include "event_groups.h"
-
 /* *INDENT-OFF* */
 #ifdef __cplusplus
     extern "C" {
diff --git a/source/include/FreeRTOS_IPv6_Sockets.h b/source/include/FreeRTOS_IPv6_Sockets.h
index c9a931e67..ba51b3381 100644
--- a/source/include/FreeRTOS_IPv6_Sockets.h
+++ b/source/include/FreeRTOS_IPv6_Sockets.h
@@ -28,11 +28,7 @@
 #ifndef FREERTOS_IPV6_SOCKETS_H
     #define FREERTOS_IPV6_SOCKETS_H
 
-/* Standard includes. */
-    #include <string.h>
-
-/* FreeRTOS includes. */
-    #include "FreeRTOS.h"
+/* Global Includes & Definitions. */
     #include "FreeRTOS_IP_Common.h"
 
     #ifdef __cplusplus
diff --git a/source/include/FreeRTOS_IPv6_Utils.h b/source/include/FreeRTOS_IPv6_Utils.h
index 34f23e985..7f029ea4d 100644
--- a/source/include/FreeRTOS_IPv6_Utils.h
+++ b/source/include/FreeRTOS_IPv6_Utils.h
@@ -33,17 +33,12 @@
  * @brief Implements the utility functions for FreeRTOS_IP.c
  */
 
-/* Standard includes. */
-#include <stdint.h>
-#include <stdio.h>
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
 
-/* FreeRTOS includes. */
-#include "FreeRTOS.h"
-
-/* FreeRTOS+TCP includes. */
+/* Core FreeRTOS+TCP Includes. */
 #include "FreeRTOS_IP.h"
 
-
 /* *INDENT-OFF* */
 #ifdef __cplusplus
     extern "C" {
diff --git a/source/include/FreeRTOS_ND.h b/source/include/FreeRTOS_ND.h
index bdbabdec7..01050bead 100644
--- a/source/include/FreeRTOS_ND.h
+++ b/source/include/FreeRTOS_ND.h
@@ -26,12 +26,10 @@
 #ifndef FREERTOS_ND_H
 #define FREERTOS_ND_H
 
-#include "FreeRTOS.h"
-
-/* Application level configuration options. */
-#include "FreeRTOSIPConfig.h"
-#include "FreeRTOSIPConfigDefaults.h"
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
 
+/* Optional FreeRTOS+TCP Includes. */
 #include "FreeRTOS_ARP.h"
 
 /* *INDENT-OFF* */
diff --git a/source/include/FreeRTOS_Routing.h b/source/include/FreeRTOS_Routing.h
index 433feac5e..4373db800 100644
--- a/source/include/FreeRTOS_Routing.h
+++ b/source/include/FreeRTOS_Routing.h
@@ -26,13 +26,16 @@
 #ifndef FREERTOS_ROUTING_H
     #define FREERTOS_ROUTING_H
 
-    #include "FreeRTOS.h"
+/* Global Includes & Definitions. */
+    #include "FreeRTOS_IP_Common.h"
+
+/* Core FreeRTOS+TCP Includes. */
     #include "FreeRTOS_IP.h"
 
+/* Optional FreeRTOS+TCP Includes. */
     #if ( ipconfigUSE_DHCP != 0 )
         #include "FreeRTOS_DHCP.h"
     #endif
-
     #if ( ipconfigUSE_IPv6 != 0 )
         #include "FreeRTOS_DHCPv6.h"
     #endif
diff --git a/source/include/FreeRTOS_Sockets.h b/source/include/FreeRTOS_Sockets.h
index 0a93660a8..924865c8e 100644
--- a/source/include/FreeRTOS_Sockets.h
+++ b/source/include/FreeRTOS_Sockets.h
@@ -28,40 +28,13 @@
 #ifndef FREERTOS_SOCKETS_H
     #define FREERTOS_SOCKETS_H
 
-/* Standard includes. */
-    #include <string.h>
-
-/* FreeRTOS includes. */
-    #include "FreeRTOS.h"
-    #include "task.h"
-
-/* Application level configuration options. */
-    #include "FreeRTOSIPConfig.h"
-    #include "FreeRTOSIPConfigDefaults.h"
-
-    #ifndef FREERTOS_IP_CONFIG_H
-        #error FreeRTOSIPConfig.h has not been included yet
-    #endif
-
+/* Global Includes & Definitions */
     #include "FreeRTOS_IP_Common.h"
 
-/* Event bit definitions are required by the select functions. */
-    #include "event_groups.h"
-
     #ifdef __cplusplus
     extern "C" {
     #endif
 
-    #ifndef INC_FREERTOS_H
-        #error FreeRTOS.h must be included before FreeRTOS_Sockets.h.
-    #endif
-
-    #ifndef INC_TASK_H
-        #ifndef TASK_H /* For compatibility with older FreeRTOS versions. */
-            #error The FreeRTOS header file task.h must be included before FreeRTOS_Sockets.h.
-        #endif
-    #endif
-
 /* Assigned to an Socket_t variable when the socket is not valid, probably
  * because it could not be created. */
     #define FREERTOS_INVALID_SOCKET          ( ( Socket_t ) ~0U )
diff --git a/source/include/FreeRTOS_Stream_Buffer.h b/source/include/FreeRTOS_Stream_Buffer.h
index 884ad044a..543a765e9 100644
--- a/source/include/FreeRTOS_Stream_Buffer.h
+++ b/source/include/FreeRTOS_Stream_Buffer.h
@@ -36,6 +36,9 @@
 #ifndef FREERTOS_STREAM_BUFFER_H
 #define FREERTOS_STREAM_BUFFER_H
 
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
+
 /* *INDENT-OFF* */
 #ifdef __cplusplus
     extern "C" {
diff --git a/source/include/FreeRTOS_TCP_IP.h b/source/include/FreeRTOS_TCP_IP.h
index 0e00c8a72..9429d2fa4 100644
--- a/source/include/FreeRTOS_TCP_IP.h
+++ b/source/include/FreeRTOS_TCP_IP.h
@@ -28,6 +28,9 @@
 #ifndef FREERTOS_TCP_IP_H
 #define FREERTOS_TCP_IP_H
 
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
+
 /* *INDENT-OFF* */
 #ifdef __cplusplus
     extern "C" {
diff --git a/source/include/FreeRTOS_TCP_Reception.h b/source/include/FreeRTOS_TCP_Reception.h
index 004b0f3c7..2093621b4 100644
--- a/source/include/FreeRTOS_TCP_Reception.h
+++ b/source/include/FreeRTOS_TCP_Reception.h
@@ -28,6 +28,9 @@
 #ifndef FREERTOS_TCP_RECEPTION_H
 #define FREERTOS_TCP_RECEPTION_H
 
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
+
 /* *INDENT-OFF* */
 #ifdef __cplusplus
     extern "C" {
diff --git a/source/include/FreeRTOS_TCP_State_Handling.h b/source/include/FreeRTOS_TCP_State_Handling.h
index 21208c5e2..889bc8040 100644
--- a/source/include/FreeRTOS_TCP_State_Handling.h
+++ b/source/include/FreeRTOS_TCP_State_Handling.h
@@ -28,6 +28,10 @@
 #ifndef FREERTOS_TCP_STATE_HANDLING_H
 #define FREERTOS_TCP_STATE_HANDLING_H
 
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
+
+/* Optional FreeRTOS+TCP Includes. */
 #include "FreeRTOS_TCP_IP.h"
 
 /* *INDENT-OFF* */
diff --git a/source/include/FreeRTOS_TCP_Transmission.h b/source/include/FreeRTOS_TCP_Transmission.h
index ab1eae67b..dc8f1230b 100644
--- a/source/include/FreeRTOS_TCP_Transmission.h
+++ b/source/include/FreeRTOS_TCP_Transmission.h
@@ -28,6 +28,9 @@
 #ifndef FREERTOS_TCP_TRANSMISSION_H
 #define FREERTOS_TCP_TRANSMISSION_H
 
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
+
 /* *INDENT-OFF* */
 #ifdef __cplusplus
     extern "C" {
diff --git a/source/include/FreeRTOS_TCP_Utils.h b/source/include/FreeRTOS_TCP_Utils.h
index 12d2daf40..4148fe5d3 100644
--- a/source/include/FreeRTOS_TCP_Utils.h
+++ b/source/include/FreeRTOS_TCP_Utils.h
@@ -28,6 +28,9 @@
 #ifndef FREERTOS_TCP_UTILS_H
 #define FREERTOS_TCP_UTILS_H
 
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
+
 /* *INDENT-OFF* */
 #ifdef __cplusplus
     extern "C" {
diff --git a/source/include/FreeRTOS_TCP_WIN.h b/source/include/FreeRTOS_TCP_WIN.h
index 787717aa3..82a99f387 100644
--- a/source/include/FreeRTOS_TCP_WIN.h
+++ b/source/include/FreeRTOS_TCP_WIN.h
@@ -33,6 +33,9 @@
 #ifndef FREERTOS_TCP_WIN_H
 #define FREERTOS_TCP_WIN_H
 
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
+
 /* *INDENT-OFF* */
 #ifdef __cplusplus
     extern "C" {
diff --git a/source/include/FreeRTOS_UDP_IP.h b/source/include/FreeRTOS_UDP_IP.h
index 0285aaebb..e4d54ea22 100644
--- a/source/include/FreeRTOS_UDP_IP.h
+++ b/source/include/FreeRTOS_UDP_IP.h
@@ -28,9 +28,10 @@
 #ifndef FREERTOS_UDP_IP_H
 #define FREERTOS_UDP_IP_H
 
-/* Application level configuration options. */
-#include "FreeRTOSIPConfig.h"
-#include "FreeRTOSIPConfigDefaults.h"
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
+
+/* Core FreeRTOS+TCP Includes. */
 #include "FreeRTOS_IP.h"
 
 /* *INDENT-OFF* */
diff --git a/source/include/NetworkBufferManagement.h b/source/include/NetworkBufferManagement.h
index 3fd9804a3..01a7b5eab 100644
--- a/source/include/NetworkBufferManagement.h
+++ b/source/include/NetworkBufferManagement.h
@@ -28,14 +28,18 @@
 #ifndef NETWORK_BUFFER_MANAGEMENT_H
 #define NETWORK_BUFFER_MANAGEMENT_H
 
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
+
+/* Core FreeRTOS+TCP Includes. */
+#include "FreeRTOS_IP.h"
+
 /* *INDENT-OFF* */
 #ifdef __cplusplus
     extern "C" {
 #endif
 /* *INDENT-ON* */
 
-#include "FreeRTOS_IP.h"
-
 /* _HT_ Two macro's needed while debugging/testing, please ignore. */
 
 #define BUFFER_FROM_WHERE_DECL
diff --git a/source/include/NetworkInterface.h b/source/include/NetworkInterface.h
index a9c804cd8..eb2011c46 100644
--- a/source/include/NetworkInterface.h
+++ b/source/include/NetworkInterface.h
@@ -28,14 +28,18 @@
 #ifndef NETWORK_INTERFACE_H
 #define NETWORK_INTERFACE_H
 
+/* Global Includes & Definitions. */
+#include "FreeRTOS_IP_Common.h"
+
+/* Core FreeRTOS+TCP Includes. */
+#include "FreeRTOS_IP.h"
+
 /* *INDENT-OFF* */
 #ifdef __cplusplus
     extern "C" {
 #endif
 /* *INDENT-ON* */
 
-#include "FreeRTOS_IP.h"
-
 /* INTERNAL API FUNCTIONS. */
 
 /* Since there are multiple interfaces, there are multiple versions