Clean up dead legacy headers and compiler work arounds

Clean up dead macos files

Clean up dead windows build files

Signed-off-by: Rye <rye@alchemyviewer.org>

30 files changed, 9 insertions, 763 deletions

diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 7311c6faf6..980b8ca05c 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -117,8 +117,6 @@ set(llcommon_HEADER_FILES
     chrono.h
     classic_callback.h
     commoncontrol.h
-    ctype_workaround.h
-    fix_macros.h
     fsyspath.h
     function_types.h
     indra_constants.h
@@ -249,7 +247,6 @@ set(llcommon_HEADER_FILES
     threadpool.h
     threadpool_fwd.h
     threadsafeschedule.h
-    timer.h
     tuple.h
     u64.h
     workqueue.h
diff --git a/indra/llcommon/ctype_workaround.h b/indra/llcommon/ctype_workaround.h
deleted file mode 100644
index 89a47fe3db..0000000000
--- a/indra/llcommon/ctype_workaround.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * @file ctype_workaround.h
- * @brief The workaround is to create some legacy symbols that point
- * to the correct symbols, which avoids link errors.
- *
- * $LicenseInfo:firstyear=2006&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef _CTYPE_WORKAROUND_H_
-#define _CTYPE_WORKAROUND_H_
-
-/**
- * the CTYPE_WORKAROUND is needed for linux dev stations that don't
- * have the broken libc6 packages needed by our out-of-date static
- * libs (such as libcrypto and libcurl).
- *
- * -- Leviathan 20060113
-*/
-
-#include <cctype>
-
-__const unsigned short int *__ctype_b;
-__const __int32_t *__ctype_tolower;
-__const __int32_t *__ctype_toupper;
-
-// call this function at the beginning of main()
-void ctype_workaround()
-{
-    __ctype_b = *(__ctype_b_loc());
-    __ctype_toupper = *(__ctype_toupper_loc());
-    __ctype_tolower = *(__ctype_tolower_loc());
-}
-
-#endif
-
diff --git a/indra/llcommon/fix_macros.h b/indra/llcommon/fix_macros.h
deleted file mode 100644
index ed6c26a371..0000000000
--- a/indra/llcommon/fix_macros.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file   fix_macros.h
- * @author Nat Goodspeed
- * @date   2012-11-16
- * @brief  The Mac system headers seem to #define macros with obnoxiously
- *         generic names, preventing any library from using those names. We've
- *         had to fix these in so many places that it's worth making a header
- *         file to handle it.
- *
- * $LicenseInfo:firstyear=2012&license=viewerlgpl$
- * Copyright (c) 2012, Linden Research, Inc.
- * $/LicenseInfo$
- */
-
-// DON'T use an #include guard: every time we encounter this header, #undef
-// these macros all over again.
-
-// who injects MACROS with such generic names?! Grr.
-#ifdef check
-#undef check
-#endif
diff --git a/indra/llcommon/llapr.h b/indra/llcommon/llapr.h
index 11e474b5dd..0e1e4277e7 100644
--- a/indra/llcommon/llapr.h
+++ b/indra/llcommon/llapr.h
@@ -40,7 +40,7 @@
 
 #include "llstring.h"
 
-#include "mutex.h"
+#include <mutex>
 
 struct apr_dso_handle_t;
 /**
diff --git a/indra/llcommon/llcond.h b/indra/llcommon/llcond.h
index 2df1719941..b72ea33dea 100644
--- a/indra/llcommon/llcond.h
+++ b/indra/llcommon/llcond.h
@@ -17,7 +17,7 @@
 #include "llunits.h"
 #include "llcoros.h"
 #include LLCOROS_MUTEX_HEADER
-#include "mutex.h"
+#include <mutex>
 #include <chrono>
 
 /**
diff --git a/indra/llcommon/llcoros.h b/indra/llcommon/llcoros.h
index 9df52b6ed5..602c65b9ba 100644
--- a/indra/llcommon/llcoros.h
+++ b/indra/llcommon/llcoros.h
@@ -34,10 +34,10 @@
 #include <boost/fiber/future/future.hpp>
 #include <boost/fiber/future/promise.hpp>
 #include <boost/fiber/recursive_mutex.hpp>
-#include "mutex.h"
 #include "llsingleton.h"
 #include "llinstancetracker.h"
 #include <functional>
+#include <mutex>
 #include <string>
 #include <exception>
 #include <queue>
diff --git a/indra/llcommon/llfixedbuffer.h b/indra/llcommon/llfixedbuffer.h
index 1234d2014f..d2cd660c18 100644
--- a/indra/llcommon/llfixedbuffer.h
+++ b/indra/llcommon/llfixedbuffer.h
@@ -27,7 +27,7 @@
 #ifndef LL_LLFIXEDBUFFER_H
 #define LL_LLFIXEDBUFFER_H
 
-#include "timer.h"
+#include "lltimer.h"
 #include <deque>
 #include <string>
 #include "llstring.h"
diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h
index 5a7f27e688..734365767d 100644
--- a/indra/llcommon/llinstancetracker.h
+++ b/indra/llcommon/llinstancetracker.h
@@ -37,7 +37,7 @@
 #include <memory>
 #include <type_traits>
 
-#include "mutex.h"
+#include <mutex>
 
 #include <boost/iterator/transform_iterator.hpp>
 #include <boost/iterator/indirect_iterator.hpp>
diff --git a/indra/llcommon/llmutex.h b/indra/llcommon/llmutex.h
index f3615a1270..bc3d8fed06 100644
--- a/indra/llcommon/llmutex.h
+++ b/indra/llcommon/llmutex.h
@@ -30,7 +30,7 @@
 #include "stdtypes.h"
 #include "llthread.h"
 
-#include "mutex.h"
+#include <mutex>
 #include <shared_mutex>
 #include <unordered_map>
 #include <condition_variable>
diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h
index 3fba8602ee..81e69ab63c 100644
--- a/indra/llcommon/llsingleton.h
+++ b/indra/llcommon/llsingleton.h
@@ -30,7 +30,7 @@
 #include <list>
 #include <typeinfo>
 #include <vector>
-#include "mutex.h"
+#include <mutex>
 #include "lockstatic.h"
 #include "llthread.h"               // on_main_thread()
 #include "llmainthreadtask.h"
diff --git a/indra/llcommon/llthreadsafequeue.h b/indra/llcommon/llthreadsafequeue.h
index 1a1d06a6fd..2a18b4a438 100644
--- a/indra/llcommon/llthreadsafequeue.h
+++ b/indra/llcommon/llthreadsafequeue.h
@@ -32,7 +32,7 @@
 #include <boost/fiber/timed_mutex.hpp>
 #include LLCOROS_CONDVAR_HEADER
 #include "llexception.h"
-#include "mutex.h"
+#include <mutex>
 #include <chrono>
 #include <queue>
 #include <string>
diff --git a/indra/llcommon/lockstatic.h b/indra/llcommon/lockstatic.h
index 7cc9b7eec0..db4c7af0ec 100644
--- a/indra/llcommon/lockstatic.h
+++ b/indra/llcommon/lockstatic.h
@@ -13,7 +13,7 @@
 #if ! defined(LL_LOCKSTATIC_H)
 #define LL_LOCKSTATIC_H
 
-#include "mutex.h"                  // std::unique_lock
+#include <mutex> // std::unique_lock
 
 namespace llthread
 {
diff --git a/indra/llcommon/mutex.h b/indra/llcommon/mutex.h
deleted file mode 100644
index 82e46315e2..0000000000
--- a/indra/llcommon/mutex.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file   mutex.h
- * @author Nat Goodspeed
- * @date   2019-12-03
- * @brief  Wrap <mutex> in odious boilerplate
- *
- * $LicenseInfo:firstyear=2019&license=viewerlgpl$
- * Copyright (c) 2019, Linden Research, Inc.
- * $/LicenseInfo$
- */
-
-#if LL_WINDOWS
-#pragma warning (push)
-#pragma warning (disable:4265)
-#endif
-// warning C4265: 'std::_Pad' : class has virtual functions, but destructor is not virtual
-
-#include <mutex>
-
-#if LL_WINDOWS
-#pragma warning (pop)
-#endif
diff --git a/indra/llcommon/timer.h b/indra/llcommon/timer.h
deleted file mode 100644
index aaa0cf0775..0000000000
--- a/indra/llcommon/timer.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file timer.h
- * @brief Legacy wrapper header.
- *
- * $LicenseInfo:firstyear=2000&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-#include "lltimer.h"
diff --git a/indra/llcorehttp/_refcounted.h b/indra/llcorehttp/_refcounted.h
index 1a01d66d14..bc90f8274d 100644
--- a/indra/llcorehttp/_refcounted.h
+++ b/indra/llcorehttp/_refcounted.h
@@ -30,7 +30,6 @@
 
 #include "linden_common.h"
 
-#include "fix_macros.h"
 #include <boost/intrusive_ptr.hpp>
 #include "llatomic.h"
 
diff --git a/indra/llfilesystem/lldiriterator.cpp b/indra/llfilesystem/lldiriterator.cpp
index b736a577bd..57d4912c94 100644
--- a/indra/llfilesystem/lldiriterator.cpp
+++ b/indra/llfilesystem/lldiriterator.cpp
@@ -28,7 +28,6 @@
 
 #include "lldiriterator.h"
 
-#include "fix_macros.h"
 #include "llregex.h"
 #include <boost/filesystem.hpp>
 
diff --git a/indra/llmath/CMakeLists.txt b/indra/llmath/CMakeLists.txt
index fb57e5db11..a4e4d0a50b 100644
--- a/indra/llmath/CMakeLists.txt
+++ b/indra/llmath/CMakeLists.txt
@@ -46,8 +46,6 @@ set(llmath_SOURCE_FILES
 set(llmath_HEADER_FILES
     CMakeLists.txt
 
-    camera.h
-    coordframe.h
     llbbox.h
     llbboxlocal.h
     llcalc.h
diff --git a/indra/llmath/camera.h b/indra/llmath/camera.h
deleted file mode 100644
index 14a08c5985..0000000000
--- a/indra/llmath/camera.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file camera.h
- * @brief Legacy wrapper header.
- *
- * $LicenseInfo:firstyear=2000&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "llcamera.h"
diff --git a/indra/llmath/coordframe.h b/indra/llmath/coordframe.h
deleted file mode 100644
index e7395b1212..0000000000
--- a/indra/llmath/coordframe.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file coordframe.h
- * @brief Legacy wrapper header.
- *
- * $LicenseInfo:firstyear=2000&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "llcoordframe.h"
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h
index d703a84d02..dc8b7504c9 100644
--- a/indra/llwindow/llwindowmacosx.h
+++ b/indra/llwindow/llwindowmacosx.h
@@ -36,11 +36,6 @@
 #include <ApplicationServices/ApplicationServices.h>
 #include <OpenGL/OpenGL.h>
 
-// AssertMacros.h does bad things.
-#include "fix_macros.h"
-#undef verify
-#undef require
-
 class LLWindowMacOSX : public LLWindow
 {
 public:
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 09fb54faf4..c2b1473e8f 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1430,8 +1430,6 @@ set(viewer_HEADER_FILES
     noise.h
     pipeline.h
     roles_constants.h
-    VertexCache.h
-    VorbisFramework.h
     )
 
 source_group("CMake Rules" FILES ViewerInstall.cmake)
diff --git a/indra/newview/Info-SecondLifeVorbis.plist b/indra/newview/Info-SecondLifeVorbis.plist
deleted file mode 100644
index 9cb367eec1..0000000000
--- a/indra/newview/Info-SecondLifeVorbis.plist
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>SecondLifeVorbis</string>
-	<key>CFBundleGetInfoString</key>
-	<string></string>
-	<key>CFBundleIconFile</key>
-	<string></string>
-	<key>CFBundleIdentifier</key>
-	<string>com.secondlife.indra.vorbis</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>SecondLifeVorbis</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string></string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>0.0.1d1</string>
-</dict>
-</plist>
diff --git a/indra/newview/VertexCache.h b/indra/newview/VertexCache.h
deleted file mode 100644
index edb231feb1..0000000000
--- a/indra/newview/VertexCache.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * @file VertexCache.h
- * @brief VertexCache class definition
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-
-#ifndef VERTEX_CACHE_H
-
-#define VERTEX_CACHE_H
-
-class VertexCache
-{
-
-public:
-
-    VertexCache(int size)
-    {
-        numEntries = size;
-
-        entries = new int[numEntries];
-
-        for(int i = 0; i < numEntries; i++)
-            entries[i] = -1;
-    }
-
-    VertexCache() { VertexCache(16); }
-    ~VertexCache() { delete[] entries; entries = 0; }
-
-    bool InCache(int entry)
-    {
-        bool returnVal = false;
-        for(int i = 0; i < numEntries; i++)
-        {
-            if(entries[i] == entry)
-            {
-                returnVal = true;
-                break;
-            }
-        }
-
-        return returnVal;
-    }
-
-    int AddEntry(int entry)
-    {
-        int removed;
-
-        removed = entries[numEntries - 1];
-
-        //push everything right one
-        for(int i = numEntries - 2; i >= 0; i--)
-        {
-            entries[i + 1] = entries[i];
-        }
-
-        entries[0] = entry;
-
-        return removed;
-    }
-
-    void Clear()
-    {
-        memset(entries, -1, sizeof(int) * numEntries);
-    }
-
-    void Copy(VertexCache* inVcache)
-    {
-        for(int i = 0; i < numEntries; i++)
-        {
-            inVcache->Set(i, entries[i]);
-        }
-    }
-
-    int At(int index) { return entries[index]; }
-    void Set(int index, int value) { entries[index] = value; }
-
-private:
-
-  int *entries;
-  int numEntries;
-
-};
-
-#endif
diff --git a/indra/newview/VorbisFramework.h b/indra/newview/VorbisFramework.h
deleted file mode 100644
index 7ee9a8c411..0000000000
--- a/indra/newview/VorbisFramework.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * @file VorbisFramework.h
- * @author Dave Camp
- * @date Fri Oct 10 2003
- * @brief For the Macview project
- *
- * $LicenseInfo:firstyear=2003&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "ogg/ogg.h"
-#include "vorbis/codec.h"
-#include "vorbis/vorbisenc.h"
-
-extern int      mac_vorbis_analysis(vorbis_block *vb,ogg_packet *op);
-
-extern int      mac_vorbis_analysis_headerout(vorbis_dsp_state *v,
-                      vorbis_comment *vc,
-                      ogg_packet *op,
-                      ogg_packet *op_comm,
-                      ogg_packet *op_code);
-
-extern int mac_vorbis_analysis_init(vorbis_dsp_state *v,vorbis_info *vi);
-
-extern int mac_vorbis_encode_ctl(vorbis_info *vi,int number,void *arg);
-
-extern int mac_vorbis_encode_setup_init(vorbis_info *vi);
-
-extern int mac_vorbis_encode_setup_managed(vorbis_info *vi,
-                       long channels,
-                       long rate,
-
-                       long max_bitrate,
-                       long nominal_bitrate,
-                       long min_bitrate);
-
-extern void     mac_vorbis_info_init(vorbis_info *vi);
-extern void     mac_vorbis_info_clear(vorbis_info *vi);
-extern void     mac_vorbis_comment_init(vorbis_comment *vc);
-extern void     mac_vorbis_comment_clear(vorbis_comment *vc);
-extern int      mac_vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb);
-extern int      mac_vorbis_block_clear(vorbis_block *vb);
-extern void     mac_vorbis_dsp_clear(vorbis_dsp_state *v);
-extern float  **mac_vorbis_analysis_buffer(vorbis_dsp_state *v,int vals);
-extern int      mac_vorbis_analysis_wrote(vorbis_dsp_state *v,int vals);
-extern int      mac_vorbis_analysis_blockout(vorbis_dsp_state *v,vorbis_block *vb);
-
-extern int      mac_ogg_stream_packetin(ogg_stream_state *os, ogg_packet *op);
-extern int      mac_ogg_stream_init(ogg_stream_state *os,int serialno);
-extern int      mac_ogg_stream_flush(ogg_stream_state *os, ogg_page *og);
-extern int      mac_ogg_stream_pageout(ogg_stream_state *os, ogg_page *og);
-extern int      mac_ogg_page_eos(ogg_page *og);
-extern int      mac_ogg_stream_clear(ogg_stream_state *os);
-
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/indra/newview/build_win32_appConfig.py b/indra/newview/build_win32_appConfig.py
deleted file mode 100755
index 1bfcc7a9bc..0000000000
--- a/indra/newview/build_win32_appConfig.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# @file build_win32_appConfig.py
-# @brief Create the windows app.config file to redirect crt linkage.
-#
-# $LicenseInfo:firstyear=2009&license=viewerlgpl$
-# Second Life Viewer Source Code
-# Copyright (C) 2010, Linden Research, Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation;
-# version 2.1 of the License only.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-#
-# Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
-# $/LicenseInfo$
-
-import sys, os, re
-from xml.dom.minidom import parse
-
-def munge_binding_redirect_version(src_manifest_name, src_config_name, dst_config_name):
-    manifest_dom = parse(src_manifest_name)
-    node = manifest_dom.getElementsByTagName('assemblyIdentity')[0]
-    manifest_assm_ver = node.getAttribute('version')
-
-    config_dom = parse(src_config_name)
-    node = config_dom.getElementsByTagName('bindingRedirect')[0]
-    node.setAttribute('newVersion', manifest_assm_ver)
-    src_old_ver = re.match('([^-]*-).*', node.getAttribute('oldVersion')).group(1)
-    node.setAttribute('oldVersion', src_old_ver + manifest_assm_ver)
-    comment = config_dom.createComment("This file is automatically generated by the build. see indra/newview/build_win32_appConfig.py")
-    config_dom.insertBefore(comment, config_dom.childNodes[0])
-
-    print("Writing: " + dst_config_name)
-    f = open(dst_config_name, 'w')
-    config_dom.writexml(f)
-    f.close()
-
-
-
-def main():
-    config = sys.argv[1]
-    src_dir = sys.argv[2]
-    dst_dir = sys.argv[3]
-    dst_name = sys.argv[4]
-
-    if config.lower() == 'debug':
-        src_manifest_name = dst_dir + '/Microsoft.VC80.DebugCRT.manifest'
-        src_config_name = src_dir + '/SecondLifeDebug.exe.config'
-    else:
-        src_manifest_name = dst_dir + '/Microsoft.VC80.CRT.manifest'
-        src_config_name = src_dir + '/SecondLife.exe.config'
-
-    dst_config_name = dst_dir + '/' + dst_name
-
-    munge_binding_redirect_version(src_manifest_name, src_config_name, dst_config_name)
-
-    return 0
-
-if __name__ == "__main__":
-    main()
diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp
index 6e56aac270..a5ab5538e7 100644
--- a/indra/newview/lllocalbitmaps.cpp
+++ b/indra/newview/lllocalbitmaps.cpp
@@ -31,8 +31,6 @@
 /* own header */
 #include "lllocalbitmaps.h"
 
-/* boost: will not compile unless equivalent is undef'd, beware. */
-#include "fix_macros.h"
 #include <boost/filesystem.hpp>
 
 /* image compression headers. */
diff --git a/indra/newview/lllocalgltfmaterials.cpp b/indra/newview/lllocalgltfmaterials.cpp
index d6facad23d..aeae7cb56a 100644
--- a/indra/newview/lllocalgltfmaterials.cpp
+++ b/indra/newview/lllocalgltfmaterials.cpp
@@ -30,8 +30,6 @@
 /* own header */
 #include "lllocalgltfmaterials.h"
 
-/* boost: will not compile unless equivalent is undef'd, beware. */
-#include "fix_macros.h"
 #include <boost/filesystem.hpp>
 
 /* time headers */
diff --git a/indra/newview/macutil_Prefix.h b/indra/newview/macutil_Prefix.h
deleted file mode 100644
index 4972ee4fa5..0000000000
--- a/indra/newview/macutil_Prefix.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * @file macutil_Prefix.h
- * @brief Precompiled prefix file
- *
- * $LicenseInfo:firstyear=2005&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-/*
- *
- *  Precompiled prefix file used for
- *      AutoUpdater
- *      crashreporter
- *
- */
-
-#include "fix_macros.h"
-
-#undef verify
-#undef require
diff --git a/indra/newview/macview_Prefix.h b/indra/newview/macview_Prefix.h
deleted file mode 100644
index faad8fa704..0000000000
--- a/indra/newview/macview_Prefix.h
+++ /dev/null
@@ -1,229 +0,0 @@
-/**
- * @file macview_Prefix.h
- * @brief Prefix header for all source files of the 'newview' target in the 'newview' project.
- *
- * $LicenseInfo:firstyear=2003&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-// MBW -- This doesn't work.  There are some conflicts between things in Carbon.h and some of the linden source.
-//#include <Carbon/Carbon.h>
-
-////////////////// From llagent.cpp
-#include "llpreprocessor.h"
-#include "stdtypes.h"
-#include "stdenums.h"
-
-#include "llagent.h"
-
-#include "llcoordframe.h"
-#include "indra_constants.h"
-#include "llmath.h"
-#include "llcriticaldamp.h"
-#include "llfocusmgr.h"
-#include "llparcel.h"
-#include "llpermissions.h"
-#include "llregionhandle.h"
-#include "m3math.h"
-#include "m4math.h"
-#include "message.h"
-#include "qmath.h"
-#include "v3math.h"
-#include "v4math.h"
-#include "vmath.h"
-//#include "llteleportflags.h"
-
-#include "llbox.h"
-#include "llbutton.h"
-#include "llconsole.h"
-#include "lldrawable.h"
-#include "llfirstuse.h"
-#include "llfloater.h"
-#include "llfloaterbuildoptions.h"
-#include "llfloaterchat.h"
-#include "llfloatergroups.h"
-#include "llfloaterworldmap.h"
-#include "llfloatermute.h"
-#include "llconversation.h"
-#include "llfloatertools.h"
-#include "llhudeffectlookat.h"
-#include "llhudmanager.h"
-#include "lljoystickbutton.h"
-#include "llmenugl.h"
-#include "llmorphview.h"
-#include "llmoveview.h"
-#include "llselectmgr.h"
-#include "llsky.h"
-#include "llrendersphere.h"
-#include "llstatusbar.h"
-#include "lltalkview.h"
-#include "lltool.h"
-#include "lltoolfocus.h"
-#include "lltoolcomp.h"     // for gToolGun
-#include "lltoolgrab.h"
-#include "lltoolmgr.h"
-#include "lltoolpie.h"
-#include "llui.h"           // for make_ui_sound
-#include "llviewercamera.h"
-#include "llviewermenu.h"
-#include "llviewerobjectlist.h"
-#include "llviewerparcelmgr.h"
-#include "llviewerparceloverlay.h"
-#include "llviewerregion.h"
-#include "llviewerstats.h"
-#include "llviewerwindow.h"
-#include "llvoavatar.h"
-#include "llvoground.h"
-#include "llvosky.h"
-#include "llworld.h"
-#include "pipeline.h"
-
-/////////////////// From llfloater.cpp
-#include "llbutton.h"
-#include "lldraghandle.h"
-#include "llfocusmgr.h"
-#include "llresizebar.h"
-#include "llresizehandle.h"
-#include "llresmgr.h"
-#include "llui.h"
-#include "llviewborder.h"
-#include "lluictrlfactory.h"
-
-
-/////////////////// From lldrawpool.cpp
-#include "llface.h"
-#include "llcontrol.h"
-#include "pipeline.h"
-
-#include "llviewerobjectlist.h" // For debug listing.
-
-//extern LLPipeline gPipeline;
-
-#include "lldrawpoolsimple.h"
-#include "lldrawpoolalpha.h"
-#include "lldrawpoolavatar.h"
-#include "lldrawpooltree.h"
-#include "lldrawpoolterrain.h"
-#include "lldrawpoolsky.h"
-#include "lldrawpoolwater.h"
-#include "lldrawpoolground.h"
-#include "lldrawpoolbump.h"
-
-/////////////////// From llface.cpp
-#include "llgl.h"
-#include "llviewerimage.h"
-#include "llsky.h"
-#include "llvosky.h"
-#include "llcontrol.h"
-#include "v3color.h"
-#include "pipeline.h"
-#include "llvolume.h"
-#include "llviewercamera.h"
-#include "lllightconstants.h"
-
-#include "llvovolume.h"
-#include "m3math.h"
-#include "lldrawpoolbump.h"
-
-
-
-/////////////////// From llpanel.cpp
-#include "llpanel.h"
-
-#include "llfontgl.h"
-#include "llrect.h"
-#include "llerror.h"
-#include "lltimer.h"
-
-#include "llmenugl.h"
-#include "llstatusbar.h"
-#include "llui.h"
-#include "llkeyboard.h"
-#include "llviewerwindow.h"
-#include "llcontrol.h"
-#include "lluictrl.h"
-#include "lluictrlfactory.h"
-#include "llviewborder.h"
-#include "llviewerimagelist.h"
-#include "llbutton.h"
-#include "llfocusmgr.h"
-
-
-
-/////////////////// From llvovolume.cpp
-#include "llvovolume.h"
-#include "llviewerimagelist.h"
-
-#include "llcontrol.h"
-
-#include "object_flags.h"
-
-#include "material_codes.h"
-#include "llagent.h"
-#include "llworld.h"
-#include "llviewerregion.h"
-#include "llprimitive.h"
-#include "llvolume.h"
-#include "lldrawable.h"
-#include "llface.h"
-#include "llvolumemgr.h"
-#include "llsky.h"
-
-#include "pipeline.h"
-#include "llmaterialtable.h"
-#include "message.h"
-#include "llviewertextureanim.h"
-#include "llviewercamera.h"
-#include "lldrawpoolbump.h"
-
-
-/////////////////// From llagentpilot.cpp
-#include "llagentpilot.h"
-#include "llagent.h"
-#include "llframestats.h"
-#include "viewer.h"
-#include "llcontrol.h"
-
-
-/////////////////// From llloginview.cpp
-#include "llloginview.h"
-
-#include "indra_constants.h"        // for key and mask constants
-#include "llfontgl.h"
-#include "v4color.h"
-#include "llwindow_impl.h"
-
-#include "llbutton.h"
-#include "llcheckboxctrl.h"
-#include "llcombobox.h"
-#include "llcontrol.h"
-#include "lllineeditor.h"
-#include "lltextbox.h"
-#include "llui.h"
-//#include "lluiconstants.h"
-#include "llviewerimagelist.h"
-#include "llviewermenu.h"           // for handle_preferences()
-#include "llviewerwindow.h"         // to link into child list
-#include "llfocusmgr.h"
-#include "llmd5.h"
-#include "llversion.h"
-#include "viewer.h"
-
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index fd8034b811..d515cea3fa 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -46,13 +46,6 @@
 #include "apr_pools.h"
 #include "apr_getopt.h"
 
-// the CTYPE_WORKAROUND is needed for linux dev stations that don't
-// have the broken libc6 packages needed by our out-of-date static
-// libs (such as libcrypto and libcurl). -- Leviathan 20060113
-#ifdef CTYPE_WORKAROUND
-#   include "ctype_workaround.h"
-#endif
-
 #include <boost/iostreams/tee.hpp>
 #include <boost/iostreams/stream.hpp>
 
@@ -619,10 +612,6 @@ int main(int argc, char **argv)
     LLFile::remove(test_log);
     LLError::logToFile(test_log);
 
-#ifdef CTYPE_WORKAROUND
-    ctype_workaround();
-#endif
-
     if (!sMasterThreadRecorder)
     {
         sMasterThreadRecorder = new LLTrace::ThreadRecorder();