diff --git a/Plugins/UE4Haxe b/Plugins/UE4Haxe
index aab6df8..66c770d 160000
--- a/Plugins/UE4Haxe
+++ b/Plugins/UE4Haxe
@@ -1 +1 @@
-Subproject commit aab6df889143f333c0aa5e4a11c318cbb72978aa
+Subproject commit 66c770d84f2590133f1c10df452c2469bf09bd1f
diff --git a/Source/HaxeProgramTest.Target.cs b/Source/HaxeProgramTest.Target.cs
index dc0cac8..19d8790 100644
--- a/Source/HaxeProgramTest.Target.cs
+++ b/Source/HaxeProgramTest.Target.cs
@@ -3,55 +3,48 @@
 
 public class HaxeProgramTestTarget : TargetRules
 {
-  public HaxeProgramTestTarget(TargetInfo target) : base(target) {
+  public HaxeProgramTestTarget(TargetInfo Target) : base(Target) {
     Type = TargetType.Program;
     LaunchModuleName = "HaxeProgramTest";
     LinkType = TargetLinkType.Monolithic;
     ExtraModuleNames.Add("HaxeProgramTest");
-  }
 
-  public override void SetupGlobalEnvironment(
-		TargetInfo Target,
-		ref LinkEnvironmentConfiguration OutLinkEnvironmentConfiguration,
-		ref CPPEnvironmentConfiguration OutCPPEnvironmentConfiguration
-		)
-	{
-		// Lean and mean
-		bCompileLeanAndMeanUE = true;
+	// Lean and mean
+	bCompileLeanAndMeanUE = true;
 
-		// Never use malloc profiling in Unreal Header Tool.
-		bUseMallocProfiler = false;
+	// Never use malloc profiling in Unreal Header Tool.
+	bUseMallocProfiler = false;
 
-		// No editor needed
-		bBuildEditor = false;
-		// Editor-only data is not needed as well
-		bBuildWithEditorOnlyData = false;
+	// No editor needed
+	bBuildEditor = false;
+	// Editor-only data is not needed as well
+	bBuildWithEditorOnlyData = false;
 
-		// Currently this app is not linking against the engine, so we'll compile out references from Core to the rest of the engine
-		bCompileAgainstEngine = false;
-		bCompileAgainstCoreUObject = false;
+	// Currently this app is not linking against the engine, so we'll compile out references from Core to the rest of the engine
+	bCompileAgainstEngine = false;
+	bCompileAgainstCoreUObject = false;
 
-		// Our test project is a console application, not a Windows app (sets entry point to main(), instead of WinMain())
-		OutLinkEnvironmentConfiguration.bIsBuildingConsoleApplication = true;
+	// Our test project is a console application, not a Windows app (sets entry point to main(), instead of WinMain())
+	bIsBuildingConsoleApplication = true;
     bUseLoggingInShipping = true;
 
-		bIncludeADO = false;
+	bIncludeADO = false;
 
-		// Do not include ICU for Linux (this is a temporary workaround, separate headless CrashReportClient target should be created, see UECORE-14 for details).
-		if (Target.Platform == UnrealTargetPlatform.Linux)
-		{
-			bCompileICU = false;
-		}
+	// Do not include ICU for Linux (this is a temporary workaround, separate headless CrashReportClient target should be created, see UECORE-14 for details).
+	if (Target.Platform == UnrealTargetPlatform.Linux)
+	{
+		bCompileICU = false;
+	}
 
-		// CrashReportClient.exe has no exports, so no need to verify that a .lib and .exp file was emitted by
-		// the linker.
-		OutLinkEnvironmentConfiguration.bHasExports = false;
+	// CrashReportClient.exe has no exports, so no need to verify that a .lib and .exp file was emitted by
+	// the linker.
+	bHasExports = false;
 
-		bUseChecksInShipping = true;
+	bUseChecksInShipping = true;
 
-		// Epic Games Launcher needs to run on OS X 10.9, so CrashReportClient needs this as well
-		OutCPPEnvironmentConfiguration.bEnableOSX109Support = true;
+	// Epic Games Launcher needs to run on OS X 10.9, so CrashReportClient needs this as well
+	bEnableOSX109Support = true;
 
-		OutCPPEnvironmentConfiguration.Definitions.Add("NOINITCRASHREPORTER=1");
-	}
+	GlobalDefinitions.Add("NOINITCRASHREPORTER=1");
+  }
 }
\ No newline at end of file
diff --git a/Source/HaxeUnitTests/Public/BasicType2.cpp b/Source/HaxeUnitTests/Public/BasicType2.cpp
index 5f2ac9a..9af9c24 100644
--- a/Source/HaxeUnitTests/Public/BasicType2.cpp
+++ b/Source/HaxeUnitTests/Public/BasicType2.cpp
@@ -1,7 +1,7 @@
-#include "HaxeUnitTests.h"
-
 #include "BasicType2.h"
 
+#include "HaxeUnitTests.h"
+
 // yeah, it seems that we REALLY NEED to define that. WTF.
 UBasicType2::UBasicType2(const FObjectInitializer& ObjectInitializer)
 : Super(ObjectInitializer)
diff --git a/Source/HaxeUnitTests/Public/BasicTypesSub.cpp b/Source/HaxeUnitTests/Public/BasicTypesSub.cpp
index bc0fce2..a737fbc 100644
--- a/Source/HaxeUnitTests/Public/BasicTypesSub.cpp
+++ b/Source/HaxeUnitTests/Public/BasicTypesSub.cpp
@@ -1,5 +1,5 @@
-#include "HaxeUnitTests.h"
 #include "BasicTypesSub.h"
+#include "HaxeUnitTests.h"
 
 int64 UBasicTypesSub1::setText(FText text)
 {
diff --git a/Source/HaxeUnitTests/Public/BasicTypesSub.h b/Source/HaxeUnitTests/Public/BasicTypesSub.h
index 982d75d..89d0e1a 100644
--- a/Source/HaxeUnitTests/Public/BasicTypesSub.h
+++ b/Source/HaxeUnitTests/Public/BasicTypesSub.h
@@ -22,7 +22,6 @@ class HAXEUNITTESTS_API UBasicTypesSub1 : public UBasicTypesUObject
 
   static UBasicTypesUObject *SomeObject;
 
-  UFUNCTION()
   virtual int64 setText(FText text) override;
 
   UFUNCTION(BlueprintImplementableEvent)
@@ -133,7 +132,6 @@ class HAXEUNITTESTS_API UBasicTypesSub3 : public UBasicTypesSub2
   bool isSub3 = true;
   virtual bool setUI64_I64_Float_Double(uint64 ui64, int64 i64, float f, double d) override;
 
-  UFUNCTION()
   virtual int64 setText(FText text) override;
 
   static UBasicTypesSub3 *CreateFromCpp() {
diff --git a/Source/HaxeUnitTests/Public/BasicTypesUObject.cpp b/Source/HaxeUnitTests/Public/BasicTypesUObject.cpp
index 3fe3516..9aaca97 100644
--- a/Source/HaxeUnitTests/Public/BasicTypesUObject.cpp
+++ b/Source/HaxeUnitTests/Public/BasicTypesUObject.cpp
@@ -1,5 +1,5 @@
-#include "HaxeUnitTests.h"
 #include "BasicTypesUObject.h"
+#include "HaxeUnitTests.h"
 
 int UBasicTypesUObject::someStaticInt = 0;
 
diff --git a/Source/HaxeUnitTests/Public/HaxeUnitTestsGameMode.cpp b/Source/HaxeUnitTests/Public/HaxeUnitTestsGameMode.cpp
index 42d790e..5c2e4a2 100644
--- a/Source/HaxeUnitTests/Public/HaxeUnitTestsGameMode.cpp
+++ b/Source/HaxeUnitTests/Public/HaxeUnitTestsGameMode.cpp
@@ -1,7 +1,7 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
-#include "HaxeUnitTests.h"
 #include "HaxeUnitTestsGameMode.h"
+#include "HaxeUnitTests.h"
 
 
 
diff --git a/Source/HaxeUnitTests/Public/NonUObject.cpp b/Source/HaxeUnitTests/Public/NonUObject.cpp
index b5e74b9..fde3a59 100644
--- a/Source/HaxeUnitTests/Public/NonUObject.cpp
+++ b/Source/HaxeUnitTests/Public/NonUObject.cpp
@@ -1,5 +1,5 @@
-#include "HaxeUnitTests.h"
 #include "NonUObject.h"
+#include "HaxeUnitTests.h"
 
 int FSimpleStruct::someStaticInt = 442;
 
diff --git a/Source/HaxeUnitTests/Public/TemplatesDef.cpp b/Source/HaxeUnitTests/Public/TemplatesDef.cpp
index 71471ac..a982864 100644
--- a/Source/HaxeUnitTests/Public/TemplatesDef.cpp
+++ b/Source/HaxeUnitTests/Public/TemplatesDef.cpp
@@ -1,5 +1,5 @@
-#include "HaxeUnitTests.h"
 #include "TemplatesDef.h"
+#include "HaxeUnitTests.h"
 
 int UTemplatesDef::someStaticInt = 42;
 
diff --git a/Source/HaxeUnitTests/Public/TestTools.cpp b/Source/HaxeUnitTests/Public/TestTools.cpp
index b4eac49..d64098c 100644
--- a/Source/HaxeUnitTests/Public/TestTools.cpp
+++ b/Source/HaxeUnitTests/Public/TestTools.cpp
@@ -1,5 +1,5 @@
-#include "HaxeUnitTests.h"
 #include "TestTools.h"
+#include "HaxeUnitTests.h"
 #include "Modules/ModuleManager.h"
 #if WITH_EDITOR
 #include "ISessionFrontendModule.h"