diff --git a/hal/inc/hal_socket.h b/hal/inc/hal_socket.h
index 5e6d15a9..e52defb5 100644
--- a/hal/inc/hal_socket.h
+++ b/hal/inc/hal_socket.h
@@ -143,7 +143,7 @@ PAL_API ServerSocket
 TcpServerSocket_create(const char* address, int port);
 
 PAL_API UdpSocket
-UdpSocket_create();
+UdpSocket_create(void);
 
 PAL_API bool
 UdpSocket_bind(UdpSocket self, const char* address, int port);
diff --git a/hal/inc/hal_time.h b/hal/inc/hal_time.h
index 8944aa19..52782959 100644
--- a/hal/inc/hal_time.h
+++ b/hal/inc/hal_time.h
@@ -69,7 +69,7 @@ Hal_getTimeInMs(void);
  * \return the system time with nanosecond resolution.
  */
 PAL_API nsSinceEpoch
-Hal_getTimeInNs();
+Hal_getTimeInNs(void);
 
 PAL_API bool
 Hal_setTimeInNs(nsSinceEpoch nsTime);
diff --git a/src/iec61850/inc_private/mms_mapping.h b/src/iec61850/inc_private/mms_mapping.h
index 195624a8..63ec5742 100644
--- a/src/iec61850/inc_private/mms_mapping.h
+++ b/src/iec61850/inc_private/mms_mapping.h
@@ -152,6 +152,10 @@ LIB61850_INTERNAL MmsDataAccessError
 Control_writeAccessControlObject(MmsMapping* self, MmsDomain* domain, char* variableIdOrig,
                          MmsValue* value, MmsServerConnection connection);
 
+LIB61850_INTERNAL MmsValue*
+Control_readAccessControlObject(MmsMapping* self, MmsDomain* domain, char* variableIdOrig,
+        MmsServerConnection connection, bool isDirectAccess);
+
 LIB61850_INTERNAL ControlObject*
 Control_lookupControlObject(MmsMapping* self, MmsDomain* domain, char* lnName, char* objectName);
 
diff --git a/src/iec61850/server/mms_mapping/mms_mapping.c b/src/iec61850/server/mms_mapping/mms_mapping.c
index 985bcc41..aa469f8f 100644
--- a/src/iec61850/server/mms_mapping/mms_mapping.c
+++ b/src/iec61850/server/mms_mapping/mms_mapping.c
@@ -1739,7 +1739,6 @@ createNamedVariableFromLogicalNode(MmsMapping* self, MmsDomain* domain,
             printf("Service tracking elements detected\n");
 
         /* TODO set flag to enable service tracking */
-        MmsVariableSpecification* trackingVariables = namedVariable->typeSpec.structure.elements[currentComponent];
 
         checkForServiceTrackingVariables(self, logicalNode);
 
diff --git a/src/iec61850/server/model/config_file_parser.c b/src/iec61850/server/model/config_file_parser.c
index e20f6edf..af7fabd8 100644
--- a/src/iec61850/server/model/config_file_parser.c
+++ b/src/iec61850/server/model/config_file_parser.c
@@ -452,7 +452,7 @@ ConfigFileParser_createModelFromConfigFile(FileHandle fileHandle)
                                 *sep = 0;
 
                                 /* check for component */
-                                char* sep = strchr(indexStr, ' ');
+                                sep = strchr(indexStr, ' ');
 
                                 if (sep) {
                                     componentVal = sep + 1;
diff --git a/src/mms/iso_mms/client/mms_client_connection.c b/src/mms/iso_mms/client/mms_client_connection.c
index 42d739c6..8a47f034 100644
--- a/src/mms/iso_mms/client/mms_client_connection.c
+++ b/src/mms/iso_mms/client/mms_client_connection.c
@@ -677,7 +677,7 @@ exit_error:
     return -1;
 }
 
-void
+static void
 handleAsyncResponse(MmsConnection self, ByteBuffer* response, uint32_t bufPos, MmsOutstandingCall outstandingCall, MmsError err)
 {