diff --git a/DesktopEditor/graphics/pro/js/drawingfile.json b/DesktopEditor/graphics/pro/js/drawingfile.json
index 324a23f25c..29b86c1ff0 100644
--- a/DesktopEditor/graphics/pro/js/drawingfile.json
+++ b/DesktopEditor/graphics/pro/js/drawingfile.json
@@ -163,7 +163,7 @@
 	{
 		"name": "d",
 		"folder": "../../../../DjVuFile/libdjvu/",
-		"files": ["../DjVu.cpp", "../DjVuFileImplementation.cpp", "Arrays.cpp", "BSByteStream.cpp", "BSEncodeByteStream.cpp", "ByteStream.cpp", "DataPool.cpp", "debug.cpp", "DjVmDir.cpp", "DjVmDir0.cpp", "DjVmDoc.cpp", "DjVmNav.cpp", "DjVuAnno.cpp", "DjVuDocEditor.cpp", "DjVuDocument.cpp", "DjVuDumpHelper.cpp", "DjVuErrorList.cpp", "DjVuFile.cpp", "DjVuFileCache.cpp", "DjVuGlobal.cpp", "DjVuGlobalMemory.cpp", "DjVuImage.cpp", "DjVuInfo.cpp", "DjVuMessageLite.cpp", "DjVuNavDir.cpp", "DjVuPalette.cpp", "DjVuPort.cpp", "DjVuText.cpp", "DjVuToPS.cpp", "GBitmap.cpp", "GContainer.cpp", "GException.cpp", "GIFFManager.cpp", "GMapAreas.cpp", "GPixmap.cpp", "GRect.cpp", "GScaler.cpp", "GSmartPointer.cpp", "DjVuGString.cpp", "GThreads.cpp", "GUnicode.cpp", "IFFByteStream.cpp", "IW44EncodeCodec.cpp", "IW44Image.cpp", "JB2EncodeCodec.cpp", "JB2Image.cpp", "JPEGDecoder.cpp", "MMRDecoder.cpp", "MMX.cpp", "UnicodeByteStream.cpp", "XMLParser.cpp", "XMLTags.cpp", "ZPCodec.cpp"]
+		"files": ["../DjVu.cpp", "../DjVuFileImplementation.cpp", "Arrays.cpp", "BSByteStream.cpp", "BSEncodeByteStream.cpp", "ByteStream.cpp", "DataPool.cpp", "debug.cpp", "DjVmDir.cpp", "DjVmDir0.cpp", "DjVmDoc.cpp", "DjVmNav.cpp", "DjVuAnno.cpp", "DjVuDocEditor.cpp", "DjVuDocument.cpp", "DjVuDumpHelper.cpp", "DjVuErrorList.cpp", "DjVuFile.cpp", "DjVuFileCache.cpp", "DjVuGlobal.cpp", "DjVuGlobalMemory.cpp", "DjVuImage.cpp", "DjVuInfo.cpp", "DjVuMessageLite.cpp", "DjVuNavDir.cpp", "DjVuPalette.cpp", "DjVuPort.cpp", "DjVuText.cpp", "DjVuToPS.cpp", "GBitmap.cpp", "GContainer.cpp", "GException.cpp", "GIFFManager.cpp", "GMapAreas.cpp", "GPixmap.cpp", "GRect.cpp", "GScaler.cpp", "GSmartPointer.cpp", "GString.cpp", "GThreads.cpp", "GUnicode.cpp", "IFFByteStream.cpp", "IW44EncodeCodec.cpp", "IW44Image.cpp", "JB2EncodeCodec.cpp", "JB2Image.cpp", "JPEGDecoder.cpp", "MMRDecoder.cpp", "MMX.cpp", "UnicodeByteStream.cpp", "XMLParser.cpp", "XMLTags.cpp", "ZPCodec.cpp"]
 	},
 	{
 		"name": "dj",
diff --git a/DesktopEditor/graphics/pro/js/qt/nativegraphics.pro b/DesktopEditor/graphics/pro/js/qt/nativegraphics.pro
index e111850d90..c871fdea84 100644
--- a/DesktopEditor/graphics/pro/js/qt/nativegraphics.pro
+++ b/DesktopEditor/graphics/pro/js/qt/nativegraphics.pro
@@ -515,7 +515,7 @@ HEADERS += \
     $$DJVU_ROOT_DIR/libdjvu/GRect.h \
     $$DJVU_ROOT_DIR/libdjvu/GScaler.h \
     $$DJVU_ROOT_DIR/libdjvu/GSmartPointer.h \
-    $$DJVU_ROOT_DIR/libdjvu/DjVuGString.h \
+    $$DJVU_ROOT_DIR/libdjvu/GString.h \
     $$DJVU_ROOT_DIR/libdjvu/GThreads.h \
     $$DJVU_ROOT_DIR/libdjvu/GURL.h \
     $$DJVU_ROOT_DIR/libdjvu/IFFByteStream.h \
@@ -571,7 +571,7 @@ SOURCES += \
     $$DJVU_ROOT_DIR/libdjvu/GRect.cpp \
     $$DJVU_ROOT_DIR/libdjvu/GScaler.cpp \
     $$DJVU_ROOT_DIR/libdjvu/GSmartPointer.cpp \
-    $$DJVU_ROOT_DIR/libdjvu/DjVuGString.cpp \
+    $$DJVU_ROOT_DIR/libdjvu/GString.cpp \
     $$DJVU_ROOT_DIR/libdjvu/GThreads.cpp \
     $$DJVU_ROOT_DIR/libdjvu/GUnicode.cpp \
     #$$DJVU_ROOT_DIR/libdjvu/GURL.cpp \
diff --git a/DjVuFile/DjVuFile.pro b/DjVuFile/DjVuFile.pro
index b5248cd172..240be44188 100644
--- a/DjVuFile/DjVuFile.pro
+++ b/DjVuFile/DjVuFile.pro
@@ -83,7 +83,7 @@ SOURCES += DjVu.cpp \
     libdjvu/GRect.cpp \
     libdjvu/GScaler.cpp \
     libdjvu/GSmartPointer.cpp \
-    libdjvu/DjVuGString.cpp \
+    libdjvu/GString.cpp \
     libdjvu/GThreads.cpp \
     libdjvu/GUnicode.cpp \
     libdjvu/GURL.cpp \
@@ -139,7 +139,7 @@ HEADERS +=     DjVu.h \
     libdjvu/GRect.h \
     libdjvu/GScaler.h \
     libdjvu/GSmartPointer.h \
-    libdjvu/DjVuGString.h \
+    libdjvu/GString.h \
     libdjvu/GThreads.h \
     libdjvu/GURL.h \
     libdjvu/IFFByteStream.h \
diff --git a/DjVuFile/libdjvu/BSEncodeByteStream.cpp b/DjVuFile/libdjvu/BSEncodeByteStream.cpp
index 4f2f0df27a..730287c1d8 100644
--- a/DjVuFile/libdjvu/BSEncodeByteStream.cpp
+++ b/DjVuFile/libdjvu/BSEncodeByteStream.cpp
@@ -68,7 +68,7 @@
 
 
 #include "BSByteStream.h"
-#include "DjVuGString.h"
+#include "GString.h"
 #undef BSORT_TIMER
 #ifdef BSORT_TIMER
 #include "GOS.h"
diff --git a/DjVuFile/libdjvu/DataPool.cpp b/DjVuFile/libdjvu/DataPool.cpp
index 91f334a96a..fe17cfa5f6 100644
--- a/DjVuFile/libdjvu/DataPool.cpp
+++ b/DjVuFile/libdjvu/DataPool.cpp
@@ -65,7 +65,7 @@
 
 #include "DataPool.h"
 #include "IFFByteStream.h"
-#include "DjVuGString.h"
+#include "GString.h"
 #include "GOS.h"
 #include "GURL.h"
 #include "debug.h"
diff --git a/DjVuFile/libdjvu/DataPool.h b/DjVuFile/libdjvu/DataPool.h
index 445bfe0f6d..8e966b0477 100644
--- a/DjVuFile/libdjvu/DataPool.h
+++ b/DjVuFile/libdjvu/DataPool.h
@@ -67,7 +67,7 @@
 
 
 #include "GThreads.h"
-#include "DjVuGString.h"
+#include "GString.h"
 #include "GURL.h"
 
 #ifdef HAVE_NAMESPACES
diff --git a/DjVuFile/libdjvu/DjVmDir.h b/DjVuFile/libdjvu/DjVmDir.h
index cbf5202270..b647290226 100644
--- a/DjVuFile/libdjvu/DjVmDir.h
+++ b/DjVuFile/libdjvu/DjVmDir.h
@@ -118,7 +118,7 @@
 
 
 
-#include "DjVuGString.h"
+#include "GString.h"
 #include "GThreads.h"
 
 #ifdef HAVE_NAMESPACES
diff --git a/DjVuFile/libdjvu/DjVmDir0.h b/DjVuFile/libdjvu/DjVmDir0.h
index 5e135bff15..2944c0ac12 100644
--- a/DjVuFile/libdjvu/DjVmDir0.h
+++ b/DjVuFile/libdjvu/DjVmDir0.h
@@ -66,7 +66,7 @@
 #endif
 
 
-#include "DjVuGString.h"
+#include "GString.h"
 
 #ifdef HAVE_NAMESPACES
 namespace DJVU {
diff --git a/DjVuFile/libdjvu/DjVmNav.h b/DjVuFile/libdjvu/DjVmNav.h
index 9e940e69fa..8ed1332ce4 100644
--- a/DjVuFile/libdjvu/DjVmNav.h
+++ b/DjVuFile/libdjvu/DjVmNav.h
@@ -66,7 +66,7 @@
 #endif
 
 #include "DjVuGlobal.h"
-#include "DjVuGString.h"
+#include "GString.h"
 #include "GThreads.h"
 
 #ifdef HAVE_NAMESPACES
diff --git a/DjVuFile/libdjvu/DjVuAnno.h b/DjVuFile/libdjvu/DjVuAnno.h
index 684c86e678..035d2b81b2 100644
--- a/DjVuFile/libdjvu/DjVuAnno.h
+++ b/DjVuFile/libdjvu/DjVuAnno.h
@@ -91,7 +91,7 @@
 //@{
 
 
-#include "DjVuGString.h"
+#include "GString.h"
 
 #ifdef HAVE_NAMESPACES
 namespace DJVU {
diff --git a/DjVuFile/libdjvu/DjVuDocument.cpp b/DjVuFile/libdjvu/DjVuDocument.cpp
index cb5792ef0d..020d8f2298 100644
--- a/DjVuFile/libdjvu/DjVuDocument.cpp
+++ b/DjVuFile/libdjvu/DjVuDocument.cpp
@@ -78,7 +78,7 @@
 
 #include "debug.h"
 
-#if defined(__linux__) || defined(LINUX) || defined(BUILDING_WASM_MODULE)
+#if defined(__linux__) || defined(LINUX)
 typedef unsigned int	UINT;
 #endif
 
diff --git a/DjVuFile/libdjvu/DjVuGlobal.h b/DjVuFile/libdjvu/DjVuGlobal.h
index 2a2cd9c097..265f4bdc61 100644
--- a/DjVuFile/libdjvu/DjVuGlobal.h
+++ b/DjVuFile/libdjvu/DjVuGlobal.h
@@ -75,11 +75,9 @@ inline void * operator new(size_t, void * ptr) { return ptr; }
 # include <new>
 #endif
 
-#ifndef BUILDING_WASM_MODULE
 #ifdef WIN32
 #include <new.h>
 #endif
-#endif
 
 //#ifdef WIN32
 //# ifdef DLL_EXPORT
diff --git a/DjVuFile/libdjvu/DjVuInfo.cpp b/DjVuFile/libdjvu/DjVuInfo.cpp
index 74a9c19ab2..607bbceb4e 100644
--- a/DjVuFile/libdjvu/DjVuInfo.cpp
+++ b/DjVuFile/libdjvu/DjVuInfo.cpp
@@ -66,7 +66,7 @@
 #include "DjVuInfo.h"
 #include "GException.h"
 #include "ByteStream.h"
-#include "DjVuGString.h"
+#include "GString.h"
 
 
 #ifdef HAVE_NAMESPACES
diff --git a/DjVuFile/libdjvu/DjVuMessageLite.h b/DjVuFile/libdjvu/DjVuMessageLite.h
index 5cd63235f6..598bc0de76 100644
--- a/DjVuFile/libdjvu/DjVuMessageLite.h
+++ b/DjVuFile/libdjvu/DjVuMessageLite.h
@@ -71,7 +71,7 @@
 // and added support for non I18N messages. 
 
 
-#include "DjVuGString.h"
+#include "GString.h"
 
 #ifdef HAVE_NAMESPACES
 namespace DJVU {
diff --git a/DjVuFile/libdjvu/DjVuNavDir.h b/DjVuFile/libdjvu/DjVuNavDir.h
index f365ae6f83..6ecca4c123 100644
--- a/DjVuFile/libdjvu/DjVuNavDir.h
+++ b/DjVuFile/libdjvu/DjVuNavDir.h
@@ -66,7 +66,7 @@
 #endif
 
 
-#include "DjVuGString.h"
+#include "GString.h"
 #include "GThreads.h"
 #include "GURL.h"
 
diff --git a/DjVuFile/libdjvu/GBitmap.cpp b/DjVuFile/libdjvu/GBitmap.cpp
index e0648b80cd..d25495b787 100644
--- a/DjVuFile/libdjvu/GBitmap.cpp
+++ b/DjVuFile/libdjvu/GBitmap.cpp
@@ -66,7 +66,7 @@
 #include "GBitmap.h"
 #include "ByteStream.h"
 #include "GRect.h"
-#include "DjVuGString.h"
+#include "GString.h"
 #include "GThreads.h"
 #include "GException.h"
 #include <string.h>
diff --git a/DjVuFile/libdjvu/GException.cpp b/DjVuFile/libdjvu/GException.cpp
index b38520f869..bfa9ae72bc 100644
--- a/DjVuFile/libdjvu/GException.cpp
+++ b/DjVuFile/libdjvu/GException.cpp
@@ -259,7 +259,7 @@ GExceptionHandler::rethrow(void)
 // This is not activated when C++ memory management
 // is overidden.  The overriding functions handle
 // memory exceptions by themselves.
-# if defined(_MSC_VER) && !defined(BUILDING_WASM_MODULE)
+# if defined(_MSC_VER)
 // Microsoft is different!
 static int throw_memory_error(size_t) { G_THROW(GException::outofmemory); return 0; }
 static int (*old_handler)(size_t) = _set_new_handler(throw_memory_error);
diff --git a/DjVuFile/libdjvu/GIFFManager.h b/DjVuFile/libdjvu/GIFFManager.h
index 387af40363..f8b55d0ecd 100644
--- a/DjVuFile/libdjvu/GIFFManager.h
+++ b/DjVuFile/libdjvu/GIFFManager.h
@@ -70,7 +70,7 @@
 #include "GContainer.h"
 #include "Arrays.h"
 #include "GSmartPointer.h"
-#include "DjVuGString.h"
+#include "GString.h"
 
 #ifdef HAVE_NAMESPACES
 namespace DJVU {
diff --git a/DjVuFile/libdjvu/GMapAreas.h b/DjVuFile/libdjvu/GMapAreas.h
index 8b2f17d02d..e27dddde19 100644
--- a/DjVuFile/libdjvu/GMapAreas.h
+++ b/DjVuFile/libdjvu/GMapAreas.h
@@ -68,7 +68,7 @@
 
 #include "GSmartPointer.h"
 #include "GContainer.h"
-#include "DjVuGString.h"
+#include "GString.h"
 #include "GRect.h"
 #include "GURL.h"
 
diff --git a/DjVuFile/libdjvu/GOS.h b/DjVuFile/libdjvu/GOS.h
index 44c2ec5c6b..085e22b6b0 100644
--- a/DjVuFile/libdjvu/GOS.h
+++ b/DjVuFile/libdjvu/GOS.h
@@ -87,7 +87,7 @@
 //@{
 
 #include "DjVuGlobal.h"
-#include "DjVuGString.h"
+#include "GString.h"
 
 #ifdef HAVE_NAMESPACES
 namespace DJVU {
diff --git a/DjVuFile/libdjvu/GPixmap.cpp b/DjVuFile/libdjvu/GPixmap.cpp
index 26ff67a3ab..8d77ac95d4 100644
--- a/DjVuFile/libdjvu/GPixmap.cpp
+++ b/DjVuFile/libdjvu/GPixmap.cpp
@@ -70,7 +70,7 @@
 
 #include "GPixmap.h"
 
-#include "DjVuGString.h"
+#include "GString.h"
 #include "GException.h"
 #include "ByteStream.h"
 #include "GRect.h"
diff --git a/DjVuFile/libdjvu/DjVuGString.cpp b/DjVuFile/libdjvu/GString.cpp
similarity index 99%
rename from DjVuFile/libdjvu/DjVuGString.cpp
rename to DjVuFile/libdjvu/GString.cpp
index 95230cc267..df827054d6 100644
--- a/DjVuFile/libdjvu/DjVuGString.cpp
+++ b/DjVuFile/libdjvu/GString.cpp
@@ -72,7 +72,7 @@
 # pragma implementation
 #endif
 
-#include "DjVuGString.h"
+#include "GString.h"
 #include "GThreads.h"
 #include "debug.h"
 
diff --git a/DjVuFile/libdjvu/DjVuGString.h b/DjVuFile/libdjvu/GString.h
similarity index 100%
rename from DjVuFile/libdjvu/DjVuGString.h
rename to DjVuFile/libdjvu/GString.h
diff --git a/DjVuFile/libdjvu/GURL.h b/DjVuFile/libdjvu/GURL.h
index dfd6d65534..92f9e367c4 100644
--- a/DjVuFile/libdjvu/GURL.h
+++ b/DjVuFile/libdjvu/GURL.h
@@ -66,7 +66,7 @@
 #endif
 
 
-#include "DjVuGString.h"
+#include "GString.h"
 #include "Arrays.h"
 #include "GThreads.h"
 
diff --git a/DjVuFile/libdjvu/GUnicode.cpp b/DjVuFile/libdjvu/GUnicode.cpp
index 21bf02d38d..6bbf6b7734 100644
--- a/DjVuFile/libdjvu/GUnicode.cpp
+++ b/DjVuFile/libdjvu/GUnicode.cpp
@@ -63,7 +63,7 @@
 # pragma implementation
 #endif
 
-#include "DjVuGString.h"
+#include "GString.h"
 #if HAS_ICONV
 #include <iconv.h>
 #endif
diff --git a/DjVuFile/libdjvu/IFFByteStream.h b/DjVuFile/libdjvu/IFFByteStream.h
index 69f3043e38..26066a39a8 100644
--- a/DjVuFile/libdjvu/IFFByteStream.h
+++ b/DjVuFile/libdjvu/IFFByteStream.h
@@ -132,7 +132,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "GException.h"
-#include "DjVuGString.h"
+#include "GString.h"
 #include "ByteStream.h"
 
 
diff --git a/DjVuFile/libdjvu/JB2Image.h b/DjVuFile/libdjvu/JB2Image.h
index 4b651c46cc..03e4d18173 100644
--- a/DjVuFile/libdjvu/JB2Image.h
+++ b/DjVuFile/libdjvu/JB2Image.h
@@ -173,7 +173,7 @@
 //@{
 
 
-#include "DjVuGString.h"
+#include "GString.h"
 #include "ZPCodec.h"
 
 
diff --git a/DjVuFile/libdjvu/JPEGDecoder.cpp b/DjVuFile/libdjvu/JPEGDecoder.cpp
index cf1ca1a917..4407c0679e 100644
--- a/DjVuFile/libdjvu/JPEGDecoder.cpp
+++ b/DjVuFile/libdjvu/JPEGDecoder.cpp
@@ -99,7 +99,7 @@ extern "C" {
 #include "GPixmap.h"
 #ifdef LIBJPEGNAME
 #include "DjVuDynamic.h"
-#include "DjVuGString.h"
+#include "GString.h"
 #endif // LIBJPEGNAME
 
 
diff --git a/DjVuFile/libdjvu/UnicodeByteStream.h b/DjVuFile/libdjvu/UnicodeByteStream.h
index bedd539fd6..65cadf0a5b 100644
--- a/DjVuFile/libdjvu/UnicodeByteStream.h
+++ b/DjVuFile/libdjvu/UnicodeByteStream.h
@@ -88,7 +88,7 @@
 //@{
 
 #include "DjVuGlobal.h"
-#include "DjVuGString.h"
+#include "GString.h"
 #include "ByteStream.h"
 
 
diff --git a/DjVuFile/libdjvu/XMLTags.h b/DjVuFile/libdjvu/XMLTags.h
index 48336badc9..0d3acfe428 100644
--- a/DjVuFile/libdjvu/XMLTags.h
+++ b/DjVuFile/libdjvu/XMLTags.h
@@ -69,7 +69,7 @@
 // This is purely Lizardtech stuff.
 
 #include "GContainer.h"
-#include "DjVuGString.h"
+#include "GString.h"
 
 #ifdef HAVE_NAMESPACES
 namespace DJVU {
diff --git a/DjVuFile/libdjvu/debug.cpp b/DjVuFile/libdjvu/debug.cpp
index d07053a0b5..234ae52947 100644
--- a/DjVuFile/libdjvu/debug.cpp
+++ b/DjVuFile/libdjvu/debug.cpp
@@ -69,7 +69,7 @@
 
 #include "GThreads.h"
 #include "GContainer.h"
-#include "DjVuGString.h"
+#include "GString.h"
 #include "ByteStream.h"
 #include "GURL.h"
 
diff --git a/PdfReader/old/Graphics.cpp b/PdfReader/old/Graphics.cpp
index 70fc3c2693..5593536108 100644
--- a/PdfReader/old/Graphics.cpp
+++ b/PdfReader/old/Graphics.cpp
@@ -5145,4 +5145,3 @@ namespace PdfReader
 			m_pResources = NULL;
 	}
 }
-