From 86b26ad181a03ce0431d812b812a25574fa48e15 Mon Sep 17 00:00:00 2001
From: Michael Zillgith <michael@zillgith.eu>
Date: Tue, 3 Mar 2015 12:37:49 +0100
Subject: [PATCH] - changed header inclusion. All libiec61850 now include
 libiec61850_platform_includes.h. All standard headers should be included from
 there.

---
 src/common/conversions.c                                 | 1 +
 src/common/inc/libiec61850_platform_includes.h           | 2 ++
 src/common/lib_memory.c                                  | 2 +-
 src/common/mem_alloc_linked_list.c                       | 2 +-
 src/common/simple_allocator.c                            | 3 +--
 src/common/string_utilities.c                            | 2 +-
 src/hal/ethernet/bsd/ethernet_bsd.c                      | 2 --
 src/hal/ethernet/linux/ethernet_linux.c                  | 4 ----
 src/hal/ethernet/win32/ethernet_win32.c                  | 5 ++---
 src/hal/filesystem/linux/file_provider_linux.c           | 4 ----
 src/hal/filesystem/win32/file_provider_win32.c           | 2 --
 src/hal/socket/bsd/socket_bsd.c                          | 3 ---
 src/hal/socket/linux/socket_linux.c                      | 3 ---
 src/hal/socket/win32/socket_win32.c                      | 2 --
 src/hal/thread/linux/thread_linux.c                      | 1 -
 src/hal/thread/win32/thread_win32.c                      | 1 -
 src/iec61850/client/client_goose_control.c               | 3 +--
 src/iec61850/client/client_report.c                      | 3 +--
 src/iec61850/client/client_report_control.c              | 3 +--
 src/iec61850/server/impl/client_connection.c             | 3 ++-
 src/iec61850/server/impl/ied_server.c                    | 2 ++
 src/iec61850/server/mms_mapping/control.c                | 2 ++
 src/iec61850/server/model/cdc.c                          | 1 +
 src/iec61850/server/model/config_file_parser.c           | 3 ---
 src/iec61850/server/model/dynamic_model.c                | 2 --
 src/mms/asn1/ber_decode.c                                | 2 +-
 src/mms/asn1/ber_encoder.c                               | 2 --
 src/mms/asn1/ber_integer.c                               | 1 -
 src/mms/iso_acse/acse.c                                  | 2 +-
 src/mms/iso_cotp/cotp.c                                  | 1 +
 src/mms/iso_mms/client/mms_client_common.c               | 1 +
 src/mms/iso_mms/client/mms_client_files.c                | 2 +-
 src/mms/iso_mms/client/mms_client_get_namelist.c         | 2 +-
 src/mms/iso_mms/client/mms_client_get_var_access.c       | 2 +-
 src/mms/iso_mms/client/mms_client_identify.c             | 2 +-
 src/mms/iso_mms/client/mms_client_initiate.c             | 1 +
 src/mms/iso_mms/client/mms_client_named_variable_list.c  | 2 +-
 src/mms/iso_mms/client/mms_client_read.c                 | 2 --
 src/mms/iso_mms/client/mms_client_status.c               | 2 +-
 src/mms/iso_mms/client/mms_client_write.c                | 1 +
 src/mms/iso_mms/common/mms_common_msg.c                  | 2 --
 src/mms/iso_mms/common/mms_value.c                       | 3 ---
 src/mms/iso_mms/server/mms_access_result.c               | 1 +
 src/mms/iso_mms/server/mms_association_service.c         | 1 +
 src/mms/iso_mms/server/mms_device.c                      | 1 +
 src/mms/iso_mms/server/mms_domain.c                      | 1 +
 src/mms/iso_mms/server/mms_file_service.c                | 1 +
 src/mms/iso_mms/server/mms_get_namelist_service.c        | 1 +
 src/mms/iso_mms/server/mms_get_var_access_service.c      | 1 +
 src/mms/iso_mms/server/mms_identify_service.c            | 1 +
 src/mms/iso_mms/server/mms_named_variable_list_service.c | 2 +-
 src/mms/iso_mms/server/mms_server.c                      | 1 +
 src/mms/iso_mms/server/mms_server_common.c               | 1 +
 src/mms/iso_mms/server/mms_status_service.c              | 1 +
 src/mms/iso_mms/server/mms_value_cache.c                 | 1 -
 src/mms/iso_mms/server/mms_write_service.c               | 1 +
 56 files changed, 44 insertions(+), 62 deletions(-)

diff --git a/src/common/conversions.c b/src/common/conversions.c
index a1e64729..95127226 100644
--- a/src/common/conversions.c
+++ b/src/common/conversions.c
@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "conversions.h"
 
 #include <time.h>
diff --git a/src/common/inc/libiec61850_platform_includes.h b/src/common/inc/libiec61850_platform_includes.h
index 6a73b3ef..435b044c 100644
--- a/src/common/inc/libiec61850_platform_includes.h
+++ b/src/common/inc/libiec61850_platform_includes.h
@@ -10,6 +10,8 @@
 #include "string_utilities.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
+#include <stdbool.h>
 
 #include "platform_endian.h"
 
diff --git a/src/common/lib_memory.c b/src/common/lib_memory.c
index d279b6c0..0a4106b3 100644
--- a/src/common/lib_memory.c
+++ b/src/common/lib_memory.c
@@ -21,7 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
-#include "lib_memory.h"
+#include "libiec61850_platform_includes.h"
 
 static MemoryExceptionHandler exceptionHandler = NULL;
 static void* exceptionHandlerParameter = NULL;
diff --git a/src/common/mem_alloc_linked_list.c b/src/common/mem_alloc_linked_list.c
index b818bae5..76e5ad83 100644
--- a/src/common/mem_alloc_linked_list.c
+++ b/src/common/mem_alloc_linked_list.c
@@ -21,7 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
-
+#include "libiec61850_platform_includes.h"
 #include "mem_alloc_linked_list.h"
 
 struct sMemAllocLinkedList {
diff --git a/src/common/simple_allocator.c b/src/common/simple_allocator.c
index c43dfdf2..89c99403 100644
--- a/src/common/simple_allocator.c
+++ b/src/common/simple_allocator.c
@@ -21,8 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
-#include <stdlib.h>
-
+#include "libiec61850_platform_includes.h"
 #include "simple_allocator.h"
 
 void
diff --git a/src/common/string_utilities.c b/src/common/string_utilities.c
index a7dead6d..d02c5f82 100644
--- a/src/common/string_utilities.c
+++ b/src/common/string_utilities.c
@@ -21,7 +21,7 @@
  *	See COPYING file for the complete license text.
  */
 
-#include "string_utilities.h"
+#include "libiec61850_platform_includes.h"
 
 char*
 copySubString(char* startPos, char* endPos)
diff --git a/src/hal/ethernet/bsd/ethernet_bsd.c b/src/hal/ethernet/bsd/ethernet_bsd.c
index ce04531e..fe601996 100644
--- a/src/hal/ethernet/bsd/ethernet_bsd.c
+++ b/src/hal/ethernet/bsd/ethernet_bsd.c
@@ -30,10 +30,8 @@
 #include <net/if_dl.h>
 
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include <fcntl.h>
 
 #include "libiec61850_platform_includes.h"
diff --git a/src/hal/ethernet/linux/ethernet_linux.c b/src/hal/ethernet/linux/ethernet_linux.c
index ecfa96ca..cff4f068 100644
--- a/src/hal/ethernet/linux/ethernet_linux.c
+++ b/src/hal/ethernet/linux/ethernet_linux.c
@@ -29,11 +29,7 @@
 #include <arpa/inet.h>
 #include <unistd.h>
 
-#include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
-#include <stdbool.h>
-#include <stdio.h>
 
 #include "libiec61850_platform_includes.h"
 #include "hal_ethernet.h"
diff --git a/src/hal/ethernet/win32/ethernet_win32.c b/src/hal/ethernet/win32/ethernet_win32.c
index cc978210..432c36cf 100644
--- a/src/hal/ethernet/win32/ethernet_win32.c
+++ b/src/hal/ethernet/win32/ethernet_win32.c
@@ -23,13 +23,12 @@
 
 #include "stack_config.h"
 
-#include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
-#include <stdbool.h>
 
 #include "hal_ethernet.h"
 
+#include "libiec61850_platform_includes.h"
+
 #if (CONFIG_INCLUDE_ETHERNET_WINDOWS == 1)
 
 
diff --git a/src/hal/filesystem/linux/file_provider_linux.c b/src/hal/filesystem/linux/file_provider_linux.c
index 91bf3d3e..f95cff5c 100644
--- a/src/hal/filesystem/linux/file_provider_linux.c
+++ b/src/hal/filesystem/linux/file_provider_linux.c
@@ -21,12 +21,8 @@
  *  See COPYING file for the complete license text.
  */
 
-#include <stdbool.h>
-#include <stdlib.h>
-#include <stdint.h>
 #include <string.h>
 #include <dirent.h>
-#include <stdio.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/hal/filesystem/win32/file_provider_win32.c b/src/hal/filesystem/win32/file_provider_win32.c
index 01250219..93b17fad 100644
--- a/src/hal/filesystem/win32/file_provider_win32.c
+++ b/src/hal/filesystem/win32/file_provider_win32.c
@@ -22,10 +22,8 @@
  */
 
 #include <stdbool.h>
-#include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
-#include <stdio.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/hal/socket/bsd/socket_bsd.c b/src/hal/socket/bsd/socket_bsd.c
index 4c609402..800ee426 100644
--- a/src/hal/socket/bsd/socket_bsd.c
+++ b/src/hal/socket/bsd/socket_bsd.c
@@ -26,10 +26,7 @@
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <unistd.h>
-#include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
-#include <stdbool.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #include <errno.h>
diff --git a/src/hal/socket/linux/socket_linux.c b/src/hal/socket/linux/socket_linux.c
index 98d255b0..fc01f75d 100644
--- a/src/hal/socket/linux/socket_linux.c
+++ b/src/hal/socket/linux/socket_linux.c
@@ -26,10 +26,7 @@
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <unistd.h>
-#include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
-#include <stdbool.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #include <errno.h>
diff --git a/src/hal/socket/win32/socket_win32.c b/src/hal/socket/win32/socket_win32.c
index fd7c6a6c..8c0b084b 100644
--- a/src/hal/socket/win32/socket_win32.c
+++ b/src/hal/socket/win32/socket_win32.c
@@ -23,8 +23,6 @@
 
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#include <stdio.h>
-#include <stdbool.h>
 #include <windows.h>
 
 #pragma comment (lib, "Ws2_32.lib")
diff --git a/src/hal/thread/linux/thread_linux.c b/src/hal/thread/linux/thread_linux.c
index cf8ec73e..0fd19e5a 100644
--- a/src/hal/thread/linux/thread_linux.c
+++ b/src/hal/thread/linux/thread_linux.c
@@ -24,7 +24,6 @@
 
 #include <pthread.h>
 #include <semaphore.h>
-#include <stdlib.h>
 #include <unistd.h>
 #include "hal_thread.h"
 
diff --git a/src/hal/thread/win32/thread_win32.c b/src/hal/thread/win32/thread_win32.c
index 02498ff1..0eb39f65 100644
--- a/src/hal/thread/win32/thread_win32.c
+++ b/src/hal/thread/win32/thread_win32.c
@@ -22,7 +22,6 @@
  */
 
 #include <windows.h>
-#include <stdlib.h>
 #include "libiec61850_platform_includes.h"
 #include "hal_thread.h"
 
diff --git a/src/iec61850/client/client_goose_control.c b/src/iec61850/client/client_goose_control.c
index 17c9e064..6827fa47 100644
--- a/src/iec61850/client/client_goose_control.c
+++ b/src/iec61850/client/client_goose_control.c
@@ -29,8 +29,7 @@
 
 #include "ied_connection_private.h"
 
-#include "lib_memory.h"
-#include "string_utilities.h"
+#include "libiec61850_platform_includes.h"
 
 struct sClientGooseControlBlock {
     char* objectReference;
diff --git a/src/iec61850/client/client_report.c b/src/iec61850/client/client_report.c
index 6fa0f3a2..bf944eef 100644
--- a/src/iec61850/client/client_report.c
+++ b/src/iec61850/client/client_report.c
@@ -29,8 +29,7 @@
 
 #include "ied_connection_private.h"
 
-#include "lib_memory.h"
-#include "string_utilities.h"
+#include "libiec61850_platform_includes.h"
 
 struct sClientReport
 {
diff --git a/src/iec61850/client/client_report_control.c b/src/iec61850/client/client_report_control.c
index 2a0856f4..e3774c20 100644
--- a/src/iec61850/client/client_report_control.c
+++ b/src/iec61850/client/client_report_control.c
@@ -29,8 +29,7 @@
 
 #include "ied_connection_private.h"
 
-#include "lib_memory.h"
-#include "string_utilities.h"
+#include "libiec61850_platform_includes.h"
 
 static bool
 isBufferedRcb(const char* objectReference)
diff --git a/src/iec61850/server/impl/client_connection.c b/src/iec61850/server/impl/client_connection.c
index 3d991122..a4925581 100644
--- a/src/iec61850/server/impl/client_connection.c
+++ b/src/iec61850/server/impl/client_connection.c
@@ -29,7 +29,8 @@
 #include "hal_thread.h"
 
 #include "ied_server_private.h"
-//#include "mms_server.h"
+
+#include "libiec61850_platform_includes.h"
 
 struct sClientConnection {
 
diff --git a/src/iec61850/server/impl/ied_server.c b/src/iec61850/server/impl/ied_server.c
index 842c199e..d630087f 100644
--- a/src/iec61850/server/impl/ied_server.c
+++ b/src/iec61850/server/impl/ied_server.c
@@ -31,6 +31,8 @@
 #include "hal_thread.h"
 #include "reporting.h"
 
+#include "libiec61850_platform_includes.h"
+
 #ifndef DEBUG_IED_SERVER
 #define DEBUG_IED_SERVER 0
 #endif
diff --git a/src/iec61850/server/mms_mapping/control.c b/src/iec61850/server/mms_mapping/control.c
index c977463b..078d5aa9 100644
--- a/src/iec61850/server/mms_mapping/control.c
+++ b/src/iec61850/server/mms_mapping/control.c
@@ -31,6 +31,8 @@
 
 #include "mms_value_internal.h"
 
+#include "libiec61850_platform_includes.h"
+
 #if (CONFIG_IEC61850_CONTROL_SERVICE == 1)
 
 #ifndef DEBUG_IED_SERVER
diff --git a/src/iec61850/server/model/cdc.c b/src/iec61850/server/model/cdc.c
index 18dbad34..9391b998 100644
--- a/src/iec61850/server/model/cdc.c
+++ b/src/iec61850/server/model/cdc.c
@@ -25,6 +25,7 @@
 
 #include "iec61850_dynamic_model.h"
 #include "iec61850_cdc.h"
+#include "libiec61850_platform_includes.h"
 
 /************************************************
  * Constructed Attribute Classes
diff --git a/src/iec61850/server/model/config_file_parser.c b/src/iec61850/server/model/config_file_parser.c
index fb22fb95..fef92d37 100644
--- a/src/iec61850/server/model/config_file_parser.c
+++ b/src/iec61850/server/model/config_file_parser.c
@@ -28,9 +28,6 @@
 #include "libiec61850_platform_includes.h"
 #include "stack_config.h"
 
-#include "string_utilities.h"
-#include <stdio.h>
-
 #define READ_BUFFER_MAX_SIZE 1024
 
 static uint8_t lineBuffer[READ_BUFFER_MAX_SIZE];
diff --git a/src/iec61850/server/model/dynamic_model.c b/src/iec61850/server/model/dynamic_model.c
index 5be73482..f6f2d0ff 100644
--- a/src/iec61850/server/model/dynamic_model.c
+++ b/src/iec61850/server/model/dynamic_model.c
@@ -21,9 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
-
 #include "iec61850_server.h"
-#include "string_utilities.h"
 #include "libiec61850_platform_includes.h"
 #include "stack_config.h"
 
diff --git a/src/mms/asn1/ber_decode.c b/src/mms/asn1/ber_decode.c
index bbd2231f..7eca9308 100644
--- a/src/mms/asn1/ber_decode.c
+++ b/src/mms/asn1/ber_decode.c
@@ -21,8 +21,8 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "ber_decode.h"
-#include "platform_endian.h"
 
 int
 BerDecoder_decodeLength(uint8_t* buffer, int* length, int bufPos, int maxBufPos)
diff --git a/src/mms/asn1/ber_encoder.c b/src/mms/asn1/ber_encoder.c
index f22f9e2b..db093223 100644
--- a/src/mms/asn1/ber_encoder.c
+++ b/src/mms/asn1/ber_encoder.c
@@ -23,8 +23,6 @@
 
 #include "libiec61850_platform_includes.h"
 #include "ber_encoder.h"
-#include "platform_endian.h"
-
 
 int
 BerEncoder_encodeLength(uint32_t length, uint8_t* buffer, int bufPos)
diff --git a/src/mms/asn1/ber_integer.c b/src/mms/asn1/ber_integer.c
index 05ef76b9..0ec626a4 100644
--- a/src/mms/asn1/ber_integer.c
+++ b/src/mms/asn1/ber_integer.c
@@ -22,7 +22,6 @@
  */
 
 #include "libiec61850_platform_includes.h"
-#include "platform_endian.h"
 #include "ber_integer.h"
 #include "ber_encoder.h"
 
diff --git a/src/mms/iso_acse/acse.c b/src/mms/iso_acse/acse.c
index 82c8606a..67f0ad15 100644
--- a/src/mms/iso_acse/acse.c
+++ b/src/mms/iso_acse/acse.c
@@ -21,8 +21,8 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "acse.h"
-
 #include "ber_encoder.h"
 #include "ber_decode.h"
 
diff --git a/src/mms/iso_cotp/cotp.c b/src/mms/iso_cotp/cotp.c
index daa8890f..10c24c41 100644
--- a/src/mms/iso_cotp/cotp.c
+++ b/src/mms/iso_cotp/cotp.c
@@ -25,6 +25,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "stack_config.h"
 #include "cotp.h"
 #include "byte_buffer.h"
diff --git a/src/mms/iso_mms/client/mms_client_common.c b/src/mms/iso_mms/client/mms_client_common.c
index 1bc2fbd0..9fd94705 100644
--- a/src/mms/iso_mms/client/mms_client_common.c
+++ b/src/mms/iso_mms/client/mms_client_common.c
@@ -21,6 +21,7 @@
  *	See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include <MmsPdu.h>
 #include "mms_common.h"
 #include "mms_client_connection.h"
diff --git a/src/mms/iso_mms/client/mms_client_files.c b/src/mms/iso_mms/client/mms_client_files.c
index a66590e3..17c0790c 100644
--- a/src/mms/iso_mms/client/mms_client_files.c
+++ b/src/mms/iso_mms/client/mms_client_files.c
@@ -21,11 +21,11 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "stack_config.h"
 #include "mms_common.h"
 #include "mms_client_connection.h"
 #include "byte_buffer.h"
-#include "string_utilities.h"
 
 #include "mms_client_internal.h"
 #include "ber_encoder.h"
diff --git a/src/mms/iso_mms/client/mms_client_get_namelist.c b/src/mms/iso_mms/client/mms_client_get_namelist.c
index 9332a120..b0b03b7c 100644
--- a/src/mms/iso_mms/client/mms_client_get_namelist.c
+++ b/src/mms/iso_mms/client/mms_client_get_namelist.c
@@ -21,12 +21,12 @@
  *	See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include <MmsPdu.h>
 #include "stack_config.h"
 #include "mms_common.h"
 #include "mms_client_connection.h"
 #include "byte_buffer.h"
-#include "string_utilities.h"
 #include "mms_client_internal.h"
 
 #include "ber_decode.h"
diff --git a/src/mms/iso_mms/client/mms_client_get_var_access.c b/src/mms/iso_mms/client/mms_client_get_var_access.c
index 4e45b34e..7ec1e23c 100644
--- a/src/mms/iso_mms/client/mms_client_get_var_access.c
+++ b/src/mms/iso_mms/client/mms_client_get_var_access.c
@@ -21,12 +21,12 @@
  *	See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include <MmsPdu.h>
 #include "stack_config.h"
 #include "mms_common.h"
 #include "mms_client_connection.h"
 #include "byte_buffer.h"
-#include "string_utilities.h"
 
 #include "mms_client_internal.h"
 
diff --git a/src/mms/iso_mms/client/mms_client_identify.c b/src/mms/iso_mms/client/mms_client_identify.c
index d20f2eae..f107797d 100644
--- a/src/mms/iso_mms/client/mms_client_identify.c
+++ b/src/mms/iso_mms/client/mms_client_identify.c
@@ -21,11 +21,11 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "stack_config.h"
 #include "mms_common.h"
 #include "mms_client_connection.h"
 #include "byte_buffer.h"
-#include "string_utilities.h"
 
 #include "mms_client_internal.h"
 #include "ber_encoder.h"
diff --git a/src/mms/iso_mms/client/mms_client_initiate.c b/src/mms/iso_mms/client/mms_client_initiate.c
index f78748ce..6458ae21 100644
--- a/src/mms/iso_mms/client/mms_client_initiate.c
+++ b/src/mms/iso_mms/client/mms_client_initiate.c
@@ -21,6 +21,7 @@
  *	See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include <MmsPdu.h>
 #include "mms_common.h"
 #include "mms_common_internal.h"
diff --git a/src/mms/iso_mms/client/mms_client_named_variable_list.c b/src/mms/iso_mms/client/mms_client_named_variable_list.c
index 161a5c70..43b67273 100644
--- a/src/mms/iso_mms/client/mms_client_named_variable_list.c
+++ b/src/mms/iso_mms/client/mms_client_named_variable_list.c
@@ -23,12 +23,12 @@
  *	See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include <MmsPdu.h>
 #include "stack_config.h"
 #include "mms_common.h"
 #include "mms_client_connection.h"
 #include "byte_buffer.h"
-#include "string_utilities.h"
 #include "mms_client_internal.h"
 #include "mms_common_internal.h"
 
diff --git a/src/mms/iso_mms/client/mms_client_read.c b/src/mms/iso_mms/client/mms_client_read.c
index c1f0aae2..b3b3b149 100644
--- a/src/mms/iso_mms/client/mms_client_read.c
+++ b/src/mms/iso_mms/client/mms_client_read.c
@@ -28,8 +28,6 @@
 #include "byte_buffer.h"
 #include "stack_config.h"
 
-#include "platform_endian.h"
-
 #include "mms_client_internal.h"
 #include "mms_common_internal.h"
 #include "mms_value_internal.h"
diff --git a/src/mms/iso_mms/client/mms_client_status.c b/src/mms/iso_mms/client/mms_client_status.c
index 1ca13352..c693d2b4 100644
--- a/src/mms/iso_mms/client/mms_client_status.c
+++ b/src/mms/iso_mms/client/mms_client_status.c
@@ -21,11 +21,11 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "stack_config.h"
 #include "mms_common.h"
 #include "mms_client_connection.h"
 #include "byte_buffer.h"
-#include "string_utilities.h"
 
 #include "mms_client_internal.h"
 #include "ber_encoder.h"
diff --git a/src/mms/iso_mms/client/mms_client_write.c b/src/mms/iso_mms/client/mms_client_write.c
index a32a07f9..5d7c822a 100644
--- a/src/mms/iso_mms/client/mms_client_write.c
+++ b/src/mms/iso_mms/client/mms_client_write.c
@@ -21,6 +21,7 @@
  *	See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include <MmsPdu.h>
 #include "mms_common.h"
 #include "mms_client_connection.h"
diff --git a/src/mms/iso_mms/common/mms_common_msg.c b/src/mms/iso_mms/common/mms_common_msg.c
index 6b2e07c5..4de9cfca 100644
--- a/src/mms/iso_mms/common/mms_common_msg.c
+++ b/src/mms/iso_mms/common/mms_common_msg.c
@@ -23,9 +23,7 @@
 
 #include "libiec61850_platform_includes.h"
 #include "mms_common_internal.h"
-#include "platform_endian.h"
 #include "stack_config.h"
-#include "string_utilities.h"
 #include "mms_value_internal.h"
 
 void
diff --git a/src/mms/iso_mms/common/mms_value.c b/src/mms/iso_mms/common/mms_value.c
index 53e35aad..ff821a33 100644
--- a/src/mms/iso_mms/common/mms_value.c
+++ b/src/mms/iso_mms/common/mms_value.c
@@ -26,9 +26,6 @@
 #include "mms_value.h"
 #include "mms_type_spec.h"
 
-#include "string_utilities.h"
-#include "platform_endian.h"
-
 #include "mms_common_internal.h"
 
 #include "mms_value_internal.h"
diff --git a/src/mms/iso_mms/server/mms_access_result.c b/src/mms/iso_mms/server/mms_access_result.c
index 767f04ca..3b4f033c 100644
--- a/src/mms/iso_mms/server/mms_access_result.c
+++ b/src/mms/iso_mms/server/mms_access_result.c
@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_access_result.h"
 #include "mms_server_internal.h"
 #include "mms_value_internal.h"
diff --git a/src/mms/iso_mms/server/mms_association_service.c b/src/mms/iso_mms/server/mms_association_service.c
index 942f2d42..ceb3e615 100644
--- a/src/mms/iso_mms/server/mms_association_service.c
+++ b/src/mms/iso_mms/server/mms_association_service.c
@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server_internal.h"
 
 /**********************************************************************************************
diff --git a/src/mms/iso_mms/server/mms_device.c b/src/mms/iso_mms/server/mms_device.c
index 1f2e0cfb..e0968bf5 100644
--- a/src/mms/iso_mms/server/mms_device.c
+++ b/src/mms/iso_mms/server/mms_device.c
@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server_internal.h"
 #include "mms_device_model.h"
 #include "stack_config.h"
diff --git a/src/mms/iso_mms/server/mms_domain.c b/src/mms/iso_mms/server/mms_domain.c
index 8085185a..c70567d0 100644
--- a/src/mms/iso_mms/server/mms_domain.c
+++ b/src/mms/iso_mms/server/mms_domain.c
@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_device_model.h"
 #include "mms_server_internal.h"
 
diff --git a/src/mms/iso_mms/server/mms_file_service.c b/src/mms/iso_mms/server/mms_file_service.c
index cf58a6d5..03618b45 100644
--- a/src/mms/iso_mms/server/mms_file_service.c
+++ b/src/mms/iso_mms/server/mms_file_service.c
@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server_internal.h"
 
 #if (MMS_FILE_SERVICE == 1)
diff --git a/src/mms/iso_mms/server/mms_get_namelist_service.c b/src/mms/iso_mms/server/mms_get_namelist_service.c
index 476d8e0d..fcd3b663 100644
--- a/src/mms/iso_mms/server/mms_get_namelist_service.c
+++ b/src/mms/iso_mms/server/mms_get_namelist_service.c
@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server_internal.h"
 #include "ber_encoder.h"
 #include "ber_decode.h"
diff --git a/src/mms/iso_mms/server/mms_get_var_access_service.c b/src/mms/iso_mms/server/mms_get_var_access_service.c
index 8177661f..d47ecb0e 100644
--- a/src/mms/iso_mms/server/mms_get_var_access_service.c
+++ b/src/mms/iso_mms/server/mms_get_var_access_service.c
@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server_internal.h"
 
 #if (MMS_GET_VARIABLE_ACCESS_ATTRIBUTES == 1)
diff --git a/src/mms/iso_mms/server/mms_identify_service.c b/src/mms/iso_mms/server/mms_identify_service.c
index 103fb830..b8ff70b4 100644
--- a/src/mms/iso_mms/server/mms_identify_service.c
+++ b/src/mms/iso_mms/server/mms_identify_service.c
@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server_internal.h"
 
 #if MMS_IDENTIFY_SERVICE == 1
diff --git a/src/mms/iso_mms/server/mms_named_variable_list_service.c b/src/mms/iso_mms/server/mms_named_variable_list_service.c
index bc51b299..66d4d4cb 100644
--- a/src/mms/iso_mms/server/mms_named_variable_list_service.c
+++ b/src/mms/iso_mms/server/mms_named_variable_list_service.c
@@ -21,10 +21,10 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server_internal.h"
 #include "mms_named_variable_list.h"
 
-#include "string_utilities.h"
 #include "ber_encoder.h"
 
 #if (MMS_DATA_SET_SERVICE == 1)
diff --git a/src/mms/iso_mms/server/mms_server.c b/src/mms/iso_mms/server/mms_server.c
index dc01e8e6..f2ee46b7 100644
--- a/src/mms/iso_mms/server/mms_server.c
+++ b/src/mms/iso_mms/server/mms_server.c
@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server.h"
 #include "mms_server_connection.h"
 #include "mms_value_cache.h"
diff --git a/src/mms/iso_mms/server/mms_server_common.c b/src/mms/iso_mms/server/mms_server_common.c
index 00d87926..f5a16e42 100644
--- a/src/mms/iso_mms/server/mms_server_common.c
+++ b/src/mms/iso_mms/server/mms_server_common.c
@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server_internal.h"
 
 /* write_out function required for ASN.1 encoding */
diff --git a/src/mms/iso_mms/server/mms_status_service.c b/src/mms/iso_mms/server/mms_status_service.c
index 4aecb74b..d0d8f14b 100644
--- a/src/mms/iso_mms/server/mms_status_service.c
+++ b/src/mms/iso_mms/server/mms_status_service.c
@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server_internal.h"
 
 #if MMS_STATUS_SERVICE == 1
diff --git a/src/mms/iso_mms/server/mms_value_cache.c b/src/mms/iso_mms/server/mms_value_cache.c
index 161ae9b9..03be3f7c 100644
--- a/src/mms/iso_mms/server/mms_value_cache.c
+++ b/src/mms/iso_mms/server/mms_value_cache.c
@@ -23,7 +23,6 @@
 
 #include "libiec61850_platform_includes.h"
 #include "mms_value_cache.h"
-#include "string_utilities.h"
 #include "string_map.h"
 #include "stack_config.h"
 
diff --git a/src/mms/iso_mms/server/mms_write_service.c b/src/mms/iso_mms/server/mms_write_service.c
index 90066ae4..9d50073b 100644
--- a/src/mms/iso_mms/server/mms_write_service.c
+++ b/src/mms/iso_mms/server/mms_write_service.c
@@ -21,6 +21,7 @@
  *	See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server_internal.h"
 #include "mms_common_internal.h"
 #include "mms_types.h"