diff --git a/Source/appfat.cpp b/Source/appfat.cpp
index 2cd154a10..7e98b0b31 100644
--- a/Source/appfat.cpp
+++ b/Source/appfat.cpp
@@ -2,34 +2,27 @@
 
 #include "../types.h"
 
-int appfat_terminated = 0; // weak
+// +Infinity after initialization of appfat.cpp.
+float appfat_cpp_init_value;
+
 char sz_error_buf[256];
 int terminating; // weak
 int cleanup_thread_id; // weak
 char empty_string;
 
-void __cdecl appfat_cpp_init()
-{
-	appfat_terminated = 0x7F800000;
-}
-
-struct j_appfat_cpp_init
-{
-	j_appfat_cpp_init()
-	{
-		appfat_cpp_init();
+// appfat_cpp_init initializes the C++ runtime of appfat.cpp.
+struct appfat_cpp_init {
+	appfat_cpp_init() {
+		appfat_cpp_init_value = INFINITY;
 	}
-} _j_appfat_cpp_init;
-/*
-bool __cdecl appfat_cpp_free(void *a1)
-{
-	bool result; // al
+} appfat_cpp_init;
 
-	if ( a1 )
-		result = SMemFree(a1, "delete", -1, 0);
-	return result;
+// delete overloads the delete operator.
+void operator delete(void *ptr) {
+	if (ptr != NULL) {
+		SMemFree(ptr, "delete", -1, 0);
+	}
 }
-*/
 
 char *__fastcall GetErr(int error_code)
 {
diff --git a/defs.h b/defs.h
index 5b67158e2..e415e4853 100644
--- a/defs.h
+++ b/defs.h
@@ -217,3 +217,8 @@ template<class T, class U> int8 __OFSUB__(T x, U y)
 #endif
 
 #endif /* IDA_GARBAGE */
+
+#ifndef INFINITY
+#include <limits>
+#define INFINITY std::numeric_limits<float>::infinity()
+#endif