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/gui/3d/guiTSControl.h

@@ -19,25 +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 _GUITSCONTROL_H_
 #define _GUITSCONTROL_H_
-
-#ifndef _GUICONTAINER_H_
 #include "gui/containers/guiContainer.h"
-#endif
-#ifndef _MMATH_H_
+
 #include "math/mMath.h"
-#endif
 
-
-#ifndef _MATTEXTURETARGET_H_
 #include "materials/matTextureTarget.h"
-#endif
 
-#ifndef _GUIOFFSCREENCANVAS_H_
 #include "gui/core/guiOffscreenCanvas.h"
-#endif
 
 class IDisplayDevice;
 class GuiOffscreenCanvas;

Engine/source/gui/buttons/guiBitmapButtonCtrl.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 _GUIBITMAPBUTTON_H_
 #define _GUIBITMAPBUTTON_H_

Engine/source/gui/buttons/guiButtonBaseCtrl.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 _GUIBUTTONBASECTRL_H_
 #define _GUIBUTTONBASECTRL_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
-
 
 /// Base class for all button controls.  Subclasses are mostly for specific
 /// rendering types.

Engine/source/gui/buttons/guiButtonCtrl.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 _GUIBUTTONCTRL_H_
 #define _GUIBUTTONCTRL_H_
-
-#ifndef _GUIBUTTONBASECTRL_H_
 #include "gui/buttons/guiButtonBaseCtrl.h"
-#endif
 
 class GuiButtonCtrl : public GuiButtonBaseCtrl
 {

Engine/source/gui/buttons/guiCheckBoxCtrl.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 _GUICHECKBOXCTRL_H_
 #define _GUICHECKBOXCTRL_H_

Engine/source/gui/buttons/guiIconButtonCtrl.h

@@ -19,13 +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 _GUIICONBUTTON_H_
 #define _GUIICONBUTTON_H_
-
-#ifndef _GUIBUTTONCTRL_H_
 #include "gui/buttons/guiButtonCtrl.h"
-#endif
+
 #ifndef GFX_Texture_Manager_H_
 #include "gfx/gfxTextureManager.h"
 #endif

Engine/source/gui/buttons/guiRadioCtrl.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 _GUIRADIOCTRL_H_
 #define _GUIRADIOCTRL_H_
-
-#ifndef _GUICHECKBOXCTRLL_H_
 #include "gui/buttons/guiCheckBoxCtrl.h"
-#endif
 
 // the radio button renders exactly the same as the check box
 // the only difference is it sends messages to its siblings to

Engine/source/gui/buttons/guiSwatchButtonCtrl.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 _GUISWATCHBUTTONCTRL_H_
 #define _GUISWATCHBUTTONCTRL_H_

Engine/source/gui/buttons/guiToggleButtonCtrl.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 _GUITOGGLEBUTTONCTRL_H_
 #define _GUITOGGLEBUTTONCTRL_H_
-
-#ifndef _GUIBUTTONCTRL_H_
 #include "gui/buttons/guiButtonCtrl.h"
-#endif
 
 class GuiToggleButtonCtrl : public GuiButtonCtrl
 {

Engine/source/gui/buttons/guiToolboxButtonCtrl.h

@@ -19,13 +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 _GUITOOLBOXBUTTON_H_
 #define _GUITOOLBOXBUTTON_H_
-
-#ifndef _GUIBUTTONCTRL_H_
 #include "gui/buttons/guiButtonCtrl.h"
-#endif
+
 #ifndef GFX_Texture_Manager_H_
 #include "gfx/gfxTextureManager.h"
 #endif

Engine/source/gui/containers/guiAutoScrollCtrl.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 _GUIAUTOSCROLLCTRL_H_
 #define _GUIAUTOSCROLLCTRL_H_

Engine/source/gui/containers/guiContainer.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 _GUICONTAINER_H_
 #define _GUICONTAINER_H_

Engine/source/gui/containers/guiCtrlArrayCtrl.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 _GUICTRLARRAYCTRL_H_
 #define _GUICTRLARRAYCTRL_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
 
 #include "gfx/gfxDevice.h"
 #include "console/console.h"

Engine/source/gui/containers/guiDragAndDropCtrl.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 _GUIDRAGANDDROPCTRL_H_
 #define _GUIDRAGANDDROPCTRL_H_

Engine/source/gui/containers/guiDynamicCtrlArrayCtrl.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 _GUIDYNAMICCTRLARRAYCTRL_H_
 #define _GUIDYNAMICCTRLARRAYCTRL_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
 
 #include "gfx/gfxDevice.h"
 #include "console/console.h"

Engine/source/gui/containers/guiFormCtrl.h

@@ -19,25 +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 _GUIFORMCTRL_H_
 #define _GUIFORMCTRL_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
-
-#ifndef _GUI_PANEL_H_
 #include "gui/containers/guiPanel.h"
-#endif
 
-#ifndef _GUIMENUBAR_H_
 #include "gui/editor/guiMenuBar.h"
-#endif
 
-#ifndef _GUICANVAS_H_
 #include "gui/core/guiCanvas.h"
-#endif
 
 #include "console/console.h"
 #include "console/consoleTypes.h"

Engine/source/gui/containers/guiFrameCtrl.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 _GUIFRAMECTRL_H_
 #define _GUIFRAMECTRL_H_

Engine/source/gui/containers/guiPaneCtrl.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 _GUIPANECTRL_H_
 #define _GUIPANECTRL_H_

Engine/source/gui/containers/guiPanel.h

@@ -19,19 +19,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 #ifndef _GUI_PANEL_H_
 #define _GUI_PANEL_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
-#ifndef _GUITICKCTRL_H_
-#include "gui/shiny/guiTickCtrl.h"
-#endif
-#ifndef _GUICONTAINER_H_
-#include "gui/containers/guiContainer.h"
-#endif
 
+#include "gui/shiny/guiTickCtrl.h"
+
+#include "gui/containers/guiContainer.h"
 
 /// The GuiPanel panel is a container that when rendered will render with the profile's fill colors
 ///

Engine/source/gui/containers/guiRolloutCtrl.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 _GUI_ROLLOUTCTRL_H_
 #define _GUI_ROLLOUTCTRL_H_
 

Engine/source/gui/containers/guiScrollCtrl.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 _GUISCROLLCTRL_H_
 #define _GUISCROLLCTRL_H_

Engine/source/gui/containers/guiSplitContainer.h

@@ -19,23 +19,15 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 #ifndef _GUI_SPLTCONTAINER_H_
 #define _GUI_SPLTCONTAINER_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
-#ifndef _GUICONTAINER_H_
+
 #include "gui/containers/guiContainer.h"
-#endif
-#ifndef _GUI_PANEL_H_
 #include "gui/containers/guiPanel.h"
-#endif
-#ifndef _PLATFORMINPUT_H_
+
 #include "platform/platformInput.h"
-#endif
-
-
 
 /// @addtogroup gui_container_group Containers
 ///

Engine/source/gui/containers/guiStackCtrl.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 _GUISTACKCTRL_H_
 #define _GUISTACKCTRL_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
 
 #include "gfx/gfxDevice.h"
 #include "console/console.h"

Engine/source/gui/containers/guiTabBookCtrl.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 _GUI_TABBOOKCTRL_H_
 #define _GUI_TABBOOKCTRL_H_
 

Engine/source/gui/containers/guiWindowCollapseCtrl.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 _GUIWINDOWCOLLAPSECTRL_H_
 #define _GUIWINDOWCOLLAPSECTRL_H_

Engine/source/gui/containers/guiWindowCtrl.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 _GUIWINDOWCTRL_H_
 #define _GUIWINDOWCTRL_H_

Engine/source/gui/controls/gui3DProjectionCtrl.h

@@ -5,6 +5,8 @@
 //  
 //   
 //-----------------------------------------------------------------------------  
+#pragma once 
+#pragma once 
   
 #ifndef _GUI3DPROJECTIONCTRL_H_  
 #define _GUI3DPROJECTIONCTRL_H_  

Engine/source/gui/controls/guiAnimBitmapCtrl.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 _GUIANIMBITMAPCTRL_H_
 #define _GUIANIMBITMAPCTRL_H_
-
-#ifndef _GUIBITMAPCTRL_H_
 #include "gui/controls/guiBitmapCtrl.h"
-#endif
 
 class guiAnimBitmapCtrl : public GuiBitmapCtrl
 {

Engine/source/gui/controls/guiBackgroundCtrl.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 _GUIBACKGROUNDCTRL_H_
 #define _GUIBACKGROUNDCTRL_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
 
 /// Renders a background, so you can have a backdrop for your GUI.
 class GuiBackgroundCtrl : public GuiControl

Engine/source/gui/controls/guiBitmapBarCtrl.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 _GUIBITMAPBARCTRL_H_
 #define _GUIBITMAPBARCTRL_H_
-
-#ifndef _GUIBITMAPCTRL_H_
 #include "gui/controls/guiBitmapCtrl.h"
-#endif
 
 class GuiBitmapBarCtrl : public GuiBitmapCtrl
 {

Engine/source/gui/controls/guiBitmapCtrl.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 _GUIBITMAPCTRL_H_
 #define _GUIBITMAPCTRL_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
 
 #include "T3D/assets/ImageAsset.h"
 /// Renders a bitmap.

Engine/source/gui/controls/guiColorPicker.h

@@ -19,12 +19,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 #ifndef _GUICOLORPICKER_H_
 #define _GUICOLORPICKER_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
 
 //----------------------------
 /// GuiColorPickerCtrl

Engine/source/gui/controls/guiConsole.h

@@ -19,18 +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 _GUICONSOLE_H_
 #define _GUICONSOLE_H_
-
-#ifndef _GUIARRAYCTRL_H_
 #include "gui/core/guiArrayCtrl.h"
-#endif
-
-#ifndef _CONSOLE_LOGGER_H_
 #include "console/consoleLogger.h"
-#endif
-
 
 class GuiConsole : public GuiArrayCtrl
 {

Engine/source/gui/controls/guiConsoleEditCtrl.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 _GUICONSOLEEDITCTRL_H_
 #define _GUICONSOLEEDITCTRL_H_
-
-#ifndef _GUITYPES_H_
 #include "gui/core/guiTypes.h"
-#endif
-#ifndef _GUITEXTEDITCTRL_H_
+
 #include "gui/controls/guiTextEditCtrl.h"
-#endif
-#ifndef _GUISCROLLCTRL_H_
+
 #include "gui/containers/guiScrollCtrl.h"
-#endif
 
 class GuiConsoleEditCtrl : public GuiTextEditCtrl
 {

Engine/source/gui/controls/guiConsoleTextCtrl.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 _GUICONSOLETEXTCTRL_H_
 #define _GUICONSOLETEXTCTRL_H_
-
-#ifndef _GFONT_H_
 #include "gfx/gFont.h"
-#endif
-#ifndef _GUITYPES_H_
+
 #include "gui/core/guiTypes.h"
-#endif
-#ifndef _GUICONTROL_H_
+
 #include "gui/core/guiControl.h"
-#endif
 
 class GuiConsoleTextCtrl : public GuiControl
 {

Engine/source/gui/controls/guiDecoyCtrl.h

@@ -19,12 +19,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 #ifndef _GUIDECOYCTRL_H_
 #define _GUIDECOYCTRL_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
 
 class GuiDecoyCtrl : public GuiControl
 {

Engine/source/gui/controls/guiDirectoryFileListCtrl.h

@@ -19,17 +19,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 
 #ifndef _GUI_DIRECTORYFILELISTCTRL_H_
 #define _GUI_DIRECTORYFILELISTCTRL_H_
-
-#ifndef _PLATFORM_H_
 #include "platform/platform.h"
-#endif
-
-#ifndef _GUI_LISTBOXCTRL_H_
 #include "gui/controls/guiListBoxCtrl.h"
-#endif
 
 class GuiDirectoryFileListCtrl : public GuiListBoxCtrl
 {

Engine/source/gui/controls/guiFileTreeCtrl.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 _GUI_FILETREECTRL_H_
 #define _GUI_FILETREECTRL_H_

Engine/source/gui/controls/guiGameListMenuCtrl.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 _GuiGameListMenuCtrl_H_
 #define _GuiGameListMenuCtrl_H_

Engine/source/gui/controls/guiGameListOptionsCtrl.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 _GuiGameListOptionsCtrl_H_
 #define _GuiGameListOptionsCtrl_H_

Engine/source/gui/controls/guiGameSettingsCtrl.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 _GuiGameSettingsCtrl_H_
 #define _GuiGameSettingsCtrl_H_

Engine/source/gui/controls/guiGradientCtrl.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 _GUIGRADIENTCTRL_H_
 #define _GUIGRADIENTCTRL_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
 
-#ifndef _GUISWATCHBUTTONCTRL_H_
 #include "gui/buttons/guiSwatchButtonCtrl.h"
-#endif
 
 class GuiGradientSwatchCtrl : public GuiSwatchButtonCtrl
 {

Engine/source/gui/controls/guiListBoxCtrl.h

@@ -19,29 +19,19 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 #ifndef _GUI_LISTBOXCTRL_H_
 #define _GUI_LISTBOXCTRL_H_
-
-#ifndef _CONSOLETYPES_H_
 #include "console/consoleTypes.h"
-#endif
 
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
 
-#ifndef _DGL_H_
 #include "gfx/gfxDevice.h"
-#endif
 
 #ifndef _H_GUIDEFAULTCONTROLRENDER_
 #include "gui/core/guiDefaultControlRender.h"
 #endif
-
-#ifndef _GUISCROLLCTRL_H_
 #include "gui/containers/guiScrollCtrl.h"
-#endif
-
 
 class GuiListBoxCtrl : public GuiControl
 {

Engine/source/gui/controls/guiMLTextCtrl.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 _GUIMLTEXTCTRL_H_
 #define _GUIMLTEXTCTRL_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
 
-#ifndef _STRINGBUFFER_H_
 #include "core/stringBuffer.h"
-#endif
 
 #ifndef SOUND_ASSET_H
 #include "T3D/assets/SoundAsset.h"

Engine/source/gui/controls/guiMLTextEditCtrl.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 _GUIMLTEXTEDITCTRL_H_
 #define _GUIMLTEXTEDITCTRL_H_
-
-#ifndef _GUIMLTEXTCTRL_H_
 #include "gui/controls/guiMLTextCtrl.h"
-#endif
 
 class GuiMLTextEditCtrl : public GuiMLTextCtrl
 {

Engine/source/gui/controls/guiMaterialCtrl.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 _GUIMATERIALCTRL_H_
 #define _GUIMATERIALCTRL_H_
-
-#ifndef _GUICONTAINER_H_
 #include "gui/containers/guiContainer.h"
-#endif
 
 #include "T3D/assets/MaterialAsset.h"
 

Engine/source/gui/controls/guiPopUpCtrl.h

@@ -19,25 +19,20 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _GUIPOPUPCTRL_H_
 #define _GUIPOPUPCTRL_H_
-
-#ifndef _GUITEXTCTRL_H_
 #include "gui/controls/guiTextCtrl.h"
-#endif
-#ifndef _GUITEXTLISTCTRL_H_
+
 #include "gui/controls/guiTextListCtrl.h"
-#endif
-#ifndef _GUIBUTTONCTRL_H_
+
 #include "gui/buttons/guiButtonCtrl.h"
-#endif
-#ifndef _GUIBACKGROUNDCTRL_H_
+
 #include "gui/controls/guiBackgroundCtrl.h"
-#endif
-#ifndef _GUISCROLLCTRL_H_
+
 #include "gui/containers/guiScrollCtrl.h"
-#endif
 
 #include "T3D/assets/ImageAsset.h"
 class GuiPopUpMenuCtrl;

Engine/source/gui/controls/guiPopUpCtrlEx.h

@@ -19,22 +19,19 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _GUIPOPUPCTRLEX_H_
 #define _GUIPOPUPCTRLEX_H_
-
-#ifndef _GUITEXTCTRL_H_
 #include "gui/controls/guiTextCtrl.h"
-#endif
-#ifndef _GUITEXTLISTCTRL_H_
+
 #include "gui/controls/guiTextListCtrl.h"
-#endif
-#ifndef _GUIBUTTONCTRL_H_
+
 #include "gui/buttons/guiButtonCtrl.h"
-#endif
-#ifndef _GUISCROLLCTRL_H_
+
 #include "gui/containers/guiScrollCtrl.h"
-#endif
+
 #include "guiTextEditCtrl.h"
 class GuiPopUpMenuCtrlEx;
 class GuiPopupTextListCtrlEx;

Engine/source/gui/controls/guiSliderCtrl.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 _GUISLIDERCTRL_H_
 #define _GUISLIDERCTRL_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
-
 
 /// A slider control that selects out of a floating-point value range.
 class GuiSliderCtrl : public GuiControl

Engine/source/gui/controls/guiTabPageCtrl.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 _GUITABPAGECTRL_H_
 #define _GUITABPAGECTRL_H_
-
-#ifndef _GUITEXTCTRL_H_
 #include "gui/controls/guiTextCtrl.h"
-#endif
 
 class GuiTabPageCtrl : public GuiTextCtrl
 {

Engine/source/gui/controls/guiTextCtrl.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 _GUITEXTCTRL_H_
 #define _GUITEXTCTRL_H_
-
-#ifndef _GFONT_H_
 #include "gfx/gFont.h"
-#endif
-#ifndef _GUITYPES_H_
+
 #include "gui/core/guiTypes.h"
-#endif
-#ifndef _GUICONTAINER_H_
+
 #include "gui/containers/guiContainer.h"
-#endif
 
 class GuiTextCtrl : public GuiContainer
 {

Engine/source/gui/controls/guiTextEditCtrl.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 _GUITEXTEDITCTRL_H_
 #define _GUITEXTEDITCTRL_H_
-
-#ifndef _GUITYPES_H_
 #include "gui/core/guiTypes.h"
-#endif
-#ifndef _GUITEXTCTRL_H_
+
 #include "gui/controls/guiTextCtrl.h"
-#endif
-#ifndef _STRINGBUFFER_H_
+
 #include "core/stringBuffer.h"
-#endif
 
 class SFXTrack;
 

Engine/source/gui/controls/guiTextEditSliderBitmapCtrl.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 _GUITEXTEDITSLIDERBITMAPCTRL_H_
 #define _GUITEXTEDITSLIDERBITMAPCTRL_H_
-
-#ifndef _GUITYPES_H_
 #include "gui/core/guiTypes.h"
-#endif
-#ifndef _GUITEXTEDITCTRL_H_
+
 #include "gui/controls/guiTextEditCtrl.h"
-#endif
 
 class GuiTextEditSliderBitmapCtrl : public GuiTextEditCtrl
 {

Engine/source/gui/controls/guiTextEditSliderCtrl.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 _GUITEXTEDITSLIDERCTRL_H_
 #define _GUITEXTEDITSLIDERCTRL_H_
-
-#ifndef _GUITYPES_H_
 #include "gui/core/guiTypes.h"
-#endif
-#ifndef _GUITEXTEDITCTRL_H_
+
 #include "gui/controls/guiTextEditCtrl.h"
-#endif
 
 class GuiTextEditSliderCtrl : public GuiTextEditCtrl
 {

Engine/source/gui/controls/guiTextListCtrl.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 _GUITEXTLISTCTRL_H_
 #define _GUITEXTLISTCTRL_H_
-
-#ifndef _GUIARRAYCTRL_H_
 #include "gui/core/guiArrayCtrl.h"
-#endif
 
 class GuiTextListCtrl : public GuiArrayCtrl
 {

Engine/source/gui/core/guiArrayCtrl.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 _GUIARRAYCTRL_H_
 #define _GUIARRAYCTRL_H_
-
-#ifndef _GUITYPES_H_
 #include "gui/core/guiTypes.h"
-#endif
-#ifndef _GUITEXTCTRL_H_
+
 #include "gui/controls/guiTextCtrl.h"
-#endif
 
 /// Renders a grid of cells.
 class GuiArrayCtrl : public GuiControl

Engine/source/gui/core/guiCanvas.h

@@ -24,23 +24,18 @@
 // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames
 // Copyright (C) 2015 Faust Logic, Inc.
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
+#pragma once 
+#pragma once 
 
 #ifndef _GUICANVAS_H_
 #define _GUICANVAS_H_
-
-#ifndef _SIMBASE_H_
 #include "console/simBase.h"
-#endif
-#ifndef _GUICONTROL_H_
-#include "gui/core/guiControl.h"
-#endif
-#ifndef _PLATFORMINPUT_H_
-#include "platform/platformInput.h"
-#endif
 
-#ifndef _SIGNAL_H_
+#include "gui/core/guiControl.h"
+
+#include "platform/platformInput.h"
+
 #include "core/util/tSignal.h"
-#endif
 
 #include "platform/input/IProcessInput.h"
 #include "windowManager/platformWindowMgr.h"

Engine/source/gui/core/guiControl.h

@@ -24,31 +24,23 @@
 // Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames
 // Copyright (C) 2015 Faust Logic, Inc.
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
+#pragma once 
+#pragma once 
 
 #ifndef _GUICONTROL_H_
 #define _GUICONTROL_H_
-
-#ifndef _MPOINT3_H_
 #include "math/mPoint3.h"
-#endif
-#ifndef _MRECT_H_
+
 #include "math/mRect.h"
-#endif
-#ifndef _COLOR_H_
+
 #include "core/color.h"
-#endif
-#ifndef _SIMBASE_H_
+
 #include "console/simBase.h"
-#endif
-#ifndef _GUITYPES_H_ 
+
 #include "gui/core/guiTypes.h"
-#endif
-#ifndef _UTIL_DELEGATE_H_
 #include "core/util/delegate.h"
-#endif
-#ifndef _LANG_H_
+
 #include "i18n/lang.h"
-#endif
 
 class GuiCanvas;
 class GuiEditCtrl;

Engine/source/gui/core/guiDefaultControlRender.h

@@ -22,10 +22,7 @@
 
 #ifndef _H_GUIDEFAULTCONTROLRENDER_
 #define _H_GUIDEFAULTCONTROLRENDER_
-
-#ifndef _MRECT_H_
 #include "math/mRect.h"
-#endif
 
 class GuiControlProfile;
 class ColorI;

Engine/source/gui/core/guiOffscreenCanvas.h

@@ -1,13 +1,12 @@
+#pragma once 
+#pragma once 
 #ifndef _GUIOFFSCREENCANVAS_H_
 #define _GUIOFFSCREENCANVAS_H_
 
 #include "math/mMath.h"
 #include "gui/core/guiCanvas.h"
 #include "core/util/tVector.h"
-
-#ifndef _MATTEXTURETARGET_H_
 #include "materials/matTextureTarget.h"
-#endif
 
 class GuiTextureDebug;
 

Engine/source/gui/core/guiScriptNotifyControl.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 _GUISCRIPTNOTIFYCTRL_H_
 #define _GUISCRIPTNOTIFYCTRL_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
 
 class GuiScriptNotifyCtrl : public GuiControl
 {

Engine/source/gui/core/guiTypes.h

@@ -19,22 +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 _GUITYPES_H_
 #define _GUITYPES_H_
-
-#ifndef _GFONT_H_
 #include "gfx/gFont.h"
-#endif
-#ifndef _COLOR_H_
+
 #include "core/color.h"
-#endif
-#ifndef _SIMBASE_H_
+
 #include "console/simBase.h"
-#endif
-#ifndef _DYNAMIC_CONSOLETYPES_H_
 #include "console/dynamicTypes.h"
-#endif
 
 #ifndef SOUND_ASSET_H_
 #include "T3D/assets/SoundAsset.h"

Engine/source/gui/editor/editorFunctions.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 _EDITORFUNCTIONS_H_
 #define _EDITORFUNCTIONS_H_

Engine/source/gui/editor/guiDebugger.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 _GUIDEBUGGER_H_
 #define _GUIDEBUGGER_H_
-
-#ifndef _GUIARRAYCTRL_H_
 #include "gui/core/guiArrayCtrl.h"
-#endif
 
 class DbgFileView : public GuiArrayCtrl
 {

Engine/source/gui/editor/guiEaseViewCtrl.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 _GUIEASEVIEWCTRL_H_
 #define _GUIEASEVIEWCTRL_H_

Engine/source/gui/editor/guiEditCtrl.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 _GUIEDITCTRL_H_
 #define _GUIEDITCTRL_H_

Engine/source/gui/editor/guiFilterCtrl.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 _GUIFILTERCTRL_H_
 #define _GUIFILTERCTRL_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
-
 
 class Filter: public Vector<F32>
 {

Engine/source/gui/editor/guiGraphCtrl.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 _GUIGRAPHCTRL_H_
 #define _GUIGRAPHCTRL_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
 
 class GuiGraphCtrl : public GuiControl
 {

Engine/source/gui/editor/guiImageList.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 _GUIIMAGELIST_H_
 #define _GUIIMAGELIST_H_
 
 #include "console/simDatablock.h"
-
-#ifndef _GUITYPES_H_
 #include "gui/core/guiTypes.h"
-#endif
-
 
 class GuiImageList : public SimObject
 {

Engine/source/gui/editor/guiInspector.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 _GUI_INSPECTOR_H_
 #define _GUI_INSPECTOR_H_

Engine/source/gui/editor/guiInspectorTypes.h

@@ -19,32 +19,21 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
 #ifndef _GUI_INSPECTOR_TYPES_H_
 #define _GUI_INSPECTOR_TYPES_H_
-
-#ifndef _GUI_INSPECTOR_H_
 #include "gui/editor/guiInspector.h"
-#endif
 
-#ifndef _GUI_INSPECTOR_FIELD_H_
 #include "gui/editor/inspector/field.h"
-#endif
 
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
 
-#ifndef _GUICHECKBOXCTRL_H_
 #include "gui/buttons/guiCheckBoxCtrl.h"
-#endif
 
-#ifndef _GUIBITMAPBUTTON_H_
 #include "gui/buttons/guiBitmapButtonCtrl.h"
-#endif
 
-#ifndef _GUITEXTEDITSLIDERCTRL_H_
 #include "gui/controls/guiTextEditSliderCtrl.h"
-#endif
+
 #include "gui/controls/guiPopUpCtrlEx.h"
 
 class GuiPopUpMenuCtrl;

Engine/source/gui/editor/guiMenuBar.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 _GUIMENUBAR_H_
 #define _GUIMENUBAR_H_
-
-#ifndef _GUITICKCTRL_H_
 #include "gui/shiny/guiTickCtrl.h"
-#endif
 
-#ifndef _POPUPMENU_H_
 #include "gui/editor/popupMenu.h"
-#endif
 
 class GuiMenuBar;
 class WindowInputGenerator;

Engine/source/gui/editor/guiParticleGraphCtrl.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 _GUIPARTICLEGRAPHCTRL_H_
 #define _GUIPARTICLEGRAPHCTRL_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
-#ifndef _STRINGTABLE_H_
-#include "core/stringTable.h"
-#endif
 
+#include "core/stringTable.h"
 
 class GuiParticleGraphCtrl : public GuiControl
 {

Engine/source/gui/editor/guiPopupMenuCtrl.h

@@ -24,18 +24,9 @@
 
 #ifndef GUI_POPUP_MENU_CTRL_H
 #define GUI_POPUP_MENU_CTRL_H
-
-#ifndef _GUITEXTLISTCTRL_H_
 #include "gui/controls/guiTextListCtrl.h"
-#endif
 
-#ifndef _GUIMENUBAR_H_
 #include "gui/editor/guiMenuBar.h"
-#endif
-
-#ifndef _POPUPMENU_H_
-#include "platform/menus/popupMenu.h"
-#endif
 
 class GuiPopupMenuBackgroundCtrl;
 
@@ -90,4 +81,4 @@ public:
    GuiMenuBar* mMenuBarCtrl;
 };
 
-#endif
+#endif

Engine/source/gui/editor/guiRectHandles.h

@@ -19,12 +19,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 #ifndef _GUIRECTHANDLES_H_
 #define _GUIRECTHANDLES_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
 
 class GuiRectHandles : public GuiControl
 {

Engine/source/gui/editor/guiSeparatorCtrl.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 _GUISEPARATORCTRL_H_
 #define _GUISEPARATORCTRL_H_
 

Engine/source/gui/editor/guiShapeEdPreview.h

@@ -19,9 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
-
-#ifndef _GUISHAPEEDPREVIEW_H_
-#define _GUISHAPEEDPREVIEW_H_
+#pragma once
 
 #include "gui/worldEditor/editTSCtrl.h"
 #include "ts/tsShapeInstance.h"
@@ -263,5 +261,3 @@ public:
    GuiShapeEdPreview();
    ~GuiShapeEdPreview();
 };
-
-#endif

Engine/source/gui/editor/inspector/customField.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 _GUI_INSPECTOR_CUSTOMFIELD_H_
 #define _GUI_INSPECTOR_CUSTOMFIELD_H_

Engine/source/gui/editor/inspector/datablockField.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 _GUI_INSPECTOR_DATABLOCKFIELD_H_
 #define _GUI_INSPECTOR_DATABLOCKFIELD_H_

Engine/source/gui/editor/inspector/dynamicField.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 _GUI_INSPECTOR_DYNAMICFIELD_H_
 #define _GUI_INSPECTOR_DYNAMICFIELD_H_

Engine/source/gui/editor/inspector/dynamicGroup.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 _GUI_INSPECTOR_DYNAMICGROUP_H_
 #define _GUI_INSPECTOR_DYNAMICGROUP_H_

Engine/source/gui/editor/inspector/field.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 _GUI_INSPECTOR_FIELD_H_
 #define _GUI_INSPECTOR_FIELD_H_

Engine/source/gui/editor/inspector/group.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 _GUI_INSPECTOR_GROUP_H_
 #define _GUI_INSPECTOR_GROUP_H_

Engine/source/gui/editor/inspector/variableField.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 _GUI_INSPECTOR_VARIABLEFIELD_H_
 #define _GUI_INSPECTOR_VARIABLEFIELD_H_
-
-#ifndef _GUI_INSPECTOR_FIELD_H_
 #include "gui/editor/inspector/field.h"
-#endif
 
 class GuiInspectorGroup;
 class GuiInspector;

Engine/source/gui/editor/inspector/variableGroup.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 _GUI_INSPECTOR_VARIABLEGROUP_H_
 #define _GUI_INSPECTOR_VARIABLEGROUP_H_
-
-#ifndef _GUI_INSPECTOR_GROUP_H_
 #include "gui/editor/inspector/group.h"
-#endif
 
 // Forward refs
 class GuiInspector;

Engine/source/gui/editor/inspector/variableInspector.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 
 
 #ifndef _GUI_VARIABLEINSPECTOR_H_
 #define _GUI_VARIABLEINSPECTOR_H_
-
-#ifndef _GUI_INSPECTOR_H_
 #include "gui/editor/guiInspector.h"
-#endif
-#ifndef _GUI_INSPECTOR_VARIABLEGROUP_H_
-#include "gui/editor/inspector/variableGroup.h"
-#endif
 
+#include "gui/editor/inspector/variableGroup.h"
 
 class GuiVariableInspector : public GuiInspector
 {

Engine/source/gui/editor/popupMenu.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 _POPUPMENU_H_
 #define _POPUPMENU_H_
 

Engine/source/gui/game/guiFadeinBitmapCtrl.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 _GUIFADEINBITMAPCTRL_H_
 #define _GUIFADEINBITMAPCTRL_H_

Engine/source/gui/game/guiMessageVectorCtrl.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 _GUIMESSAGEVECTORCTRL_H_
 #define _GUIMESSAGEVECTORCTRL_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
-#ifndef _MESSAGEVECTOR_H_
+
 #include "gui/utility/messageVector.h"
-#endif
 
 /// Render a MessageVector (chat HUD)
 ///

Engine/source/gui/game/guiProgressBitmapCtrl.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 _GuiProgressBitmapCtrl_H_
 #define _GuiProgressBitmapCtrl_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
 
-#ifndef _GUITEXTCTRL_H_
 #include "gui/controls/guiTextCtrl.h"
-#endif
 
 #include "T3D/assets/ImageAsset.h"
 

Engine/source/gui/game/guiProgressCtrl.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 _GUIPROGRESSCTRL_H_
 #define _GUIPROGRESSCTRL_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
 
-#ifndef _GUITEXTCTRL_H_
 #include "gui/controls/guiTextCtrl.h"
-#endif
-
 
 class GuiProgressCtrl : public GuiTextCtrl
 {

Engine/source/gui/shaderEditor/guiShaderEditor.h

@@ -19,19 +19,15 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _GUISHADEREDITOR_H_
 #define _GUISHADEREDITOR_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
-#ifndef _UNDO_H_
+
 #include "util/undo.h"
-#endif
-#ifndef _GFX_GFXDRAWER_H_
 #include "gfx/gfxDrawUtil.h"
-#endif
 
 #ifndef _SHADERNODE_H_
 #include "gui/shaderEditor/guiShaderNode.h"

Engine/source/gui/shaderEditor/guiShaderNode.h

@@ -19,22 +19,15 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
+#pragma once 
+#pragma once 
 
 #ifndef _SHADERNODE_H_
 #define _SHADERNODE_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
 
-#ifndef _SIMBASE_H_
 #include "console/simBase.h"
-#endif
-
-#ifndef _GFX_GFXDRAWER_H_
 #include "gfx/gfxDrawUtil.h"
-#endif
-
 
 enum class NodeTypes
 {

Engine/source/gui/shiny/guiAudioCtrl.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 _GUIAUDIOCTRL_H_
 #define _GUIAUDIOCTRL_H_
-
-#ifndef _GUITICKCTRL_H_
 #include "gui/shiny/guiTickCtrl.h"
-#endif
 
 #ifndef SOUND_ASSET_H
 #include "T3D/assets/SoundAsset.h"

Engine/source/gui/shiny/guiTickCtrl.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 _GUITICKCTRL_H_
 #define _GUITICKCTRL_H_

Engine/source/gui/theora/guiTheoraCtrl.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 _GUITHEORACTRL_H_
 #define _GUITHEORACTRL_H_

Engine/source/gui/utility/guiBubbleTextCtrl.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 _GUIBUBBLETEXTCTRL_H_
 #define _GUIBUBBLETEXTCTRL_H_
-
-#ifndef _GUITEXTCTRL_H_
 #include "gui/controls/guiTextCtrl.h"
-#endif
-#ifndef _GUIMLTEXTCTRL_H_
+
 #include "gui/controls/guiMLTextCtrl.h"
-#endif
 
 /// A single-line text control that displays its text in a multi-line popup when
 /// clicked.

Engine/source/gui/utility/guiInputCtrl.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 _GUIINPUTCTRL_H_
 #define _GUIINPUTCTRL_H_

Engine/source/gui/utility/guiMouseEventCtrl.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 _GUIMOUSEEVENTCTRL_H_
 #define _GUIMOUSEEVENTCTRL_H_
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
-
 
 class GuiMouseEventCtrl : public GuiControl
 {

Engine/source/gui/utility/guiRenderTargetVizCtrl.h

@@ -23,13 +23,8 @@
 
 #ifndef GUIRENDERTARGETVIZCTRL_H
 #define GUIRENDERTARGETVIZCTRL_H
-
-#ifndef _GUICONTROL_H_
 #include "gui/core/guiControl.h"
-#endif
-#ifndef _TEXTARGETBIN_MGR_H_
 #include "renderInstance/renderTexTargetBinManager.h"
-#endif
 
 class GuiRenderTargetVizCtrl : public GuiControl
 {