diff --git a/Classes/CallConferenceTableView.m b/Classes/CallConferenceTableView.m
index 1abf56af9..9e89b79e2 100644
--- a/Classes/CallConferenceTableView.m
+++ b/Classes/CallConferenceTableView.m
@@ -17,6 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#import "linphoneapp-Swift.h"
 #import "CallConferenceTableView.h"
 #import "UICallConferenceCell.h"
 #import "LinphoneManager.h"
diff --git a/Classes/CallOutgoingView.m b/Classes/CallOutgoingView.m
index 1a2a42352..462c1cbfa 100644
--- a/Classes/CallOutgoingView.m
+++ b/Classes/CallOutgoingView.m
@@ -17,6 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#import "linphoneapp-Swift.h"
 #import "CallOutgoingView.h"
 #import "PhoneMainView.h"
 
diff --git a/Classes/CallView.m b/Classes/CallView.m
index 5702d6e54..9d9514ee1 100644
--- a/Classes/CallView.m
+++ b/Classes/CallView.m
@@ -17,6 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#import "linphoneapp-Swift.h"
 #import <AddressBook/AddressBook.h>
 #import <AudioToolbox/AudioToolbox.h>
 #import <OpenGLES/EAGL.h>
diff --git a/Classes/ChatConversationView.h b/Classes/ChatConversationView.h
index ec0ec8f15..cb600d244 100644
--- a/Classes/ChatConversationView.h
+++ b/Classes/ChatConversationView.h
@@ -32,7 +32,6 @@
 #import "UIImageViewDeletable.h"
 #import "UIConfirmationDialog.h"
 #import "UIInterfaceStyleButton.h"
-#import "linphoneapp-Swift.h"
 #import "UIChatReplyBubbleView.h"
 #include "linphone/linphonecore.h"
 
diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m
index 78a5a65f4..5830f5683 100644
--- a/Classes/ChatConversationView.m
+++ b/Classes/ChatConversationView.m
@@ -19,6 +19,7 @@
 
 #import <Photos/PHAssetChangeRequest.h>
 
+#import "linphoneapp-Swift.h"
 #import "ChatConversationView.h"
 #import "PhoneMainView.h"
 #import "Utils.h"
diff --git a/Classes/DevicesListView.m b/Classes/DevicesListView.m
index 4913b6173..6216db51e 100644
--- a/Classes/DevicesListView.m
+++ b/Classes/DevicesListView.m
@@ -17,6 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#import "linphoneapp-Swift.h"
 #import "DevicesListView.h"
 #import "PhoneMainView.h"
 #import "UIDeviceCell.h"
diff --git a/Classes/LinphoneAppDelegate.h b/Classes/LinphoneAppDelegate.h
index d3820267b..9a4768d11 100644
--- a/Classes/LinphoneAppDelegate.h
+++ b/Classes/LinphoneAppDelegate.h
@@ -23,7 +23,6 @@
 #import <UserNotifications/UserNotifications.h>
 #import <UserNotificationsUI/UserNotificationsUI.h>
 #import <CoreLocation/CoreLocation.h>
-#import "linphoneapp-Swift.h"
 
 
 @interface LinphoneAppDelegate : NSObject <UIApplicationDelegate, UNUserNotificationCenterDelegate, CLLocationManagerDelegate> {
diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m
index 4f464118a..1bcb4f7a6 100644
--- a/Classes/LinphoneAppDelegate.m
+++ b/Classes/LinphoneAppDelegate.m
@@ -17,6 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#import "linphoneapp-Swift.h"
 #import "LinphoneAppDelegate.h"
 #import "ContactDetailsView.h"
 #import "ContactsListView.h"
diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m
index f0c9f6f9c..1203c80a2 100644
--- a/Classes/LinphoneCoreSettingsStore.m
+++ b/Classes/LinphoneCoreSettingsStore.m
@@ -17,6 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#import "linphoneapp-Swift.h"
 #import "LinphoneCoreSettingsStore.h"
 #import "Utils.h"
 #import "PhoneMainView.h"
diff --git a/Classes/LinphoneManager.h b/Classes/LinphoneManager.h
index 63af59110..d544354be 100644
--- a/Classes/LinphoneManager.h
+++ b/Classes/LinphoneManager.h
@@ -35,7 +35,6 @@
 #include "bctoolbox/list.h"
 #import "OrderedDictionary.h"
 
-#import "linphoneapp-Swift.h"
 
 extern NSString *const LINPHONERC_APPLICATION_KEY;
 
diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index b86a4b1fe..64788c350 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -22,6 +22,7 @@
 #include <netdb.h>
 #include <sys/sysctl.h>
 
+#import "linphoneapp-Swift.h"
 #import <AudioToolbox/AudioToolbox.h>
 #import <CoreTelephony/CTCallCenter.h>
 #import <CoreTelephony/CTTelephonyNetworkInfo.h>
diff --git a/Classes/LinphoneUI/UICallButton.m b/Classes/LinphoneUI/UICallButton.m
index c84a7dafd..be9bdfd81 100644
--- a/Classes/LinphoneUI/UICallButton.m
+++ b/Classes/LinphoneUI/UICallButton.m
@@ -17,6 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#import "linphoneapp-Swift.h"
 #import "UICallButton.h"
 #import "LinphoneManager.h"
 
diff --git a/Classes/LinphoneUI/UICallConferenceCell.m b/Classes/LinphoneUI/UICallConferenceCell.m
index 0e64ca4b1..f9c8d94a0 100644
--- a/Classes/LinphoneUI/UICallConferenceCell.m
+++ b/Classes/LinphoneUI/UICallConferenceCell.m
@@ -17,6 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#import "linphoneapp-Swift.h"
 #import "UICallConferenceCell.h"
 #import "Utils.h"
 #import "PhoneMainView.h"
diff --git a/Classes/LinphoneUI/UIChatBubblePhotoCell.m b/Classes/LinphoneUI/UIChatBubblePhotoCell.m
index cf6c18807..2371ad7b2 100644
--- a/Classes/LinphoneUI/UIChatBubblePhotoCell.m
+++ b/Classes/LinphoneUI/UIChatBubblePhotoCell.m
@@ -17,6 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#import "linphoneapp-Swift.h"
 #import "UIChatBubblePhotoCell.h"
 #import "LinphoneManager.h"
 #import "PhoneMainView.h"
diff --git a/Classes/LinphoneUI/UIChatBubbleTextCell.m b/Classes/LinphoneUI/UIChatBubbleTextCell.m
index d89943469..f3bc6d8f8 100644
--- a/Classes/LinphoneUI/UIChatBubbleTextCell.m
+++ b/Classes/LinphoneUI/UIChatBubbleTextCell.m
@@ -17,6 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#import "linphoneapp-Swift.h"
 #import "UIChatBubbleTextCell.h"
 #import "LinphoneManager.h"
 #import "PhoneMainView.h"
diff --git a/Classes/LinphoneUI/UIHangUpButton.m b/Classes/LinphoneUI/UIHangUpButton.m
index 6ab96297d..2aab33916 100644
--- a/Classes/LinphoneUI/UIHangUpButton.m
+++ b/Classes/LinphoneUI/UIHangUpButton.m
@@ -17,6 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#import "linphoneapp-Swift.h"
 #import "UIHangUpButton.h"
 #import "LinphoneManager.h"
 
diff --git a/Classes/LinphoneUI/UIPauseButton.m b/Classes/LinphoneUI/UIPauseButton.m
index e586925e8..15c258b1a 100644
--- a/Classes/LinphoneUI/UIPauseButton.m
+++ b/Classes/LinphoneUI/UIPauseButton.m
@@ -17,6 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#import "linphoneapp-Swift.h"
 #import "UIPauseButton.h"
 #import "LinphoneManager.h"
 #import "Utils.h"
diff --git a/Classes/LinphoneUI/UISpeakerButton.m b/Classes/LinphoneUI/UISpeakerButton.m
index 64c12d5b9..4c123133b 100644
--- a/Classes/LinphoneUI/UISpeakerButton.m
+++ b/Classes/LinphoneUI/UISpeakerButton.m
@@ -17,6 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#import "linphoneapp-Swift.h"
 #import <AudioToolbox/AudioToolbox.h>
 #import "UISpeakerButton.h"
 #import "Utils.h"
diff --git a/Classes/LinphoneUI/UIVideoButton.m b/Classes/LinphoneUI/UIVideoButton.m
index af97c4295..dc395c7e2 100644
--- a/Classes/LinphoneUI/UIVideoButton.m
+++ b/Classes/LinphoneUI/UIVideoButton.m
@@ -17,6 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#import "linphoneapp-Swift.h"
 #import "UIVideoButton.h"
 #include "LinphoneManager.h"
 #import "Log.h"
diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m
index 3d0ad4962..8a15d910c 100644
--- a/Classes/PhoneMainView.m
+++ b/Classes/PhoneMainView.m
@@ -17,6 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#import "linphoneapp-Swift.h"
 #import <QuartzCore/QuartzCore.h>
 #import <AudioToolbox/AudioServices.h>
 #import "LinphoneAppDelegate.h"
diff --git a/Classes/Utils/FileTransferDelegate.m b/Classes/Utils/FileTransferDelegate.m
index 85996c87a..8f87b1408 100644
--- a/Classes/Utils/FileTransferDelegate.m
+++ b/Classes/Utils/FileTransferDelegate.m
@@ -17,6 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#import "linphoneapp-Swift.h"
 #import "FileTransferDelegate.h"
 #import "LinphoneManager.h"
 #import "PhoneMainView.h"