diff --git a/source/daplink/bootloader/daplink.c b/source/daplink/bootloader/daplink.c
deleted file mode 100644
index 47b32f011c..0000000000
--- a/source/daplink/bootloader/daplink.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * @file    daplink.c
- * @brief   Implementation of daplink.h for the bootloader application
- *
- * DAPLink Interface Firmware
- * Copyright (c) 2009-2019, ARM Limited, All Rights Reserved
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "daplink.h"
-#include "virtual_fs.h"
-#include "compiler.h"
-
-COMPILER_ASSERT(DAPLINK_BUILD_KEY == DAPLINK_BUILD_KEY_BL);
-
-// daplink_mode_file_name, daplink_url_name and
-// daplink_drive_name strings must be 11 characters
-// excluding the null terminated character
-const char daplink_mode_file_name[11] = "START_IFACT";
-
-bool daplink_is_bootloader()
-{
-    return true;
-}
-
-bool daplink_is_interface()
-{
-    return false;
-}
diff --git a/source/daplink/daplink.h b/source/daplink/daplink.h
index a8cb441a8c..8003c35d85 100644
--- a/source/daplink/daplink.h
+++ b/source/daplink/daplink.h
@@ -75,8 +75,46 @@ COMPILER_ASSERT(DAPLINK_RAM_SHARED_START + DAPLINK_RAM_SHARED_SIZE == DAPLINK_RA
 // Macro with the name of the main application header file.
 #if defined(DAPLINK_BL)
 #define DAPLINK_MAIN_HEADER "main_bootloader.h"
+
+#include "virtual_fs.h"
+
+COMPILER_ASSERT(DAPLINK_BUILD_KEY == DAPLINK_BUILD_KEY_BL);
+
+// daplink_mode_file_name, daplink_url_name and
+// daplink_drive_name strings must be 11 characters
+// excluding the null terminated character
+static const char daplink_mode_file_name[11] = "START_IFACT";
+
+__STATIC_FORCEINLINE bool daplink_is_bootloader()
+{
+    return true;
+}
+
+__STATIC_FORCEINLINE bool daplink_is_interface()
+{
+    return false;
+}
+
 #elif defined(DAPLINK_IF)
 #define DAPLINK_MAIN_HEADER "main_interface.h"
+
+#ifdef DRAG_N_DROP_SUPPORT
+#include "virtual_fs.h"
+COMPILER_ASSERT(DAPLINK_BUILD_KEY == DAPLINK_BUILD_KEY_IF);
+
+static const vfs_filename_t daplink_mode_file_name = "START_BLACT";
+#endif //DRAG_N_DROP_SUPPORT
+
+__STATIC_FORCEINLINE bool daplink_is_bootloader()
+{
+    return false;
+}
+
+__STATIC_FORCEINLINE bool daplink_is_interface()
+{
+    return true;
+}
+
 #else
 #error "Neither DAPLINK_BL nor DAPLINK_IF are defined!"
 #endif
@@ -87,9 +125,6 @@ typedef struct {
     uint32_t version;
 } daplink_info_t;
 
-bool daplink_is_bootloader(void);
-bool daplink_is_interface(void);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/daplink/drag-n-drop/vfs_manager.h b/source/daplink/drag-n-drop/vfs_manager.h
index 4f2104fabd..fdaa80bd11 100644
--- a/source/daplink/drag-n-drop/vfs_manager.h
+++ b/source/daplink/drag-n-drop/vfs_manager.h
@@ -32,9 +32,6 @@
 extern "C" {
 #endif
 
-
-extern const vfs_filename_t daplink_mode_file_name;
-
 /* Callable from anywhere */
 
 // Enable or disable the virtual filesystem
diff --git a/source/daplink/interface/daplink.c b/source/daplink/interface/daplink.c
deleted file mode 100644
index 4952a8bc0d..0000000000
--- a/source/daplink/interface/daplink.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * @file    daplink.c
- * @brief   Implementation of daplink.h
- *
- * DAPLink Interface Firmware
- * Copyright (c) 2009-2019, ARM Limited, All Rights Reserved
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "daplink.h"
-
-#ifdef DRAG_N_DROP_SUPPORT
-
-#include "virtual_fs.h"
-#include "compiler.h"
-
-COMPILER_ASSERT(DAPLINK_BUILD_KEY == DAPLINK_BUILD_KEY_IF);
-
-const vfs_filename_t daplink_mode_file_name = "START_BLACT";
-
-#endif //DRAG_N_DROP_SUPPORT
-
-bool daplink_is_bootloader()
-{
-    return false;
-}
-
-bool daplink_is_interface()
-{
-    return true;
-}