diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlCommand.cpp b/Source/PlasticSourceControl/Private/PlasticSourceControlCommand.cpp
index 7903b52b..343e4a27 100644
--- a/Source/PlasticSourceControl/Private/PlasticSourceControlCommand.cpp
+++ b/Source/PlasticSourceControl/Private/PlasticSourceControlCommand.cpp
@@ -3,8 +3,10 @@
 #include "PlasticSourceControlPrivatePCH.h"
 #include "PlasticSourceControlCommand.h"
 #include "PlasticSourceControlModule.h"
-#include "PlasticSourceControlProvider.h"
+#include "ISourceControlOperation.h"
 #include "IPlasticSourceControlWorker.h"
+#include "Modules/ModuleManager.h"
+
 
 FPlasticSourceControlCommand::FPlasticSourceControlCommand(const TSharedRef<class ISourceControlOperation, ESPMode::ThreadSafe>& InOperation, const TSharedRef<class IPlasticSourceControlWorker, ESPMode::ThreadSafe>& InWorker, const FSourceControlOperationComplete& InOperationCompleteDelegate)
 	: Operation(InOperation)
diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlCommand.h b/Source/PlasticSourceControl/Private/PlasticSourceControlCommand.h
index 3737f239..8308024e 100644
--- a/Source/PlasticSourceControl/Private/PlasticSourceControlCommand.h
+++ b/Source/PlasticSourceControl/Private/PlasticSourceControlCommand.h
@@ -2,6 +2,10 @@
 
 #pragma once
 
+#include "CoreMinimal.h"
+#include "Misc/IQueuedWork.h"
+#include "ISourceControlProvider.h"
+
 /**
  * Used to execute Plastic commands multi-threaded.
  */
diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlMenu.cpp b/Source/PlasticSourceControl/Private/PlasticSourceControlMenu.cpp
index 2cd992a6..311cedaa 100644
--- a/Source/PlasticSourceControl/Private/PlasticSourceControlMenu.cpp
+++ b/Source/PlasticSourceControl/Private/PlasticSourceControlMenu.cpp
@@ -7,10 +7,13 @@
 #include "PlasticSourceControlMenuCommands.h"
 
 #include "PlasticSourceControlProvider.h"
-#include "PlasticSourceControlOperations.h"
 
-#include "SlateExtras.h"
 #include "LevelEditor.h"
+#include "Widgets/Notifications/SNotificationList.h"
+#include "Framework/Notifications/NotificationManager.h"
+#include "Framework/Multibox/MultiBoxBuilder.h"
+#include "Misc/MessageDialog.h"
+#include "EditorStyleSet.h"
 
 static const FName PlasticSourceControlMenuTabName("PlasticSourceControlMenu");
 
diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlMenu.h b/Source/PlasticSourceControl/Private/PlasticSourceControlMenu.h
index 4c99d2e0..2eda95e8 100644
--- a/Source/PlasticSourceControl/Private/PlasticSourceControlMenu.h
+++ b/Source/PlasticSourceControl/Private/PlasticSourceControlMenu.h
@@ -2,6 +2,12 @@
 
 #pragma once
 
+#include "CoreMinimal.h"
+#include "ISourceControlProvider.h"
+
+#include "ISourceControlOperation.h"
+#include "SourceControlOperations.h"
+#include "PlasticSourceControlOperations.h"
 
 class FToolBarBuilder;
 class FMenuBuilder;
@@ -20,7 +26,7 @@ class FPlasticSourceControlMenu
 private:
 	void AddMenuExtension(FMenuBuilder& Builder);
 
-	TSharedRef<FExtender> OnExtendLevelEditorViewMenu(const TSharedRef<FUICommandList> CommandList);
+	TSharedRef<class FExtender> OnExtendLevelEditorViewMenu(const TSharedRef<class FUICommandList> CommandList);
 
 	void DisplayInProgressNotification(const FSourceControlOperationRef& InOperation);
 	void RemoveInProgressNotification();
@@ -33,10 +39,11 @@ class FPlasticSourceControlMenu
 	FDelegateHandle ViewMenuExtenderHandle;
 
 	/** Current source control operation from menu if any */
+	// TODO: move back to the cpp file (and remove corresponding include files)
 	TSharedPtr<FSync, ESPMode::ThreadSafe> SyncOperation;
-	TSharedPtr<class FPlasticRevertUnchanged, ESPMode::ThreadSafe> RevertUnchangedOperation;
-	TSharedPtr<class FPlasticRevertAll, ESPMode::ThreadSafe> RevertAllOperation;
-	TWeakPtr<SNotificationItem> OperationInProgressNotification;
+	TSharedPtr<FPlasticRevertUnchanged, ESPMode::ThreadSafe> RevertUnchangedOperation;
+	TSharedPtr<FPlasticRevertAll, ESPMode::ThreadSafe> RevertAllOperation;
+	TWeakPtr<class SNotificationItem> OperationInProgressNotification;
 	/** Delegate called when a source control operation has completed */
 	void OnSourceControlOperationComplete(const FSourceControlOperationRef& InOperation, ECommandResult::Type InResult);
 };
\ No newline at end of file
diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlMenuCommands.h b/Source/PlasticSourceControl/Private/PlasticSourceControlMenuCommands.h
index e3578505..7cff420d 100644
--- a/Source/PlasticSourceControl/Private/PlasticSourceControlMenuCommands.h
+++ b/Source/PlasticSourceControl/Private/PlasticSourceControlMenuCommands.h
@@ -2,7 +2,8 @@
 
 #pragma once
 
-#include "SlateBasics.h"
+#include "CoreMinimal.h"
+#include "Commands.h"
 #include "PlasticSourceControlMenuStyle.h"
 
 class FPlasticSourceControlMenuCommands : public TCommands<FPlasticSourceControlMenuCommands>
diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlMenuStyle.cpp b/Source/PlasticSourceControl/Private/PlasticSourceControlMenuStyle.cpp
index 957cb165..3ea1c5fc 100644
--- a/Source/PlasticSourceControl/Private/PlasticSourceControlMenuStyle.cpp
+++ b/Source/PlasticSourceControl/Private/PlasticSourceControlMenuStyle.cpp
@@ -4,6 +4,9 @@
 
 #include "PlasticSourceControlMenuStyle.h"
 #include "SlateGameResources.h"
+#include "Styling/ISlateStyle.h"
+#include "Styling/SlateStyleRegistry.h"
+#include "Framework/Application/SlateApplication.h"
 #include "IPluginManager.h"
 
 TSharedPtr< FSlateStyleSet > FPlasticSourceControlMenuStyle::StyleInstance = NULL;
diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlMenuStyle.h b/Source/PlasticSourceControl/Private/PlasticSourceControlMenuStyle.h
index e3cc2f0c..9ae3d655 100644
--- a/Source/PlasticSourceControl/Private/PlasticSourceControlMenuStyle.h
+++ b/Source/PlasticSourceControl/Private/PlasticSourceControlMenuStyle.h
@@ -1,7 +1,7 @@
 // Copyright (c) 2016 Codice Software - Sebastien Rombauts (sebastien.rombauts@gmail.com)
 #pragma once
 
-#include "SlateBasics.h"
+#include "CoreMinimal.h"
 
 /**  */
 class FPlasticSourceControlMenuStyle
@@ -15,16 +15,16 @@ class FPlasticSourceControlMenuStyle
 	/** reloads textures used by slate renderer */
 	static void ReloadTextures();
 
-	/** @return The Slate style set for the Shooter game */
-	static const ISlateStyle& Get();
+	/** @return The Slate style set for the menu */
+	static const class ISlateStyle& Get();
 
 	static FName GetStyleSetName();
 
 private:
 
-	static TSharedRef< class FSlateStyleSet > Create();
+	static TSharedRef<class FSlateStyleSet> Create();
 
 private:
 
-	static TSharedPtr< class FSlateStyleSet > StyleInstance;
+	static TSharedPtr<class FSlateStyleSet> StyleInstance;
 };
\ No newline at end of file
diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlModule.cpp b/Source/PlasticSourceControl/Private/PlasticSourceControlModule.cpp
index 42cb0e08..66f0e456 100644
--- a/Source/PlasticSourceControl/Private/PlasticSourceControlModule.cpp
+++ b/Source/PlasticSourceControl/Private/PlasticSourceControlModule.cpp
@@ -2,10 +2,9 @@
 
 #include "PlasticSourceControlPrivatePCH.h"
 #include "PlasticSourceControlModule.h"
-#include "ModuleManager.h"
-#include "ISourceControlModule.h"
 #include "PlasticSourceControlOperations.h"
-#include "Runtime/Core/Public/Features/IModularFeatures.h"
+#include "Misc/App.h"
+#include "Features/IModularFeatures.h"
 #include "IPluginManager.h"
 
 #define LOCTEXT_NAMESPACE "PlasticSourceControl"
diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlOperations.cpp b/Source/PlasticSourceControl/Private/PlasticSourceControlOperations.cpp
index 7cf763a7..3b3a6c68 100644
--- a/Source/PlasticSourceControl/Private/PlasticSourceControlOperations.cpp
+++ b/Source/PlasticSourceControl/Private/PlasticSourceControlOperations.cpp
@@ -8,6 +8,9 @@
 #include "PlasticSourceControlUtils.h"
 #include "AssetRegistryModule.h"
 
+#include "HAL/FileManager.h"
+#include "Misc/Paths.h"
+
 #define LOCTEXT_NAMESPACE "PlasticSourceControl"
 
 FName FPlasticRevertUnchanged::GetName() const
diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlOperations.h b/Source/PlasticSourceControl/Private/PlasticSourceControlOperations.h
index b4a96643..bac54827 100644
--- a/Source/PlasticSourceControl/Private/PlasticSourceControlOperations.h
+++ b/Source/PlasticSourceControl/Private/PlasticSourceControlOperations.h
@@ -8,6 +8,7 @@
 #include "PlasticSourceControlState.h"
 #include "PlasticSourceControlRevision.h"
 
+#include "ISourceControlOperation.h"
 
 /**
  * Internal operation used to revert checked-out unchanged files
diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlPrivatePCH.h b/Source/PlasticSourceControl/Private/PlasticSourceControlPrivatePCH.h
index 39cd11ea..087b51cf 100644
--- a/Source/PlasticSourceControl/Private/PlasticSourceControlPrivatePCH.h
+++ b/Source/PlasticSourceControl/Private/PlasticSourceControlPrivatePCH.h
@@ -2,7 +2,5 @@
 
 #pragma once
 
-#include "Core.h"
-#include "SlateBasics.h"
-#include "EditorStyle.h"
+#include "CoreMinimal.h"
 #include "ISourceControlModule.h"
diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlProvider.cpp b/Source/PlasticSourceControl/Private/PlasticSourceControlProvider.cpp
index 851ab4a8..6284b66b 100644
--- a/Source/PlasticSourceControl/Private/PlasticSourceControlProvider.cpp
+++ b/Source/PlasticSourceControl/Private/PlasticSourceControlProvider.cpp
@@ -12,6 +12,10 @@
 #include "MessageLog.h"
 #include "ScopedSourceControlProgress.h"
 
+#include "Misc/Paths.h"
+#include "HAL/PlatformProcess.h"
+#include "Misc/QueuedThreadPool.h"
+
 #define LOCTEXT_NAMESPACE "PlasticSourceControl"
 
 static FName ProviderName("Plastic SCM");
diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlRevision.cpp b/Source/PlasticSourceControl/Private/PlasticSourceControlRevision.cpp
index bb49b182..9b6e2903 100644
--- a/Source/PlasticSourceControl/Private/PlasticSourceControlRevision.cpp
+++ b/Source/PlasticSourceControl/Private/PlasticSourceControlRevision.cpp
@@ -7,6 +7,9 @@
 #include "PlasticSourceControlUtils.h"
 #include "SPlasticSourceControlSettings.h"
 
+#include "HAL/FileManager.h"
+#include "Misc/Paths.h"
+
 #define LOCTEXT_NAMESPACE "PlasticSourceControl"
 
 bool FPlasticSourceControlRevision::Get( FString& InOutFilename ) const
diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlSettings.cpp b/Source/PlasticSourceControl/Private/PlasticSourceControlSettings.cpp
index 54006388..37e877ed 100644
--- a/Source/PlasticSourceControl/Private/PlasticSourceControlSettings.cpp
+++ b/Source/PlasticSourceControl/Private/PlasticSourceControlSettings.cpp
@@ -7,6 +7,10 @@
 #include "PlasticSourceControlUtils.h"
 #include "SourceControlHelpers.h"
 
+#include "Misc/ScopeLock.h"
+#include "Misc/ConfigCacheIni.h"
+#include "HAL/PlatformTime.h"
+
 namespace PlasticSettingsConstants
 {
 
diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlUtils.cpp b/Source/PlasticSourceControl/Private/PlasticSourceControlUtils.cpp
index dcd5705b..379855e6 100644
--- a/Source/PlasticSourceControl/Private/PlasticSourceControlUtils.cpp
+++ b/Source/PlasticSourceControl/Private/PlasticSourceControlUtils.cpp
@@ -2,15 +2,27 @@
 
 #include "PlasticSourceControlPrivatePCH.h"
 #include "PlasticSourceControlUtils.h"
-#include "PlasticSourceControlState.h"
 #include "PlasticSourceControlModule.h"
 #include "PlasticSourceControlCommand.h"
+#include "HAL/PlatformProcess.h"
+#include "HAL/PlatformFilemanager.h"
+#include "HAL/FileManager.h"
+#include "Misc/ScopeLock.h"
+#include "Misc/FileHelper.h"
+#include "Misc/Paths.h"
+#include "HAL/PlatformTime.h"
+#include "Modules/ModuleManager.h"
 #include "XmlParser.h"
 
 #if PLATFORM_LINUX
 #include <sys/ioctl.h>
 #endif
 
+#if PLATFORM_WINDOWS
+#include "WindowsHWrapper.h" // SECURITY_ATTRIBUTES
+#undef GetUserName
+#endif
+
 
 namespace PlasticSourceControlConstants
 {
diff --git a/Source/PlasticSourceControl/Private/SPlasticSourceControlSettings.cpp b/Source/PlasticSourceControl/Private/SPlasticSourceControlSettings.cpp
index 424c35bb..3f73fab4 100644
--- a/Source/PlasticSourceControl/Private/SPlasticSourceControlSettings.cpp
+++ b/Source/PlasticSourceControl/Private/SPlasticSourceControlSettings.cpp
@@ -5,7 +5,22 @@
 #include "PlasticSourceControlModule.h"
 #include "PlasticSourceControlUtils.h"
 
-#include "SlateExtras.h"
+#include "Fonts/SlateFontInfo.h"
+#include "Misc/Paths.h"
+#include "Misc/FileHelper.h"
+#include "Modules/ModuleManager.h"
+#include "Framework/Notifications/NotificationManager.h"
+#include "Styling/SlateTypes.h"
+#include "Widgets/Input/SEditableTextBox.h"
+#include "Widgets/Input/SMultiLineEditableTextBox.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Input/SCheckBox.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Layout/SSeparator.h"
+#include "Widgets/Notifications/SNotificationList.h"
+#include "Widgets/SBoxPanel.h"
+#include "Widgets/Text/STextBlock.h"
+#include "EditorStyleSet.h"
 
 #define LOCTEXT_NAMESPACE "SPlasticSourceControlSettings"
 
diff --git a/Source/PlasticSourceControl/Private/SPlasticSourceControlSettings.h b/Source/PlasticSourceControl/Private/SPlasticSourceControlSettings.h
index cc3978fe..95967842 100644
--- a/Source/PlasticSourceControl/Private/SPlasticSourceControlSettings.h
+++ b/Source/PlasticSourceControl/Private/SPlasticSourceControlSettings.h
@@ -2,6 +2,16 @@
 
 #pragma once
 
+#include "CoreMinimal.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Layout/Visibility.h"
+#include "Input/Reply.h"
+#include "Styling/SlateTypes.h"
+
+#include "ISourceControlProvider.h"
+#include "ISourceControlOperation.h"
+
 class SPlasticSourceControlSettings : public SCompoundWidget
 {
 public:
@@ -48,7 +58,7 @@ class SPlasticSourceControlSettings : public SCompoundWidget
 	FText InitialCommitMessage;
 
 	/** Initial checkin asynchronous operation progress notification */
-	TWeakPtr<SNotificationItem> OperationInProgressNotification;
+	TWeakPtr<class SNotificationItem> OperationInProgressNotification;
 
 	void DisplayInProgressNotification(const FSourceControlOperationRef& InOperation);
 	void RemoveInProgressNotification();
@@ -58,7 +68,6 @@ class SPlasticSourceControlSettings : public SCompoundWidget
 	/** Delegate called when a source control operation has completed */
 	void OnSourceControlOperationComplete(const FSourceControlOperationRef& InOperation, ECommandResult::Type InResult);
 
-
 	FReply OnClickedInitializePlasticWorkspace();
 
 	/** Delegate to add a Plastic ignore.conf file to an existing Plastic workspace */