diff --git a/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedIdentityLibrary.h b/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedIdentityLibrary.h
index 890c55b..8136541 100644
--- a/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedIdentityLibrary.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedIdentityLibrary.h
@@ -6,9 +6,9 @@
 #include "Kismet/BlueprintFunctionLibrary.h"
 #include "Online.h"
 #include "OnlineSubsystem.h"
-#include "OnlineIdentityInterface.h"
-#include "OnlineUserInterface.h"
-#include "OnlinePresenceInterface.h"
+#include "Interfaces/OnlineIdentityInterface.h"
+#include "Interfaces/OnlineUserInterface.h"
+#include "Interfaces/OnlinePresenceInterface.h"
 #include "Engine/GameInstance.h"
 #include "Engine/LocalPlayer.h"
 
diff --git a/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessions.h b/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessions.h
index 79f4ea8..5c50f5c 100644
--- a/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessions.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessions.h
@@ -1,6 +1,6 @@
 #pragma once
  
-#include "ModuleManager.h"
+#include "Modules/ModuleManager.h"
 
 class AdvancedSessions : public IModuleInterface
 {
diff --git a/AdvancedSessions/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h b/AdvancedSessions/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h
index fdeccb1..595b3b0 100644
--- a/AdvancedSessions/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h
@@ -1,9 +1,9 @@
 #pragma once
 #include "CoreMinimal.h"
-#include "EngineMinimal.h"
+//#include "EngineMinimal.h"
 #include "Engine/Engine.h"
 #include "GameFramework/PlayerState.h"
-#include "Core.h"
+//#include "Core.h"
 #include "Interfaces/OnlineSessionInterface.h"
 #include "OnlineSessionSettings.h"
 #include "OnlineDelegateMacros.h"
@@ -11,6 +11,7 @@
 #include "OnlineSubsystemImpl.h"
 #include "OnlineSubsystemUtils.h"
 #include "OnlineSubsystemUtilsModule.h"
+#include "Gameframework/PlayerController.h"
 #include "Modules/ModuleManager.h"
 #include "OnlineSubsystemUtilsClasses.h"
 #include "BlueprintDataDefinitions.generated.h"	
diff --git a/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h b/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h
index 4acef32..448ab59 100644
--- a/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h
@@ -3,7 +3,7 @@
 
 #include "CoreMinimal.h"
 #include "BlueprintDataDefinitions.h"
-#include "OnlineIdentityInterface.h"
+#include "Interfaces/OnlineIdentityInterface.h"
 #include "GetUserPrivilegeCallbackProxy.generated.h"
 
 DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FBlueprintGetUserPrivilegeDelegate,/* const &FBPUniqueNetId, PlayerID,*/ EBPUserPrivileges, QueriedPrivilege, bool, HadPrivilege);
diff --git a/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h b/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h
index f35161f..72433f6 100644
--- a/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h
@@ -3,7 +3,7 @@
 
 #include "CoreMinimal.h"
 #include "BlueprintDataDefinitions.h"
-#include "OnlineIdentityInterface.h"
+#include "Interfaces/OnlineIdentityInterface.h"
 #include "Engine/LocalPlayer.h"
 #include "LoginUserCallbackProxy.generated.h"
 
diff --git a/AdvancedSessions/Source/AdvancedSessions/Classes/LogoutUserCallbackProxy.h b/AdvancedSessions/Source/AdvancedSessions/Classes/LogoutUserCallbackProxy.h
index 01a33f4..9907095 100644
--- a/AdvancedSessions/Source/AdvancedSessions/Classes/LogoutUserCallbackProxy.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/LogoutUserCallbackProxy.h
@@ -3,7 +3,7 @@
 
 #include "CoreMinimal.h"
 #include "BlueprintDataDefinitions.h"
-#include "OnlineIdentityInterface.h"
+#include "Interfaces/OnlineIdentityInterface.h"
 #include "Engine/LocalPlayer.h"
 #include "LogoutUserCallbackProxy.generated.h"
 
diff --git a/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp b/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp
index af2e75c..67be832 100644
--- a/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp
+++ b/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp
@@ -1,5 +1,7 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 #include "AdvancedFriendsGameInstance.h"
+#include "Kismet/GameplayStatics.h"
+#include "Gameframework/PlayerController.h"
 
 //General Log
 DEFINE_LOG_CATEGORY(AdvancedFriendsInterfaceLog);
diff --git a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h
index 52c74a1..6a2962c 100644
--- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h
+++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h
@@ -12,6 +12,7 @@
 #include "Interfaces/OnlinePresenceInterface.h"
 #include "Engine/GameInstance.h"
 #include "Interfaces/OnlineSessionInterface.h"
+#include "BlueprintDataDefinitions.h"
 #include "UObject/UObjectIterator.h"
 
 // This is taken directly from UE4 - OnlineSubsystemSteamPrivatePCH.h as a fix for the array_count macro
diff --git a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamSessions.h b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamSessions.h
index 1b34cec..edaf63b 100644
--- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamSessions.h
+++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamSessions.h
@@ -1,7 +1,7 @@
 #pragma once
  
 #include "CoreMinimal.h"
-#include "ModuleManager.h"
+#include "Modules/ModuleManager.h"
 
 class AdvancedSteamSessions : public IModuleInterface
 {
diff --git a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp
index 647c20d..d551b17 100644
--- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp
+++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp
@@ -1,7 +1,7 @@
 // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
 
 #include "SteamRequestGroupOfficersCallbackProxy.h"
-#include "CoreOnline.h"
+#include "UObject/CoreOnline.h"
 #include "AdvancedSteamFriendsLibrary.h"
 #include "OnlineSubSystemHeader.h"
 //#include "OnlineSubsystemSteamTypes.h"