I don't see VCL or NT351 being checked in any ifdef

So drop the GVER thing and -DVCL and -DNT351.

set_soenv.in

@@ -51,7 +51,7 @@ my ( $SOLAR_JAVA,
 #
 # Platform dependent constant values.
 my ( $COM, $ARCH, $CPU, $CPUNAME, $GUI, $GUIBASE,
-      $GVER, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR,
+      $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR,
       $DYNAMIC_CRT, $use_shl_versions, $JRELIBDIR,
       $JRETOOLKITDIR, $JRETHREADDIR );
 #
@@ -208,7 +208,6 @@ if ( $platform =~ m/solaris/ )
    $COMPATH        = '@COMPATH@';
    $GUI            = "UNX";
    $GUIBASE        = "unx";
-   $GVER           = "VCL";
    $INPATH         = $OUTPATH.$PROEXT;
    $OS             = "SOLARIS";
    $PATH_SEPERATOR = $ps;
@@ -257,7 +256,6 @@ elsif ( $platform =~ m/netbsd/ )
       $COMPATH        = '@COMPATH@';
       $GUI            = "UNX";
       $GUIBASE        = "unx";
-      $GVER           = "VCL";
       $OS             = "NETBSD";
       $PATH_SEPERATOR = $ps;
       $OUTPATH        = "unxnbsd";
@@ -271,7 +269,6 @@ elsif ( $platform =~ m/kfreebsd/ )
       $COMPATH        = '@COMPATH@';
       $GUI            = "UNX";
       $GUIBASE        = "unx";
-      $GVER           = "VCL";
       $OS             = "LINUX";
       $PATH_SEPERATOR = $ps;
 
@@ -307,7 +304,6 @@ elsif ( $platform =~ m/freebsd/ )
       $COMPATH        = '@COMPATH@';
       $GUI            = "UNX";
       $GUIBASE        = "unx";
-      $GVER           = "VCL";
       $OS             = "FREEBSD";
       $PATH_SEPERATOR = $ps;
       $OSVERSION      = '@OSVERSION@';
@@ -351,7 +347,6 @@ elsif ( $platform =~ m/openbsd/ )
       $COMPATH        = '@COMPATH@';
       $GUI            = "UNX";
       $GUIBASE        = "unx";
-      $GVER           = "VCL";
       $OS             = "OPENBSD";
       $PATH_SEPERATOR = $ps;
       $OSVERSION      = '@OSVERSION@';
@@ -387,7 +382,6 @@ elsif ( $platform =~ m/linux/ )
       $COMPATH        = '@COMPATH@';
       $GUI            = "UNX";
       $GUIBASE        = "unx";
-      $GVER           = "VCL";
       $OS             = "LINUX";
       $PATH_SEPERATOR = $ps;
 
@@ -632,7 +626,6 @@ elsif ( $platform =~ m/cygwin|mingw32/ )
       $CPU            = "X" if $CL_X64;
       $GUI            = "WNT";
       $GUIBASE        = "WIN";
-      $GVER           = "NT351";
       $OS             = "WNT";
       $DYNAMIC_CRT    = "TRUE";
       $use_shl_versions = "TRUE";
@@ -719,7 +712,6 @@ elsif ( $platform =~ m/darwin/ )
         $MACOSX_SDK_PATH='@MACOSX_SDK_PATH@';
         $FRAMEWORKSHOME = $MACOSX_SDK_PATH."/System/Library/Frameworks";
     }
-    $GVER           = "VCL";
     $INPATH         = $OUTPATH.$PROEXT;
     $PATH_SEPERATOR = $ps;
 }
@@ -750,7 +742,6 @@ elsif ( $platform =~ m/dragonfly/ )
       $COMPATH        = '@COMPATH@';
       $GUI            = "UNX";
       $GUIBASE        = "unx";
-      $GVER           = "VCL";
       $OS             = "DRAGONFLY";
       $PATH_SEPERATOR = $ps;
       $OUTPATH        = "unxdfly";
@@ -771,7 +762,6 @@ elsif ( $platform =~ m/aix/ )
    $COMPATH        = '@COMPATH@';
    $GUI            = "UNX";
    $GUIBASE        = "unx";
-   $GVER           = "VCL";
    $INPATH         = $OUTPATH.$PROEXT;
    $OS             = "AIX";
    $PATH_SEPERATOR = $ps;
@@ -1553,7 +1543,6 @@ ToFile( "CPU",               $CPU,               "e" );
 ToFile( "CPUNAME",           $CPUNAME,           "e" );
 ToFile( "GUI",               $GUI,               "e" );
 ToFile( "GUIBASE",           $GUIBASE,           "e" );
-ToFile( "GVER",              $GVER,              "e" );
 ToFile( "OS",                $OS,                "e" );
 ToFile( "OSVERSION",         $OSVERSION,         "e" );
 ToFile( "PTHREAD_CFLAGS",    "@PTHREAD_CFLAGS@", "e" );

solenv/gbuild/gbuild.mk

@@ -182,7 +182,6 @@ gb_GLOBALDEFS := \
 	-D_REENTRANT \
 	-DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \
 	-DSUPD=$(UPD) \
-	-DVCL \
 	$(gb_OSDEFS) \
 	$(gb_COMPILERDEFS) \
 	$(gb_CPUDEFS) \

solenv/gbuild/platform/WNT_INTEL_GCC.mk

@@ -39,7 +39,6 @@ gb_RC := $(WINDRES)
 gb_OSDEFS := \
 	-DWINVER=0x0500 \
 	-D_WIN32_IE=0x0500 \
-	-DNT351 \
 	-DWIN32 \
 	-DWNT \
 

solenv/gbuild/platform/WNT_INTEL_MSC.mk

@@ -52,7 +52,6 @@ endif
 gb_OSDEFS := \
 	-DWINVER=0x0500 \
 	-D_WIN32_IE=0x0500 \
-	-DNT351 \
 	-DWIN32 \
 	-DWNT \
 

solenv/inc/set_wntx64.mk

@@ -46,7 +46,7 @@ USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:forScope,wchar_t- -GR
 # Stack buffer overrun detection.
 CFLAGS+=-GS
 
-USE_CDEFS_X64+= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -DX86_64 -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
+USE_CDEFS_X64+= -D$(OS) -D$(GUI) -D$(COM) -DX86_64 -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
 .IF "$(debug)"!=""
 USE_CFLAGS_X64+=-Zi -Fd$(MISC_X64)/$(@:b).pdb
 USE_CDEFS_X64+=-DDEBUG

solenv/inc/settings.mk

@@ -807,7 +807,7 @@ CDEFS=-D$(OS)
 .IF "$(GUI)" != "$(OS)"
 CDEFS+=-D$(GUI)
 .ENDIF
-CDEFS+=-D$(GVER) -D$(COM) -D$(CPUNAME)
+CDEFS+=-D$(COM) -D$(CPUNAME)
 
 .IF "$(USE_DEBUG_RUNTIME)" != ""
 CDEFS+=-D_DEBUG_RUNTIME
@@ -897,7 +897,7 @@ RSCUPDVER=$(RSCREVISION)
 RSCUPDVERDEF=-DUPDVER="$(RSCUPDVER)"
 
 RSCFLAGS=-s
-RSCDEFS=-D$(GUI) -D$(GVER) -D$(COM) $(JAVADEF)
+RSCDEFS=-D$(GUI) -D$(COM) $(JAVADEF)
 
 RSCDEFIMG*=default_images
 

solenv/inc/startup/startup.mk

@@ -33,7 +33,7 @@ CALLTARGETS=$(MAKETARGETS)
 .INCLUDEDIRS : $(DMAKE_INC) $(SOLARVERSION)$/$(INPATH)$/inc $(SOLARENV)$/inc
 
 # Grab key definitions from the environment
-# .IMPORT .IGNORE : OS TMPDIR UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME GVER COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT VCL ENVCFLAGS
+# .IMPORT .IGNORE : OS TMPDIR UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT ENVCFLAGS
 
 .IF "$(OS)" == "" || "$(OS)" == "Windows_NT"
 .ERROR : ; @echo Forced error: Environment variable OS has to be set for OOo build!

tools/Library_tl.mk

@@ -39,7 +39,6 @@ $(eval $(call gb_Library_set_include,tl,\
 
 $(eval $(call gb_Library_add_defs,tl,\
     -DTOOLS_DLLIMPLEMENTATION \
-    -DVCL \
 ))
 
 $(eval $(call gb_Library_add_api,tl,\