diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b1ff63..7ee233d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ project(libiec61850)
 
 set(LIB_VERSION_MAJOR "0")
 set(LIB_VERSION_MINOR "8")
-set(LIB_VERSION_PATCH "4")
+set(LIB_VERSION_PATCH "5")
 
 # feature checks
 include(CheckLibraryExists)
diff --git a/config/stack_config.h b/config/stack_config.h
index d159819..60a4056 100644
--- a/config/stack_config.h
+++ b/config/stack_config.h
@@ -131,7 +131,7 @@
 /* default results for MMS identify service */
 #define CONFIG_DEFAULT_MMS_VENDOR_NAME "libiec61850.com"
 #define CONFIG_DEFAULT_MMS_MODEL_NAME "LIBIEC61850"
-#define CONFIG_DEFAULT_MMS_REVISION "0.8.4"
+#define CONFIG_DEFAULT_MMS_REVISION "0.8.5"
 
 /* MMS virtual file store base path - where file services are looking for files */
 #define CONFIG_VIRTUAL_FILESTORE_BASEPATH "./vmd-filestore/"
diff --git a/src/doxygen.config b/src/doxygen.config
index d4b7390..7ffa8cf 100644
--- a/src/doxygen.config
+++ b/src/doxygen.config
@@ -18,7 +18,7 @@ DOXYFILE_ENCODING      = UTF-8
 
 PROJECT_NAME           = "libIEC61850"
 
-PROJECT_NUMBER         = 0.8.4
+PROJECT_NUMBER         = 0.8.5
 
 PROJECT_BRIEF          = "Open-source IEC 61850 MMS/GOOSE server and client library"
 
diff --git a/src/mms/inc/mms_common.h b/src/mms/inc/mms_common.h
index 495c8d1..50d6b12 100644
--- a/src/mms/inc/mms_common.h
+++ b/src/mms/inc/mms_common.h
@@ -30,25 +30,11 @@
 extern "C" {
 #endif
 
-//TODO move to other file
-#define DEFAULT_MAX_SERV_OUTSTANDING_CALLING 5
-#define DEFAULT_MAX_SERV_OUTSTANDING_CALLED 5
-#define DEFAULT_DATA_STRUCTURE_NESTING_LEVEL 10
-#define DEFAULT_MAX_PDU_SIZE 65000
-
-//TODO move to other file - not required in API
-typedef enum
-{
-    MMS_ERROR, MMS_INITIATE, MMS_CONFIRMED_REQUEST, MMS_OK, MMS_CONCLUDE
-} MmsIndication;
-
 /**
  * \addtogroup common_api_group
  */
 /**@{*/
 
-
-
 typedef enum
 {
     /* generic error codes */
diff --git a/src/mms/inc_private/mms_common_internal.h b/src/mms/inc_private/mms_common_internal.h
index 23378e2..f35d7d7 100644
--- a/src/mms/inc_private/mms_common_internal.h
+++ b/src/mms/inc_private/mms_common_internal.h
@@ -1,7 +1,7 @@
 /*
  *  mms_common_internal.h
  *
- *  Copyright 2013 Michael Zillgith
+ *  Copyright 2013, 2014, 2015 Michael Zillgith
  *
  *  This file is part of libIEC61850.
  *
@@ -21,11 +21,24 @@
  *  See COPYING file for the complete license text.
  */
 
+#ifndef MMS_COMMON_INTERNAL_H_
+#define MMS_COMMON_INTERNAL_H_
+
 #include "mms_value.h"
 #include "MmsPdu.h"
 #include "mms_access_result.h"
 #include "conversions.h"
 
+#define DEFAULT_MAX_SERV_OUTSTANDING_CALLING 5
+#define DEFAULT_MAX_SERV_OUTSTANDING_CALLED 5
+#define DEFAULT_DATA_STRUCTURE_NESTING_LEVEL 10
+
+typedef enum
+{
+    MMS_ERROR, MMS_INITIATE, MMS_CONFIRMED_REQUEST, MMS_OK, MMS_CONCLUDE
+} MmsIndication;
+
+
 MmsValue*
 mmsMsg_parseDataElement(Data_t* dataElement);
 
@@ -52,3 +65,6 @@ mmsMsg_copyAsn1IdentifierToStringBuffer(Identifier_t identifier, char* buffer, i
 
 void
 mmsMsg_deleteAccessResultList(AccessResult_t** accessResult, int variableCount);
+
+#endif /* MMS_COMMON_INTERNAL */
+
diff --git a/src/mms/inc_private/mms_server_connection.h b/src/mms/inc_private/mms_server_connection.h
index f5441b0..2468710 100644
--- a/src/mms/inc_private/mms_server_connection.h
+++ b/src/mms/inc_private/mms_server_connection.h
@@ -31,6 +31,7 @@
 #include "libiec61850_platform_includes.h"
 
 #include "mms_common.h"
+#include "mms_common_internal.h"
 #include "mms_device_model.h"
 #include "mms_value.h"
 #include "mms_server.h"
diff --git a/src/mms/iso_mms/client/mms_client_initiate.c b/src/mms/iso_mms/client/mms_client_initiate.c
index 5eed340..bef3943 100644
--- a/src/mms/iso_mms/client/mms_client_initiate.c
+++ b/src/mms/iso_mms/client/mms_client_initiate.c
@@ -23,6 +23,7 @@
 
 #include <MmsPdu.h>
 #include "mms_common.h"
+#include "mms_common_internal.h"
 #include "mms_client_connection.h"
 #include "byte_buffer.h"