diff --git a/Source/vampires/EXPPickup.cpp b/Source/vampires/EXPPickup.cpp
index 45e6397..e776bc0 100644
--- a/Source/vampires/EXPPickup.cpp
+++ b/Source/vampires/EXPPickup.cpp
@@ -3,6 +3,7 @@
 
 #include "EXPPickup.h"
 
+#include "EXPComponent.h"
 #include "PlayerCharacter.h"
 
 void AEXPPickup::BeginPlay()
diff --git a/Source/vampires/EnemyCharacter.cpp b/Source/vampires/EnemyCharacter.cpp
index 9bf6088..bbf0981 100644
--- a/Source/vampires/EnemyCharacter.cpp
+++ b/Source/vampires/EnemyCharacter.cpp
@@ -3,6 +3,10 @@
 
 #include "EnemyCharacter.h"
 
+#include "EXPPickup.h"
+#include "HealthComponent.h"
+#include "ObjectPoolComponent.h"
+#include "ObjectPoolManager.h"
 #include "VampireGameMode.h"
 #include "Kismet/GameplayStatics.h"
 
diff --git a/Source/vampires/EnemyCharacter.h b/Source/vampires/EnemyCharacter.h
index b26a27c..55b72ab 100644
--- a/Source/vampires/EnemyCharacter.h
+++ b/Source/vampires/EnemyCharacter.h
@@ -3,12 +3,12 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "EXPPickup.h"
-#include "ObjectPoolComponent.h"
 #include "VampireCharacter.h"
-#include "BehaviorTree/BehaviorTree.h"
 #include "EnemyCharacter.generated.h"
 
+class UObjectPoolComponent;
+class UBehaviorTree;
+class AEXPPickup;
 /**
  * 
  */
diff --git a/Source/vampires/GoldPickup.cpp b/Source/vampires/GoldPickup.cpp
index a51bef5..ec1eaf1 100644
--- a/Source/vampires/GoldPickup.cpp
+++ b/Source/vampires/GoldPickup.cpp
@@ -3,6 +3,7 @@
 
 #include "GoldPickup.h"
 
+#include "GoldComponent.h"
 #include "PlayerCharacter.h"
 
 class APlayerCharacter;
diff --git a/Source/vampires/ObjectPoolManager.cpp b/Source/vampires/ObjectPoolManager.cpp
index 2dc0da0..b8113db 100644
--- a/Source/vampires/ObjectPoolManager.cpp
+++ b/Source/vampires/ObjectPoolManager.cpp
@@ -2,7 +2,6 @@
 
 
 #include "ObjectPoolManager.h"
-
 #include "ObjectPoolComponent.h"
 
 // Called when the game starts or when spawned
diff --git a/Source/vampires/Pickup.cpp b/Source/vampires/Pickup.cpp
index 328d457..37fcf50 100644
--- a/Source/vampires/Pickup.cpp
+++ b/Source/vampires/Pickup.cpp
@@ -4,8 +4,9 @@
 #include "Pickup.h"
 
 #include "PlayerCharacter.h"
+#include "Components/SphereComponent.h"
 #include "Kismet/GameplayStatics.h"
-#include "Kismet/KismetMathLibrary.h"
+#include "PaperSpriteComponent.h"
 
 // Sets default values
 APickup::APickup()
@@ -19,7 +20,7 @@ APickup::APickup()
 	SphereComponent->SetSphereRadius(25.0f);
 
 	SpriteComponent = CreateDefaultSubobject<UPaperSpriteComponent>(TEXT("Sprite Component"));
-	SpriteComponent->SetRelativeRotation(FRotator(0.0f, 90.0f,-90.0f));
+	SpriteComponent->SetRelativeRotation(FRotator(0.0f, 90.0f, -90.0f));
 	SpriteComponent->SetRelativeScale3D(FVector(.5f, .5f, .5f));
 	SpriteComponent->SetupAttachment(RootComponent);
 }
@@ -53,7 +54,7 @@ void APickup::OnBeginOverlap(UPrimitiveComponent* OverlappedComponent, AActor* O
                              const FHitResult& SweepResult)
 {
 	if (APlayerCharacter* PlayerCharacter = Cast<APlayerCharacter>(OtherActor))
-	{		
+	{
 		// TODO: Add extra functionality
 		if (PickupSoundBase)
 		{
diff --git a/Source/vampires/Pickup.h b/Source/vampires/Pickup.h
index 97dfffe..68c86b8 100644
--- a/Source/vampires/Pickup.h
+++ b/Source/vampires/Pickup.h
@@ -3,11 +3,12 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "Components/SphereComponent.h"
 #include "GameFramework/Actor.h"
-#include "PaperSpriteComponent.h"
 #include "Pickup.generated.h"
 
+class USphereComponent;
+class UPaperSpriteComponent;
+
 UCLASS()
 class VAMPIRES_API APickup : public AActor
 {
diff --git a/Source/vampires/PlayerCharacter.cpp b/Source/vampires/PlayerCharacter.cpp
index 4cff263..c81daa7 100644
--- a/Source/vampires/PlayerCharacter.cpp
+++ b/Source/vampires/PlayerCharacter.cpp
@@ -6,7 +6,13 @@
 #include "VampirePlayerController.h"
 #include "EnhancedInputComponent.h"
 #include "EnhancedInputSubsystems.h"
+#include "EXPComponent.h"
+#include "GoldComponent.h"
 #include "InputMappingContext.h"
+#include "WeaponInventoryComponent.h"
+#include "Camera/CameraComponent.h"
+#include "Components/WidgetComponent.h"
+#include "GameFramework/SpringArmComponent.h"
 
 APlayerCharacter::APlayerCharacter()
 {
@@ -39,9 +45,9 @@ APlayerCharacter::APlayerCharacter()
 	// Create HealthBar Widget Component
 	HealthBarWidgetComponent = CreateDefaultSubobject<UWidgetComponent>(TEXT("Healthbar"));
 	HealthBarWidgetComponent->SetupAttachment(RootComponent);
-	HealthBarWidgetComponent->SetRelativeLocation(FVector(0,0,90));
+	HealthBarWidgetComponent->SetRelativeLocation(FVector(0, 0, 90));
 	HealthBarWidgetComponent->SetTwoSided(true);
-	HealthBarWidgetComponent->SetBackgroundColor(FLinearColor(1,1,1,0));
+	HealthBarWidgetComponent->SetBackgroundColor(FLinearColor(1, 1, 1, 0));
 }
 
 void APlayerCharacter::BeginPlay()
diff --git a/Source/vampires/PlayerCharacter.h b/Source/vampires/PlayerCharacter.h
index c595568..ea7758c 100644
--- a/Source/vampires/PlayerCharacter.h
+++ b/Source/vampires/PlayerCharacter.h
@@ -3,16 +3,16 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "EXPComponent.h"
-#include "GoldComponent.h"
 #include "VampireCharacter.h"
-#include "WeaponInventoryComponent.h"
-#include "Camera/CameraComponent.h"
-#include "GameFramework/SpringArmComponent.h"
-#include "Blueprint/UserWidget.h"
-#include "Components/WidgetComponent.h"
 #include "PlayerCharacter.generated.h"
 
+struct FInputActionInstance;
+class UWidgetComponent;
+class UWeaponInventoryComponent;
+class UGoldComponent;
+class UEXPComponent;
+class UCameraComponent;
+class USpringArmComponent;
 class UInputMappingContext;
 class UInputAction;
 
diff --git a/Source/vampires/VampireAIController.cpp b/Source/vampires/VampireAIController.cpp
index 516ae74..6e9ef60 100644
--- a/Source/vampires/VampireAIController.cpp
+++ b/Source/vampires/VampireAIController.cpp
@@ -3,6 +3,11 @@
 
 #include "VampireAIController.h"
 
+#include "EnemyCharacter.h"
+#include "HealthComponent.h"
+#include "VampireCharacter.h"
+#include "BehaviorTree/BehaviorTree.h"
+#include "BehaviorTree/BehaviorTreeComponent.h"
 #include "BehaviorTree/BlackboardComponent.h"
 #include "Kismet/GameplayStatics.h"
 #include "Navigation/CrowdFollowingComponent.h"
diff --git a/Source/vampires/VampireAIController.h b/Source/vampires/VampireAIController.h
index dd34516..80c8327 100644
--- a/Source/vampires/VampireAIController.h
+++ b/Source/vampires/VampireAIController.h
@@ -4,13 +4,12 @@
 
 #include "CoreMinimal.h"
 #include "AIController.h"
-#include "DetourCrowdAIController.h"
-#include "EnemyCharacter.h"
-#include "HealthComponent.h"
-#include "PlayerCharacter.h"
-#include "BehaviorTree/BehaviorTreeComponent.h"
 #include "VampireAIController.generated.h"
 
+class AEnemyCharacter;
+class APlayerCharacter;
+class UBehaviorTreeComponent;
+class UBlackboardComponent;
 /**
  * 
  */
diff --git a/Source/vampires/VampireCharacter.cpp b/Source/vampires/VampireCharacter.cpp
index 5c411ee..01815c3 100644
--- a/Source/vampires/VampireCharacter.cpp
+++ b/Source/vampires/VampireCharacter.cpp
@@ -3,6 +3,9 @@
 
 #include "VampireCharacter.h"
 
+#include "HealthComponent.h"
+#include "PaperFlipbookComponent.h"
+
 // Sets default values
 AVampireCharacter::AVampireCharacter()
 {
diff --git a/Source/vampires/VampireCharacter.h b/Source/vampires/VampireCharacter.h
index eec94a1..dc764f3 100644
--- a/Source/vampires/VampireCharacter.h
+++ b/Source/vampires/VampireCharacter.h
@@ -4,10 +4,11 @@
 
 #include "CoreMinimal.h"
 #include "GameFramework/Character.h"
-#include "HealthComponent.h"
-#include "PaperFlipbookComponent.h"
 #include "VampireCharacter.generated.h"
 
+class UHealthComponent;
+class UPaperFlipbookComponent;
+
 UCLASS()
 class VAMPIRES_API AVampireCharacter : public ACharacter
 {
diff --git a/Source/vampires/VampireGameMode.cpp b/Source/vampires/VampireGameMode.cpp
index 02a8501..443c660 100644
--- a/Source/vampires/VampireGameMode.cpp
+++ b/Source/vampires/VampireGameMode.cpp
@@ -3,6 +3,10 @@
 
 #include "VampireGameMode.h"
 
+#include "EnemyCharacter.h"
+#include "ObjectPoolManager.h"
+#include "PlayerCharacter.h"
+#include "VampirePlayerController.h"
 #include "Components/CapsuleComponent.h"
 #include "Kismet/GameplayStatics.h"
 
diff --git a/Source/vampires/VampireGameMode.h b/Source/vampires/VampireGameMode.h
index def66c6..a1a3289 100644
--- a/Source/vampires/VampireGameMode.h
+++ b/Source/vampires/VampireGameMode.h
@@ -3,13 +3,13 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "EnemyCharacter.h"
-#include "ObjectPoolManager.h"
-#include "PlayerCharacter.h"
-#include "VampirePlayerController.h"
 #include "GameFramework/GameMode.h"
 #include "VampireGameMode.generated.h"
 
+class AObjectPoolManager;
+class AVampirePlayerController;
+class APlayerCharacter;
+class AEnemyCharacter;
 /**
  * 
  */
diff --git a/Source/vampires/WeaponInventoryComponent.cpp b/Source/vampires/WeaponInventoryComponent.cpp
index 55c5b39..7dfef42 100644
--- a/Source/vampires/WeaponInventoryComponent.cpp
+++ b/Source/vampires/WeaponInventoryComponent.cpp
@@ -2,6 +2,7 @@
 
 
 #include "WeaponInventoryComponent.h"
+#include "Weapon.h"
 
 // Sets default values for this component's properties
 UWeaponInventoryComponent::UWeaponInventoryComponent()
diff --git a/Source/vampires/WeaponInventoryComponent.h b/Source/vampires/WeaponInventoryComponent.h
index 6729d4a..8f6748c 100644
--- a/Source/vampires/WeaponInventoryComponent.h
+++ b/Source/vampires/WeaponInventoryComponent.h
@@ -3,11 +3,12 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "Weapon.h"
 #include "Components/ActorComponent.h"
 #include "WeaponInventoryComponent.generated.h"
 
 
+class AWeapon;
+
 UCLASS(ClassGroup=(Custom), meta=(BlueprintSpawnableComponent))
 class VAMPIRES_API UWeaponInventoryComponent : public UActorComponent
 {
diff --git a/UpgradeLog.htm b/UpgradeLog.htm
new file mode 100644
index 0000000..f81edc1
Binary files /dev/null and b/UpgradeLog.htm differ