Compilation changes

Few compile time attempts to speed things up

Swap include guards for pramga once
Change compile options in the cmakeLists for source
generate a pch

small tweaks

Engine/source/core/bitMatrix.h

@@ -19,16 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _BITMATRIX_H_
 #define _BITMATRIX_H_
-
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
-#ifndef _BITVECTOR_H_
+
 #include "core/bitVector.h"
-#endif
 
 /// A matrix of bits.
 ///

Engine/source/core/bitRender.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _BITRENDER_H_
 #define _BITRENDER_H_
-
-#ifndef _MMATH_H_
 #include "math/mMath.h"
-#endif
 
 /// Functions for rendering to 1bpp bitmaps.
 ///

Engine/source/core/bitSet.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _BITSET_H_
 #define _BITSET_H_
-
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
 
 /// A convenience class to manipulate a set of bits.
 ///

Engine/source/core/bitVector.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _BITVECTOR_H_
 #define _BITVECTOR_H_

Engine/source/core/bitVectorW.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _BITVECTORW_H_
 #define _BITVECTORW_H_
-
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
 
 /// @see BitVector
 class BitVectorW

Engine/source/core/color.h

@@ -19,20 +19,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _COLOR_H_
 #define _COLOR_H_
-
-#ifndef _MPOINT3_H_
 #include "math/mPoint3.h" 
-#endif
-#ifndef _MPOINT4_H_
-#include "math/mPoint4.h" 
-#endif
 
-#ifndef _ENGINEAPI_H_
+#include "math/mPoint4.h" 
+
 #include "console/engineAPI.h"
-#endif
 
 #ifdef TORQUE_USE_LEGACY_GAMMA
 const F32 gGamma = 2.2f;

Engine/source/core/crc.h

@@ -19,14 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _CRC_H_
 #define _CRC_H_
-
-#ifndef _TORQUE_TYPES_H_
 #include "platform/types.h"
-#endif
-
 
 class Stream;
 

Engine/source/core/dataChunker.h

@@ -4,6 +4,8 @@
 //
 // SPDX-License-Identifier: MIT
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _DATACHUNKER_H_
 #define _DATACHUNKER_H_
@@ -14,9 +16,7 @@
 #ifndef _PLATFORMASSERT_H_
 #  include "platform/platformAssert.h"
 #endif
-#ifndef _FRAMEALLOCATOR_H_
 #include "core/frameAllocator.h"
-#endif
 
 #include <algorithm>
 #include <stdint.h>

Engine/source/core/dnet.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _DNET_H_
 #define _DNET_H_
-
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
 
 #include "platform/platformNet.h"
 

Engine/source/core/factoryCache.h

@@ -19,13 +19,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _FACTORY_CACHE_H_
 #define _FACTORY_CACHE_H_
-
-#ifndef _TVECTOR_H_
 #include "core/util/tVector.h"
-#endif
 
 //-----------------------------------------------------------------------------
 

Engine/source/core/fileObject.h

@@ -19,16 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _FILEOBJECT_H_
 #define _FILEOBJECT_H_
-
-#ifndef _SIMBASE_H_
 #include "console/simBase.h"
-#endif
-#ifndef _FILESTREAM_H_
+
 #include "core/stream/fileStream.h"
-#endif
 
 class FileObject : public SimObject
 {

Engine/source/core/fileio.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _FILEIO_H_
 #define _FILEIO_H_
-
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
 
 class File
 {

Engine/source/core/filterStream.h

@@ -19,17 +19,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _FILTERSTREAM_H_
 #define _FILTERSTREAM_H_
 
 //Includes
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
-#ifndef _STREAM_H_
+
 #include "core/stream/stream.h"
-#endif
 
 class FilterStream : public Stream
 {

Engine/source/core/frameAllocator.h

@@ -4,13 +4,12 @@
 //
 // SPDX-License-Identifier: MIT
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _FRAMEALLOCATOR_H_
 #define _FRAMEALLOCATOR_H_
-
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
 
 /// Implements an buffer which allocates data based on the alignment of type T.
 /// 

Engine/source/core/iTickable.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _ITICKABLE_H_
 #define _ITICKABLE_H_

Engine/source/core/idGenerator.h

@@ -19,16 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _IDGENERATOR_H_
 #define _IDGENERATOR_H_
-
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
-#ifndef _TVECTOR_H_
+
 #include "core/util/tVector.h"
-#endif
 
 class IdGenerator
 {

Engine/source/core/memVolume.h

@@ -19,16 +19,13 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 #ifndef _MEMVOLUME_H_
 #define _MEMVOLUME_H_
-
-#ifndef _VOLUME_H_
 #include "core/volume.h"
-#endif
 
-#ifndef _TDICTIONARY_H_
 #include "core/util/tDictionary.h"
-#endif 
 
 namespace Torque
 {

Engine/source/core/module.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _MODULE_H_
 #define _MODULE_H_

Engine/source/core/ogg/oggInputStream.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _OGGINPUTSTREAM_H_
 #define _OGGINPUTSTREAM_H_

Engine/source/core/ogg/oggTheoraDecoder.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _OGGTHEORADECODER_H_
 #define _OGGTHEORADECODER_H_

Engine/source/core/ogg/oggVorbisDecoder.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _OGGVORBISDECODER_H_
 #define _OGGVORBISDECODER_H_

Engine/source/core/resizeStream.h

@@ -19,17 +19,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _RESIZESTREAM_H_
 #define _RESIZESTREAM_H_
 
 //Includes
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
-#ifndef _FILTERSTREAM_H_
+
 #include "core/filterStream.h"
-#endif
 
 class ResizeFilterStream : public FilterStream, public IStreamByteCount
 {

Engine/source/core/resource.h

@@ -22,30 +22,17 @@
 
 #ifndef __RESOURCE_H__
 #define __RESOURCE_H__
-
-#ifndef _DATACHUNKER_H_
 #include "core/dataChunker.h"
-#endif
 
-#ifndef _PATH_H_
 #include "core/util/path.h"
-#endif
 
-#ifndef _REFBASE_H_
 #include "core/util/refBase.h"
-#endif
 
-#ifndef _TIMECLASS_H_
 #include "core/util/timeClass.h"
-#endif
 
-#ifndef _TSIGNAL_H_
 #include "core/util/tSignal.h"
-#endif
 
-#ifndef _PLATFORMASSERT_H_
 #include "platform/platformAssert.h"
-#endif
 
 #include <memory>
 

Engine/source/core/resourceManager.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _RESOURCEMANAGER_H_
 #define _RESOURCEMANAGER_H_
@@ -26,10 +28,7 @@
 #ifndef __RESOURCE_H__
 #include "core/resource.h"
 #endif
-
-#ifndef _TDICTIONARY_H_
 #include "core/util/tDictionary.h"
-#endif
 
 class ResourceManager
 {

Engine/source/core/stream/bitStream.h

@@ -24,19 +24,16 @@
 // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames
 // Copyright (C) 2015 Faust Logic, Inc.
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
+#pragma once 
+#pragma once 
 
 #ifndef _BITSTREAM_H_
 #define _BITSTREAM_H_
-
-#ifndef _STREAM_H_
 #include "core/stream/stream.h"
-#endif
-#ifndef _MPOINT3_H_
+
 #include "math/mPoint3.h"
-#endif
-#ifndef _CRC_H_
+
 #include "core/crc.h"
-#endif
 
 //-------------------------------------- Some caveats when using this class:
 //                                        - Get/setPosition semantics are changed

Engine/source/core/stream/fileStream.h

@@ -19,16 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _FILESTREAM_H_
 #define _FILESTREAM_H_
-
-#ifndef _VOLUME_H_
 #include "core/volume.h"
-#endif
-#ifndef _STREAM_H_
+
 #include "core/stream/stream.h"
-#endif
 
 class FileStream : public Stream
 {

Engine/source/core/stream/fileStreamObject.h

@@ -19,18 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _FILESTREAMOBJECT_H_
 #define _FILESTREAMOBJECT_H_
-
-#ifndef _STREAMOBJECT_H_
 #include "core/stream/streamObject.h"
-#endif
 
-#ifndef _FILESTREAM_H_
 #include "core/stream/fileStream.h"
-#endif
-
 
 class FileStreamObject : public StreamObject
 {

Engine/source/core/stream/ioHelper.h

@@ -19,13 +19,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _UTIL_IOHELPER_H_
 #define _UTIL_IOHELPER_H_
-
-#ifndef _CORE_STREAM_H_
 #include "core/stream/stream.h"
-#endif
 
 /// Helper templates to aggregate IO operations - generally used in
 /// template expansion.

Engine/source/core/stream/memStream.h

@@ -19,14 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _MEMSTREAM_H_
 #define _MEMSTREAM_H_
-
-#ifndef _STREAM_H_
 #include "core/stream/stream.h"
-#endif
-
 
 /// The MemStream class is used to read and write to a memory buffer.
 class MemStream : public Stream

Engine/source/core/stream/stream.h

@@ -19,19 +19,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _STREAM_H_
 #define _STREAM_H_
-
-#ifndef _TORQUE_TYPES_H_
 #include "platform/types.h"
-#endif
-#ifndef _ENDIAN_H_
+
 #include "core/util/endian.h"
-#endif
-#ifndef _STRINGFUNCTIONS_H_
+
 #include "core/strings/stringFunctions.h"
-#endif
 
 /// @defgroup stream_overload Primitive Type Stream Operation Overloads
 /// These macros declare the read and write functions for all primitive types.

Engine/source/core/stream/streamObject.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _STREAMOBJECT_H_
 #define _STREAMOBJECT_H_
-
-#ifndef _SIMOBJECT_H_
 #include "console/simObject.h"
-#endif
 
 /// @addtogroup zip_group
 // @{

Engine/source/core/stream/tStream.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _TSTREAM_H_
 #define _TSTREAM_H_

Engine/source/core/stringBuffer.h

@@ -19,18 +19,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _STRINGBUFFER_H_
 #define _STRINGBUFFER_H_
 
 //Includes
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
 
-#ifndef _TVECTOR_H_
 #include "core/util/tVector.h"
-#endif
 
 #include "console/console.h"
 

Engine/source/core/stringTable.cpp

@@ -24,6 +24,8 @@
 #include "core/stringTable.h"
 #include "platform/profiler.h"
 
+template class Vector<StringTableEntry>;
+
 _StringTable *_gStringTable = NULL;
 const U32 _StringTable::csm_stInitSize = 29;
 

Engine/source/core/stringTable.h

@@ -19,17 +19,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once
 
 #ifndef _STRINGTABLE_H_
 #define _STRINGTABLE_H_
-
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
-#ifndef _DATACHUNKER_H_
-#include "core/dataChunker.h"
-#endif
 
+#include "core/util/tVector.h"
+#include "core/dataChunker.h"
+
+extern template class Vector<StringTableEntry>;
 
 //--------------------------------------
 /// A global table for the hashing and tracking of strings.

Engine/source/core/strings/findMatch.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _FINDMATCH_H_
 #define _FINDMATCH_H_
-
-#ifndef _TVECTOR_H_
 #include "core/util/tVector.h"
-#endif
 
 class   FindMatch
 {

Engine/source/core/strings/stringFunctions.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _STRINGFUNCTIONS_H_
 #define _STRINGFUNCTIONS_H_
@@ -27,14 +29,9 @@
 #include <string.h>
 #include <ctype.h>
 #include <cstdarg>
-
-#ifndef _TORQUE_TYPES_H_
 #include "platform/types.h"
-#endif
 
-#ifndef _PLATFORMASSERT_H_
 #include "platform/platformAssert.h"
-#endif
 
 #if defined(TORQUE_OS_WIN)
 // These standard functions are not defined on Win32 and other Microsoft platforms...

Engine/source/core/strings/stringUnit.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _STRINGUNIT_H_
 #define _STRINGUNIT_H_

Engine/source/core/strings/unicode.h

@@ -19,14 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _UNICODE_H_
 #define _UNICODE_H_
-
-#ifndef _TORQUE_TYPES_H_
 #include "platform/types.h"
-#endif
-
 
 /// Unicode conversion utility functions
 ///

Engine/source/core/tAlgorithm.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _TALGORITHM_H_
 #define _TALGORITHM_H_

Engine/source/core/tSparseArray.h

@@ -19,17 +19,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _TSPARSEARRAY_H_
 #define _TSPARSEARRAY_H_
 
 //Includes
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
-#ifndef _PLATFORMASSERT_H_
+
 #include "platform/platformAssert.h"
-#endif
 
 template <class T>
 class SparseArray

Engine/source/core/tagDictionary.h

@@ -19,16 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _TAGDICTIONARY_H_
 #define _TAGDICTIONARY_H_
-
-#ifndef _STRINGTABLE_H_
 #include "core/stringTable.h"
-#endif
-#ifndef _TVECTOR_H_
+
 #include "core/util/tVector.h"
-#endif
 
 class Stream;
 

Engine/source/core/threadStatic.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _TORQUETHREADSTATIC_H_
 #define _TORQUETHREADSTATIC_H_

Engine/source/core/tokenizer.h

@@ -19,22 +19,18 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _TOKENIZER_H_
 #define _TOKENIZER_H_
 
 //Includes
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
 
-#ifndef _STREAM_H_
 #include "core/stream/stream.h"
-#endif
 
-#ifndef _TVECTOR_H_
 #include "core/util/tVector.h"
-#endif
 
 class SizedStream;
 

Engine/source/core/util/autoPtr.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _AUTOPTR_H_
 #define _AUTOPTR_H_

Engine/source/core/util/byteBuffer.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _BYTEBUFFER_H_
 #define _BYTEBUFFER_H_
-
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
 
 namespace Torque
 {

Engine/source/core/util/delegate.h

@@ -19,6 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _UTIL_DELEGATE_H_
 #define _UTIL_DELEGATE_H_

Engine/source/core/util/dxt5nmSwizzle.h

@@ -19,6 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _DXT5nm_SWIZZLE_H_
 #define _DXT5nm_SWIZZLE_H_

Engine/source/core/util/endian.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _ENDIAN_H_
 #define _ENDIAN_H_
-
-#ifndef _TORQUE_TYPES_H_
 #include "platform/types.h"
-#endif
 
 //------------------------------------------------------------------------------
 // Endian conversions

Engine/source/core/util/hashFunction.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _HASHFUNCTION_H_
 #define _HASHFUNCTION_H_
-
-#ifndef _TORQUE_TYPES_H_
 #include "platform/types.h"
-#endif
 
 namespace Torque
 {

Engine/source/core/util/journal/journal.h

@@ -19,6 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _UTIL_JOURNAL_JOURNAL_H_
 #define _UTIL_JOURNAL_JOURNAL_H_ 

Engine/source/core/util/journal/journaledSignal.h

@@ -19,16 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _JOURNALEDSIGNAL_H_
 #define _JOURNALEDSIGNAL_H_
-
-#ifndef _UTIL_JOURNAL_JOURNAL_H_
 #include "core/util/journal/journal.h"
-#endif
-#ifndef _TSIGNAL_H_
+
 #include "core/util/tSignal.h"
-#endif
 
 template<typename Signature> class JournaledSignal;
 

Engine/source/core/util/journal/process.h

@@ -19,6 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _UTIL_JOURNAL_PROCESS_H_
 #define _UTIL_JOURNAL_PROCESS_H_

Engine/source/core/util/namedSingleton.h

@@ -19,6 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _TORQUE_CORE_UTIL_NAMEDSINGLETON_H_
 #define _TORQUE_CORE_UTIL_NAMEDSINGLETON_H_

Engine/source/core/util/noncopyable.h

@@ -19,6 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _CORE_NONCOPYABLE_H_
 #define _CORE_NONCOPYABLE_H_

Engine/source/core/util/path.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _PATH_H_
 #define _PATH_H_
-
-#ifndef _TORQUE_STRING_H_
 #include "core/util/str.h"
-#endif
 
 namespace Torque
 {

Engine/source/core/util/rawData.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _RAWDATA_H_
 #define _RAWDATA_H_

Engine/source/core/util/refBase.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _REFBASE_H_
 #define _REFBASE_H_

Engine/source/core/util/rgb2luv.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _RGB2LUV_H_
 #define _RGB2LUV_H_
-
-#ifndef _COLOR_H_
 #include "core/color.h"
-#endif
 
 namespace ConvertRGB
 {

Engine/source/core/util/rgb2xyz.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _RGB2XYZ_H_
 #define _RGB2XYZ_H_

Engine/source/core/util/safeCast.h

@@ -19,6 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _TORQUE_CORE_UTIL_SAFECAST_H_
 #define _TORQUE_CORE_UTIL_SAFECAST_H_

Engine/source/core/util/safeDelete.h

@@ -19,6 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _TORQUE_SAFEDELETE_H_
 #define _TORQUE_SAFEDELETE_H_

Engine/source/core/util/str.h

@@ -19,15 +19,13 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _TORQUE_STRING_H_
 #define _TORQUE_STRING_H_
 
 #include <cstdarg>
-
-#ifndef _TORQUE_TYPES_H_
 #include "platform/types.h"
-#endif
 
 #include <string.h>
 

Engine/source/core/util/swizzle.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _SWIZZLE_H_
 #define _SWIZZLE_H_

Engine/source/core/util/swizzleSpec.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _SWIZZLESPEC_H_
 #define _SWIZZLESPEC_H_

Engine/source/core/util/tAlignedArray.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _ALIGNEDARRAY_H_
 #define _ALIGNEDARRAY_H_

Engine/source/core/util/tDictionary.h

@@ -19,24 +19,17 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _TDICTIONARY_H_
 #define _TDICTIONARY_H_
-
-#ifndef _STRINGFUNCTIONS_H_
 #include "core/strings/stringFunctions.h"
-#endif
-#ifndef _HASHFUNCTION_H_
+
 #include "core/util/hashFunction.h"
-#endif
-#ifndef _TORQUE_STRING_H_
 #include "core/util/str.h"
-#endif
 
-#ifndef _DATACHUNKER_H_
 #include "core/dataChunker.h"
-#endif
-
 
 // TODO: Maybe move these into a more general Tuple class?
 

Engine/source/core/util/tFixedSizeDeque.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _TFIXEDSIZEDEQUE_H_
 #define _TFIXEDSIZEDEQUE_H_

Engine/source/core/util/tFixedSizeVector.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _TFIXEDSIZEVECTOR_H_
 #define _TFIXEDSIZEVECTOR_H_

Engine/source/core/util/tList.h

@@ -22,10 +22,7 @@
 
 #ifndef _TORQUE_LIST_
 #define _TORQUE_LIST_
-
-#ifndef _TORQUE_TYPES_H_
 #include "platform/types.h"
-#endif
 
 namespace Torque
 {

Engine/source/core/util/tNamedFactory.h

@@ -19,17 +19,13 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _TFACTORY_H_
 #define _TFACTORY_H_
-
-#ifndef _TDICTIONARY_H_
 #include "core/util/tDictionary.h"
-#endif
-#ifndef _TORQUE_STRING_H_
 #include "core/util/str.h"
-#endif
-
 
 /// A helper template class for registering creation 
 /// methods to name strings.

Engine/source/core/util/tSignal.h

@@ -19,17 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _TSIGNAL_H_
 #define _TSIGNAL_H_
-
-#ifndef _UTIL_DELEGATE_H_
 #include "core/util/delegate.h"
-#endif
 
-#ifndef _TVECTOR_H_
 #include "core/util/tVector.h"
-#endif
 
 /// Signals (Multi-cast Delegates)
 /// 

Engine/source/core/util/tSingleton.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _TSINGLETON_H_
 #define _TSINGLETON_H_
-
-#ifndef _PLATFORMASSERT_H_
 #include "platform/platformAssert.h"
-#endif
 
 /// This is a simple thread safe singleton class based on the 
 /// design of boost::singleton_default (see http://www.boost.org/).

Engine/source/core/util/tUnmanagedVector.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _TUNMANAGEDVECTOR_H_
 #define _TUNMANAGEDVECTOR_H_

Engine/source/core/util/tVector.h

@@ -19,15 +19,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _TVECTOR_H_
 #define _TVECTOR_H_
 
 // TODO: This shouldn't be included in headers... it should
 // be included by the source file before all other includes.
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
+
 #include <algorithm>
 #include "console/engineTypes.h"
 #include "console/engineTypeInfo.h"
@@ -992,9 +993,7 @@ public:
 };
 
 // Include vector specializations
-#ifndef _TVECTORSPEC_H_
 #include "core/util/tVectorSpecializations.h"
-#endif
 
 #endif //_TVECTOR_H_
 

Engine/source/core/util/tVectorSpecializations.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _TVECTORSPEC_H_
 #define _TVECTORSPEC_H_
-
-#ifndef _TVECTOR_H_
 #include "core/util/tVector.h"
-#endif
 
 // Not exactly a specialization, just a vector to use when speed is a concern
 template<class T>

Engine/source/core/util/timeClass.h

@@ -19,16 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _TIMECLASS_H_
 #define _TIMECLASS_H_
-
-#ifndef _TORQUE_TYPES_H_
 #include "platform/types.h"
-#endif
-#ifndef _PLATFORM_H_
+
 #include "platform/platform.h"
-#endif
 
 #if defined(TORQUE_COMPILER_VISUALC)
    #define TORQUE_CONSTANT_S64(a) (a##I64)

Engine/source/core/util/timeSource.h

@@ -19,22 +19,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _TIMESOURCE_H_
 #define _TIMESOURCE_H_
-
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
 
-#ifndef _TSTREAM_H_
 #include "core/stream/tStream.h"
-#endif
 
-#ifndef _SIM_H_
 #include "console/sim.h"
-#endif
-
 
 /// Timer that queries the real-time ticker.
 struct RealMSTimer

Engine/source/core/util/uuid.h

@@ -19,6 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _TORQUE_UUID_H_
 #define _TORQUE_UUID_H_

Engine/source/core/util/zip/centralDir.h

@@ -21,6 +21,8 @@
 //-----------------------------------------------------------------------------
 
 #include "core/util/zip/fileHeader.h"
+#pragma once 
+#pragma once 
 
 #ifndef _CENTRALDIR_H_
 #define _CENTRALDIR_H_

Engine/source/core/util/zip/compressor.h

@@ -21,6 +21,8 @@
 //-----------------------------------------------------------------------------
 
 #include "core/util/zip/centralDir.h"
+#pragma once 
+#pragma once 
 
 #ifndef _COMPRESSOR_H_
 #define _COMPRESSOR_H_

Engine/source/core/util/zip/crctab.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _CRCTAB_H_
 #define _CRCTAB_H_

Engine/source/core/util/zip/extraField.h

@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _EXTRAFIELD_H_
 #define _EXTRAFIELD_H_

Engine/source/core/util/zip/fileHeader.h

@@ -22,6 +22,8 @@
 
 #include "core/util/zip/extraField.h"
 #include "core/util/tVector.h"
+#pragma once 
+#pragma once 
 
 #ifndef _FILEHEADER_H_
 #define _FILEHEADER_H_

Engine/source/core/util/zip/zipArchive.h

@@ -29,6 +29,8 @@
 #include "core/util/tVector.h"
 #include "core/util/tDictionary.h"
 #include "core/util/timeClass.h"
+#pragma once 
+#pragma once 
 
 #ifndef _ZIPARCHIVE_H_
 #define _ZIPARCHIVE_H_

Engine/source/core/util/zip/zipCryptStream.h

@@ -19,13 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _ZIPCRYPTSTREAM_H_
 #define _ZIPCRYPTSTREAM_H_
-
-#ifndef _FILTERSTREAM_H_
 #include "core/filterStream.h"
-#endif
 
 class ZipCryptRStream : public FilterStream
 {

Engine/source/core/util/zip/zipObject.h

@@ -25,6 +25,8 @@
 #include "core/util/tVector.h"
 #include "core/stream/streamObject.h"
 #include "core/util/str.h"
+#pragma once 
+#pragma once 
 
 #ifndef _ZIPOBJECT_H_
 #define _ZIPOBJECT_H_

Engine/source/core/util/zip/zipStatFilter.h

@@ -33,6 +33,8 @@
 // time to complete. With compression done on the fly the time consuming code
 // is pushed out to when writing to files, which is significantly easier to
 // do asynchronously.
+#pragma once 
+#pragma once 
 
 #ifndef _ZIPSTATFILTER_H_
 #define _ZIPSTATFILTER_H_

Engine/source/core/util/zip/zipSubStream.h

@@ -19,14 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _ZIPSUBSTREAM_H_
 #define _ZIPSUBSTREAM_H_
 
 //Includes
-#ifndef _FILTERSTREAM_H_
 #include "core/filterStream.h"
-#endif
 
 struct z_stream_s;
 

Engine/source/core/util/zip/zipTempStream.h

@@ -22,6 +22,8 @@
 
 #include "core/util/zip/zipArchive.h"
 #include "core/util/str.h"
+#pragma once 
+#pragma once 
 
 #ifndef _ZIPTEMPSTREAM_H_
 #define _ZIPTEMPSTREAM_H_

Engine/source/core/util/zip/zipVolume.h

@@ -19,6 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 #ifndef _CORE_ZIP_VOLUME_H_
 #define _CORE_ZIP_VOLUME_H_
 

Engine/source/core/virtualMountSystem.h

@@ -19,6 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 #ifndef _CORE_VMS_H_
 #define _CORE_VMS_H_
 

Engine/source/core/volume.h

@@ -19,37 +19,25 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _VOLUME_H_
 #define _VOLUME_H_
-
-#ifndef _TSIGNAL_H_
 #include "core/util/tSignal.h"
-#endif
 
-#ifndef _TVECTOR_H_
 #include "core/util/tVector.h"
-#endif
 
-#ifndef _REFBASE_H_
 #include "core/util/refBase.h"
-#endif
 
-#ifndef _TDICTIONARY_H_
 #include "core/util/tDictionary.h"
-#endif
 
 #ifndef _TORQUE_LIST_
 #include "core/util/tList.h"
 #endif
-
-#ifndef _PATH_H_
 #include "core/util/path.h"
-#endif
 
-#ifndef _TIMECLASS_H_
 #include "core/util/timeClass.h"
-#endif
 
 namespace Torque
 {