From 6d7179c31e2cbad65ed1027c02a9a20f0ec2f69e Mon Sep 17 00:00:00 2001
From: Harriet Brown <harriet.brown@stfc.ac.uk>
Date: Mon, 9 Mar 2020 16:40:55 +0000
Subject: [PATCH] Replace header guards in qt/Widgets with pragma once

This commit replaces all header guards in qt/Widgets with #pragma once.
---
 .../common/inc/MantidQtWidgets/Common/AlgorithmDialog.h     | 6 ++----
 .../inc/MantidQtWidgets/Common/AlgorithmDialogFactory.h     | 6 ++----
 .../inc/MantidQtWidgets/Common/AlgorithmHintStrategy.h      | 5 +----
 .../inc/MantidQtWidgets/Common/AlgorithmHistoryWindow.h     | 5 +----
 .../inc/MantidQtWidgets/Common/AlgorithmInputHistory.h      | 5 +----
 .../AlgorithmProgress/AlgorithmProgressDialogPresenter.h    | 5 +----
 .../AlgorithmProgress/AlgorithmProgressDialogWidget.h       | 5 +----
 .../Common/AlgorithmProgress/AlgorithmProgressModel.h       | 5 +----
 .../Common/AlgorithmProgress/AlgorithmProgressPresenter.h   | 5 +----
 .../AlgorithmProgress/AlgorithmProgressPresenterBase.h      | 5 +----
 .../Common/AlgorithmProgress/AlgorithmProgressWidget.h      | 6 ++----
 .../AlgorithmProgress/IAlgorithmProgressDialogWidget.h      | 5 +----
 .../Common/AlgorithmProgress/IAlgorithmProgressWidget.h     | 5 +----
 .../inc/MantidQtWidgets/Common/AlgorithmPropertiesWidget.h  | 5 +----
 .../common/inc/MantidQtWidgets/Common/AlgorithmRunner.h     | 5 +----
 .../inc/MantidQtWidgets/Common/AlgorithmSelectorWidget.h    | 5 +----
 .../inc/MantidQtWidgets/Common/AlternateCSPythonLexer.h     | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/BaseDecoder.h  | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/BaseEncoder.h  | 5 +----
 .../common/inc/MantidQtWidgets/Common/Batch/AssertOrThrow.h | 5 +----
 .../inc/MantidQtWidgets/Common/Batch/BuildSubtreeItems.h    | 6 ++----
 qt/widgets/common/inc/MantidQtWidgets/Common/Batch/Cell.h   | 6 ++----
 .../common/inc/MantidQtWidgets/Common/Batch/CellDelegate.h  | 6 ++----
 .../inc/MantidQtWidgets/Common/Batch/CellStandardItem.h     | 6 ++----
 .../inc/MantidQtWidgets/Common/Batch/ExtractSubtrees.h      | 6 ++----
 .../inc/MantidQtWidgets/Common/Batch/FilteredTreeModel.h    | 6 ++----
 .../inc/MantidQtWidgets/Common/Batch/FindSubtreeRoots.h     | 6 ++----
 .../common/inc/MantidQtWidgets/Common/Batch/IJobTreeView.h  | 6 ++----
 .../common/inc/MantidQtWidgets/Common/Batch/JobTreeView.h   | 6 ++----
 .../MantidQtWidgets/Common/Batch/JobTreeViewSignalAdapter.h | 6 ++----
 .../inc/MantidQtWidgets/Common/Batch/MockJobTreeView.h      | 6 ++----
 .../inc/MantidQtWidgets/Common/Batch/QtBasicNavigation.h    | 6 ++----
 .../Common/Batch/QtStandardItemTreeAdapter.h                | 6 ++----
 .../MantidQtWidgets/Common/Batch/QtTreeCursorNavigation.h   | 6 ++----
 qt/widgets/common/inc/MantidQtWidgets/Common/Batch/Row.h    | 6 ++----
 .../common/inc/MantidQtWidgets/Common/Batch/RowLocation.h   | 6 ++----
 .../inc/MantidQtWidgets/Common/Batch/RowLocationAdapter.h   | 6 ++----
 .../common/inc/MantidQtWidgets/Common/Batch/RowPredicate.h  | 6 ++----
 .../inc/MantidQtWidgets/Common/Batch/StrictQModelIndices.h  | 6 ++----
 .../common/inc/MantidQtWidgets/Common/Batch/Subtree.h       | 6 ++----
 .../common/inc/MantidQtWidgets/Common/Batch/equal.hpp       | 5 +----
 .../inc/MantidQtWidgets/Common/BatchAlgorithmRunner.h       | 5 +----
 .../common/inc/MantidQtWidgets/Common/BoolPropertyWidget.h  | 5 +----
 .../common/inc/MantidQtWidgets/Common/CatalogHelper.h       | 6 ++----
 .../common/inc/MantidQtWidgets/Common/CatalogSearch.h       | 6 ++----
 .../common/inc/MantidQtWidgets/Common/CatalogSelector.h     | 5 +----
 .../common/inc/MantidQtWidgets/Common/CheckboxHeader.h      | 6 ++----
 qt/widgets/common/inc/MantidQtWidgets/Common/Configurable.h | 5 +----
 .../inc/MantidQtWidgets/Common/ConvolutionFunctionModel.h   | 5 +----
 .../Common/DataProcessorUI/AbstractTreeModel.h              | 5 +----
 .../Common/DataProcessorUI/AppendGroupCommand.h             | 6 ++----
 .../Common/DataProcessorUI/AppendRowCommand.h               | 6 ++----
 .../Common/DataProcessorUI/ClearSelectedCommand.h           | 6 ++----
 .../Common/DataProcessorUI/CollapseGroupsCommand.h          | 6 ++----
 .../inc/MantidQtWidgets/Common/DataProcessorUI/Column.h     | 6 ++----
 .../inc/MantidQtWidgets/Common/DataProcessorUI/Command.h    | 6 ++----
 .../MantidQtWidgets/Common/DataProcessorUI/CommandBase.h    | 6 ++----
 .../Common/DataProcessorUI/ConstColumnIterator.h            | 6 ++----
 .../Common/DataProcessorUI/CopySelectedCommand.h            | 6 ++----
 .../Common/DataProcessorUI/CutSelectedCommand.h             | 6 ++----
 .../Common/DataProcessorUI/DataProcessorMainPresenter.h     | 6 ++----
 .../Common/DataProcessorUI/DataProcessorPresenter.h         | 6 ++----
 .../Common/DataProcessorUI/DataProcessorView.h              | 6 ++----
 .../Common/DataProcessorUI/DeleteGroupCommand.h             | 6 ++----
 .../Common/DataProcessorUI/DeleteRowCommand.h               | 6 ++----
 .../MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h  | 6 ++----
 .../Common/DataProcessorUI/ExpandGroupsCommand.h            | 6 ++----
 .../Common/DataProcessorUI/ExportTableCommand.h             | 6 ++----
 .../Common/DataProcessorUI/GenerateNotebook.h               | 6 ++----
 .../Common/DataProcessorUI/GenericDataProcessorPresenter.h  | 6 ++----
 .../DataProcessorUI/GenericDataProcessorPresenterFactory.h  | 6 ++----
 .../GenericDataProcessorPresenterGroupReducerWorker.h       | 6 ++----
 .../GenericDataProcessorPresenterRowReducerWorker.h         | 5 +----
 .../DataProcessorUI/GenericDataProcessorPresenterThread.h   | 5 +----
 .../Common/DataProcessorUI/GroupRowsCommand.h               | 6 ++----
 .../Common/DataProcessorUI/ImportTableCommand.h             | 6 ++----
 .../MantidQtWidgets/Common/DataProcessorUI/MockObjects.h    | 5 +----
 .../Common/DataProcessorUI/NewTableCommand.h                | 6 ++----
 .../Common/DataProcessorUI/OneLevelTreeManager.h            | 6 ++----
 .../Common/DataProcessorUI/OpenTableCommand.h               | 6 ++----
 .../MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h | 6 ++----
 .../inc/MantidQtWidgets/Common/DataProcessorUI/OptionsMap.h | 6 ++----
 .../MantidQtWidgets/Common/DataProcessorUI/OptionsQMap.h    | 6 ++----
 .../Common/DataProcessorUI/PasteSelectedCommand.h           | 6 ++----
 .../MantidQtWidgets/Common/DataProcessorUI/PauseCommand.h   | 6 ++----
 .../Common/DataProcessorUI/PlotGroupCommand.h               | 6 ++----
 .../MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h | 6 ++----
 .../Common/DataProcessorUI/PostprocessingAlgorithm.h        | 6 ++----
 .../Common/DataProcessorUI/PostprocessingStep.h             | 6 ++----
 .../MantidQtWidgets/Common/DataProcessorUI/PreprocessMap.h  | 6 ++----
 .../Common/DataProcessorUI/PreprocessingAlgorithm.h         | 6 ++----
 .../MantidQtWidgets/Common/DataProcessorUI/ProcessCommand.h | 6 ++----
 .../Common/DataProcessorUI/ProcessingAlgorithm.h            | 6 ++----
 .../Common/DataProcessorUI/ProcessingAlgorithmBase.h        | 6 ++----
 .../Common/DataProcessorUI/QDataProcessorWidget.h           | 6 ++----
 .../Common/DataProcessorUI/QOneLevelTreeModel.h             | 5 +----
 .../Common/DataProcessorUI/QTwoLevelTreeModel.h             | 5 +----
 .../Common/DataProcessorUI/QtCommandAdapter.h               | 6 ++----
 .../Common/DataProcessorUI/QtDataProcessorOptionsDialog.h   | 5 +----
 .../Common/DataProcessorUI/SaveTableAsCommand.h             | 6 ++----
 .../Common/DataProcessorUI/SaveTableCommand.h               | 6 ++----
 .../Common/DataProcessorUI/SeparatorCommand.h               | 6 ++----
 .../MantidQtWidgets/Common/DataProcessorUI/ToStdStringMap.h | 6 ++----
 .../inc/MantidQtWidgets/Common/DataProcessorUI/TreeData.h   | 6 ++----
 .../MantidQtWidgets/Common/DataProcessorUI/TreeManager.h    | 6 ++----
 .../Common/DataProcessorUI/TwoLevelTreeManager.h            | 6 ++----
 .../MantidQtWidgets/Common/DataProcessorUI/VectorString.h   | 6 ++----
 .../inc/MantidQtWidgets/Common/DataProcessorUI/WhiteList.h  | 6 ++----
 .../Common/DataProcessorUI/WorkspaceCommand.h               | 6 ++----
 .../Common/DataProcessorUI/WorkspaceNameUtils.h             | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/DataSelector.h | 6 ++----
 qt/widgets/common/inc/MantidQtWidgets/Common/DiagResults.h  | 5 +----
 .../common/inc/MantidQtWidgets/Common/DistributionOptions.h | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/DllOption.h    | 5 +----
 .../common/inc/MantidQtWidgets/Common/DoubleSpinBox.h       | 6 ++----
 .../common/inc/MantidQtWidgets/Common/DropEventHelper.h     | 5 +----
 .../inc/MantidQtWidgets/Common/EditLocalParameterDialog.h   | 5 +----
 .../common/inc/MantidQtWidgets/Common/FileDialogHandler.h   | 5 +----
 .../common/inc/MantidQtWidgets/Common/FilePropertyWidget.h  | 5 +----
 .../inc/MantidQtWidgets/Common/FilenameDialogEditor.h       | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/FindDialog.h   | 5 +----
 .../inc/MantidQtWidgets/Common/FindFilesThreadPoolManager.h | 5 +----
 .../Common/FindFilesThreadPoolManagerMockObjects.h          | 5 +----
 .../common/inc/MantidQtWidgets/Common/FindFilesWorker.h     | 5 +----
 .../common/inc/MantidQtWidgets/Common/FindReplaceDialog.h   | 5 +----
 .../common/inc/MantidQtWidgets/Common/FitOptionsBrowser.h   | 5 +----
 .../common/inc/MantidQtWidgets/Common/FitPropertyBrowser.h  | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/FlowLayout.h   | 5 +----
 .../common/inc/MantidQtWidgets/Common/FunctionBrowser.h     | 5 +----
 .../Common/FunctionBrowser/FunctionBrowserUtils.h           | 5 +----
 .../common/inc/MantidQtWidgets/Common/FunctionModel.h       | 5 +----
 .../MantidQtWidgets/Common/FunctionMultiDomainPresenter.h   | 5 +----
 .../common/inc/MantidQtWidgets/Common/FunctionTreeView.h    | 5 +----
 .../common/inc/MantidQtWidgets/Common/GenericDialog.h       | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/GraphOptions.h | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/HelpWindow.h   | 6 ++----
 qt/widgets/common/inc/MantidQtWidgets/Common/Hint.h         | 6 ++----
 qt/widgets/common/inc/MantidQtWidgets/Common/HintStrategy.h | 5 +----
 .../common/inc/MantidQtWidgets/Common/HintingLineEdit.h     | 5 +----
 .../inc/MantidQtWidgets/Common/HintingLineEditFactory.h     | 5 +----
 .../common/inc/MantidQtWidgets/Common/IFunctionBrowser.h    | 5 +----
 .../common/inc/MantidQtWidgets/Common/IFunctionModel.h      | 5 +----
 .../common/inc/MantidQtWidgets/Common/IFunctionView.h       | 5 +----
 .../common/inc/MantidQtWidgets/Common/IMuonFitDataModel.h   | 5 +----
 .../inc/MantidQtWidgets/Common/IMuonFitDataSelector.h       | 5 +----
 .../inc/MantidQtWidgets/Common/IMuonFitFunctionModel.h      | 5 +----
 .../common/inc/MantidQtWidgets/Common/IProjectSaveView.h    | 6 ++----
 .../inc/MantidQtWidgets/Common/IProjectSerialisable.h       | 5 +----
 .../common/inc/MantidQtWidgets/Common/ISlitCalculator.h     | 5 +----
 .../inc/MantidQtWidgets/Common/IWorkspaceFitControl.h       | 5 +----
 .../Common/IndirectFitPropertyBrowserLegacy.h               | 5 +----
 .../common/inc/MantidQtWidgets/Common/InputController.h     | 5 +----
 .../common/inc/MantidQtWidgets/Common/InstrumentSelector.h  | 5 +----
 .../common/inc/MantidQtWidgets/Common/InterfaceManager.h    | 4 +---
 .../common/inc/MantidQtWidgets/Common/LineEditWithClear.h   | 5 +----
 .../common/inc/MantidQtWidgets/Common/ListPropertyWidget.h  | 5 +----
 .../inc/MantidQtWidgets/Common/LocalParameterEditor.h       | 5 +----
 .../inc/MantidQtWidgets/Common/LocalParameterItemDelegate.h | 5 +----
 .../common/inc/MantidQtWidgets/Common/LogValueFinder.h      | 5 +----
 .../common/inc/MantidQtWidgets/Common/LogValueSelector.h    | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/MWRunFiles.h   | 5 +----
 .../inc/MantidQtWidgets/Common/ManageUserDirectories.h      | 5 +----
 .../inc/MantidQtWidgets/Common/MantidAlgorithmMetatype.h    | 5 +----
 .../inc/MantidQtWidgets/Common/MantidDesktopServices.h      | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/MantidDialog.h | 5 +----
 .../common/inc/MantidQtWidgets/Common/MantidDisplayBase.h   | 6 ++----
 .../common/inc/MantidQtWidgets/Common/MantidHelpInterface.h | 5 +----
 .../common/inc/MantidQtWidgets/Common/MantidHelpWindow.h    | 6 ++----
 .../common/inc/MantidQtWidgets/Common/MantidTreeModel.h     | 6 ++----
 .../common/inc/MantidQtWidgets/Common/MantidTreeWidget.h    | 6 ++----
 .../inc/MantidQtWidgets/Common/MantidTreeWidgetItem.h       | 6 ++----
 .../common/inc/MantidQtWidgets/Common/MantidWSIndexDialog.h | 6 ++----
 qt/widgets/common/inc/MantidQtWidgets/Common/MantidWidget.h | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/MdConstants.h  | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/MdSettings.h   | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/Message.h      | 5 +----
 .../common/inc/MantidQtWidgets/Common/MessageDisplay.h      | 5 +----
 .../common/inc/MantidQtWidgets/Common/MockAlgorithmRunner.h | 5 +----
 .../inc/MantidQtWidgets/Common/MockProgressableView.h       | 5 +----
 .../common/inc/MantidQtWidgets/Common/MockSlitCalculator.h  | 5 +----
 .../common/inc/MantidQtWidgets/Common/MultifitSetupDialog.h | 5 +----
 .../common/inc/MantidQtWidgets/Common/MuonFitDataSelector.h | 5 +----
 .../inc/MantidQtWidgets/Common/MuonFitPropertyBrowser.h     | 5 +----
 .../common/inc/MantidQtWidgets/Common/MuonFunctionBrowser.h | 5 +----
 .../common/inc/MantidQtWidgets/Common/NonOrthogonal.h       | 5 +----
 .../common/inc/MantidQtWidgets/Common/NotificationService.h | 5 +----
 .../common/inc/MantidQtWidgets/Common/ObserverPattern.h     | 5 +----
 .../inc/MantidQtWidgets/Common/OptionsPropertyWidget.h      | 5 +----
 .../common/inc/MantidQtWidgets/Common/ParseKeyValueString.h | 5 +----
 .../common/inc/MantidQtWidgets/Common/ParseNumerics.h       | 6 ++----
 qt/widgets/common/inc/MantidQtWidgets/Common/PlotAxis.h     | 5 +----
 .../common/inc/MantidQtWidgets/Common/PluginLibraries.h     | 5 +----
 .../common/inc/MantidQtWidgets/Common/PrecompiledHeader.h   | 5 +----
 .../inc/MantidQtWidgets/Common/ProcessingAlgoWidget.h       | 6 ++----
 .../common/inc/MantidQtWidgets/Common/ProgressPresenter.h   | 6 ++----
 .../common/inc/MantidQtWidgets/Common/ProgressableView.h    | 5 +----
 .../common/inc/MantidQtWidgets/Common/ProjectSaveModel.h    | 5 +----
 .../inc/MantidQtWidgets/Common/ProjectSavePresenter.h       | 5 +----
 .../common/inc/MantidQtWidgets/Common/PropertyHandler.h     | 5 +----
 .../common/inc/MantidQtWidgets/Common/PropertyWidget.h      | 5 +----
 .../inc/MantidQtWidgets/Common/PropertyWidgetFactory.h      | 5 +----
 .../inc/MantidQtWidgets/Common/Python/CodeExecution.h       | 5 +----
 .../common/inc/MantidQtWidgets/Common/Python/Object.h       | 5 +----
 .../common/inc/MantidQtWidgets/Common/Python/QHashToDict.h  | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/Python/Sip.h   | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/PythonRunner.h | 5 +----
 .../common/inc/MantidQtWidgets/Common/QScienceSpinBox.h     | 6 ++----
 qt/widgets/common/inc/MantidQtWidgets/Common/QStringUtils.h | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/QtJSONUtils.h  | 5 +----
 .../Common/QtPropertyBrowser/ButtonEditorFactory.h          | 5 +----
 .../Common/QtPropertyBrowser/CompositeEditorFactory.h       | 5 +----
 .../Common/QtPropertyBrowser/DoubleDialogEditor.h           | 5 +----
 .../Common/QtPropertyBrowser/DoubleEditorFactory.h          | 5 +----
 .../Common/QtPropertyBrowser/FilenameDialogEditor.h         | 5 +----
 .../Common/QtPropertyBrowser/FormulaDialogEditor.h          | 5 +----
 .../Common/QtPropertyBrowser/ParameterPropertyManager.h     | 5 +----
 .../Common/QtPropertyBrowser/StringDialogEditor.h           | 5 +----
 .../Common/QtPropertyBrowser/StringEditorFactory.h          | 5 +----
 .../Common/QtPropertyBrowser/WorkspaceEditorFactory.h       | 5 +----
 .../Common/QtPropertyBrowser/qtbuttonpropertybrowser.h      | 5 +----
 .../Common/QtPropertyBrowser/qteditorfactory.h              | 5 +----
 .../Common/QtPropertyBrowser/qtgroupboxpropertybrowser.h    | 5 +----
 .../Common/QtPropertyBrowser/qtpropertybrowser.h            | 5 +----
 .../Common/QtPropertyBrowser/qtpropertybrowserutils_p.h     | 5 +----
 .../Common/QtPropertyBrowser/qtpropertymanager.h            | 5 +----
 .../Common/QtPropertyBrowser/qttreepropertybrowser.h        | 5 +----
 .../Common/QtPropertyBrowser/qtvariantproperty.h            | 6 ++----
 .../common/inc/MantidQtWidgets/Common/QtSignalChannel.h     | 5 +----
 .../common/inc/MantidQtWidgets/Common/RenameParDialog.h     | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/RepoModel.h    | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/RepoTreeView.h | 5 +----
 .../common/inc/MantidQtWidgets/Common/SaveWorkspaces.h      | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/ScriptEditor.h | 5 +----
 .../inc/MantidQtWidgets/Common/ScriptRepositoryView.h       | 5 +----
 .../inc/MantidQtWidgets/Common/SelectFunctionDialog.h       | 5 +----
 .../inc/MantidQtWidgets/Common/SelectWorkspacesDialog.h     | 5 +----
 .../MantidQtWidgets/Common/SelectionNotificationService.h   | 5 +----
 .../common/inc/MantidQtWidgets/Common/SequentialFitDialog.h | 5 +----
 .../common/inc/MantidQtWidgets/Common/SignalBlocker.h       | 5 +----
 .../inc/MantidQtWidgets/Common/SlicingAlgorithmDialog.h     | 5 +----
 .../common/inc/MantidQtWidgets/Common/SlitCalculator.h      | 5 +----
 .../common/inc/MantidQtWidgets/Common/SyncedCheckboxes.h    | 5 +----
 .../common/inc/MantidQtWidgets/Common/TSVSerialiser.h       | 5 +----
 .../Common/Testing/QApplicationGlobalFixture.h              | 5 +----
 .../common/inc/MantidQtWidgets/Common/TextPropertyWidget.h  | 5 +----
 .../common/inc/MantidQtWidgets/Common/TrackedAction.h       | 5 +----
 .../common/inc/MantidQtWidgets/Common/UserFunctionDialog.h  | 5 +----
 .../common/inc/MantidQtWidgets/Common/UserInputValidator.h  | 5 +----
 .../common/inc/MantidQtWidgets/Common/UserSubWindow.h       | 5 +----
 .../inc/MantidQtWidgets/Common/UserSubWindowFactory.h       | 5 +----
 .../inc/MantidQtWidgets/Common/VatesViewerInterface.h       | 5 +----
 .../common/inc/MantidQtWidgets/Common/WidgetDllOption.h     | 5 +----
 .../inc/MantidQtWidgets/Common/WidgetScrollbarDecorator.h   | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/WindowIcons.h  | 6 ++----
 .../common/inc/MantidQtWidgets/Common/WorkspaceIcons.h      | 6 ++----
 .../common/inc/MantidQtWidgets/Common/WorkspaceObserver.h   | 5 +----
 .../MantidQtWidgets/Common/WorkspacePresenter/ADSAdapter.h  | 5 +----
 .../Common/WorkspacePresenter/IWorkspaceDockView.h          | 5 +----
 .../Common/WorkspacePresenter/ViewNotifiable.h              | 6 ++----
 .../Common/WorkspacePresenter/WorkspaceDockMockObjects.h    | 5 +----
 .../Common/WorkspacePresenter/WorkspacePresenter.h          | 6 ++----
 .../Common/WorkspacePresenter/WorkspaceProvider.h           | 6 ++----
 .../Common/WorkspacePresenter/WorkspaceProviderNotifiable.h | 6 ++----
 .../Common/WorkspacePresenter/WorkspaceTreeWidget.h         | 6 ++----
 .../Common/WorkspacePresenter/WorkspaceTreeWidgetSimple.h   | 6 ++----
 .../common/inc/MantidQtWidgets/Common/WorkspaceSelector.h   | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/pixmaps.h      | 5 +----
 qt/widgets/common/inc/MantidQtWidgets/Common/pqHelpWindow.h | 5 +----
 qt/widgets/common/test/AlgorithmHintStrategyTest.h          | 5 +----
 .../AlgorithmProgressDialogPresenterTest.h                  | 6 ++----
 .../test/AlgorithmProgress/AlgorithmProgressPresenterTest.h | 6 ++----
 .../common/test/AlgorithmProgress/ManualProgressReporter.h  | 5 +----
 .../AlgorithmProgress/MockAlgorithmProgressDialogWidget.h   | 6 ++----
 .../test/AlgorithmProgress/MockAlgorithmProgressWidget.h    | 6 ++----
 qt/widgets/common/test/Batch/BuildSubtreeItemsTest.h        | 6 ++----
 qt/widgets/common/test/Batch/ExtractSubtreesTest.h          | 6 ++----
 qt/widgets/common/test/Batch/FindSubtreeRootsTest.h         | 5 +----
 qt/widgets/common/test/Batch/QtAdaptedModelTest.h           | 5 +----
 qt/widgets/common/test/Batch/RowLocationTest.h              | 5 +----
 qt/widgets/common/test/BatchAlgorithmRunnerTest.h           | 5 +----
 qt/widgets/common/test/ConvolutionFunctionModelTest.h       | 5 +----
 qt/widgets/common/test/DataProcessorUI/CommandsTest.h       | 6 ++----
 .../common/test/DataProcessorUI/GenerateNotebookTest.h      | 5 +----
 .../DataProcessorUI/GenericDataProcessorPresenterTest.h     | 6 ++----
 .../common/test/DataProcessorUI/OneLevelTreeManagerTest.h   | 6 ++----
 .../test/DataProcessorUI/PostprocessingAlgorithmTest.h      | 6 ++----
 qt/widgets/common/test/DataProcessorUI/PreprocessMapTest.h  | 6 ++----
 .../test/DataProcessorUI/PreprocessingAlgorithmTest.h       | 6 ++----
 .../test/DataProcessorUI/ProcessingAlgorithmBaseTest.h      | 5 +----
 .../common/test/DataProcessorUI/ProcessingAlgorithmTest.h   | 6 ++----
 .../common/test/DataProcessorUI/QOneLevelTreeModelTest.h    | 5 +----
 .../common/test/DataProcessorUI/QTwoLevelTreeModelTest.h    | 5 +----
 .../common/test/DataProcessorUI/TwoLevelTreeManagerTest.h   | 6 ++----
 qt/widgets/common/test/DataProcessorUI/WhiteListTest.h      | 6 ++----
 qt/widgets/common/test/FileDialogHandlerTest.h              | 5 +----
 qt/widgets/common/test/FindFilesThreadPoolManagerTest.h     | 5 +----
 qt/widgets/common/test/FindFilesWorkerTest.h                | 5 +----
 qt/widgets/common/test/FunctionBrowserUtilsTest.h           | 6 ++----
 qt/widgets/common/test/FunctionModelTest.h                  | 5 +----
 qt/widgets/common/test/FunctionMultiDomainPresenterTest.h   | 5 +----
 qt/widgets/common/test/InterfaceManagerTest.h               | 5 +----
 qt/widgets/common/test/LogValueFinderTest.h                 | 5 +----
 qt/widgets/common/test/MockScriptRepository.h               | 6 ++----
 qt/widgets/common/test/NonOrthogonalTest.h                  | 5 +----
 qt/widgets/common/test/ParseKeyValueStringTest.h            | 5 +----
 qt/widgets/common/test/PlotAxisTest.h                       | 5 +----
 qt/widgets/common/test/ProgressableViewTest.h               | 5 +----
 qt/widgets/common/test/ProjectSaveMockObjects.h             | 5 +----
 qt/widgets/common/test/ProjectSaveModelTest.h               | 5 +----
 qt/widgets/common/test/ProjectSavePresenterTest.h           | 5 +----
 qt/widgets/common/test/Python/SipTest.h                     | 5 +----
 qt/widgets/common/test/QtJSONUtilsTest.h                    | 5 +----
 qt/widgets/common/test/RepoModelTest.h                      | 5 +----
 qt/widgets/common/test/SelectionNotificationServiceTest.h   | 5 +----
 qt/widgets/common/test/SignalBlockerTest.h                  | 5 +----
 qt/widgets/common/test/TrackedActionTest.h                  | 5 +----
 qt/widgets/common/test/UserInputValidatorTest.h             | 5 +----
 qt/widgets/common/test/WidgetsCommonTestInitialization.h    | 5 +----
 qt/widgets/factory/inc/MantidQtWidgets/Factory/DllOption.h  | 5 +----
 .../factory/inc/MantidQtWidgets/Factory/WidgetFactory.h     | 5 +----
 .../MantidQtWidgets/InstrumentView/BankRenderingHelpers.h   | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/BankTextureBuilder.h | 6 ++----
 .../InstrumentView/BaseCustomInstrumentModel.h              | 5 +----
 .../InstrumentView/BaseCustomInstrumentPresenter.h          | 5 +----
 .../InstrumentView/BaseCustomInstrumentView.h               | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/BinDialog.h          | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/CollapsiblePanel.h   | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/ColorBar.h           | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/ColorMap.h           | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/DetXMLFile.h         | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/DllOption.h          | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/GLColor.h            | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/GLObject.h           | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/GridTextureFace.h    | 6 ++----
 .../inc/MantidQtWidgets/InstrumentView/InstrumentActor.h    | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/InstrumentRenderer.h | 6 ++----
 .../MantidQtWidgets/InstrumentView/InstrumentTreeModel.h    | 5 +----
 .../MantidQtWidgets/InstrumentView/InstrumentTreeWidget.h   | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/InstrumentWidget.h   | 5 +----
 .../InstrumentView/InstrumentWidgetDecoder.h                | 5 +----
 .../InstrumentView/InstrumentWidgetEncoder.h                | 5 +----
 .../InstrumentView/InstrumentWidgetMaskTab.h                | 5 +----
 .../InstrumentView/InstrumentWidgetPickTab.h                | 5 +----
 .../InstrumentView/InstrumentWidgetRenderTab.h              | 6 ++----
 .../MantidQtWidgets/InstrumentView/InstrumentWidgetTab.h    | 5 +----
 .../InstrumentView/InstrumentWidgetTreeTab.h                | 5 +----
 .../MantidQtWidgets/InstrumentView/InstrumentWidgetTypes.h  | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/MantidGLWidget.h     | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/MaskBinsData.h       | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/MiniPlot.h           | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/MiniPlotMpl.h        | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/MiniPlotQwt.h        | 6 ++----
 .../inc/MantidQtWidgets/InstrumentView/OpenGLError.h        | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/PanelsSurface.h      | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/PeakMarker2D.h       | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/PeakOverlay.h        | 5 +----
 .../InstrumentView/PlotFitAnalysisPaneModel.h               | 5 +----
 .../InstrumentView/PlotFitAnalysisPanePresenter.h           | 5 +----
 .../InstrumentView/PlotFitAnalysisPaneView.h                | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/Projection3D.h       | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/ProjectionSurface.h  | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/RectF.h              | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/RotationSurface.h    | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/Shape2D.h            | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/Shape2DCollection.h  | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/SimpleWidget.h       | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/UCorrectionDialog.h  | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/UnwrappedCylinder.h  | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/UnwrappedDetector.h  | 6 ++----
 .../inc/MantidQtWidgets/InstrumentView/UnwrappedSphere.h    | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/UnwrappedSurface.h   | 5 +----
 .../inc/MantidQtWidgets/InstrumentView/Viewport.h           | 5 +----
 .../MantidQtWidgets/InstrumentView/XIntegrationControl.h    | 5 +----
 .../instrumentview/test/InstrumentViewTestInitialization.h  | 5 +----
 .../instrumentview/test/InstrumentWidgetDecoderTest.h       | 5 +----
 .../instrumentview/test/InstrumentWidgetEncoderTest.h       | 5 +----
 qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Artist.h       | 5 +----
 qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Axes.h         | 5 +----
 qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/BackendQt.h    | 5 +----
 .../mplcpp/inc/MantidQtWidgets/MplCpp/ColorConverter.h      | 5 +----
 .../mplcpp/inc/MantidQtWidgets/MplCpp/ColorbarWidget.h      | 5 +----
 qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Colormap.h     | 5 +----
 qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Colors.h       | 6 ++----
 qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Cycler.h       | 5 +----
 qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/DllConfig.h    | 5 +----
 .../mplcpp/inc/MantidQtWidgets/MplCpp/ErrorbarContainer.h   | 5 +----
 qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Figure.h       | 5 +----
 .../mplcpp/inc/MantidQtWidgets/MplCpp/FigureCanvasQt.h      | 6 ++----
 qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Line2D.h       | 5 +----
 qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/MantidAxes.h   | 5 +----
 .../mplcpp/inc/MantidQtWidgets/MplCpp/MantidColorMap.h      | 5 +----
 qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/PanZoomTool.h  | 5 +----
 qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/PeakMarker.h   | 5 +----
 qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Plot.h         | 5 +----
 qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/RangeMarker.h  | 5 +----
 .../mplcpp/inc/MantidQtWidgets/MplCpp/ScalarMappable.h      | 5 +----
 qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/SingleMarker.h | 5 +----
 qt/widgets/mplcpp/test/ArtistTest.h                         | 5 +----
 qt/widgets/mplcpp/test/AxesTest.h                           | 5 +----
 qt/widgets/mplcpp/test/ColorConverterTest.h                 | 5 +----
 qt/widgets/mplcpp/test/ColormapTest.h                       | 5 +----
 qt/widgets/mplcpp/test/ColorsTest.h                         | 5 +----
 qt/widgets/mplcpp/test/CyclerTest.h                         | 5 +----
 qt/widgets/mplcpp/test/FigureCanvasQtTest.h                 | 5 +----
 qt/widgets/mplcpp/test/FigureTest.h                         | 5 +----
 qt/widgets/mplcpp/test/Line2DTest.h                         | 5 +----
 qt/widgets/mplcpp/test/MantidAxesTest.h                     | 5 +----
 qt/widgets/mplcpp/test/MantidColormapTest.h                 | 5 +----
 qt/widgets/mplcpp/test/MplCppTestInitialization.h           | 5 +----
 qt/widgets/mplcpp/test/PanZoomToolTest.h                    | 5 +----
 qt/widgets/mplcpp/test/PlotTest.h                           | 5 +----
 qt/widgets/mplcpp/test/QBackendExtractTest.h                | 5 +----
 qt/widgets/mplcpp/test/ScalarMappableTest.h                 | 5 +----
 qt/widgets/plotting/inc/MantidQtWidgets/Plotting/AxisID.h   | 5 +----
 .../inc/MantidQtWidgets/Plotting/ContourPreviewPlot.h       | 5 +----
 .../plotting/inc/MantidQtWidgets/Plotting/DllOption.h       | 5 +----
 .../inc/MantidQtWidgets/Plotting/Mpl/ContourPreviewPlot.h   | 5 +----
 .../plotting/inc/MantidQtWidgets/Plotting/Mpl/PeakPicker.h  | 5 +----
 .../plotting/inc/MantidQtWidgets/Plotting/Mpl/PreviewPlot.h | 5 +----
 .../inc/MantidQtWidgets/Plotting/Mpl/RangeSelector.h        | 5 +----
 .../inc/MantidQtWidgets/Plotting/Mpl/SingleSelector.h       | 5 +----
 .../plotting/inc/MantidQtWidgets/Plotting/PeakPicker.h      | 5 +----
 .../plotting/inc/MantidQtWidgets/Plotting/PreviewPlot.h     | 5 +----
 .../inc/MantidQtWidgets/Plotting/Qwt/ColorBarWidget.h       | 5 +----
 .../inc/MantidQtWidgets/Plotting/Qwt/ContourPreviewPlot.h   | 5 +----
 .../inc/MantidQtWidgets/Plotting/Qwt/DisplayCurveFit.h      | 5 +----
 .../MantidQtWidgets/Plotting/Qwt/DraggableColorBarWidget.h  | 5 +----
 .../plotting/inc/MantidQtWidgets/Plotting/Qwt/ErrorCurve.h  | 5 +----
 .../plotting/inc/MantidQtWidgets/Plotting/Qwt/MWView.h      | 5 +----
 .../inc/MantidQtWidgets/Plotting/Qwt/MantidColorMap.h       | 5 +----
 .../Plotting/Qwt/MantidQwtIMDWorkspaceData.h                | 6 ++----
 .../MantidQtWidgets/Plotting/Qwt/MantidQwtWorkspaceData.h   | 5 +----
 .../plotting/inc/MantidQtWidgets/Plotting/Qwt/PeakPicker.h  | 5 +----
 .../inc/MantidQtWidgets/Plotting/Qwt/PowerScaleEngine.h     | 5 +----
 .../plotting/inc/MantidQtWidgets/Plotting/Qwt/PreviewPlot.h | 5 +----
 .../plotting/inc/MantidQtWidgets/Plotting/Qwt/QwtHelper.h   | 5 +----
 .../inc/MantidQtWidgets/Plotting/Qwt/QwtRasterDataMD.h      | 5 +----
 .../Plotting/Qwt/QwtRasterDataMDNonOrthogonal.h             | 5 +----
 .../inc/MantidQtWidgets/Plotting/Qwt/QwtWorkspaceBinData.h  | 6 ++----
 .../MantidQtWidgets/Plotting/Qwt/QwtWorkspaceSpectrumData.h | 6 ++----
 .../inc/MantidQtWidgets/Plotting/Qwt/RangeSelector.h        | 5 +----
 .../plotting/inc/MantidQtWidgets/Plotting/Qwt/SafeQwtPlot.h | 5 +----
 .../plotting/inc/MantidQtWidgets/Plotting/Qwt/ScaleEngine.h | 5 +----
 .../plotting/inc/MantidQtWidgets/Plotting/Qwt/SignalRange.h | 5 +----
 .../inc/MantidQtWidgets/Plotting/Qwt/SingleSelector.h       | 5 +----
 .../plotting/inc/MantidQtWidgets/Plotting/Qwt/qwt_compat.h  | 5 +----
 .../plotting/inc/MantidQtWidgets/Plotting/RangeSelector.h   | 5 +----
 .../plotting/inc/MantidQtWidgets/Plotting/SingleSelector.h  | 5 +----
 qt/widgets/plotting/test/ContourPreviewPlotTest.h           | 5 +----
 qt/widgets/plotting/test/MantidColorMapTest.h               | 5 +----
 qt/widgets/plotting/test/PlottingTestInitialization.h       | 5 +----
 qt/widgets/plotting/test/QwtWorkspaceBinDataTest.h          | 5 +----
 qt/widgets/plotting/test/QwtWorkspaceSpectrumDataTest.h     | 5 +----
 qt/widgets/plotting/test/SignalRangeTest.h                  | 5 +----
 .../Plugins/AlgorithmDialogs/CatalogPublishDialog.h         | 5 +----
 .../AlgorithmDialogs/ConvertTableToMatrixWorkspaceDialog.h  | 5 +----
 .../MantidQtWidgets/Plugins/AlgorithmDialogs/FitDialog.h    | 5 +----
 .../Plugins/AlgorithmDialogs/LOQScriptInputDialog.h         | 5 +----
 .../Plugins/AlgorithmDialogs/LoadDAEDialog.h                | 5 +----
 .../MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDialog.h   | 5 +----
 .../Plugins/AlgorithmDialogs/LoadRawDialog.h                | 5 +----
 .../Plugins/AlgorithmDialogs/MantidGLWidget.h               | 5 +----
 .../Plugins/AlgorithmDialogs/PeriodicTableWidget.h          | 5 +----
 .../AlgorithmDialogs/PlotAsymmetryByLogValueDialog.h        | 5 +----
 .../Plugins/AlgorithmDialogs/PrecompiledHeader.h            | 5 +----
 .../Plugins/AlgorithmDialogs/SampleShapeHelpers.h           | 5 +----
 .../Plugins/AlgorithmDialogs/SmoothNeighboursDialog.h       | 5 +----
 .../Plugins/AlgorithmDialogs/SortTableWorkspaceDialog.h     | 5 +----
 .../Plugins/AlgorithmDialogs/StartLiveDataDialog.h          | 5 +----
 .../inc/MantidQtWidgets/Plugins/Designer/DesignerPlugin.h   | 5 +----
 .../Plugins/Designer/PluginCollectionInterface.h            | 5 +----
 .../inc/MantidQtWidgets/RefDetectorView/DllOption.h         | 5 +----
 .../inc/MantidQtWidgets/RefDetectorView/RefIVConnections.h  | 5 +----
 .../inc/MantidQtWidgets/RefDetectorView/RefImageDisplay.h   | 5 +----
 .../inc/MantidQtWidgets/RefDetectorView/RefImagePlotItem.h  | 5 +----
 .../inc/MantidQtWidgets/RefDetectorView/RefImageView.h      | 5 +----
 .../inc/MantidQtWidgets/RefDetectorView/RefLimitsHandler.h  | 5 +----
 .../MantidQtWidgets/RefDetectorView/RefMatrixWSImageView.h  | 5 +----
 .../inc/MantidQtWidgets/RefDetectorView/RefRangeHandler.h   | 5 +----
 .../inc/MantidQtWidgets/RefDetectorView/RefSliderHandler.h  | 5 +----
 .../MantidQtWidgets/SliceViewer/CompositePeaksPresenter.h   | 5 +----
 .../MantidQtWidgets/SliceViewer/ConcretePeaksPresenter.h    | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/CoordinateTransform.h   | 6 ++----
 .../inc/MantidQtWidgets/SliceViewer/CustomTools.h           | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/DimensionSliceWidget.h  | 5 +----
 .../sliceviewer/inc/MantidQtWidgets/SliceViewer/DllOption.h | 5 +----
 .../SliceViewer/EllipsoidPlaneSliceCalculator.h             | 5 +----
 .../MantidQtWidgets/SliceViewer/FirstExperimentInfoQuery.h  | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/LineOverlay.h           | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/LinePlotOptions.h       | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/LineViewer.h            | 6 ++----
 .../inc/MantidQtWidgets/SliceViewer/NonOrthogonalAxis.h     | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/NonOrthogonalOverlay.h  | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/NullPeaksPresenter.h    | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/PeakBoundingBox.h       | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/PeakEditMode.h          | 6 ++----
 .../MantidQtWidgets/SliceViewer/PeakOverlayInteractive.h    | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/PeakOverlayView.h       | 5 +----
 .../MantidQtWidgets/SliceViewer/PeakOverlayViewFactory.h    | 5 +----
 .../SliceViewer/PeakOverlayViewFactoryBase.h                | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/PeakPalette.h           | 6 ++----
 .../inc/MantidQtWidgets/SliceViewer/PeakPrimitives.h        | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/PeakRepresentation.h    | 5 +----
 .../MantidQtWidgets/SliceViewer/PeakRepresentationCross.h   | 6 ++----
 .../SliceViewer/PeakRepresentationEllipsoid.h               | 6 ++----
 .../MantidQtWidgets/SliceViewer/PeakRepresentationSphere.h  | 6 ++----
 .../sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakView.h  | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/PeakViewColor.h         | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/PeakViewFactory.h       | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/PeaksPresenter.h        | 5 +----
 .../MantidQtWidgets/SliceViewer/PeaksTableColumnsDialog.h   | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/PeaksViewer.h           | 6 ++----
 .../MantidQtWidgets/SliceViewer/PeaksViewerOverlayDialog.h  | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/PeaksWorkspaceWidget.h  | 6 ++----
 .../SliceViewer/ProxyCompositePeaksPresenter.h              | 5 +----
 .../MantidQtWidgets/SliceViewer/QwtScaleDrawNonOrthogonal.h | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/SliceViewer.h           | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/SliceViewerFunctions.h  | 6 ++----
 .../inc/MantidQtWidgets/SliceViewer/SliceViewerWindow.h     | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/SnapToGridDialog.h      | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/UpdateableOnDemand.h    | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/XYLimitsDialog.h        | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/ZoomableOnDemand.h      | 5 +----
 .../inc/MantidQtWidgets/SliceViewer/ZoomablePeaksView.h     | 5 +----
 qt/widgets/sliceviewer/test/CompositePeaksPresenterTest.h   | 5 +----
 qt/widgets/sliceviewer/test/ConcretePeaksPresenterTest.h    | 5 +----
 qt/widgets/sliceviewer/test/CoordinateTransformTest.h       | 6 ++----
 .../sliceviewer/test/EllipsoidPlaneSliceCalculatorTest.h    | 5 +----
 qt/widgets/sliceviewer/test/MockObjects.h                   | 5 +----
 qt/widgets/sliceviewer/test/NullPeaksPresenterTest.h        | 5 +----
 qt/widgets/sliceviewer/test/PeakBoundingBoxTest.h           | 5 +----
 qt/widgets/sliceviewer/test/PeakPaletteTest.h               | 5 +----
 qt/widgets/sliceviewer/test/PeakRepresentationCrossTest.h   | 5 +----
 .../sliceviewer/test/PeakRepresentationEllipsoidTest.h      | 5 +----
 qt/widgets/sliceviewer/test/PeakRepresentationSphereTest.h  | 5 +----
 qt/widgets/sliceviewer/test/SliceViewerFunctionsTest.h      | 5 +----
 .../inc/MantidQtWidgets/SpectrumViewer/ArrayDataSource.h    | 5 +----
 .../inc/MantidQtWidgets/SpectrumViewer/ColorMaps.h          | 5 +----
 .../inc/MantidQtWidgets/SpectrumViewer/DataArray.h          | 5 +----
 .../inc/MantidQtWidgets/SpectrumViewer/DllOptionSV.h        | 5 +----
 .../inc/MantidQtWidgets/SpectrumViewer/EModeHandler.h       | 5 +----
 .../inc/MantidQtWidgets/SpectrumViewer/GraphDisplay.h       | 5 +----
 .../inc/MantidQtWidgets/SpectrumViewer/IRangeHandler.h      | 5 +----
 .../inc/MantidQtWidgets/SpectrumViewer/ISliderHandler.h     | 5 +----
 .../inc/MantidQtWidgets/SpectrumViewer/MatrixWSDataSource.h | 5 +----
 .../inc/MantidQtWidgets/SpectrumViewer/QtUtils.h            | 5 +----
 .../inc/MantidQtWidgets/SpectrumViewer/RangeHandler.h       | 5 +----
 .../inc/MantidQtWidgets/SpectrumViewer/SVConnections.h      | 5 +----
 .../inc/MantidQtWidgets/SpectrumViewer/SVUtils.h            | 5 +----
 .../inc/MantidQtWidgets/SpectrumViewer/SliderHandler.h      | 5 +----
 .../inc/MantidQtWidgets/SpectrumViewer/SpectrumDataSource.h | 5 +----
 .../inc/MantidQtWidgets/SpectrumViewer/SpectrumDisplay.h    | 5 +----
 .../inc/MantidQtWidgets/SpectrumViewer/SpectrumPlotItem.h   | 5 +----
 .../inc/MantidQtWidgets/SpectrumViewer/SpectrumView.h       | 5 +----
 .../inc/MantidQtWidgets/SpectrumViewer/TrackingPicker.h     | 5 +----
 555 files changed, 697 insertions(+), 2219 deletions(-)

diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmDialog.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmDialog.h
index bd8dd424322..329b48270f3 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmDialog.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_ALGORITHMDIALOG_H_
-#define MANTIDQT_API_ALGORITHMDIALOG_H_
+#pragma once
 
 /* Used to register classes into the factory. creates a global object in an
  * anonymous namespace. The object itself does nothing, but the comma operator
@@ -343,5 +342,4 @@ protected:
   //@}
 };
 } // namespace API
-} // namespace MantidQt
-#endif // MANTIDQT_API_ALGORITHMDIALOG_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmDialogFactory.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmDialogFactory.h
index 4fef8732580..d478efc8031 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmDialogFactory.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmDialogFactory.h
@@ -5,8 +5,7 @@
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
 
-#ifndef MANTIDQT_API_ALGORITHMDIALOGFACTORYIMPL_H_
-#define MANTIDQT_API_ALGORITHMDIALOGFACTORYIMPL_H_
+#pragma once
 
 //------------------------
 // Includes
@@ -67,5 +66,4 @@ namespace Kernel {
 EXTERN_MANTIDQT_COMMON template class EXPORT_OPT_MANTIDQT_COMMON
     Mantid::Kernel::SingletonHolder<MantidQt::API::AlgorithmDialogFactoryImpl>;
 } // namespace Kernel
-} // namespace Mantid
-#endif
\ No newline at end of file
+} // namespace Mantid
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmHintStrategy.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmHintStrategy.h
index 0cdaa393820..85ae08b4bc4 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmHintStrategy.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmHintStrategy.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_ALGORITHMHINTSTRATEGY_H
-#define MANTID_MANTIDWIDGETS_ALGORITHMHINTSTRATEGY_H
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/IAlgorithm.h"
@@ -57,5 +56,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTID_MANTIDWIDGETS_ALGORITHMHINTSTRATEGY_H */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmHistoryWindow.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmHistoryWindow.h
index 5aa702ae7c0..67ea1b360a9 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmHistoryWindow.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmHistoryWindow.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef ALGORITHMHISTORYWINDOW_H
-#define ALGORITHMHISTORYWINDOW_H
+#pragma once
 
 #include "DllOption.h"
 
@@ -217,5 +216,3 @@ private:
 
   std::vector<Mantid::Kernel::PropertyHistory_sptr> m_Histprop;
 };
-
-#endif // ALGORITHMHISTORYWINDOW_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmInputHistory.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmInputHistory.h
index c74629fb7e6..5392636f81c 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmInputHistory.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmInputHistory.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_ALGORITHMINPUTHISTORY_H_
-#define MANTIDQT_API_ALGORITHMINPUTHISTORY_H_
+#pragma once
 
 //----------------------------------
 // Includes
@@ -103,5 +102,3 @@ EXTERN_MANTIDQT_COMMON template class EXPORT_OPT_MANTIDQT_COMMON
     Mantid::Kernel::SingletonHolder<MantidQt::API::AlgorithmInputHistoryImpl>;
 }
 } // namespace Mantid
-
-#endif // ALGORITHMINPUTHISTORY_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressDialogPresenter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressDialogPresenter.h
index 88af1ed6d5a..de578ca0903 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressDialogPresenter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressDialogPresenter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef ALGORITHMPROGRESSDIALOGPRESENTER_H
-#define ALGORITHMPROGRESSDIALOGPRESENTER_H
+#pragma once
 
 #include "MantidAPI/IAlgorithm.h"
 #include "MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressModel.h"
@@ -52,5 +51,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // ALGORITHMPROGRESSDIALOGPRESENTER_H
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressDialogWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressDialogWidget.h
index a8694ee6143..8cd67431d11 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressDialogWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressDialogWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_ALGORITHMPROGRESSDIALOGWIDGET_H
-#define MANTID_MANTIDWIDGETS_ALGORITHMPROGRESSDIALOGWIDGET_H
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressDialogPresenter.h"
@@ -74,5 +73,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // ALGORITHMPROGRESSDIALOGWIDGET_H
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressModel.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressModel.h
index 9c03008cc78..3060475f239 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressModel.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressModel.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef ALGORITHMPROGRESSMODEL_H
-#define ALGORITHMPROGRESSMODEL_H
+#pragma once
 
 #include "MantidAPI/AlgorithmObserver.h"
 #include "MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressPresenterBase.h"
@@ -65,5 +64,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // ALGORITHMPROGRESSMODEL_H
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressPresenter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressPresenter.h
index 33251176641..d46ef283906 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressPresenter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressPresenter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef ALGORITHMPROGRESSPRESENTER_H
-#define ALGORITHMPROGRESSPRESENTER_H
+#pragma once
 
 #include "MantidKernel/Timer.h"
 #include "MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressModel.h"
@@ -61,5 +60,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // ALGORITHMPROGRESSPRESENTER_H
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressPresenterBase.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressPresenterBase.h
index 785e30e7552..e9c144f268e 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressPresenterBase.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressPresenterBase.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef ALGORITHMPROGRESSPRESENTERBASE_H
-#define ALGORITHMPROGRESSPRESENTERBASE_H
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 
@@ -59,5 +58,3 @@ signals:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // ALGORITHMPROGRESSPRESENTERBASE_H
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressWidget.h
index 7cb0c741294..15e799aa51e 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef ALGORITHMPROGRESSWIDGET_H
-#define ALGORITHMPROGRESSWIDGET_H
+#pragma once
 //----------------------------------
 // Includes
 //----------------------------------
@@ -71,5 +70,4 @@ private:
 };
 
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // ALGORITHMPROGRESSWIDGET_H
\ No newline at end of file
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/IAlgorithmProgressDialogWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/IAlgorithmProgressDialogWidget.h
index f8bd9355bb0..0fe86d94940 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/IAlgorithmProgressDialogWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/IAlgorithmProgressDialogWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_IALGORITHMPROGRESSDIALOGWIDGET_H
-#define MANTID_MANTIDWIDGETS_IALGORITHMPROGRESSDIALOGWIDGET_H
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 
@@ -34,5 +33,3 @@ public:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // IALGORITHMPROGRESSDIALOGWIDGET_H
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/IAlgorithmProgressWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/IAlgorithmProgressWidget.h
index de43247906d..11ffb47139b 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/IAlgorithmProgressWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/IAlgorithmProgressWidget.h
@@ -1,5 +1,4 @@
-#ifndef IALGORITHMPROGRESSWIDGET_H
-#define IALGORITHMPROGRESSWIDGET_H
+#pragma once
 class QString;
 
 namespace MantidQt {
@@ -17,5 +16,3 @@ public:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // IALGORITHMPROGRESSWIDGET_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmPropertiesWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmPropertiesWidget.h
index 0d3c5952eb0..21a36ed4810 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmPropertiesWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmPropertiesWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_API_ALGORITHMPROPERTIESWIDGET_H_
-#define MANTID_API_ALGORITHMPROPERTIESWIDGET_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/IAlgorithm.h"
@@ -111,5 +110,3 @@ private:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTID_API_ALGORITHMPROPERTIESWIDGET_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmRunner.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmRunner.h
index e529bccc99e..c0b113e4337 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmRunner.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmRunner.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_API_ALGORITHMRUNNER_H_
-#define MANTID_API_ALGORITHMRUNNER_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/Algorithm.h"
@@ -77,5 +76,3 @@ protected:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTID_API_ALGORITHMRUNNER_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmSelectorWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmSelectorWidget.h
index c29de630605..3b975b8cd3a 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmSelectorWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmSelectorWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_ALGORITHMSELECTORWIDGET_H_
-#define MANTID_MANTIDWIDGETS_ALGORITHMSELECTORWIDGET_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/AlgorithmFactory.h"
@@ -149,5 +148,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTID_MANTIDWIDGETS_ALGORITHMSELECTORWIDGET_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlternateCSPythonLexer.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlternateCSPythonLexer.h
index a7e91bb2ac7..083081670ac 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/AlternateCSPythonLexer.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/AlternateCSPythonLexer.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_WIDGETS_ALTERNATECSPYTHONLEXER_H
-#define MANTIDQT_WIDGETS_ALTERNATECSPYTHONLEXER_H
+#pragma once
 
 #include <Qsci/qscilexerpython.h>
 
@@ -23,5 +22,3 @@ public:
 private:
   QFont m_font;
 };
-
-#endif // MANTIDQT_WIDGETS_ALTERNATECSPYTHONLEXER_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/BaseDecoder.h b/qt/widgets/common/inc/MantidQtWidgets/Common/BaseDecoder.h
index f1ee37139b1..6881b81102c 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/BaseDecoder.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/BaseDecoder.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_ABSTRACTDECODER_H_
-#define MANTIDQT_API_ABSTRACTDECODER_H_
+#pragma once
 
 #include <QList>
 #include <QMap>
@@ -26,5 +25,3 @@ public:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTIDQT_API_ABSTRACTDECODER_H_ */
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/BaseEncoder.h b/qt/widgets/common/inc/MantidQtWidgets/Common/BaseEncoder.h
index d731d15fbe2..f579e662d6a 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/BaseEncoder.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/BaseEncoder.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_ABSTRACTENCODER_H_
-#define MANTIDQT_API_ABSTRACTENCODER_H_
+#pragma once
 
 #include <QList>
 #include <QMap>
@@ -26,5 +25,3 @@ public:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTIDQT_API_ABSTRACTENCODER_H_ */
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/AssertOrThrow.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/AssertOrThrow.h
index 5b4156e323b..024aa396338 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/AssertOrThrow.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/AssertOrThrow.h
@@ -8,8 +8,7 @@
 See the developer documentation for Batch Widget at
 developer.mantidproject.org/BatchWidget/index.html
 */
-#ifndef MANTIDQTMANTIDWIDGETS_ASSERTORTHROW_H_
-#define MANTIDQTMANTIDWIDGETS_ASSERTORTHROW_H_
+#pragma once
 #include <stdexcept>
 #include <string>
 
@@ -17,5 +16,3 @@ inline void assertOrThrow(bool condition, std::string const &message) {
   if (!condition)
     throw std::runtime_error(message);
 }
-
-#endif
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/BuildSubtreeItems.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/BuildSubtreeItems.h
index c3baea53faf..fef33a391ca 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/BuildSubtreeItems.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/BuildSubtreeItems.h
@@ -8,8 +8,7 @@
 See the developer documentation for Batch Widget at
 developer.mantidproject.org/BatchWidget/index.html
 */
-#ifndef MANTIDQTMANTIDWIDGETS_BUILDSUBTREE_H_
-#define MANTIDQTMANTIDWIDGETS_BUILDSUBTREE_H_
+#pragma once
 #include "MantidQtWidgets/Common/Batch/AssertOrThrow.h"
 #include "MantidQtWidgets/Common/Batch/QtStandardItemTreeAdapter.h"
 #include "MantidQtWidgets/Common/Batch/RowLocationAdapter.h"
@@ -42,5 +41,4 @@ private:
 
 } // namespace Batch
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/Cell.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/Cell.h
index affca5af6ad..db3265d6a8d 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/Cell.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/Cell.h
@@ -8,8 +8,7 @@
 See the developer documentation for Batch Widget at
 developer.mantidproject.org/BatchWidget/index.html
 */
-#ifndef MANTIDQTMANTIDWIDGETS_CELL_H_
-#define MANTIDQTMANTIDWIDGETS_CELL_H_
+#pragma once
 #include "MantidQtWidgets/Common/DllOption.h"
 #include <string>
 #include <vector>
@@ -85,5 +84,4 @@ paddedCellsToWidth(std::vector<Cell> const &cells, Cell const &paddingCell,
                    int paddedWidth);
 } // namespace Batch
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_CELL_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/CellDelegate.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/CellDelegate.h
index e61835aa9a1..1a15207a449 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/CellDelegate.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/CellDelegate.h
@@ -8,8 +8,7 @@
 See the developer documentation for Batch Widget at
 developer.mantidproject.org/BatchWidget/index.html
 */
-#ifndef MANTIDQTMANTIDWIDGETS_CELLDELEGATE_H_
-#define MANTIDQTMANTIDWIDGETS_CELLDELEGATE_H_
+#pragma once
 #include "MantidQtWidgets/Common/Batch/FilteredTreeModel.h"
 #include <QStandardItemModel>
 #include <QStyledItemDelegate>
@@ -33,5 +32,4 @@ private:
 };
 } // namespace Batch
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_CELLDELEGATE_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/CellStandardItem.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/CellStandardItem.h
index 27eb6dcfdcb..85ae9cb5cbf 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/CellStandardItem.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/CellStandardItem.h
@@ -8,8 +8,7 @@
 See the developer documentation for Batch Widget at
 developer.mantidproject.org/BatchWidget/index.html
 */
-#ifndef MANTIDQTMANTIDWIDGETS_CELLSTANDARDITEM_H_
-#define MANTIDQTMANTIDWIDGETS_CELLSTANDARDITEM_H_
+#pragma once
 #include "MantidQtWidgets/Common/Batch/Cell.h"
 #include <QColor>
 #include <QStandardItem>
@@ -46,5 +45,4 @@ void applyCellPropertiesToItem(Cell const &cell, QStandardItem &item);
 Cell extractCellPropertiesFromItem(QStandardItem const &item);
 } // namespace Batch
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_CELLSTANDARDITEM_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/ExtractSubtrees.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/ExtractSubtrees.h
index 30e8d04dc37..b7f36a140aa 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/ExtractSubtrees.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/ExtractSubtrees.h
@@ -8,8 +8,7 @@
 See the developer documentation for Batch Widget at
 developer.mantidproject.org/BatchWidget/index.html
 */
-#ifndef MANTIDQTMANTIDWIDGETS_EXTRACTSUBTREES_H_
-#define MANTIDQTMANTIDWIDGETS_EXTRACTSUBTREES_H_
+#pragma once
 #include "MantidQtWidgets/Common/Batch/AssertOrThrow.h"
 #include "MantidQtWidgets/Common/Batch/Row.h"
 #include "MantidQtWidgets/Common/Batch/RowLocation.h"
@@ -45,5 +44,4 @@ private:
 
 } // namespace Batch
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/FilteredTreeModel.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/FilteredTreeModel.h
index c6706efd287..12a2a312f89 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/FilteredTreeModel.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/FilteredTreeModel.h
@@ -8,8 +8,7 @@
 See the developer documentation for Batch Widget at
 developer.mantidproject.org/BatchWidget/index.html
 */
-#ifndef MANTIDQTMANTIDWIDGETS_FILTEREDTREEMODEL_H_
-#define MANTIDQTMANTIDWIDGETS_FILTEREDTREEMODEL_H_
+#pragma once
 #include "MantidQtWidgets/Common/Batch/RowLocation.h"
 #include "MantidQtWidgets/Common/Batch/RowLocationAdapter.h"
 #include "MantidQtWidgets/Common/Batch/RowPredicate.h"
@@ -38,5 +37,4 @@ private:
 };
 } // namespace Batch
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_FILTEREDTREEMODEL_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/FindSubtreeRoots.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/FindSubtreeRoots.h
index 1f59eada915..d933bb99945 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/FindSubtreeRoots.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/FindSubtreeRoots.h
@@ -8,8 +8,7 @@
 See the developer documentation for Batch Widget at
 developer.mantidproject.org/BatchWidget/index.html
 */
-#ifndef MANTIDQTMANTIDWIDGETS_FINDSUBTREEROOTS_H_
-#define MANTIDQTMANTIDWIDGETS_FINDSUBTREEROOTS_H_
+#pragma once
 #include "MantidQtWidgets/Common/Batch/AssertOrThrow.h"
 #include "MantidQtWidgets/Common/Batch/RowLocation.h"
 #include "MantidQtWidgets/Common/DllOption.h"
@@ -32,5 +31,4 @@ private:
 
 } // namespace Batch
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/IJobTreeView.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/IJobTreeView.h
index c30e087e073..73be371198e 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/IJobTreeView.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/IJobTreeView.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_IJOBTREEVIEW_H_
-#define MANTIDQTMANTIDWIDGETS_IJOBTREEVIEW_H_
+#pragma once
 #include "MantidQtWidgets/Common/Batch/Cell.h"
 #include "MantidQtWidgets/Common/Batch/Row.h"
 #include "MantidQtWidgets/Common/Batch/RowLocation.h"
@@ -104,5 +103,4 @@ public:
 };
 } // namespace Batch
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_IJOBTREEVIEW_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/JobTreeView.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/JobTreeView.h
index 50de63f2061..21573c68964 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/JobTreeView.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/JobTreeView.h
@@ -8,8 +8,7 @@
 See the developer documentation for Batch Widget at
 developer.mantidproject.org/BatchWidget/index.html
 */
-#ifndef MANTIDQTMANTIDWIDGETS_JOBTREEVIEW_H_
-#define MANTIDQTMANTIDWIDGETS_JOBTREEVIEW_H_
+#pragma once
 #include "MantidQtWidgets/Common/Batch/Cell.h"
 #include "MantidQtWidgets/Common/Batch/ExtractSubtrees.h"
 #include "MantidQtWidgets/Common/Batch/FilteredTreeModel.h"
@@ -179,5 +178,4 @@ private:
 };
 } // namespace Batch
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_JOBTREEVIEW_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/JobTreeViewSignalAdapter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/JobTreeViewSignalAdapter.h
index 64eb32e58b7..15d93266aea 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/JobTreeViewSignalAdapter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/JobTreeViewSignalAdapter.h
@@ -8,8 +8,7 @@
 See the developer documentation for Batch Widget at
 developer.mantidproject.org/BatchWidget/index.html
 */
-#ifndef MANTIDQTMANTIDWIDGETS_JOBTREEVIEWSIGNALADAPTER_H_
-#define MANTIDQTMANTIDWIDGETS_JOBTREEVIEWSIGNALADAPTER_H_
+#pragma once
 #include "MantidQtWidgets/Common/Batch/JobTreeView.h"
 #include "MantidQtWidgets/Common/DllOption.h"
 namespace MantidQt {
@@ -57,5 +56,4 @@ signals:
 };
 } // namespace Batch
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_JOBTREEVIEWSIGNALADAPTER_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/MockJobTreeView.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/MockJobTreeView.h
index f62c14aeaed..d529e9e3f53 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/MockJobTreeView.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/MockJobTreeView.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_MOCKJOBTREEVIEW_H_
-#define MANTIDQTMANTIDWIDGETS_MOCKJOBTREEVIEW_H_
+#pragma once
 #include "MantidKernel/WarningSuppressions.h"
 #include "MantidQtWidgets/Common/Batch/IJobTreeView.h"
 #include <gmock/gmock.h>
@@ -93,5 +92,4 @@ private:
 GNU_DIAG_ON_SUGGEST_OVERRIDE
 } // namespace Batch
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_MOCKJOBTREEVIEW_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/QtBasicNavigation.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/QtBasicNavigation.h
index 6794802f2bd..324d37a2945 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/QtBasicNavigation.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/QtBasicNavigation.h
@@ -8,8 +8,7 @@
 See the developer documentation for Batch Widget at
 developer.mantidproject.org/BatchWidget/index.html
 */
-#ifndef MANTIDQTMANTIDWIDGETS_QTBASICNAVIGATION_H_
-#define MANTIDQTMANTIDWIDGETS_QTBASICNAVIGATION_H_
+#pragma once
 #include <QModelIndex>
 
 namespace MantidQt {
@@ -30,5 +29,4 @@ bool hasRowBelow(QModelIndex const &index);
 bool areOnSameRow(QModelIndex const &a, QModelIndex const &b);
 } // namespace Batch
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_QTBASICNAVIGATION_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/QtStandardItemTreeAdapter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/QtStandardItemTreeAdapter.h
index cd97c4b6150..de5542aa0c2 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/QtStandardItemTreeAdapter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/QtStandardItemTreeAdapter.h
@@ -8,8 +8,7 @@
 See the developer documentation for Batch Widget at
 developer.mantidproject.org/BatchWidget/index.html
 */
-#ifndef MANTIDQTMANTIDWIDGETS_TREEITEMMODELADAPTER_H_
-#define MANTIDQTMANTIDWIDGETS_TREEITEMMODELADAPTER_H_
+#pragma once
 #include "MantidQtWidgets/Common/Batch/Row.h"
 #include "MantidQtWidgets/Common/Batch/StrictQModelIndices.h"
 #include "MantidQtWidgets/Common/DllOption.h"
@@ -90,5 +89,4 @@ modelItemFromIndex(QStandardItemModel const &model,
                    QModelIndexForMainModel const &index);
 } // namespace Batch
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_TREEITEMMODELADAPTER_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/QtTreeCursorNavigation.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/QtTreeCursorNavigation.h
index 06a6dd0a669..5b7e0114308 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/QtTreeCursorNavigation.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/QtTreeCursorNavigation.h
@@ -8,8 +8,7 @@
 See the developer documentation for Batch Widget at
 developer.mantidproject.org/BatchWidget/index.html
 */
-#ifndef MANTIDQTMANTIDWIDGETS_QTTREECURSORNAVIGATION_H_
-#define MANTIDQTMANTIDWIDGETS_QTTREECURSORNAVIGATION_H_
+#pragma once
 #include <QModelIndex>
 #include <utility>
 namespace MantidQt {
@@ -44,5 +43,4 @@ private:
 };
 } // namespace Batch
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_QTTREECURSORNAVIGATION_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/Row.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/Row.h
index 4dc57320bd9..49d01fb9c93 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/Row.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/Row.h
@@ -8,8 +8,7 @@
 See the developer documentation for Batch Widget at
 developer.mantidproject.org/BatchWidget/index.html
 */
-#ifndef MANTIDQTMANTIDWIDGETS_ROW_H_
-#define MANTIDQTMANTIDWIDGETS_ROW_H_
+#pragma once
 #include "MantidQtWidgets/Common/Batch/Cell.h"
 #include "MantidQtWidgets/Common/Batch/RowLocation.h"
 #include "MantidQtWidgets/Common/DllOption.h"
@@ -46,5 +45,4 @@ EXPORT_OPT_MANTIDQT_COMMON bool operator>=(Row const &lhs, Row const &rhs);
 
 } // namespace Batch
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/RowLocation.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/RowLocation.h
index 66dcd7992d4..2e1c02e5852 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/RowLocation.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/RowLocation.h
@@ -8,8 +8,7 @@
 See the developer documentation for Batch Widget at
 developer.mantidproject.org/BatchWidget/index.html
 */
-#ifndef MANTIDQTMANTIDWIDGETS_ROWLOCATION_H_
-#define MANTIDQTMANTIDWIDGETS_ROWLOCATION_H_
+#pragma once
 #include "MantidQtWidgets/Common/DllOption.h"
 #include <boost/optional.hpp>
 #include <ostream>
@@ -54,5 +53,4 @@ pathsSameUntilDepth(int depth, RowLocation const &locationA,
 
 } // namespace Batch
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/RowLocationAdapter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/RowLocationAdapter.h
index f957571cc6f..43042598387 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/RowLocationAdapter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/RowLocationAdapter.h
@@ -8,8 +8,7 @@
 See the developer documentation for Batch Widget at
 developer.mantidproject.org/BatchWidget/index.html
 */
-#ifndef MANTIDQTMANTIDWIDGETS_ROWLOCATIONADAPTER_H_
-#define MANTIDQTMANTIDWIDGETS_ROWLOCATIONADAPTER_H_
+#pragma once
 #include "MantidQtWidgets/Common/Batch/RowLocation.h"
 #include "MantidQtWidgets/Common/Batch/StrictQModelIndices.h"
 #include "MantidQtWidgets/Common/DllOption.h"
@@ -35,5 +34,4 @@ private:
 };
 } // namespace Batch
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_ROWLOCATIONADAPTER_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/RowPredicate.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/RowPredicate.h
index e51f65e7538..3724e4c1ae4 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/RowPredicate.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/RowPredicate.h
@@ -8,8 +8,7 @@
 See the developer documentation for Batch Widget at
 developer.mantidproject.org/BatchWidget/index.html
 */
-#ifndef MANTIDQTMANTIDWIDGETS_ROWPREDICATE_H_
-#define MANTIDQTMANTIDWIDGETS_ROWPREDICATE_H_
+#pragma once
 
 #include "MantidQtWidgets/Common/Batch/RowLocation.h"
 #include <memory>
@@ -47,5 +46,4 @@ std::unique_ptr<RowPredicate> makeFilterFromLambda(Predicate predicate) {
 }
 } // namespace Batch
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_ROWPREDICATE_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/StrictQModelIndices.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/StrictQModelIndices.h
index 9fe09c3cfb4..e41c151f0f1 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/StrictQModelIndices.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/StrictQModelIndices.h
@@ -8,8 +8,7 @@
 See the developer documentation for Batch Widget at
 developer.mantidproject.org/BatchWidget/index.html
 */
-#ifndef MANTIDQTMANTIDWIDGETS_STRICTQMODELINDICES_H_
-#define MANTIDQTMANTIDWIDGETS_STRICTQMODELINDICES_H_
+#pragma once
 #include "MantidQtWidgets/Common/Batch/AssertOrThrow.h"
 #include "MantidQtWidgets/Common/DllOption.h"
 #include <QModelIndex>
@@ -99,5 +98,4 @@ inline QModelIndexForMainModel fromMainModel(QModelIndex const &mainModelIndex,
 }
 } // namespace Batch
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_STRICTQMODELINDICES_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/Subtree.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/Subtree.h
index 76d86f84c98..a389b49f1cb 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/Subtree.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/Subtree.h
@@ -8,8 +8,7 @@
 See the developer documentation for Batch Widget at
 developer.mantidproject.org/BatchWidget/index.html
 */
-#ifndef MANTIDQTMANTIDWIDGETS_SUBTREE_H_
-#define MANTIDQTMANTIDWIDGETS_SUBTREE_H_
+#pragma once
 #include "MantidQtWidgets/Common/Batch/Row.h"
 
 namespace MantidQt {
@@ -77,5 +76,4 @@ bool allSubtreeRootsShareAParentAndAllSubtreeNodesAreConnected(
 }
 } // namespace Batch
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_SUBTREE_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/equal.hpp b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/equal.hpp
index 1210d48217f..c99d534dbe1 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/equal.hpp
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Batch/equal.hpp
@@ -10,8 +10,7 @@
 /// \brief Test ranges to if they are equal
 /// \author Marshall Clow
 
-#ifndef BOOST_ALGORITHM_EQUAL_HPP
-#define BOOST_ALGORITHM_EQUAL_HPP
+#pragma once
 
 #include <algorithm>    // for std::equal
 #include <iterator>
@@ -94,6 +93,4 @@ bool equal ( InputIterator1 first1, InputIterator1 last1,
 //  There are already range-based versions of these.
 
 }} // namespace boost and algorithm
-
-#endif // BOOST_ALGORITHM_EQUAL_HPP
 // clang-format on
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/BatchAlgorithmRunner.h b/qt/widgets/common/inc/MantidQtWidgets/Common/BatchAlgorithmRunner.h
index bfcc65c1e2c..2f25ac66388 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/BatchAlgorithmRunner.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/BatchAlgorithmRunner.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_API_BATCHALGORITHMRUNNER_H_
-#define MANTID_API_BATCHALGORITHMRUNNER_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/Algorithm.h"
@@ -206,5 +205,3 @@ private:
 };
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTID_API_BATCHALGORITHMRUNNER_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/BoolPropertyWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/BoolPropertyWidget.h
index f66e8799f2b..cf93277be57 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/BoolPropertyWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/BoolPropertyWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_API_BOOLPROPERTYWIDGET_H_
-#define MANTID_API_BOOLPROPERTYWIDGET_H_
+#pragma once
 
 #include "MantidKernel/PropertyWithValue.h"
 #include "MantidKernel/System.h"
@@ -41,5 +40,3 @@ protected:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTID_API_BOOLPROPERTYWIDGET_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/CatalogHelper.h b/qt/widgets/common/inc/MantidQtWidgets/Common/CatalogHelper.h
index c021624afbc..02f9ca87a4e 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/CatalogHelper.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/CatalogHelper.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTWIDGETS_CATALOGHELPER_H_
-#define MANTIDQTWIDGETS_CATALOGHELPER_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/AlgorithmManager.h"
@@ -66,5 +65,4 @@ private:
       const std::map<std::string, std::string> &userInputFields);
 };
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTWIDGETS_CATALOGHELPER_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/CatalogSearch.h b/qt/widgets/common/inc/MantidQtWidgets/Common/CatalogSearch.h
index be90ee839ec..98bc1f6ee4c 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/CatalogSearch.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/CatalogSearch.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTWIDGETS_CATALOGSEARCH_H_
-#define MANTIDQTWIDGETS_CATALOGSEARCH_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/ITableWorkspace.h"
@@ -201,5 +200,4 @@ private:
   void correctedToolTip(std::string toolTip, QLabel *label);
 };
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTWIDGETS_CATALOGSEARCH_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/CatalogSelector.h b/qt/widgets/common/inc/MantidQtWidgets/Common/CatalogSelector.h
index bdb875c425b..8f2d7ce7f7d 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/CatalogSelector.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/CatalogSelector.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTWIDGETS_CATALOGSELECTOR_H_
-#define MANTIDQTWIDGETS_CATALOGSELECTOR_H_
+#pragma once
 
 #include "DllOption.h"
 #include "ui_CatalogSelector.h"
@@ -38,5 +37,3 @@ protected:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQTWIDGETS_CATALOGSELECTOR_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/CheckboxHeader.h b/qt/widgets/common/inc/MantidQtWidgets/Common/CheckboxHeader.h
index 4ccdb9cb24f..810dc3aec0e 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/CheckboxHeader.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/CheckboxHeader.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTWIDGETS_CHECKBOXHEADER_H_
-#define MANTIDQTWIDGETS_CHECKBOXHEADER_H_
+#pragma once
 
 #include "DllOption.h"
 
@@ -50,5 +49,4 @@ private:
   bool m_checked;
 };
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTWIDGETS_CHECKBOXHEADER_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Configurable.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Configurable.h
index 81a770f54b1..b4eedca4be9 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Configurable.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Configurable.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_CONFIGURABLE_H
-#define MANTIDQT_MANTIDWIDGETS_CONFIGURABLE_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DllOption.h"
 
@@ -30,5 +29,3 @@ public:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQT_MANTIDWIDGETS_CONFIGURABLE_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/ConvolutionFunctionModel.h b/qt/widgets/common/inc/MantidQtWidgets/Common/ConvolutionFunctionModel.h
index 0785824b87e..b634a7b913e 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/ConvolutionFunctionModel.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/ConvolutionFunctionModel.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDWIDGETS_CONVOLUTIONFUNCTIONMODEL_H_
-#define MANTIDWIDGETS_CONVOLUTIONFUNCTIONMODEL_H_
+#pragma once
 
 #include "DllOption.h"
 #include "FunctionModel.h"
@@ -78,5 +77,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDWIDGETS_CONVOLUTIONFUNCTIONMODEL_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AbstractTreeModel.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AbstractTreeModel.h
index 0ba82049860..7ce7ad3c48a 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AbstractTreeModel.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AbstractTreeModel.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_ABSTRACTDATAPROCESSORTREEMODEL_H_
-#define MANTIDQTMANTIDWIDGETS_ABSTRACTDATAPROCESSORTREEMODEL_H_
+#pragma once
 
 #include "MantidAPI/ITableWorkspace_fwd.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/WhiteList.h"
@@ -76,5 +75,3 @@ protected:
 } // namespace DataProcessor
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTIDQTMANTIDWIDGETS_ABSTRACTDATAPROCESSORTREEMODEL_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h
index 2d8054bc14d..5a389814507 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORAPPENDGROUPCOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORAPPENDGROUPCOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
@@ -40,5 +39,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORAPPENDGROUPCOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h
index dc6da7c4b1b..0f0b5e99989 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORAPPENDROWCOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORAPPENDROWCOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
@@ -40,5 +39,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORAPPENDROWCOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h
index 3824e6ad455..33b44aae880 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORCLEARSELECTEDCOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORCLEARSELECTEDCOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -37,5 +36,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORCLEARSELECTEDCOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h
index 7cef41bae8f..83626497bd4 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOLLAPSEGROUPSCOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOLLAPSEGROUPSCOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -38,5 +37,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOLLAPSEGROUPSCOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/Column.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/Column.h
index 50706c801c0..70acd9037f6 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/Column.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/Column.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOLUMN_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOLUMN_H
+#pragma once
 #include "MantidQtWidgets/Common/DllOption.h"
 #include <QString>
 namespace MantidQt {
@@ -38,5 +37,4 @@ private:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOLUMN_H
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/Command.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/Command.h
index 07fbd5e4a59..feca29d2f4a 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/Command.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/Command.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOMMAND_H
+#pragma once
 
 #include <memory>
 #include <vector>
@@ -53,5 +52,4 @@ protected:
 using Command_uptr = std::unique_ptr<Command>;
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CommandBase.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CommandBase.h
index 4a9376b605e..8d2ef2b05b4 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CommandBase.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CommandBase.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOMMANDBASE_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOMMANDBASE_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/Command.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
@@ -36,5 +35,4 @@ protected:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOMMANDBASE_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ConstColumnIterator.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ConstColumnIterator.h
index f8e15a0690c..a5b68242bbb 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ConstColumnIterator.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ConstColumnIterator.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORCONSTCOLUMNITERATOR_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORCONSTCOLUMNITERATOR_H
+#pragma once
 #include "MantidQtWidgets/Common/DataProcessorUI/Column.h"
 #include "MantidQtWidgets/Common/DllOption.h"
 #include <QString>
@@ -62,5 +61,4 @@ ConstColumnIterator EXPORT_OPT_MANTIDQT_COMMON operator-(
     ConstColumnIterator::difference_type n, const ConstColumnIterator &rhs);
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_DATAPROCESSORCONSTCOLUMNITERATOR_H
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
index a6f5aa73ef2..78470ac1911 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOPYSELECTEDCOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOPYSELECTEDCOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -39,5 +38,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOPYSELECTEDCOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h
index 94ae3cffbe9..5c5112e21c3 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORCUTSELECTEDCOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORCUTSELECTEDCOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -39,5 +38,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORCUTSELECTEDCOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h
index ab2f8043d61..c7a9430eda0 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORMAINPRESENTER_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORMAINPRESENTER_H
+#pragma once
 
 #include "MantidKernel/System.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/OptionsQMap.h"
@@ -77,5 +76,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /* MANTIDQTMANTIDWIDGETS_DATAPROCESSORMAINPRESENTER_H */
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h
index a675d3f13e0..921a24289fc 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORPRESENTER_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORPRESENTER_H
+#pragma once
 
 #include <QVariant>
 #include <map>
@@ -107,5 +106,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORPRESENTER_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorView.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorView.h
index a3130abf832..180a7bcb66e 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorView.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorView.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORVIEW_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORVIEW_H
+#pragma once
 
 #include "MantidKernel/System.h"
 
@@ -107,5 +106,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORVIEW_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h
index 752c7e66e61..03a877a8651 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORDELETEGROUPCOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORDELETEGROUPCOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -38,5 +37,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORDELETEGROUPCOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h
index 944b049ef68..a6597baba1f 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORDELETEROWCOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORDELETEROWCOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -35,5 +34,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORDELETEROWCOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h
index dd701eb71c8..e8a9f1ebf20 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSOREXPANDCOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSOREXPANDCOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -40,5 +39,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSOREXPANDCOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExpandGroupsCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExpandGroupsCommand.h
index f5c1f7efc77..25c96bcc0a2 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExpandGroupsCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExpandGroupsCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSOREXPANDGROUPSCOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSOREXPANDGROUPSCOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -38,5 +37,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSOREXPANDGROUPSCOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h
index c16703d038c..f48736e8f09 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSOREXPORTTABLECOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSOREXPORTTABLECOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -40,5 +39,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSOREXPORTTABLECOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenerateNotebook.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenerateNotebook.h
index de72e0914c3..aa54d27cab6 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenerateNotebook.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenerateNotebook.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORGENERATENOTEBOOK_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORGENERATENOTEBOOK_H
+#pragma once
 
 /** @class GenerateNotebook
 
@@ -110,5 +109,4 @@ private:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_DATAPROCESSORGENERATENOTEBOOK_H
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h
index 3cc18396608..1e876c3a7cc 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_GENERICDATAPROCESSORPRESENTER_H
-#define MANTIDQTMANTIDWIDGETS_GENERICDATAPROCESSORPRESENTER_H
+#pragma once
 #include "MantidAPI/IAlgorithm_fwd.h"
 #include "MantidAPI/ITableWorkspace_fwd.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/Command.h"
@@ -393,5 +392,4 @@ private:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_GENERICDATAPROCESSORPRESENTER_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterFactory.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterFactory.h
index 11f38d5e1b5..17ab0fe5a57 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterFactory.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterFactory.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_GENERICDATAPROCESSORPRESENTERFACTORY_H
-#define MANTIDQTMANTIDWIDGETS_GENERICDATAPROCESSORPRESENTERFACTORY_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h"
 
@@ -32,5 +31,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_GENERICDATAPROCESSORPRESENTERFACTORY_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterGroupReducerWorker.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterGroupReducerWorker.h
index 7ca0566e5b8..3761614c1f1 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterGroupReducerWorker.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterGroupReducerWorker.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_GENERICDATAPROCESSORPRESENTER_GENERICDATAPROCESSORPRESENTERGROUPREDUCERWORKER_H
-#define MANTIDQTMANTIDWIDGETS_GENERICDATAPROCESSORPRESENTER_GENERICDATAPROCESSORPRESENTERGROUPREDUCERWORKER_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h"
 
@@ -68,5 +67,4 @@ private:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_GENERICDATAPROCESSORPRESENTER_GENERICDATAPROCESSORPRESENTERGROUPREDUCERWORKER_H
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterRowReducerWorker.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterRowReducerWorker.h
index 2e23ca01f52..8e2332aed01 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterRowReducerWorker.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterRowReducerWorker.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_GENERICDATAPROCESSORPRESENTER_GENERICDATAPROCESSORPRESENTERROWREDUCERWORKER_H
-#define MANTIDQTMANTIDWIDGETS_GENERICDATAPROCESSORPRESENTER_GENERICDATAPROCESSORPRESENTERROWREDUCERWORKER_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h"
 
@@ -69,5 +68,3 @@ private:
 } // namespace DataProcessor
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQTMANTIDWIDGETS_GENERICDATAPROCESSORPRESENTER_GENERICDATAPROCESSORPRESENTERROWREDUCERWORKER_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterThread.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterThread.h
index 7f44112d06f..8ebb644fad5 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterThread.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterThread.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_GENERICDATAPROCESSORPRESENTER_GENERICDATAPROCESSORPRESENTERTHREAD_H
-#define MANTIDQTMANTIDWIDGETS_GENERICDATAPROCESSORPRESENTER_GENERICDATAPROCESSORPRESENTERTHREAD_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h"
 
@@ -52,5 +51,3 @@ private:
 } // namespace DataProcessor
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQTMANTIDWIDGETS_GENERICDATAPROCESSORPRESENTER_GENERICDATAPROCESSORPRESENTERTHREAD_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h
index f5c0645f3b3..80f742086cb 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORGROUPROWSCOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORGROUPROWSCOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -36,5 +35,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORGROUPROWSCOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h
index 1a394ab462a..caf78456565 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORIMPORTTABLECOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORIMPORTTABLECOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -37,5 +36,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORIMPORTTABLECOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/MockObjects.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/MockObjects.h
index 5232e2f2899..37df12b8fdb 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/MockObjects.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/MockObjects.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_DATAPROCESSORVIEWMOCKOBJECTS_H
-#define MANTID_MANTIDWIDGETS_DATAPROCESSORVIEWMOCKOBJECTS_H
+#pragma once
 
 #include "MantidKernel/WarningSuppressions.h"
 
@@ -251,5 +250,3 @@ public:
 };
 
 GNU_DIAG_ON_SUGGEST_OVERRIDE
-
-#endif /*MANTID_MANTIDWIDGETS_DATAPROCESSORVIEWMOCKOBJECTS_H*/
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h
index 310d09ef854..91ecc871dd5 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORNEWTABLECOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORNEWTABLECOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -36,5 +35,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORNEWTABLECOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OneLevelTreeManager.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OneLevelTreeManager.h
index f1cc3c40766..ba0d4a12282 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OneLevelTreeManager.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OneLevelTreeManager.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORONELEVELTREEMANAGER_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORONELEVELTREEMANAGER_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/TreeManager.h"
 #include "MantidQtWidgets/Common/DllOption.h"
@@ -130,5 +129,4 @@ private:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORONELEVELTREEMANAGER_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OpenTableCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OpenTableCommand.h
index 15f619cd88f..8d62d347379 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OpenTableCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OpenTableCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSOROPENTABLECOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSOROPENTABLECOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -38,5 +37,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSOROPENTABLECOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h
index 59e098cefea..03864e2a001 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSOROPTIONSTABLECOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSOROPTIONSTABLECOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -36,5 +35,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSOROPTIONSTABLECOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OptionsMap.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OptionsMap.h
index 90fd348d2f9..89a255e3cbc 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OptionsMap.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OptionsMap.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSOROPTIONSMAP_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSOROPTIONSMAP_H
+#pragma once
 /** This file defines utilities for handling option maps used by
     the DataProcessor widget.
     */
@@ -33,5 +32,4 @@ ColumnOptionsMap DLLExport
 convertColumnOptionsFromQMap(const ColumnOptionsQMap &src);
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_DATAPROCESSOROPTIONSMAP_H
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OptionsQMap.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OptionsQMap.h
index 82e024b7807..3dd048b8df6 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OptionsQMap.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OptionsQMap.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSOROPTIONSQMAP_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSOROPTIONSQMAP_H
+#pragma once
 /** This file defines utilities for handling option maps used by the data
     processor widget. These are QVariantMap equivalents of the types in
     OptionsMap.h. The QVariantMap types are required in the sip conversions for
@@ -28,5 +27,4 @@ using OptionsQMap = QVariantMap;
 using ColumnOptionsQMap = QVariantMap;
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_DATAPROCESSOROPTIONSQMAP_H
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h
index b99403af81c..50592c69942 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORPASTESELECTEDCOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORPASTESELECTEDCOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -39,5 +38,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORPASTESELECTEDCOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PauseCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PauseCommand.h
index ec18c37b9f6..54df542c362 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PauseCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PauseCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORPAUSECOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORPAUSECOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -38,5 +37,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORPAUSECOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PlotGroupCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PlotGroupCommand.h
index 52182132d59..e31f9ab2746 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PlotGroupCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PlotGroupCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORPLOTGROUPCOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORPLOTGROUPCOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -38,5 +37,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORPLOTGROUPCOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h
index 9d6489b2dda..2210de302b1 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORPLOTROWCOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORPLOTROWCOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -38,5 +37,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORPLOTROWCOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PostprocessingAlgorithm.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PostprocessingAlgorithm.h
index a5fc6086956..a3e56491e8e 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PostprocessingAlgorithm.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PostprocessingAlgorithm.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORPOSTPROCESSINGALGORITHM_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORPOSTPROCESSINGALGORITHM_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/ProcessingAlgorithmBase.h"
 #include "MantidQtWidgets/Common/DllOption.h"
@@ -53,5 +52,4 @@ private:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORPOSTPROCESSINGALGORITHM_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PostprocessingStep.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PostprocessingStep.h
index 51648979e02..c0d540afbdd 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PostprocessingStep.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PostprocessingStep.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTWIDGETS_POSTPROCESSINGSTEP
-#define MANTIDQTWIDGETS_POSTPROCESSINGSTEP
+#pragma once
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/PostprocessingAlgorithm.h"
@@ -45,5 +44,4 @@ private:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTWIDGETS_POSTPROCESSINGSTEP
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PreprocessMap.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PreprocessMap.h
index 3e7c6d092ad..4ee90c9e7cb 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PreprocessMap.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PreprocessMap.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORPREPROCESSMAP_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORPREPROCESSMAP_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/PreprocessingAlgorithm.h"
 #include "MantidQtWidgets/Common/DllOption.h"
@@ -41,5 +40,4 @@ private:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORPREPROCESSMAP_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PreprocessingAlgorithm.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PreprocessingAlgorithm.h
index 994ae7139aa..2f82f64e542 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PreprocessingAlgorithm.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PreprocessingAlgorithm.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORPREPROCESSINGALGORITHM_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORPREPROCESSINGALGORITHM_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/ProcessingAlgorithmBase.h"
 #include "MantidQtWidgets/Common/DllOption.h"
@@ -60,5 +59,4 @@ private:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORPREPROCESSINGALGORITHM_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ProcessCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ProcessCommand.h
index 5ac5c30dbc2..61ba97b0332 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ProcessCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ProcessCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORPROCESSCOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORPROCESSCOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -40,5 +39,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORPROCESSCOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ProcessingAlgorithm.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ProcessingAlgorithm.h
index 9d718e30360..0b4e3ab5f50 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ProcessingAlgorithm.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ProcessingAlgorithm.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORPROCESSINGALGORITHM_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORPROCESSINGALGORITHM_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/ProcessingAlgorithmBase.h"
 #include "MantidQtWidgets/Common/DllOption.h"
@@ -74,5 +73,4 @@ private:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORPROCESSINGALGORITHM_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ProcessingAlgorithmBase.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ProcessingAlgorithmBase.h
index cc679f2a1a3..fd8b12607b3 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ProcessingAlgorithmBase.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ProcessingAlgorithmBase.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORALGORITHMBASE_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORALGORITHMBASE_H
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidQtWidgets/Common/DllOption.h"
@@ -79,5 +78,4 @@ protected:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORALGORITHMBASE_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h
index ec6ac6c6591..61bb171b38c 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_QDATAPROCESSORWIDGET_H_
-#define MANTIDQTMANTIDWIDGETS_QDATAPROCESSORWIDGET_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/AbstractTreeModel.h"
@@ -194,5 +193,4 @@ private slots:
 
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /* MANTIDQTMANTIDWIDGETS_QDATAPROCESSORWIDGET_H_ */
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QOneLevelTreeModel.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QOneLevelTreeModel.h
index 579a920c062..09c30594bf3 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QOneLevelTreeModel.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QOneLevelTreeModel.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_QDATAPROCESSORONELEVELTREEMODEL_H_
-#define MANTIDQTMANTIDWIDGETS_QDATAPROCESSORONELEVELTREEMODEL_H_
+#pragma once
 
 #include "MantidAPI/ITableWorkspace_fwd.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/AbstractTreeModel.h"
@@ -107,5 +106,3 @@ using QOneLevelTreeModel_sptr = boost::shared_ptr<QOneLevelTreeModel>;
 } // namespace DataProcessor
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTIDQTMANTIDWIDGETS_QDATAPROCESSORONELEVELTREEMODEL_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QTwoLevelTreeModel.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QTwoLevelTreeModel.h
index d6ae35ac0de..a66f7ec0d03 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QTwoLevelTreeModel.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QTwoLevelTreeModel.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_QDATAPROCESSORTWOLEVELTREEMODEL_H_
-#define MANTIDQTMANTIDWIDGETS_QDATAPROCESSORTWOLEVELTREEMODEL_H_
+#pragma once
 
 #include "MantidAPI/ITableWorkspace_fwd.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/AbstractTreeModel.h"
@@ -154,5 +153,3 @@ using QTwoLevelTreeModel_sptr = boost::shared_ptr<QTwoLevelTreeModel>;
 } // namespace DataProcessor
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTIDQTMANTIDWIDGETS_QDATAPROCESSORTWOLEVELTREEMODEL_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QtCommandAdapter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QtCommandAdapter.h
index 345362ac632..79cdc66b609 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QtCommandAdapter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QtCommandAdapter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOMMANDADAPTER_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOMMANDADAPTER_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/Command.h"
 #include "MantidQtWidgets/Common/DllOption.h"
@@ -141,5 +140,4 @@ private:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOMMANDADAPTER_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QtDataProcessorOptionsDialog.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QtDataProcessorOptionsDialog.h
index 201a5da64b7..c609795560a 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QtDataProcessorOptionsDialog.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QtDataProcessorOptionsDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_QTDATAPROCESSOROPTIONSDIALOG_H
-#define MANTIDQTMANTIDWIDGETS_QTDATAPROCESSOROPTIONSDIALOG_H
+#pragma once
 
 #include "MantidKernel/System.h"
 
@@ -51,5 +50,3 @@ protected:
 } // namespace DataProcessor
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTIDQTMANTIDWIDGETS_QTDATAPROCESSOROPTIONSDIALOG_H */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/SaveTableAsCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/SaveTableAsCommand.h
index 1f8aa9738b9..edb6e8ff36a 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/SaveTableAsCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/SaveTableAsCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORSAVETABLEASCOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORSAVETABLEASCOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -39,5 +38,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORSAVETABLEASCOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/SaveTableCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/SaveTableCommand.h
index 79b2389f1fa..b64d500d403 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/SaveTableCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/SaveTableCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORSAVETABLECOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORSAVETABLECOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -37,5 +36,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORSAVETABLECOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/SeparatorCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/SeparatorCommand.h
index 7d033c4b76e..0affea6e9b1 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/SeparatorCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/SeparatorCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORSEPARATORCOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORSEPARATORCOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -35,5 +34,4 @@ public:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORSEPARATORCOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ToStdStringMap.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ToStdStringMap.h
index 603bc2cac26..2607192e133 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ToStdStringMap.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ToStdStringMap.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_DATAPROCESSORTOSTDSTRINGMAP_H
-#define MANTID_MANTIDWIDGETS_DATAPROCESSORTOSTDSTRINGMAP_H
+#pragma once
 #include "MantidQtWidgets/Common/DllOption.h"
 #include <QString>
 #include <map>
@@ -22,5 +21,4 @@ std::map<std::string, std::string> EXPORT_OPT_MANTIDQT_COMMON
 toStdStringMap(std::map<QString, QString> const &inMap);
 }
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTID_MANTIDWIDGETS_DATAPROCESSORTOSTDSTRINGMAP_H
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/TreeData.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/TreeData.h
index 6fa152a4539..23844f7e58d 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/TreeData.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/TreeData.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORTREEDATA_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORTREEDATA_H
+#pragma once
 /** This file defines the RowData, GroupData and TreeData type aliases used by
    the
     DataProcessor widget.
@@ -150,5 +149,4 @@ using TreeData = std::map<int, GroupData>;
 EXPORT_OPT_MANTIDQT_COMMON bool canPostprocess(GroupData const &group);
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_DATAPROCESSORTREEDATA_H
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/TreeManager.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/TreeManager.h
index 5ac4b23b47b..0ff878b036a 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/TreeManager.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/TreeManager.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORTREEMANAGER_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORTREEMANAGER_H
+#pragma once
 
 #include "MantidAPI/ITableWorkspace_fwd.h"
 #include "MantidAPI/Workspace_fwd.h"
@@ -120,5 +119,4 @@ protected:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /* MANTIDQTMANTIDWIDGETS_DATAPROCESSORTREEMANAGER_H */
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/TwoLevelTreeManager.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/TwoLevelTreeManager.h
index 7eb96e39196..a9e6bb0a410 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/TwoLevelTreeManager.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/TwoLevelTreeManager.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORTWOLEVELTREEMANAGER_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORTWOLEVELTREEMANAGER_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/TreeManager.h"
 #include "MantidQtWidgets/Common/DllOption.h"
@@ -129,5 +128,4 @@ private:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORTWOLEVELTREEMANAGER_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/VectorString.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/VectorString.h
index 6275c1e7191..74fcfe906f6 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/VectorString.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/VectorString.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORVECTORSTRING_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORVECTORSTRING_H
+#pragma once
 
 /** @class VectorString
  */
@@ -70,5 +69,4 @@ QString vectorParamString(const QString &param_name,
 }
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQTMANTIDWIDGETS_DATAPROCESSORVECTORSTRING_H
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/WhiteList.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/WhiteList.h
index b55467d81e2..911d524befb 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/WhiteList.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/WhiteList.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORWHITELIST_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORWHITELIST_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/Column.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/ConstColumnIterator.h"
@@ -61,5 +60,4 @@ private:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORWHITELIST_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/WorkspaceCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/WorkspaceCommand.h
index fa563fdc980..5b792b5c2af 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/WorkspaceCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/WorkspaceCommand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORWORKSPACECOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORWORKSPACECOMMAND_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
@@ -39,5 +38,4 @@ private:
 };
 } // namespace DataProcessor
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORWORKSPACECOMMAND_H*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/WorkspaceNameUtils.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/WorkspaceNameUtils.h
index 3a367a4be04..f87b7c2b58e 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/WorkspaceNameUtils.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/WorkspaceNameUtils.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETSDATAPROCESSOR_WORKSPACENAMEUTILS_H
-#define MANTIDQTMANTIDWIDGETSDATAPROCESSOR_WORKSPACENAMEUTILS_H
+#pragma once
 
 /** Utilities for finding the output name of reduced workspaces based
 on the reduction algorithm's input values and preprocessing settings
@@ -43,5 +42,3 @@ OptionsMap DLLExport getCanonicalOptions(
 } // namespace DataProcessor
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQTMANTIDWIDGETSDATAPROCESSOR_WORKSPACENAMEUTILS_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataSelector.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataSelector.h
index c4a2c040c8d..770efb3a91a 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataSelector.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataSelector.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_DATASELECTOR_H_
-#define MANTIDQTMANTIDWIDGETS_DATASELECTOR_H_
+#pragma once
 
 #include "DllOption.h"
 #include "ui_DataSelector.h"
@@ -439,5 +438,4 @@ private:
 };
 
 } /* namespace MantidWidgets */
-} /* namespace MantidQt */
-#endif /* DATASELECTOR_H_ */
+} /* namespace MantidQt */
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DiagResults.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DiagResults.h
index b5951be61e0..1a6e976dc33 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DiagResults.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DiagResults.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTCUSTOMINTERFACES_EXCITATIONSDIAGRESULTS_H_
-#define MANTIDQTCUSTOMINTERFACES_EXCITATIONSDIAGRESULTS_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidQtWidgets/Common/MantidDialog.h"
@@ -39,5 +38,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQTCUSTOMINTERFACES_EXCITATIONSDIAGRESULTS_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DistributionOptions.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DistributionOptions.h
index d97207f721b..37a1ba165da 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DistributionOptions.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DistributionOptions.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DISTRIBUTIONOPTIONS_H_
-#define DISTRIBUTIONOPTIONS_H_
+#pragma once
 
 /**
  * This file contains declarations of options which control
@@ -20,5 +19,3 @@ enum DistributionFlag {
   DistributionFalse        // Disable distribution plotting
 };
 } // namespace MantidQt
-
-#endif // DISTRIBUTIONOPTIONS_H_
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DllOption.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DllOption.h
index 527cbb3cf6b..f774b819a9b 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DllOption.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DllOption.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_COMMON_DLLOPTION_H_
-#define MANTIDQT_COMMON_DLLOPTION_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 
@@ -16,5 +15,3 @@
 #define EXPORT_OPT_MANTIDQT_COMMON DLLImport
 #define EXTERN_MANTIDQT_COMMON extern
 #endif /* IN_MANTIDQT_COMMON */
-
-#endif // MANTIDQT_COMMON_DLLOPTION_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DoubleSpinBox.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DoubleSpinBox.h
index 68a9e0f304b..d8c2969291d 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DoubleSpinBox.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DoubleSpinBox.h
@@ -15,8 +15,7 @@
  *   Boston, MA  02110-1301  USA                                           *
  *                                                                         *
  ***************************************************************************/
-#ifndef DoubleSpinBox_H
-#define DoubleSpinBox_H
+#pragma once
 
 #include "DllOption.h"
 #include <map>
@@ -109,5 +108,4 @@ private:
   DoubleSpinBox *d_spin_box;
   QCheckBox *d_checkbox;
   LimitType d_type;
-};
-#endif // FITDIALOG_H
+};
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DropEventHelper.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DropEventHelper.h
index 81afd2aa86c..135dffba09f 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DropEventHelper.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DropEventHelper.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_DROPEVENTHELPER_H
-#define MANTIDQT_MANTIDWIDGETS_DROPEVENTHELPER_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DllOption.h"
 
@@ -25,5 +24,3 @@ extractPythonFiles(const QDropEvent *event);
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/EditLocalParameterDialog.h b/qt/widgets/common/inc/MantidQtWidgets/Common/EditLocalParameterDialog.h
index 7290e2855dd..fb7a69b4d16 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/EditLocalParameterDialog.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/EditLocalParameterDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDWIDGETS_EDITLOCALPARAMETERDIALOG_H_
-#define MANTIDWIDGETS_EDITLOCALPARAMETERDIALOG_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidQtWidgets/Common/LogValueFinder.h"
@@ -87,5 +86,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*MANTIDWIDGETS_EDITLOCALPARAMETERDIALOG_H_*/
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/FileDialogHandler.h b/qt/widgets/common/inc/MantidQtWidgets/Common/FileDialogHandler.h
index a13d62e447c..e0c44dbadb8 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/FileDialogHandler.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/FileDialogHandler.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_FILEDIALOGHANDLER_H_
-#define MANTIDQT_API_FILEDIALOGHANDLER_H_
+#pragma once
 
 #include "MantidKernel/DllConfig.h"
 #include <QFileDialog>
@@ -68,5 +67,3 @@ DLLExport QString getCaption(const std::string &dialogName,
 } // namespace FileDialogHandler
 } // namespace API
 } // namespace MantidQt
-
-#endif // MANTIDQT_API_FILEDIALOGHANDLER_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/FilePropertyWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/FilePropertyWidget.h
index e5a63e10464..c760cc6a30b 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/FilePropertyWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/FilePropertyWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_API_FILEPROPERTYWIDGET_H_
-#define MANTID_API_FILEPROPERTYWIDGET_H_
+#pragma once
 
 #include "MantidAPI/FileProperty.h"
 #include "MantidAPI/MultipleFileProperty.h"
@@ -49,5 +48,3 @@ protected:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTID_API_FILEPROPERTYWIDGET_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/FilenameDialogEditor.h b/qt/widgets/common/inc/MantidQtWidgets/Common/FilenameDialogEditor.h
index 66bede234e5..b91bc247c6d 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/FilenameDialogEditor.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/FilenameDialogEditor.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_FILENAMEDIALOGEDITFACTORY_H
-#define MANTIDQT_MANTIDWIDGETS_FILENAMEDIALOGEDITFACTORY_H
+#pragma once
 
 #include "MantidQtWidgets/Common/QtPropertyBrowser/StringDialogEditor.h"
 
@@ -45,5 +44,3 @@ protected:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQT_MANTIDWIDGETS_FILENAMEDIALOGEDITFACTORY_H
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/FindDialog.h b/qt/widgets/common/inc/MantidQtWidgets/Common/FindDialog.h
index 4fcda4e961f..5e65bb4f4eb 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/FindDialog.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/FindDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef FINDDIALOG_H_
-#define FINDDIALOG_H_
+#pragma once
 
 //--------------------------------------------------
 // Includes
@@ -22,5 +21,3 @@ class EXPORT_OPT_MANTIDQT_COMMON FindDialog : public FindReplaceDialog {
 public:
   FindDialog(ScriptEditor *editor);
 };
-
-#endif // FINDDIALOG_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/FindFilesThreadPoolManager.h b/qt/widgets/common/inc/MantidQtWidgets/Common/FindFilesThreadPoolManager.h
index 18ac8c262b9..01b32870661 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/FindFilesThreadPoolManager.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/FindFilesThreadPoolManager.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_FINDFILESTHREADPOOLMANAGER_H_
-#define MANTIDQTMANTIDWIDGETS_FINDFILESTHREADPOOLMANAGER_H_
+#pragma once
 
 #include "MantidQtWidgets/Common/DllOption.h"
 #include "MantidQtWidgets/Common/FindFilesWorker.h"
@@ -70,5 +69,3 @@ private:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif // MANTIDQTMANTIDWIDGETS_FINDFILESTHREADPOOLMANAGER_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/FindFilesThreadPoolManagerMockObjects.h b/qt/widgets/common/inc/MantidQtWidgets/Common/FindFilesThreadPoolManagerMockObjects.h
index 59fb8890872..ee73d7d2ce0 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/FindFilesThreadPoolManagerMockObjects.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/FindFilesThreadPoolManagerMockObjects.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_FINDFILESTHREADPOOLMANAGERTESTMOCKOBJECTS_H_
-#define MANTIDQT_API_FINDFILESTHREADPOOLMANAGERTESTMOCKOBJECTS_H_
+#pragma once
 
 #include "MantidQtWidgets/Common/DllOption.h"
 #include "MantidQtWidgets/Common/FindFilesThreadPoolManager.h"
@@ -104,5 +103,3 @@ private:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTIDQT_API_FINDFILESTHREADPOOLMANAGERTESTMOCKOBJECTS_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/FindFilesWorker.h b/qt/widgets/common/inc/MantidQtWidgets/Common/FindFilesWorker.h
index ee8e1887d50..8dae8a10045 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/FindFilesWorker.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/FindFilesWorker.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_FINDFILESWORKER_H_
-#define MANTIDQTMANTIDWIDGETS_FINDFILESWORKER_H_
+#pragma once
 
 #include "MantidQtWidgets/Common/DllOption.h"
 
@@ -98,5 +97,3 @@ private:
 // Add to Qt's meta type system. This allows the type
 // to be passed between signals & slots
 Q_DECLARE_METATYPE(MantidQt::API::FindFilesSearchResults)
-
-#endif // MANTIDQTMANTIDWIDGETS_FINDFILESWORKER_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/FindReplaceDialog.h b/qt/widgets/common/inc/MantidQtWidgets/Common/FindReplaceDialog.h
index 33cf5683060..e508b0abc55 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/FindReplaceDialog.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/FindReplaceDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef FINDREPLACEDIALOG_H_
-#define FINDREPLACEDIALOG_H_
+#pragma once
 
 //----------------------------------
 // Includes
@@ -99,5 +98,3 @@ private:
   QGridLayout *m_topLayout;
   QVBoxLayout *m_vb2;
 };
-
-#endif // FINDREPLACEDIALOG_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/FitOptionsBrowser.h b/qt/widgets/common/inc/MantidQtWidgets/Common/FitOptionsBrowser.h
index d9c6796ec4d..b7ec9e0adc4 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/FitOptionsBrowser.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/FitOptionsBrowser.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDWIDGETS_FITOPTIONSBROWSER_H_
-#define MANTIDWIDGETS_FITOPTIONSBROWSER_H_
+#pragma once
 
 #include "DllOption.h"
 
@@ -190,5 +189,3 @@ private:
 } // namespace MantidWidgets
 
 } // namespace MantidQt
-
-#endif /*MANTIDWIDGETS_FITOPTIONSBROWSER_H_*/
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/FitPropertyBrowser.h b/qt/widgets/common/inc/MantidQtWidgets/Common/FitPropertyBrowser.h
index e5d1b542566..5582f6e7d92 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/FitPropertyBrowser.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/FitPropertyBrowser.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef FITPROPERTYBROWSER_H_
-#define FITPROPERTYBROWSER_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/AlgorithmObserver.h"
@@ -708,5 +707,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*FITPROPERTYBROWSER_H_*/
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/FlowLayout.h b/qt/widgets/common/inc/MantidQtWidgets/Common/FlowLayout.h
index 1b820e6e624..577ee2986b0 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/FlowLayout.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/FlowLayout.h
@@ -38,8 +38,7 @@
 **
 ****************************************************************************/
 
-#ifndef FLOWLAYOUT_H
-#define FLOWLAYOUT_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DllOption.h"
 #include <QLayout>
@@ -79,5 +78,3 @@ private:
 };
 } // namespace API
 } // namespace MantidQt
-
-#endif
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/FunctionBrowser.h b/qt/widgets/common/inc/MantidQtWidgets/Common/FunctionBrowser.h
index b4e8907a2cb..a7963d369e1 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/FunctionBrowser.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/FunctionBrowser.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDWIDGETS_FUNCTIONBROWSER_H_
-#define MANTIDWIDGETS_FUNCTIONBROWSER_H_
+#pragma once
 
 #include "DllOption.h"
 
@@ -157,5 +156,3 @@ public:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*MANTIDWIDGETS_FUNCTIONBROWSER_H_*/
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/FunctionBrowser/FunctionBrowserUtils.h b/qt/widgets/common/inc/MantidQtWidgets/Common/FunctionBrowser/FunctionBrowserUtils.h
index dee56ed913b..9650be03205 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/FunctionBrowser/FunctionBrowserUtils.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/FunctionBrowser/FunctionBrowserUtils.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDWIDGETS_FUNCTIONBROWSERUTILS_H_
-#define MANTIDWIDGETS_FUNCTIONBROWSERUTILS_H_
+#pragma once
 #include "MantidAPI/IFunction_fwd.h"
 #include "MantidQtWidgets/Common/DllOption.h"
 
@@ -58,5 +57,3 @@ public:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDWIDGETS_FUNCTIONBROWSERUTILS_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/FunctionModel.h b/qt/widgets/common/inc/MantidQtWidgets/Common/FunctionModel.h
index 2abd3734a9d..e989b6812eb 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/FunctionModel.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/FunctionModel.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDWIDGETS_FUNCTIONMODEL_H_
-#define MANTIDWIDGETS_FUNCTIONMODEL_H_
+#pragma once
 
 #include "DllOption.h"
 
@@ -85,5 +84,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDWIDGETS_FUNCTIONMODEL_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/FunctionMultiDomainPresenter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/FunctionMultiDomainPresenter.h
index af82c056cc8..eb552e0f12b 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/FunctionMultiDomainPresenter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/FunctionMultiDomainPresenter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDWIDGETS_FUNCTIONMULTIDOMAINPRESENTER_H_
-#define MANTIDWIDGETS_FUNCTIONMULTIDOMAINPRESENTER_H_
+#pragma once
 
 #include "DllOption.h"
 
@@ -106,5 +105,3 @@ public:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDWIDGETS_FUNCTIONMULTIDOMAINPRESENTER_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/FunctionTreeView.h b/qt/widgets/common/inc/MantidQtWidgets/Common/FunctionTreeView.h
index 2de491a18af..d7db6f5801f 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/FunctionTreeView.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/FunctionTreeView.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDWIDGETS_FUNCTIONTREEVIEW_H_
-#define MANTIDWIDGETS_FUNCTIONTREEVIEW_H_
+#pragma once
 
 #include "DllOption.h"
 
@@ -374,5 +373,3 @@ public:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*MANTIDWIDGETS_FUNCTIONTREEVIEW_H_*/
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/GenericDialog.h b/qt/widgets/common/inc/MantidQtWidgets/Common/GenericDialog.h
index 6522682960b..a79c700906b 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/GenericDialog.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/GenericDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_GENERICDIALOG_H_
-#define MANTIDQT_API_GENERICDIALOG_H_
+#pragma once
 
 //----------------------------------
 // Includes
@@ -58,5 +57,3 @@ private:
 };
 } // namespace API
 } // namespace MantidQt
-
-#endif // MANTIDQT_API_GENERICDIALOG_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/GraphOptions.h b/qt/widgets/common/inc/MantidQtWidgets/Common/GraphOptions.h
index 8700e6d251a..f99c0c36a1e 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/GraphOptions.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/GraphOptions.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDGRAPHOPTIONS_H_
-#define MANTIDGRAPHOPTIONS_H_
+#pragma once
 
 /**
  * This file contains declarations of options such as scale types that are
@@ -53,5 +52,3 @@ enum CurveType {
   User
 };
 } // namespace GraphOptions
-
-#endif // MANTIDSCALETYPE_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/HelpWindow.h b/qt/widgets/common/inc/MantidQtWidgets/Common/HelpWindow.h
index 007b0f9777a..b7743796c8d 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/HelpWindow.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/HelpWindow.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef HELPWINDOW_H
-#define HELPWINDOW_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DllOption.h"
 #include <QString>
@@ -40,5 +39,4 @@ public:
                                   const std::string &section = std::string());
 };
 } // namespace API
-} // namespace MantidQt
-#endif // HELPWINDOW_H
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Hint.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Hint.h
index a88ef44b87a..13710b117da 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Hint.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Hint.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_HINT_H_
-#define MANTID_MANTIDWIDGETS_HINT_H_
+#pragma once
 #include "DllOption.h"
 #include <string>
 
@@ -26,5 +25,4 @@ private:
 EXPORT_OPT_MANTIDQT_COMMON bool operator==(Hint const &lhs, Hint const &rhs);
 EXPORT_OPT_MANTIDQT_COMMON bool operator!=(Hint const &lhs, Hint const &rhs);
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTID_MANTIDWIDGETS_HINT_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/HintStrategy.h b/qt/widgets/common/inc/MantidQtWidgets/Common/HintStrategy.h
index e1943fd6acd..0e9a687fd40 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/HintStrategy.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/HintStrategy.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_HINTSTRATEGY_H
-#define MANTID_MANTIDWIDGETS_HINTSTRATEGY_H
+#pragma once
 
 #include "DllOption.h"
 #include "MantidQtWidgets/Common/Hint.h"
@@ -33,5 +32,3 @@ public:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTID_MANTIDWIDGETS_HINTSTRATEGY_H */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/HintingLineEdit.h b/qt/widgets/common/inc/MantidQtWidgets/Common/HintingLineEdit.h
index c2e15982e43..99d5108d0cf 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/HintingLineEdit.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/HintingLineEdit.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_HINTINGLINEEDIT_H_
-#define MANTID_MANTIDWIDGETS_HINTINGLINEEDIT_H_
+#pragma once
 
 #include "DllOption.h"
 #include "Hint.h"
@@ -52,5 +51,3 @@ protected slots:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTID_MANTIDWIDGETS_HINTINGLINEEDIT_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/HintingLineEditFactory.h b/qt/widgets/common/inc/MantidQtWidgets/Common/HintingLineEditFactory.h
index 25f596efa0a..7cf0e023cbb 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/HintingLineEditFactory.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/HintingLineEditFactory.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_HINTINGLINEEDITFACTORY_H
-#define MANTID_MANTIDWIDGETS_HINTINGLINEEDITFACTORY_H
+#pragma once
 
 #include <QPainter>
 #include <QStyledItemDelegate>
@@ -50,5 +49,3 @@ protected:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTID_MANTIDWIDGETS_HINTINGLINEEDITFACTORY_H */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/IFunctionBrowser.h b/qt/widgets/common/inc/MantidQtWidgets/Common/IFunctionBrowser.h
index 785f7057f84..a92fb023383 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/IFunctionBrowser.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/IFunctionBrowser.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_IFUNCTIONBROWSER_H_
-#define MANTID_MANTIDWIDGETS_IFUNCTIONBROWSER_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/IFunction_fwd.h"
@@ -53,5 +52,3 @@ public:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTID_MANTIDWIDGETS_IFUNCTIONBROWSER_H
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/IFunctionModel.h b/qt/widgets/common/inc/MantidQtWidgets/Common/IFunctionModel.h
index 6ab79bb2cd7..398b9c030a5 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/IFunctionModel.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/IFunctionModel.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDWIDGETS_IFUNCTIONMODEL_H_
-#define MANTIDWIDGETS_IFUNCTIONMODEL_H_
+#pragma once
 
 #include "DllOption.h"
 
@@ -82,5 +81,3 @@ protected:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDWIDGETS_IFUNCTIONMODEL_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/IFunctionView.h b/qt/widgets/common/inc/MantidQtWidgets/Common/IFunctionView.h
index d9aa2b73738..d42392a8e0f 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/IFunctionView.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/IFunctionView.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDWIDGETS_IFUNCTIONVIEW_H_
-#define MANTIDWIDGETS_IFUNCTIONVIEW_H_
+#pragma once
 
 #include "DllOption.h"
 
@@ -71,5 +70,3 @@ signals:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*MANTIDWIDGETS_IFUNCTIONVIEW_H_*/
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/IMuonFitDataModel.h b/qt/widgets/common/inc/MantidQtWidgets/Common/IMuonFitDataModel.h
index 876bb4b6826..e18b4b6a900 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/IMuonFitDataModel.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/IMuonFitDataModel.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_IMUONFITDATAMODEL_H_
-#define MANTID_MANTIDWIDGETS_IMUONFITDATAMODEL_H_
+#pragma once
 
 #include "DllOption.h"
 #include <QObject>
@@ -32,5 +31,3 @@ signals:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTID_MANTIDWIDGETS_IMUONFITDATAMODEL_H
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/IMuonFitDataSelector.h b/qt/widgets/common/inc/MantidQtWidgets/Common/IMuonFitDataSelector.h
index 2ec8526cae8..f1e9529c37c 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/IMuonFitDataSelector.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/IMuonFitDataSelector.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_IMUONFITDATASELECTOR_H_
-#define MANTID_MANTIDWIDGETS_IMUONFITDATASELECTOR_H_
+#pragma once
 
 #include "DllOption.h"
 #include <QString>
@@ -48,5 +47,3 @@ public:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTID_MANTIDWIDGETS_IMUONFITDATASELECTOR_H_ */
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/IMuonFitFunctionModel.h b/qt/widgets/common/inc/MantidQtWidgets/Common/IMuonFitFunctionModel.h
index 46d23163ff9..26e84474448 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/IMuonFitFunctionModel.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/IMuonFitFunctionModel.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_IMUONFITFUNCTIONMODEL_H_
-#define MANTID_MANTIDWIDGETS_IMUONFITFUNCTIONMODEL_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/IFunction.h"
@@ -40,5 +39,3 @@ signals:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTID_MANTIDWIDGETS_IMUONFITFUNCTIONMODEL_H
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/IProjectSaveView.h b/qt/widgets/common/inc/MantidQtWidgets/Common/IProjectSaveView.h
index 40607f94765..f107ff82a86 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/IProjectSaveView.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/IProjectSaveView.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_CUSTOMINTERFACES_IPROJECTSAVEVIEW_H
-#define MANTID_CUSTOMINTERFACES_IPROJECTSAVEVIEW_H
+#pragma once
 
 #include "MantidQtWidgets/Common/IProjectSerialisable.h"
 
@@ -65,5 +64,4 @@ public:
   removeFromExcludedWindowsList(const std::vector<std::string> &windows) = 0;
 };
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /* MANTID_CUSTOMINTERFACES_IPROJECTSAVEVIEW_H */
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/IProjectSerialisable.h b/qt/widgets/common/inc/MantidQtWidgets/Common/IProjectSerialisable.h
index cecf7b68a13..a7a3a4b0258 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/IProjectSerialisable.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/IProjectSerialisable.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_API_IProjectSerialisable_H_
-#define MANTID_API_IProjectSerialisable_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 #include <stdexcept>
@@ -51,5 +50,3 @@ public:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTID_API_ProjectSerialisable_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/ISlitCalculator.h b/qt/widgets/common/inc/MantidQtWidgets/Common/ISlitCalculator.h
index a56b6caf67f..0ae4a8f2f1e 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/ISlitCalculator.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/ISlitCalculator.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_ISLITCALCULATOR_H
-#define MANTID_MANTIDWIDGETS_ISLITCALCULATOR_H
+#pragma once
 
 #include "DllOption.h"
 #include <string>
@@ -21,5 +20,3 @@ public:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTID_MANTIDWIDGETS_ISLITCALCULATOR_H */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/IWorkspaceFitControl.h b/qt/widgets/common/inc/MantidQtWidgets/Common/IWorkspaceFitControl.h
index a1a602feb83..5b324e54b15 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/IWorkspaceFitControl.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/IWorkspaceFitControl.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_IWORKSPACEFITCONTROL_H_
-#define MANTID_MANTIDWIDGETS_IWORKSPACEFITCONTROL_H_
+#pragma once
 
 #include "DllOption.h"
 #include <QString>
@@ -30,5 +29,3 @@ public:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTID_MANTIDWIDGETS_IWORKSPACEFITCONTROL_H_
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/IndirectFitPropertyBrowserLegacy.h b/qt/widgets/common/inc/MantidQtWidgets/Common/IndirectFitPropertyBrowserLegacy.h
index 3a537c1bb1c..2c25db839be 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/IndirectFitPropertyBrowserLegacy.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/IndirectFitPropertyBrowserLegacy.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef INDIRECTFITPROPERTYBROWSERLEGACY_H_
-#define INDIRECTFITPROPERTYBROWSERLEGACY_H_
+#pragma once
 
 #include "MantidQtWidgets/Common/FitPropertyBrowser.h"
 #include "MantidQtWidgets/Common/QtPropertyBrowser/qtpropertymanager.h"
@@ -225,5 +224,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*INDIRECTFITPROPERTYBROWSER_H_*/
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/InputController.h b/qt/widgets/common/inc/MantidQtWidgets/Common/InputController.h
index 4ec8a209438..fed5fb03a81 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/InputController.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/InputController.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_INPUTCONTROLLER_H
-#define MANTID_MANTIDWIDGETS_INPUTCONTROLLER_H
+#pragma once
 
 #include "DllOption.h"
 #include <QColor>
@@ -306,5 +305,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTID_MANTIDWIDGETS_INPUTCONTROLLER_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/InstrumentSelector.h b/qt/widgets/common/inc/MantidQtWidgets/Common/InstrumentSelector.h
index 1d163d11e52..c2a62ba25a7 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/InstrumentSelector.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/InstrumentSelector.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_INSTRUMENTSELECTOR_H_
-#define MANTIDQTMANTIDWIDGETS_INSTRUMENTSELECTOR_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidKernel/ConfigService.h"
@@ -100,5 +99,3 @@ private: // members
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQTMANTIDWIDGETS_INSTRUMENTSELECTOR_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/InterfaceManager.h b/qt/widgets/common/inc/MantidQtWidgets/Common/InterfaceManager.h
index c3fbbff516f..076b0d579c7 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/InterfaceManager.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/InterfaceManager.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_DIALOGMANAGER_H_
-#define MANTIDQT_API_DIALOGMANAGER_H_
+#pragma once
 
 //----------------------------------
 // Includes
@@ -172,4 +171,3 @@ private:
            new Mantid::Kernel::Instantiator<TYPE, MantidHelpInterface>())),    \
        0));                                                                    \
   }
-#endif // MANTIDQT_API_DIALOGMANAGER
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/LineEditWithClear.h b/qt/widgets/common/inc/MantidQtWidgets/Common/LineEditWithClear.h
index 1f2fd5e1db0..2b3a0218e9f 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/LineEditWithClear.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/LineEditWithClear.h
@@ -7,8 +7,7 @@
 **
 ****************************************************************************/
 
-#ifndef LINEEDITWITHCLEAR_H
-#define LINEEDITWITHCLEAR_H
+#pragma once
 
 #include "DllOption.h"
 #include "MantidKernel/System.h"
@@ -36,5 +35,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // LINEEDITWITHCLEAR_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/ListPropertyWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/ListPropertyWidget.h
index b7922f78029..d0ed25a6342 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/ListPropertyWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/ListPropertyWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_API_LISTPROPERTYWIDGET_H_
-#define MANTID_API_LISTPROPERTYWIDGET_H_
+#pragma once
 
 #include "MantidKernel/Property.h"
 #include "MantidKernel/System.h"
@@ -42,5 +41,3 @@ protected:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTID_API_LISTPROPERTYWIDGET_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/LocalParameterEditor.h b/qt/widgets/common/inc/MantidQtWidgets/Common/LocalParameterEditor.h
index ea161d97356..aafe3bd4fca 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/LocalParameterEditor.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/LocalParameterEditor.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDWIDGETS_LOCALPARAMETEREDITOR_H_
-#define MANTIDWIDGETS_LOCALPARAMETEREDITOR_H_
+#pragma once
 
 #include <QWidget>
 
@@ -90,5 +89,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*MANTIDWIDGETS_DATASETPLOTDATA_H_*/
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/LocalParameterItemDelegate.h b/qt/widgets/common/inc/MantidQtWidgets/Common/LocalParameterItemDelegate.h
index 193a4937ad6..f6ea8af406b 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/LocalParameterItemDelegate.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/LocalParameterItemDelegate.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDWIDGETS_LOCALPARAMETERITEMDELEGATE_H_
-#define MANTIDWIDGETS_LOCALPARAMETERITEMDELEGATE_H_
+#pragma once
 
 #include <QStyledItemDelegate>
 
@@ -63,5 +62,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*MANTIDWIDGETS_LOCALPARAMETERITEMDELEGATE_H_*/
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/LogValueFinder.h b/qt/widgets/common/inc/MantidQtWidgets/Common/LogValueFinder.h
index 8c247e00fc9..60936100853 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/LogValueFinder.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/LogValueFinder.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_MDFLOGVALUEFINDER_H_
-#define MANTIDQT_MANTIDWIDGETS_MDFLOGVALUEFINDER_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidKernel/Statistics.h"
@@ -39,5 +38,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTIDQT_MANTIDWIDGETS_MDFLOGVALUEFINDER_H_ */
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/LogValueSelector.h b/qt/widgets/common/inc/MantidQtWidgets/Common/LogValueSelector.h
index d0bd854ffe7..4163a15cbe1 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/LogValueSelector.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/LogValueSelector.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_LOGVALUESELECTOR_H_
-#define MANTIDQT_MANTIDWIDGETS_LOGVALUESELECTOR_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidKernel/Statistics.h"
@@ -72,5 +71,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTIDQT_MANTIDWIDGETS_LOGVALUESELECTOR_H_ */
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MWRunFiles.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MWRunFiles.h
index a74a6391244..bd1a3960f3d 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MWRunFiles.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MWRunFiles.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_MWRUNFILES_H_
-#define MANTIDQTMANTIDWIDGETS_MWRUNFILES_H_
+#pragma once
 
 #include "MantidQtWidgets/Common/DllOption.h"
 #include "MantidQtWidgets/Common/FindFilesThreadPoolManager.h"
@@ -281,5 +280,3 @@ private:
 };
 } // namespace API
 } // namespace MantidQt
-
-#endif // MANTIDQTMANTIDWIDGETS_MWRUNFILES_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/ManageUserDirectories.h b/qt/widgets/common/inc/MantidQtWidgets/Common/ManageUserDirectories.h
index 08df76b19ed..b7050f4a541 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/ManageUserDirectories.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/ManageUserDirectories.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANAGE_USER_DIRECTORIES_H
-#define MANTIDQT_MANAGE_USER_DIRECTORIES_H
+#pragma once
 
 #include "DllOption.h"
 #include "MantidQtWidgets/Common/MantidDialog.h"
@@ -50,5 +49,3 @@ private:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTIDQT_MANAGE_USER_DIRECTORIES_H */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidAlgorithmMetatype.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidAlgorithmMetatype.h
index 6b213d210a6..5b9608cd235 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidAlgorithmMetatype.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidAlgorithmMetatype.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDALGORITHMMETATYPE_H
-#define MANTIDALGORITHMMETATYPE_H
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include <QMetaType>
@@ -18,5 +17,3 @@
  */
 
 Q_DECLARE_METATYPE(Mantid::API::IAlgorithm_sptr)
-
-#endif /* MANTIDALGORITHMMETATYPE_H */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidDesktopServices.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidDesktopServices.h
index 6fd2c037b2b..3d6d02ebb88 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidDesktopServices.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidDesktopServices.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_MANTIDDESKTOPSERVICES_H_
-#define MANTIDQT_API_MANTIDDESKTOPSERVICES_H_
+#pragma once
 
 #include "DllOption.h"
 #include <QDesktopServices>
@@ -28,5 +27,3 @@ public:
 };
 } // namespace API
 } // namespace MantidQt
-
-#endif // MANTIDQT_API_MANTIDDESKTOPSERVICES_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidDialog.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidDialog.h
index 28284ad9939..a59af37b824 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidDialog.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_MANTIDDIALOG_H_
-#define MANTIDQT_API_MANTIDDIALOG_H_
+#pragma once
 
 //----------------------------------
 // Includes
@@ -85,5 +84,3 @@ private:
 };
 } // namespace API
 } // namespace MantidQt
-
-#endif // MANTIDQT_API_MANTIDDIALOG_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidDisplayBase.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidDisplayBase.h
index e98943a6fdb..858086fd7d1 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidDisplayBase.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidDisplayBase.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_MANTIDDISPLAYBASE_H_
-#define MANTID_MANTIDWIDGETS_MANTIDDISPLAYBASE_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmObserver.h"
 #include "MantidAPI/IAlgorithm_fwd.h"
@@ -129,5 +128,4 @@ public:
 #endif
 };
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTID_MANTIDWIDGETS_MANTIDDISPLAYBASE_H_
\ No newline at end of file
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidHelpInterface.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidHelpInterface.h
index d9f7f346578..1757f4b5564 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidHelpInterface.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidHelpInterface.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_HELPWINDOWINTERFACE_H_
-#define MANTIDQT_API_HELPWINDOWINTERFACE_H_
+#pragma once
 
 #include "DllOption.h"
 #include <QWidget>
@@ -54,5 +53,3 @@ public slots:
 };
 } // namespace API
 } // namespace MantidQt
-
-#endif // MANTIDQT_API_HELPWINDOWINTERFACE_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidHelpWindow.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidHelpWindow.h
index fd7751750fb..3cc0c5ae05d 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidHelpWindow.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidHelpWindow.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDHELPWINDOW_H
-#define MANTIDHELPWINDOW_H
+#pragma once
 
 #include "DllOption.h"
 #include "MantidQtWidgets/Common/MantidHelpInterface.h"
@@ -73,5 +72,4 @@ public slots:
 };
 
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDHELPWINDOW_H
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidTreeModel.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidTreeModel.h
index c87150a8dab..380d750a693 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidTreeModel.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidTreeModel.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_MANTIDTREEMODEL_H
-#define MANTIDQT_MANTIDWIDGETS_MANTIDTREEMODEL_H
+#pragma once
 //----------------------------------
 // Includes
 //----------------------------------
@@ -148,5 +147,4 @@ private:
   MantidTreeModel &operator=(const MantidTreeModel &);
 };
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQT_MANTIDWIDGETS_MANTIDTREEMODEL_H
\ No newline at end of file
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidTreeWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidTreeWidget.h
index 047537bd465..e33fb87f350 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidTreeWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidTreeWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_MANTIDTREEWIDGET_H
-#define MANTIDQT_MANTIDWIDGETS_MANTIDTREEWIDGET_H
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
@@ -62,5 +61,4 @@ private:
   Qt::SortOrder m_sortOrder;
 };
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQT_MANTIDWIDGETS_MANTIDTREEWIDGET_H
\ No newline at end of file
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidTreeWidgetItem.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidTreeWidgetItem.h
index 5b86f78449e..7d3c491aba9 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidTreeWidgetItem.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidTreeWidgetItem.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDTREEWIDGETITEM_H
-#define MANTIDTREEWIDGETITEM_H
+#pragma once
 
 #include "MantidAPI/WorkspaceGroup.h"
 #include "MantidKernel/DateAndTime.h"
@@ -37,5 +36,4 @@ private:
   int m_sortPos;
 };
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDTREEWIDGETITEM_H
\ No newline at end of file
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidWSIndexDialog.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidWSIndexDialog.h
index 104d4ba259e..dbe12cbf2f1 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidWSIndexDialog.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidWSIndexDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDWSINDEXDIALOG_H_
-#define MANTIDWSINDEXDIALOG_H_
+#pragma once
 
 //----------------------------------
 // Includes
@@ -436,5 +435,4 @@ private:
   QVBoxLayout *m_outer;
 };
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDWSINDEXDIALOG_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidWidget.h
index 878c5dc9681..7b34bc45285 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTAPI_MANTIDWIDGET_H_
-#define MANTIDQTAPI_MANTIDWIDGET_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidQtWidgets/Common/PythonRunner.h"
@@ -56,5 +55,3 @@ private:
 };
 } // namespace API
 } // namespace MantidQt
-
-#endif // MANTIDQTAPI_MANTIDWIDGET_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MdConstants.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MdConstants.h
index 5903ff7165f..cae58f8f067 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MdConstants.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MdConstants.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MDCONSTANTS_H_
-#define MDCONSTANTS_H_
+#pragma once
 
 #include "DllOption.h"
 #include <QColor>
@@ -86,5 +85,3 @@ private:
 };
 } // namespace API
 } // namespace MantidQt
-
-#endif
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MdSettings.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MdSettings.h
index 726e59bc79d..478f4e09203 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MdSettings.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MdSettings.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MDSETTINGS_H_
-#define MDSETTINGS_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidQtWidgets/Common/MdConstants.h"
@@ -178,5 +177,3 @@ private:
 };
 } // namespace API
 } // namespace MantidQt
-
-#endif
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Message.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Message.h
index 366567d53e5..633d92291b6 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Message.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Message.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MESSAGE_H_
-#define MESSAGE_H_
+#pragma once
 
 //----------------------------------
 // Includes
@@ -71,5 +70,3 @@ private:
 
 /// Required to operate in signals/slots
 Q_DECLARE_METATYPE(MantidQt::MantidWidgets::Message)
-
-#endif // MESSAGE_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MessageDisplay.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MessageDisplay.h
index d9e2d14005c..f2202724127 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MessageDisplay.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MessageDisplay.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MESSAGEDISPLAY_H_
-#define MESSAGEDISPLAY_H_
+#pragma once
 
 //----------------------------------
 // Includes
@@ -188,5 +187,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MESSAGEDISPLAY_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MockAlgorithmRunner.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MockAlgorithmRunner.h
index 6dbf00d84dd..466354c1227 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MockAlgorithmRunner.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MockAlgorithmRunner.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_MOCKALGORITHMRUNNER_H
-#define MANTIDQT_MANTIDWIDGETS_MOCKALGORITHMRUNNER_H
+#pragma once
 
 #include "MantidAPI/IAlgorithm_fwd.h"
 #include "MantidKernel/WarningSuppressions.h"
@@ -38,5 +37,3 @@ private:
 };
 
 GNU_DIAG_ON_SUGGEST_OVERRIDE
-
-#endif
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MockProgressableView.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MockProgressableView.h
index 5c2618cb6c1..77b7513802a 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MockProgressableView.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MockProgressableView.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_MOCKPROGRESSABLEVIEW_H
-#define MANTID_MANTIDWIDGETS_MOCKPROGRESSABLEVIEW_H
+#pragma once
 
 #include "MantidKernel/WarningSuppressions.h"
 #include "MantidQtWidgets/Common/ProgressableView.h"
@@ -25,5 +24,3 @@ public:
   MOCK_METHOD0(setAsEndlessIndicator, void());
   GNU_DIAG_ON_SUGGEST_OVERRIDE
 };
-
-#endif /* MANTID_MANTIDWIDGETS_MOCKPROGRESSABLEVIEW_H */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MockSlitCalculator.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MockSlitCalculator.h
index 2a0dc116050..9cd7cca8fef 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MockSlitCalculator.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MockSlitCalculator.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_MOCKSLITCALCULATOR_H
-#define MANTID_MANTIDWIDGETS_MOCKSLITCALCULATOR_H
+#pragma once
 
 #include "ISlitCalculator.h"
 #include <gmock/gmock.h>
@@ -19,5 +18,3 @@ public:
   MOCK_METHOD0(show, void());
   GNU_DIAG_ON_SUGGEST_OVERRIDE
 };
-
-#endif /* MANTID_MANTIDWIDGETS_MOCKSLITCALCULATOR_H */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MultifitSetupDialog.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MultifitSetupDialog.h
index 1f55503efd6..94fbff4bbf2 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MultifitSetupDialog.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MultifitSetupDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MULTIFITSETUPTDIALOG_H
-#define MULTIFITSETUPTDIALOG_H
+#pragma once
 
 #include "ui_MultifitSetupDialog.h"
 #include <QDialog>
@@ -49,5 +48,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MULTIFITSETUPTDIALOG_H */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MuonFitDataSelector.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MuonFitDataSelector.h
index 9ca2687842d..9ae3c4e2390 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MuonFitDataSelector.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MuonFitDataSelector.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_MUONFITDATASELECTOR_H_
-#define MANTID_MANTIDWIDGETS_MUONFITDATASELECTOR_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidQtWidgets/Common/FitPropertyBrowser.h"
@@ -130,5 +129,3 @@ private slots:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTID_MANTIDWIDGETS_MUONFITDATASELECTOR_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MuonFitPropertyBrowser.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MuonFitPropertyBrowser.h
index 38d8ef0fcca..0e4a707b80e 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MuonFitPropertyBrowser.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MuonFitPropertyBrowser.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MUONFITPROPERTYBROWSER_H_
-#define MUONFITPROPERTYBROWSER_H_
+#pragma once
 
 #include "MantidQtWidgets/Common/FitPropertyBrowser.h"
 #include "MantidQtWidgets/Common/IMuonFitDataModel.h"
@@ -251,5 +250,3 @@ private:
 std::map<std::string, double> readMultipleNormalization();
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*MUONFITPROPERTYBROWSER_H_*/
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MuonFunctionBrowser.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MuonFunctionBrowser.h
index 27910ff9366..1f3a55b571c 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MuonFunctionBrowser.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MuonFunctionBrowser.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_MUONFUNCTIONBROWSER_H_
-#define MANTID_MANTIDWIDGETS_MUONFUNCTIONBROWSER_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidQtWidgets/Common/FunctionBrowser.h"
@@ -27,5 +26,3 @@ public:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTID_MANTIDWIDGETS_MUONFUNCTIONBROWSER_H_ */
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/NonOrthogonal.h b/qt/widgets/common/inc/MantidQtWidgets/Common/NonOrthogonal.h
index 7c6799e420c..6037d3637bd 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/NonOrthogonal.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/NonOrthogonal.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDQT_API_NON_ORTHOGONAL_H_
-#define MANTID_MANTIDQT_API_NON_ORTHOGONAL_H_
+#pragma once
 
 #include "MantidAPI/IMDWorkspace.h"
 #include "MantidKernel/Matrix.h"
@@ -65,5 +64,3 @@ getGridLineAnglesInRadian(const std::array<Mantid::coord_t, 9> &skewMatrixCoord,
                           size_t dimX, size_t dimY);
 } // namespace API
 } // namespace MantidQt
-
-#endif
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/NotificationService.h b/qt/widgets/common/inc/MantidQtWidgets/Common/NotificationService.h
index 8a16b1f3ec1..561a08ca95b 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/NotificationService.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/NotificationService.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTAPI_NOTIFICATIONSERVICE_H_
-#define MANTIDQTAPI_NOTIFICATIONSERVICE_H_
+#pragma once
 
 #include "DllOption.h"
 #include <QObject>
@@ -59,5 +58,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQTAPI_NOTIFICATIONSERVICE_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/ObserverPattern.h b/qt/widgets/common/inc/MantidQtWidgets/Common/ObserverPattern.h
index 4bd753a81ee..bfa5b26fca0 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/ObserverPattern.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/ObserverPattern.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_CUSTOMINTERFACES_OBSERVERPATTERN_H_
-#define MANTIDQT_CUSTOMINTERFACES_OBSERVERPATTERN_H_
+#pragma once
 #include <functional>
 #include <set>
 #include <string>
@@ -72,5 +71,3 @@ public:
 private:
   std::function<void()> m_slot;
 };
-
-#endif /* MANTIDQT_CUSTOMINTERFACES_OBSERVERPATTERN_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/OptionsPropertyWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/OptionsPropertyWidget.h
index 4da25b98f25..81301519b85 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/OptionsPropertyWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/OptionsPropertyWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_API_OPTIONSPROPERTYWIDGET_H_
-#define MANTID_API_OPTIONSPROPERTYWIDGET_H_
+#pragma once
 
 #include "MantidKernel/Property.h"
 #include "MantidKernel/System.h"
@@ -45,5 +44,3 @@ protected:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTID_API_OPTIONSPROPERTYWIDGET_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/ParseKeyValueString.h b/qt/widgets/common/inc/MantidQtWidgets/Common/ParseKeyValueString.h
index e9d67031584..a369df47983 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/ParseKeyValueString.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/ParseKeyValueString.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_PARSEKEYVALUESTRING_H
-#define MANTIDQTMANTIDWIDGETS_PARSEKEYVALUESTRING_H
+#pragma once
 
 /** parseKeyValueString
 
@@ -44,5 +43,3 @@ std::string EXPORT_OPT_MANTIDQT_COMMON optionsToString(
     const bool quoteValues = true, const std::string &separator = ", ");
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQTMANTIDWIDGETS_PARSEKEYVALUESTRING_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/ParseNumerics.h b/qt/widgets/common/inc/MantidQtWidgets/Common/ParseNumerics.h
index 51582bc4ac7..1853da2d35b 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/ParseNumerics.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/ParseNumerics.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_DATAPOCESSORPARSENUMERICS_H
-#define MANTID_MANTIDWIDGETS_DATAPOCESSORPARSENUMERICS_H
+#pragma once
 #include "MantidQtWidgets/Common/DllOption.h"
 #include <QString>
 /**
@@ -20,5 +19,4 @@ double EXPORT_OPT_MANTIDQT_COMMON parseDouble(QString const &in);
 /// Converts a string denoting a denary integer to it
 int EXPORT_OPT_MANTIDQT_COMMON parseDenaryInteger(QString const &in);
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTID_MANTIDWIDGETS_DATAPOCESSORPARSENUMERICS_H
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/PlotAxis.h b/qt/widgets/common/inc/MantidQtWidgets/Common/PlotAxis.h
index 733fc66c9b7..7613ed597ea 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/PlotAxis.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/PlotAxis.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_PLOTAXISLABEL_H_
-#define MANTIDQT_API_PLOTAXISLABEL_H_
+#pragma once
 
 #include "MantidAPI/IMDWorkspace.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
@@ -55,5 +54,3 @@ private:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTIDQT_API_PLOTAXISLABEL_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/PluginLibraries.h b/qt/widgets/common/inc/MantidQtWidgets/Common/PluginLibraries.h
index 9eae016a648..b895f0c8c17 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/PluginLibraries.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/PluginLibraries.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_WIDGETS_COMMON_PLUGINLIBRARIES_H
-#define MANTIDQT_WIDGETS_COMMON_PLUGINLIBRARIES_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DllOption.h"
 
@@ -23,5 +22,3 @@ EXPORT_OPT_MANTIDQT_COMMON int loadPluginsFromCfgPath(std::string key);
 EXPORT_OPT_MANTIDQT_COMMON int loadPluginsFromPath(std::string path);
 } // namespace API
 } // namespace MantidQt
-
-#endif // PLUGINLIBRARYLOADER_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/PrecompiledHeader.h b/qt/widgets/common/inc/MantidQtWidgets/Common/PrecompiledHeader.h
index 8e8a0c60f24..e163b14143c 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/PrecompiledHeader.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/PrecompiledHeader.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_PRECOMPILEDHEADER_H_
-#define MANTIDQT_API_PRECOMPILEDHEADER_H_
+#pragma once
 
 // Mantid
 #include "MantidAPI/Algorithm.h"
@@ -17,5 +16,3 @@
 #include <set>
 #include <string>
 #include <vector>
-
-#endif // MANTIDQT_API_PRECOMPILEDHEADER_H_
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/ProcessingAlgoWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/ProcessingAlgoWidget.h
index c8ae7e5be8f..12dd8d97eef 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/ProcessingAlgoWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/ProcessingAlgoWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDWIDGETS_PROCESSINGALGOWIDGET_H_
-#define MANTIDWIDGETS_PROCESSINGALGOWIDGET_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/Algorithm.h"
@@ -92,5 +91,4 @@ private:
 };
 
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/ProgressPresenter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/ProgressPresenter.h
index e0f4dfd4531..aa2a3fba136 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/ProgressPresenter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/ProgressPresenter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_PROGRESSPRESENTER_H
-#define MANTIDQTMANTIDWIDGETS_PROGRESSPRESENTER_H
+#pragma once
 
 #include "MantidKernel/ProgressBase.h"
 #include "MantidQtWidgets/Common/ProgressableView.h"
@@ -39,5 +38,4 @@ public:
   }
   void setAsEndlessIndicator() { m_progressableView->setAsEndlessIndicator(); }
   ~ProgressPresenter() {}
-};
-#endif /* MANTIDQTMANTIDWIDGETS_PROGRESSPRESENTER_H */
+};
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/ProgressableView.h b/qt/widgets/common/inc/MantidQtWidgets/Common/ProgressableView.h
index 60eee7fa240..38fedbdeb7a 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/ProgressableView.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/ProgressableView.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_PROGRESSABLEVIEW_H_
-#define MANTIDQTMANTIDWIDGETS_PROGRESSABLEVIEW_H_
+#pragma once
 
 #include "MantidQtWidgets/Common/DllOption.h"
 
@@ -39,5 +38,3 @@ protected:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTIDQTMANTIDWIDGETS_PROGRESSABLEVIEW_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/ProjectSaveModel.h b/qt/widgets/common/inc/MantidQtWidgets/Common/ProjectSaveModel.h
index f3a5d40afe2..5444574a027 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/ProjectSaveModel.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/ProjectSaveModel.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_PROJECTSAVEMODEL_H
-#define MANTIDQT_MANTIDWIDGETS_PROJECTSAVEMODEL_H
+#pragma once
 
 #include "MantidAPI/Workspace.h"
 #include "MantidQtWidgets/Common/IProjectSerialisable.h"
@@ -99,5 +98,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQT_MANTIDWIDGETS_PROJECTSAVEMODEL_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/ProjectSavePresenter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/ProjectSavePresenter.h
index c3d4fa31c33..a1290a64ecd 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/ProjectSavePresenter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/ProjectSavePresenter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_PROJECTSAVEPRESENTER_H
-#define MANTIDQT_MANTIDWIDGETS_PROJECTSAVEPRESENTER_H
+#pragma once
 
 #include "MantidAPI/Workspace.h"
 #include "MantidQtWidgets/Common/IProjectSaveView.h"
@@ -56,5 +55,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // PROJECTSAVEPRESENTER_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/PropertyHandler.h b/qt/widgets/common/inc/MantidQtWidgets/Common/PropertyHandler.h
index 5a350326a8c..d786af57fa4 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/PropertyHandler.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/PropertyHandler.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef PROPERTY_HANDLER_H
-#define PROPERTY_HANDLER_H
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/IFunction.h"
@@ -276,5 +275,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* PROPERTY_HANDLER_H */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/PropertyWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/PropertyWidget.h
index 8cb33b06744..5a6c07edca6 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/PropertyWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/PropertyWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_API_PROPERTYWIDGET_H_
-#define MANTID_API_PROPERTYWIDGET_H_
+#pragma once
 
 #include "MantidKernel/Property.h"
 #include "MantidKernel/System.h"
@@ -171,5 +170,3 @@ protected:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTID_API_PROPERTYWIDGET_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/PropertyWidgetFactory.h b/qt/widgets/common/inc/MantidQtWidgets/Common/PropertyWidgetFactory.h
index 96759c1c991..a37ab75e1e2 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/PropertyWidgetFactory.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/PropertyWidgetFactory.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_API_PROPERTYWIDGETFACTORY_H_
-#define MANTID_API_PROPERTYWIDGETFACTORY_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 
@@ -38,5 +37,3 @@ public:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTID_API_PROPERTYWIDGETFACTORY_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Python/CodeExecution.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Python/CodeExecution.h
index 444795d16a8..7d43bcecab1 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Python/CodeExecution.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Python/CodeExecution.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTWIDGETS_LINETRACKINGEXECUTOR_H
-#define MANTIDQTWIDGETS_LINETRACKINGEXECUTOR_H
+#pragma once
 
 #include "MantidPythonInterface/core/WrapPython.h"
 #include "MantidQtWidgets/Common/DllOption.h"
@@ -31,5 +30,3 @@ private:
 };
 
 } // namespace MantidQt::Widgets::Common::Python
-
-#endif // MANTIDQTWIDGETS_LINETRACKINGEXECUTOR_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Python/Object.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Python/Object.h
index 8f1ac425e76..dd91c128f25 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Python/Object.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Python/Object.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTWIDGETS_PYTHON_OBJECT_H
-#define MANTIDQTWIDGETS_PYTHON_OBJECT_H
+#pragma once
 
 #include "MantidPythonInterface/core/ErrorHandling.h"
 #include "MantidPythonInterface/core/GlobalInterpreterLock.h"
@@ -105,5 +104,3 @@ private:
 } // namespace Common
 } // namespace Widgets
 } // namespace MantidQt
-
-#endif // MANTIDQTWIDGETS_PYTHON_OBJECT_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Python/QHashToDict.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Python/QHashToDict.h
index 4e2170e9652..642f324e17d 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Python/QHashToDict.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Python/QHashToDict.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTWIDGETS_QHASHTODICT_H
-#define MANTIDQTWIDGETS_QHASHTODICT_H
+#pragma once
 #include "MantidQtWidgets/Common/DllOption.h"
 #include "MantidQtWidgets/Common/Python/Object.h"
 
@@ -25,5 +24,3 @@ EXPORT_OPT_MANTIDQT_COMMON Python::Dict qHashToDict(const KwArgs &hash);
 } // namespace Common
 } // namespace Widgets
 } // namespace MantidQt
-
-#endif /* MANTIDQTWIDGETS_QHASHTODICT_H */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Python/Sip.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Python/Sip.h
index 08ec5f0b67a..4ce163728c9 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Python/Sip.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Python/Sip.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTWIDGETS_SIPUTILS_H
-#define MANTIDQTWIDGETS_SIPUTILS_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DllOption.h"
 #include "MantidQtWidgets/Common/Python/Object.h"
@@ -48,5 +47,3 @@ template <typename T> T *extract(const Object &obj) {
 } // namespace Widgets
 
 } // namespace MantidQt
-
-#endif // MPLCPP_SIPUTILS_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/PythonRunner.h b/qt/widgets/common/inc/MantidQtWidgets/Common/PythonRunner.h
index 057afdfa2d1..a388786b9e5 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/PythonRunner.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/PythonRunner.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTAPI_PYTHONRUNNER_H_
-#define MANTIDQTAPI_PYTHONRUNNER_H_
+#pragma once
 
 #include "DllOption.h"
 #include <QObject>
@@ -40,5 +39,3 @@ signals:
 };
 } // namespace API
 } // namespace MantidQt
-
-#endif // MANTIDQTAPI_PYTHONRUNNER_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QScienceSpinBox.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QScienceSpinBox.h
index ab71fef3b49..233a2fc7ec1 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QScienceSpinBox.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QScienceSpinBox.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_QSCIENCESPINBOX_H_
-#define MANTIDQT_API_QSCIENCESPINBOX_H_
+#pragma once
 
 #include "MantidQtWidgets/Common/DllOption.h"
 
@@ -59,5 +58,4 @@ signals:
 };
 
 } // namespace API
-} // namespace MantidQt
-#endif /* MANTIDQT_API_QSCIENCESPINBOX_H_ */
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QStringUtils.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QStringUtils.h
index 21db08acdec..4f8308b13b1 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QStringUtils.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QStringUtils.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_QSTRINGUTILS_H
-#define MANTIDQT_API_QSTRINGUTILS_H
+#pragma once
 
 #include <QString>
 #include <string>
@@ -43,5 +42,3 @@ inline QString toQStringInternal(const std::wstring &str) {
 }
 } // namespace API
 } // namespace MantidQt
-
-#endif // MANTIDQT_API_QSTRINGUTILS_H
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtJSONUtils.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtJSONUtils.h
index 36e0748ee28..8900d00d7d7 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtJSONUtils.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtJSONUtils.h
@@ -5,8 +5,7 @@
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
 
-#ifndef MANTIDQT_API_QJSONUTILS_H
-#define MANTIDQT_API_QJSONUTILS_H
+#pragma once
 
 #include "DllOption.h"
 
@@ -29,5 +28,3 @@ QMap<QString, QVariant>
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTIDQT_API_QJSONUTILS_H */
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/ButtonEditorFactory.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/ButtonEditorFactory.h
index 47f17d42ff8..9f51ad04bd4 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/ButtonEditorFactory.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/ButtonEditorFactory.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef BUTTONEDITORFACTORY_H
-#define BUTTONEDITORFACTORY_H
+#pragma once
 
 #include "ParameterPropertyManager.h"
 #include "qtpropertymanager.h"
@@ -66,5 +65,3 @@ public:
 Q_SIGNALS:
   void buttonClicked(QtProperty * /*_t1*/);
 };
-
-#endif // BUTTONEDITORFACTORY_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/CompositeEditorFactory.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/CompositeEditorFactory.h
index 48b58d21350..af8ffddc090 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/CompositeEditorFactory.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/CompositeEditorFactory.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef COMPOSITEEDITORFACTORY_H
-#define COMPOSITEEDITORFACTORY_H
+#pragma once
 
 #include "qtpropertybrowser.h"
 #include <QPushButton>
@@ -64,5 +63,3 @@ private:
   FactoryBaseType *m_secondaryFactory;
   QString m_optionName;
 };
-
-#endif // COMPOSITEEDITORFACTORY_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/DoubleDialogEditor.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/DoubleDialogEditor.h
index 3b8aaff9472..464fb05f901 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/DoubleDialogEditor.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/DoubleDialogEditor.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DOUBLEDIALOGEDITORFACTORY_H
-#define DOUBLEDIALOGEDITORFACTORY_H
+#pragma once
 
 #include "DoubleEditorFactory.h"
 #include "ParameterPropertyManager.h"
@@ -79,5 +78,3 @@ protected:
   disconnectPropertyManager(ParameterPropertyManager * /*manager*/) override {}
   bool m_hasOption;
 };
-
-#endif // DOUBLEDIALOGEDITORFACTORY_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/DoubleEditorFactory.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/DoubleEditorFactory.h
index 0c7054b9f74..f05a2fd68a6 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/DoubleEditorFactory.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/DoubleEditorFactory.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DOUBLEEDITORFACTORY_H
-#define DOUBLEEDITORFACTORY_H
+#pragma once
 
 #include "ParameterPropertyManager.h"
 #include "qtpropertymanager.h"
@@ -101,5 +100,3 @@ public:
       : DoubleEditorFactoryBase<ParameterPropertyManager, ParameterEditor>(
             parent) {}
 };
-
-#endif // DOUBLEEDITORFACTORY_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/FilenameDialogEditor.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/FilenameDialogEditor.h
index f52bfc32107..e6795ba1e36 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/FilenameDialogEditor.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/FilenameDialogEditor.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_FILENAMEDIALOGEDITFACTORY_H
-#define MANTIDQT_MANTIDWIDGETS_FILENAMEDIALOGEDITFACTORY_H
+#pragma once
 
 #include "StringDialogEditor.h"
 
@@ -45,5 +44,3 @@ protected:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQT_MANTIDWIDGETS_FILENAMEDIALOGEDITFACTORY_H
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/FormulaDialogEditor.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/FormulaDialogEditor.h
index 08605ec3a61..352dcda7ac1 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/FormulaDialogEditor.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/FormulaDialogEditor.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_FORMULADIALOGEDIT_H
-#define MANTIDQT_MANTIDWIDGETS_FORMULADIALOGEDIT_H
+#pragma once
 
 #include "StringDialogEditor.h"
 
@@ -42,5 +41,3 @@ protected:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQT_MANTIDWIDGETS_FORMULADIALOGEDIT_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/ParameterPropertyManager.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/ParameterPropertyManager.h
index bb52d3b2783..fd61738a07a 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/ParameterPropertyManager.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/ParameterPropertyManager.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef PARAMETERPROPERTYMANAGER_H
-#define PARAMETERPROPERTYMANAGER_H
+#pragma once
 
 #include "qtpropertymanager.h"
 
@@ -85,5 +84,3 @@ private:
   bool m_hasGlobalOption;
   QSet<QtProperty *> m_globals;
 };
-
-#endif // PARAMETERPROPERTYMANAGER_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/StringDialogEditor.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/StringDialogEditor.h
index ed224078c81..2679ac1304d 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/StringDialogEditor.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/StringDialogEditor.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef STRINGDIALOGEDITORFACTORY_H
-#define STRINGDIALOGEDITORFACTORY_H
+#pragma once
 
 #include "qtpropertymanager.h"
 
@@ -56,5 +55,3 @@ private:
   QLineEdit *m_lineEdit;
   QtProperty *m_property;
 };
-
-#endif // STRINGDIALOGEDITORFACTORY_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/StringEditorFactory.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/StringEditorFactory.h
index d20a6efdf67..64a20f52757 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/StringEditorFactory.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/StringEditorFactory.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef STRINGEDITORFACTORY_H
-#define STRINGEDITORFACTORY_H
+#pragma once
 
 #include "qtpropertymanager.h"
 #include <QLineEdit>
@@ -38,5 +37,3 @@ protected slots:
 private:
   QtProperty *m_property;
 };
-
-#endif // STRINGEDITORFACTORY_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/WorkspaceEditorFactory.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/WorkspaceEditorFactory.h
index 1bad7304688..1e25c1c9ba6 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/WorkspaceEditorFactory.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/WorkspaceEditorFactory.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef STRINGEDITORFACTORY_H
-#define STRINGEDITORFACTORY_H
+#pragma once
 
 #include "MantidQtWidgets/Common/QtPropertyBrowser/qtpropertymanager.h"
 #include "MantidQtWidgets/Common/WorkspaceSelector.h"
@@ -45,5 +44,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // STRINGEDITORFACTORY_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtbuttonpropertybrowser.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtbuttonpropertybrowser.h
index d4a89718f22..5ff81e339a9 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtbuttonpropertybrowser.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtbuttonpropertybrowser.h
@@ -85,8 +85,7 @@
 **
 ****************************************************************************/
 
-#ifndef QTBUTTONPROPERTYBROWSER_H
-#define QTBUTTONPROPERTYBROWSER_H
+#pragma once
 
 #include "qtpropertybrowser.h"
 #include <QMap>
@@ -186,5 +185,3 @@ private:
 #if QT_VERSION >= 0x040400
 QT_END_NAMESPACE
 #endif
-
-#endif
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qteditorfactory.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qteditorfactory.h
index b9e1fb143f7..099e3ede400 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qteditorfactory.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qteditorfactory.h
@@ -85,8 +85,7 @@
 **
 ****************************************************************************/
 
-#ifndef QTEDITORFACTORY_H
-#define QTEDITORFACTORY_H
+#pragma once
 
 #include "qtpropertybrowserutils_p.h"
 #include "qtpropertymanager.h"
@@ -800,5 +799,3 @@ public:
 #if QT_VERSION >= 0x040400
 QT_END_NAMESPACE
 #endif
-
-#endif
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtgroupboxpropertybrowser.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtgroupboxpropertybrowser.h
index 7c6106190f3..236860a2cca 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtgroupboxpropertybrowser.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtgroupboxpropertybrowser.h
@@ -85,8 +85,7 @@
 **
 ****************************************************************************/
 
-#ifndef QTGROUPBOXPROPERTYBROWSER_H
-#define QTGROUPBOXPROPERTYBROWSER_H
+#pragma once
 
 #include "qtpropertybrowser.h"
 #include <QMap>
@@ -170,5 +169,3 @@ private:
 #if QT_VERSION >= 0x040400
 QT_END_NAMESPACE
 #endif
-
-#endif
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowser.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowser.h
index a94fc4a01db..38b29187e8d 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowser.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowser.h
@@ -85,8 +85,7 @@
 **
 ****************************************************************************/
 
-#ifndef QTPROPERTYBROWSER_H
-#define QTPROPERTYBROWSER_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DllOption.h"
 #include <QMap>
@@ -423,5 +422,3 @@ public:
 #if QT_VERSION >= 0x040400
 QT_END_NAMESPACE
 #endif
-
-#endif // QTPROPERTYBROWSER_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowserutils_p.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowserutils_p.h
index 7437441efbc..39f0522746e 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowserutils_p.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowserutils_p.h
@@ -96,8 +96,7 @@
 // We mean it.
 //
 
-#ifndef QTPROPERTYBROWSERUTILS_H
-#define QTPROPERTYBROWSERUTILS_H
+#pragma once
 
 #include <QIcon>
 #include <QMap>
@@ -204,5 +203,3 @@ private:
 #if QT_VERSION >= 0x040400
 QT_END_NAMESPACE
 #endif
-
-#endif
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertymanager.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertymanager.h
index dedd26e011d..a5e5e7b40eb 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertymanager.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertymanager.h
@@ -85,8 +85,7 @@
 **
 ****************************************************************************/
 
-#ifndef QTPROPERTYMANAGER_H
-#define QTPROPERTYMANAGER_H
+#pragma once
 
 #include "qtpropertybrowser.h"
 
@@ -1504,5 +1503,3 @@ private:
 #if QT_VERSION >= 0x040400
 QT_END_NAMESPACE
 #endif
-
-#endif
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qttreepropertybrowser.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qttreepropertybrowser.h
index 26f669ffee9..cfe2db199c5 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qttreepropertybrowser.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qttreepropertybrowser.h
@@ -85,8 +85,7 @@
 **
 ****************************************************************************/
 
-#ifndef QTTREEPROPERTYBROWSER_H
-#define QTTREEPROPERTYBROWSER_H
+#pragma once
 
 #include "qtpropertybrowser.h"
 
@@ -383,5 +382,3 @@ private:
 #if QT_VERSION >= 0x040400
 QT_END_NAMESPACE
 #endif
-
-#endif
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtvariantproperty.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtvariantproperty.h
index f54dce9beb2..2e20706f693 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtvariantproperty.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtvariantproperty.h
@@ -85,8 +85,7 @@
 **
 ****************************************************************************/
 
-#ifndef QTVARIANTPROPERTY_H
-#define QTVARIANTPROPERTY_H
+#pragma once
 
 #include "qtpropertybrowser.h"
 #include <QIcon>
@@ -332,5 +331,4 @@ QT_END_NAMESPACE
 #endif
 
 Q_DECLARE_METATYPE(QIcon)
-Q_DECLARE_METATYPE(QtIconMap)
-#endif
+Q_DECLARE_METATYPE(QtIconMap)
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtSignalChannel.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtSignalChannel.h
index 635e01f1f5c..c6a61fbbaa4 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtSignalChannel.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtSignalChannel.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTAPI_QTSIGNALCHANNEL_H_
-#define MANTIDQTAPI_QTSIGNALCHANNEL_H_
+#pragma once
 
 #include "DllOption.h"
 
@@ -57,5 +56,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQTAPI_MANTIDWIDGET_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/RenameParDialog.h b/qt/widgets/common/inc/MantidQtWidgets/Common/RenameParDialog.h
index e060666ba38..4064a094a8c 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/RenameParDialog.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/RenameParDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_RENAMEPARDIALOG_H_
-#define MANTIDQTMANTIDWIDGETS_RENAMEPARDIALOG_H_
+#pragma once
 
 #include "DllOption.h"
 #include "ui_RenameParDialog.h"
@@ -42,5 +41,3 @@ protected:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQTMANTIDWIDGETS_RENAMEPARDIALOG_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/RepoModel.h b/qt/widgets/common/inc/MantidQtWidgets/Common/RepoModel.h
index c5e7bcd894f..0b7f8188bfc 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/RepoModel.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/RepoModel.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_API_REPOMODEL_H_
-#define MANTID_API_REPOMODEL_H_
+#pragma once
 #include "MantidAPI/ScriptRepository.h"
 #include "MantidQtWidgets/Common/DllOption.h"
 #include <QAbstractItemModel>
@@ -253,5 +252,3 @@ private slots:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTID_API_SCRIPTREPOSITORYVIEW_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/RepoTreeView.h b/qt/widgets/common/inc/MantidQtWidgets/Common/RepoTreeView.h
index 9846f11aad6..3f9668f0c65 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/RepoTreeView.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/RepoTreeView.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_API_REPOTREEVIEW_H_
-#define MANTID_API_REPOTREEVIEW_H_
+#pragma once
 
 #include "DllOption.h"
 #include <QTreeView>
@@ -39,5 +38,3 @@ protected slots:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTID_API_REPOTREEVIEW_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/SaveWorkspaces.h b/qt/widgets/common/inc/MantidQtWidgets/Common/SaveWorkspaces.h
index b743bcb3a1e..34a5546aaa2 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/SaveWorkspaces.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/SaveWorkspaces.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_SAVEWORKSPACES_H_
-#define MANTIDQTMANTIDWIDGETS_SAVEWORKSPACES_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidQtWidgets/Common/MantidDialog.h"
@@ -87,5 +86,3 @@ private slots:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQTMANTIDWIDGETS_SAVEWORKSPACES_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/ScriptEditor.h b/qt/widgets/common/inc/MantidQtWidgets/Common/ScriptEditor.h
index 79fc79ca0b8..5407509b1b4 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/ScriptEditor.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/ScriptEditor.h
@@ -5,8 +5,7 @@
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
 
-#ifndef SCRIPTEDITOR_H_
-#define SCRIPTEDITOR_H_
+#pragma once
 
 //----------------------------------
 // Includes
@@ -188,5 +187,3 @@ private:
   /// Name of group that the settings are stored under
   QString m_settingsGroup;
 };
-
-#endif // SCRIPTEDITOR_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/ScriptRepositoryView.h b/qt/widgets/common/inc/MantidQtWidgets/Common/ScriptRepositoryView.h
index 5dfa96413ea..924051120ad 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/ScriptRepositoryView.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/ScriptRepositoryView.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_API_SCRIPTREPOSITORYVIEW_H_
-#define MANTID_API_SCRIPTREPOSITORYVIEW_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidQtWidgets/Common/MantidDialog.h"
@@ -88,5 +87,3 @@ private:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTID_API_SCRIPTREPOSITORYVIEW_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/SelectFunctionDialog.h b/qt/widgets/common/inc/MantidQtWidgets/Common/SelectFunctionDialog.h
index 372ae7939d4..964e0090ab0 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/SelectFunctionDialog.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/SelectFunctionDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDWIDGETS_SELECTFUNCTIONDIALOG_H_
-#define MANTIDWIDGETS_SELECTFUNCTIONDIALOG_H_
+#pragma once
 
 //--------------------------------------------------
 // Includes
@@ -64,5 +63,3 @@ private slots:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDWIDGETS_SELECTFUNCTIONDIALOG_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/SelectWorkspacesDialog.h b/qt/widgets/common/inc/MantidQtWidgets/Common/SelectWorkspacesDialog.h
index 7e90b696dc8..8fba396d142 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/SelectWorkspacesDialog.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/SelectWorkspacesDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SELECTWORKSPACESDIALOG_H
-#define SELECTWORKSPACESDIALOG_H
+#pragma once
 
 //----------------------------
 //   Includes
@@ -60,5 +59,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* SELECTWORKSPACESDIALOG_H */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/SelectionNotificationService.h b/qt/widgets/common/inc/MantidQtWidgets/Common/SelectionNotificationService.h
index 43b2da7c367..738b579dbd7 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/SelectionNotificationService.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/SelectionNotificationService.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTAPI_SELECTION_NOTIFICATION_SERVICE_H_
-#define MANTIDQTAPI_SELECTION_NOTIFICATION_SERVICE_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidKernel/SingletonHolder.h"
@@ -59,5 +58,3 @@ EXTERN_MANTIDQT_COMMON template class EXPORT_OPT_MANTIDQT_COMMON Mantid::
     Kernel::SingletonHolder<MantidQt::API::SelectionNotificationServiceImpl>;
 }
 } // namespace Mantid
-
-#endif // MANTIDQTAPI_SELECTION_NOTIFICATION_SERVICE_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/SequentialFitDialog.h b/qt/widgets/common/inc/MantidQtWidgets/Common/SequentialFitDialog.h
index e077c2ff349..60b75a2c9dc 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/SequentialFitDialog.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/SequentialFitDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SEQUENTIALFITDIALOG_H
-#define SEQUENTIALFITDIALOG_H
+#pragma once
 
 //----------------------------
 //   Includes
@@ -122,5 +121,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* SEQUENTIALFITDIALOG_H */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/SignalBlocker.h b/qt/widgets/common/inc/MantidQtWidgets/Common/SignalBlocker.h
index c308b25d6db..b589a0d339a 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/SignalBlocker.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/SignalBlocker.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_API_SIGNALBLOCKER_H_
-#define MANTID_API_SIGNALBLOCKER_H_
+#pragma once
 
 #include "DllOption.h"
 #include <QObject>
@@ -37,5 +36,3 @@ public:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTID_API_SIGNALBLOCKER_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/SlicingAlgorithmDialog.h b/qt/widgets/common/inc/MantidQtWidgets/Common/SlicingAlgorithmDialog.h
index 1928528f18d..a514674bdce 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/SlicingAlgorithmDialog.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/SlicingAlgorithmDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTCUSTOMDIALOGS_SLICINGALGORITHMDIALOG_H_
-#define MANTIDQTCUSTOMDIALOGS_SLICINGALGORITHMDIALOG_H_
+#pragma once
 
 //----------------------
 // Includes
@@ -153,5 +152,3 @@ public:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/SlitCalculator.h b/qt/widgets/common/inc/MantidQtWidgets/Common/SlitCalculator.h
index 7f6d5243903..90b61d1356b 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/SlitCalculator.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/SlitCalculator.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_SLITCALCULATOR_H
-#define MANTID_MANTIDWIDGETS_SLITCALCULATOR_H
+#pragma once
 
 //----------------------------------
 // Includes
@@ -47,5 +46,3 @@ private slots:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTID_MANTIDWIDGETS_SLITCALCULATOR_H */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/SyncedCheckboxes.h b/qt/widgets/common/inc/MantidQtWidgets/Common/SyncedCheckboxes.h
index 6c6e381275d..3afba732a28 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/SyncedCheckboxes.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/SyncedCheckboxes.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_SYNCEDCHECKBOXES_H_
-#define MANTIDQT_API_SYNCEDCHECKBOXES_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidKernel/System.h"
@@ -52,5 +51,3 @@ private:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTIDQT_API_SYNCEDCHECKBOXES_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/TSVSerialiser.h b/qt/widgets/common/inc/MantidQtWidgets/Common/TSVSerialiser.h
index de00dd672bc..cc33813d820 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/TSVSerialiser.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/TSVSerialiser.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_TSVSERIALISER_H_
-#define MANTID_TSVSERIALISER_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidKernel/CaseInsensitiveMap.h"
@@ -173,5 +172,3 @@ private:
 };
 } // namespace API
 } // namespace MantidQt
-
-#endif
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/Testing/QApplicationGlobalFixture.h b/qt/widgets/common/inc/MantidQtWidgets/Common/Testing/QApplicationGlobalFixture.h
index 6d6d5bc166e..3dd2009411f 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/Testing/QApplicationGlobalFixture.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/Testing/QApplicationGlobalFixture.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_WIDGETS_COMMON_QAPPLICATIONHOLDER_H
-#define MANTIDQT_WIDGETS_COMMON_QAPPLICATIONHOLDER_H
+#pragma once
 
 #include <cxxtest/GlobalFixture.h>
 
@@ -36,5 +35,3 @@ public:
   GNU_DIAG_ON("pedantic")
   QApplication *m_app;
 };
-
-#endif // MANTIDQT_WIDGETS_COMMON_QAPPLICATIONHOLDER_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/TextPropertyWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/TextPropertyWidget.h
index 1ef7d31e66a..50ffacf974b 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/TextPropertyWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/TextPropertyWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_API_TEXTPROPERTYWIDGET_H_
-#define MANTID_API_TEXTPROPERTYWIDGET_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 #include "MantidQtWidgets/Common/PropertyWidget.h"
@@ -43,5 +42,3 @@ protected:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTID_API_TEXTPROPERTYWIDGET_H_ */
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/TrackedAction.h b/qt/widgets/common/inc/MantidQtWidgets/Common/TrackedAction.h
index 10995997c9c..6e44482f6ee 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/TrackedAction.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/TrackedAction.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_TRACKEDACTION_H_
-#define MANTID_MANTIDWIDGETS_TRACKEDACTION_H_
+#pragma once
 
 #include "DllOption.h"
 #include <QAction>
@@ -45,5 +44,3 @@ public slots:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTID_MANTIDWIDGETS_TRACKEDACTION_H_ */
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/UserFunctionDialog.h b/qt/widgets/common/inc/MantidQtWidgets/Common/UserFunctionDialog.h
index c4fa59808ca..42636522488 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/UserFunctionDialog.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/UserFunctionDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_USERFUNCTIONDIALOG_H_
-#define MANTIDQTMANTIDWIDGETS_USERFUNCTIONDIALOG_H_
+#pragma once
 
 #include "DllOption.h"
 #include "ui_UserFunctionDialog.h"
@@ -81,5 +80,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQTMANTIDWIDGETS_USERFUNCTIONDIALOG_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/UserInputValidator.h b/qt/widgets/common/inc/MantidQtWidgets/Common/UserInputValidator.h
index 577ea1f97c2..d4bdddeb126 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/UserInputValidator.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/UserInputValidator.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_CUSTOMINTERFACES_USERINPUTVALIDATOR_H_
-#define MANTID_CUSTOMINTERFACES_USERINPUTVALIDATOR_H_
+#pragma once
 
 #include "MantidAPI/MatrixWorkspace_fwd.h"
 #include "MantidQtWidgets/Common/DataSelector.h"
@@ -157,5 +156,3 @@ UserInputValidator::getADSWorkspace(std::string const &workspaceName) {
 
 } // namespace CustomInterfaces
 } // namespace MantidQt
-
-#endif // MANTID_CUSTOMINTERFACES_USERINPUTVALIDATOR_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/UserSubWindow.h b/qt/widgets/common/inc/MantidQtWidgets/Common/UserSubWindow.h
index 864b71ac824..0abe307ff0e 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/UserSubWindow.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/UserSubWindow.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_USERSUBWINDOW_H_
-#define MANTIDQT_API_USERSUBWINDOW_H_
+#pragma once
 
 /* Used to register classes into the factory. Creates a global object in an
  * anonymous namespace. The object itself does nothing, but the comma operator
@@ -151,5 +150,3 @@ private:
 };
 } // namespace API
 } // namespace MantidQt
-
-#endif // MANTIDQT_API_USERSUBWINDOW_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/UserSubWindowFactory.h b/qt/widgets/common/inc/MantidQtWidgets/Common/UserSubWindowFactory.h
index 311e471a50f..ec7ba336de0 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/UserSubWindowFactory.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/UserSubWindowFactory.h
@@ -5,8 +5,7 @@
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
 
-#ifndef MANTIDQT_API_USERSUBWINDOWFACTORYIMPL_H_
-#define MANTIDQT_API_USERSUBWINDOWFACTORYIMPL_H_
+#pragma once
 
 //------------------------
 // Includes
@@ -160,5 +159,3 @@ EXTERN_MANTIDQT_COMMON template class EXPORT_OPT_MANTIDQT_COMMON
     Mantid::Kernel::SingletonHolder<MantidQt::API::UserSubWindowFactoryImpl>;
 } // namespace Kernel
 } // namespace Mantid
-
-#endif
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/VatesViewerInterface.h b/qt/widgets/common/inc/MantidQtWidgets/Common/VatesViewerInterface.h
index dac78663ff0..10ff3744c82 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/VatesViewerInterface.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/VatesViewerInterface.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_VATESVIEWERINTERFACE_H_
-#define MANTIDQT_API_VATESVIEWERINTERFACE_H_
+#pragma once
 
 #include "DllOption.h"
 #include "IProjectSerialisable.h"
@@ -75,5 +74,3 @@ public slots:
 };
 } // namespace API
 } // namespace MantidQt
-
-#endif // MANTIDQT_API_VATESVIEWERINTERFACE_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/WidgetDllOption.h b/qt/widgets/common/inc/MantidQtWidgets/Common/WidgetDllOption.h
index dd6d27019c4..9fa90c30b14 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/WidgetDllOption.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/WidgetDllOption.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_DLLOPTION_H_
-#define MANTIDQT_MANTIDWIDGETS_DLLOPTION_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 
@@ -14,5 +13,3 @@
 #else
 #define EXPORT_OPT_MANTIDQT_MANTIDWIDGETS DLLImport
 #endif /* IN_MANTIDQT_MANTIDWIDGETS */
-
-#endif // MANTIDQT_MANTIDWIDGETS_DLLOPTION_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/WidgetScrollbarDecorator.h b/qt/widgets/common/inc/MantidQtWidgets/Common/WidgetScrollbarDecorator.h
index bbc34a44962..47a5ecd08ea 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/WidgetScrollbarDecorator.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/WidgetScrollbarDecorator.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_WIDGETSCROLLBARDECORATOR_H_
-#define MANTIDQT_API_WIDGETSCROLLBARDECORATOR_H_
+#pragma once
 
 //----------------------------------
 // Includes
@@ -110,5 +109,3 @@ private:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif // MANTIDQT_API_WIDGETSCROLLBARDECORATOR_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/WindowIcons.h b/qt/widgets/common/inc/MantidQtWidgets/Common/WindowIcons.h
index 179bf6e3ea7..5b2e92d506b 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/WindowIcons.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/WindowIcons.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_WINDOWICONS_H_
-#define MANTIDQT_API_WINDOWICONS_H_
+#pragma once
 
 #include "DllOption.h"
 #include <QIcon>
@@ -36,5 +35,4 @@ private:
   QMap<std::string, std::string> m_idToPixmapName;
 };
 } // namespace API
-} // namespace MantidQt
-#endif // MANTIDQT_API_WINDOWICONS_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspaceIcons.h b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspaceIcons.h
index ed2dfcce9a6..c5c0f64c231 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspaceIcons.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspaceIcons.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_WORKSPACEICONS_H_
-#define MANTIDQT_API_WORKSPACEICONS_H_
+#pragma once
 
 #include "DllOption.h"
 #include <QMap>
@@ -34,5 +33,4 @@ private:
   QMap<std::string, std::string> m_idToPixmapName;
 };
 } // namespace API
-} // namespace MantidQt
-#endif // MANTIDQT_API_WORKSPACEICONS_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspaceObserver.h b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspaceObserver.h
index e762d5e6d23..d21ec9212e8 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspaceObserver.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspaceObserver.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef WORKSPACE_OBSERVER_H
-#define WORKSPACE_OBSERVER_H
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/AnalysisDataService.h"
@@ -245,5 +244,3 @@ private:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/ADSAdapter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/ADSAdapter.h
index 760f131febc..e5c7a7552ad 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/ADSAdapter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/ADSAdapter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_ADSADAPTER_H_
-#define MANTID_MANTIDWIDGETS_ADSADAPTER_H_
+#pragma once
 
 #include "MantidQtWidgets/Common/DllOption.h"
 #include "MantidQtWidgets/Common/WorkspaceObserver.h"
@@ -81,5 +80,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTID_MANTIDWIDGETS_ADSADAPTER_H_
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/IWorkspaceDockView.h b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/IWorkspaceDockView.h
index abe90d75626..6ec190e4815 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/IWorkspaceDockView.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/IWorkspaceDockView.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_IWORKSPACEDOCKVIEW_H_
-#define MANTIDQT_MANTIDWIDGETS_IWORKSPACEDOCKVIEW_H_
+#pragma once
 
 #include "MantidAPI/IAlgorithm_fwd.h"
 #include "MantidAPI/Workspace_fwd.h"
@@ -93,5 +92,3 @@ public:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQT_MANTIDWIDGETS_IWORKSPACEDOCKVIEW_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/ViewNotifiable.h b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/ViewNotifiable.h
index d08cddf458a..af0e72ce88f 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/ViewNotifiable.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/ViewNotifiable.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_VIEWNOTIFIABLE_H_
-#define MANTID_MANTIDWIDGETS_VIEWNOTIFIABLE_H_
+#pragma once
 /**
 \class  ViewNotifiable
 \brief  Mixin class allows view notifications
@@ -60,5 +59,4 @@ public:
 };
 
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTID_MANTIDWIDGETS_VIEWNOTIFIABLE_H_
\ No newline at end of file
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceDockMockObjects.h b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceDockMockObjects.h
index c512e1908af..01586892eb0 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceDockMockObjects.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceDockMockObjects.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_WORKSPACEDOCKMOCKOBJECTS_H
-#define MANTIDQT_MANTIDWIDGETS_WORKSPACEDOCKMOCKOBJECTS_H
+#pragma once
 
 #include "MantidKernel/WarningSuppressions.h"
 
@@ -111,5 +110,3 @@ public:
 };
 
 GNU_DIAG_ON_SUGGEST_OVERRIDE
-
-#endif // MANTIDQT_MANTIDWIDGETS_WORKSPACEDOCKMOCKOBJECTS_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspacePresenter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspacePresenter.h
index d59b6cb1c58..7f62b4a5feb 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspacePresenter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspacePresenter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_WORKSPACEPRESENTER_H_
-#define MANTIDQT_MANTIDWIDGETS_WORKSPACEPRESENTER_H_
+#pragma once
 
 #include "MantidQtWidgets/Common/DllOption.h"
 #include "MantidQtWidgets/Common/WorkspacePresenter/ViewNotifiable.h"
@@ -92,5 +91,4 @@ private:
   ADSAdapter_uptr m_adapter;
 };
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQT_MANTIDWIDGETS_WORKSPACEPRESENTER_H_
\ No newline at end of file
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceProvider.h b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceProvider.h
index 5c4d68e80ff..f4203c637d4 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceProvider.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceProvider.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_WORKSPACEPROVIDER_H_
-#define MANTID_MANTIDWIDGETS_WORKSPACEPROVIDER_H_
+#pragma once
 
 #include "MantidAPI/Workspace_fwd.h"
 #include <boost/shared_ptr.hpp>
@@ -39,5 +38,4 @@ public:
 };
 
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTID_MANTIDWIDGETS_WORKSPACEPROVIDER_H_
\ No newline at end of file
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceProviderNotifiable.h b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceProviderNotifiable.h
index af967e8ba2a..e53e80c6d06 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceProviderNotifiable.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceProviderNotifiable.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_WORKSPACEPROVIDERNOTIFIABLE_H_
-#define MANTID_MANTIDWIDGETS_WORKSPACEPROVIDERNOTIFIABLE_H_
+#pragma once
 
 /**
 \class  WorkspaceProviderNotifiable
@@ -36,5 +35,4 @@ public:
 };
 
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTID_MANTIDWIDGETS_ADSNOTIFIABLE_H_
\ No newline at end of file
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceTreeWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceTreeWidget.h
index 68a0672511e..2ca6dd0d1ad 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceTreeWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceTreeWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_WORKSPACETREEWIDGET_H
-#define MANTIDQT_MANTIDWIDGETS_WORKSPACETREEWIDGET_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DllOption.h"
 #include "MantidQtWidgets/Common/MantidTreeWidget.h"
@@ -277,5 +276,4 @@ signals:
   void signalUpdateTree(const TopLevelItems & /*_t1*/);
 };
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQT_MANTIDWIDGETS_WORKSPACETREEWIDGET_H
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceTreeWidgetSimple.h b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceTreeWidgetSimple.h
index 5405833a05a..0b8320f2001 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceTreeWidgetSimple.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspacePresenter/WorkspaceTreeWidgetSimple.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_WORKSPACETREEWIDGETSIMPLE_H
-#define MANTIDQT_MANTIDWIDGETS_WORKSPACETREEWIDGETSIMPLE_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DllOption.h"
 #include "MantidQtWidgets/Common/WorkspacePresenter/WorkspaceTreeWidget.h"
@@ -79,5 +78,4 @@ private:
       *m_showAlgorithmHistory, *m_showDetectors;
 };
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // MANTIDQT_MANTIDWIDGETS_WORKSPACETREEWIDGETSIMPLE_H
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspaceSelector.h b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspaceSelector.h
index dc4be7fce20..e53b14f9aad 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspaceSelector.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/WorkspaceSelector.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_WORKSPACESELECTOR_H_
-#define MANTIDQTMANTIDWIDGETS_WORKSPACESELECTOR_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/AnalysisDataService.h"
@@ -141,5 +140,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQTMANTIDWIDGETS_INSTRUMENTSELECTOR_H_
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/pixmaps.h b/qt/widgets/common/inc/MantidQtWidgets/Common/pixmaps.h
index c6b4e7166ab..04f7117147a 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/pixmaps.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/pixmaps.h
@@ -28,8 +28,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef MANTIDQT_API_PIXMAPS_H
-#define MANTIDQT_API_PIXMAPS_H
+#pragma once
 
 #include "MantidQtWidgets/Common/DllOption.h"
 #include "qpixmap.h"
@@ -40,5 +39,3 @@ namespace API {
 EXPORT_OPT_MANTIDQT_COMMON QPixmap getQPixmap(const std::string &name);
 } // namespace API
 } // namespace MantidQt
-
-#endif // MANTIDQT_API_PIXMAPS_H
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/pqHelpWindow.h b/qt/widgets/common/inc/MantidQtWidgets/Common/pqHelpWindow.h
index 0e48246248b..3ad5450c291 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/pqHelpWindow.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/pqHelpWindow.h
@@ -29,8 +29,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ========================================================================*/
-#ifndef __pqHelpWindow_h
-#define __pqHelpWindow_h
+#pragma once
 
 #include "DllOption.h"
 #include <QMainWindow>
@@ -123,5 +122,3 @@ private:
   class pqNetworkAccessManager;
   friend class pqNetworkAccessManager;
 };
-
-#endif
diff --git a/qt/widgets/common/test/AlgorithmHintStrategyTest.h b/qt/widgets/common/test/AlgorithmHintStrategyTest.h
index 5a9e19b0bdc..c65c2b1e52a 100644
--- a/qt/widgets/common/test/AlgorithmHintStrategyTest.h
+++ b/qt/widgets/common/test/AlgorithmHintStrategyTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_ALGORITHMHINTSTRATEGYTEST_H
-#define MANTID_MANTIDWIDGETS_ALGORITHMHINTSTRATEGYTEST_H
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/FrameworkManager.h"
@@ -103,5 +102,3 @@ public:
 protected:
   IAlgorithm_sptr m_propAlg;
 };
-
-#endif /*MANTID_MANTIDWIDGETS_ALGORITHMHINTSTRATEGYTEST_H */
diff --git a/qt/widgets/common/test/AlgorithmProgress/AlgorithmProgressDialogPresenterTest.h b/qt/widgets/common/test/AlgorithmProgress/AlgorithmProgressDialogPresenterTest.h
index cde88c6662c..1ab8a1cc360 100644
--- a/qt/widgets/common/test/AlgorithmProgress/AlgorithmProgressDialogPresenterTest.h
+++ b/qt/widgets/common/test/AlgorithmProgress/AlgorithmProgressDialogPresenterTest.h
@@ -1,5 +1,4 @@
-#ifndef MANTIDQT_MANTIDWIDGETS_ALGORITHMPROGRESSPRESENTERTEST_H_
-#define MANTIDQT_MANTIDWIDGETS_ALGORITHMPROGRESSPRESENTERTEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmFactory.h"
 #include "MantidAPI/AlgorithmManager.h"
@@ -165,5 +164,4 @@ public:
 
 private:
   std::unique_ptr<NiceMock<MockAlgorithmProgressDialogWidget>> mockDialogView;
-};
-#endif // MANTIDQT_MANTIDWIDGETS_ALGORITHMPROGRESSTEST_H_
+};
\ No newline at end of file
diff --git a/qt/widgets/common/test/AlgorithmProgress/AlgorithmProgressPresenterTest.h b/qt/widgets/common/test/AlgorithmProgress/AlgorithmProgressPresenterTest.h
index ada369676b4..b629b7de198 100644
--- a/qt/widgets/common/test/AlgorithmProgress/AlgorithmProgressPresenterTest.h
+++ b/qt/widgets/common/test/AlgorithmProgress/AlgorithmProgressPresenterTest.h
@@ -1,5 +1,4 @@
-#ifndef MANTIDQT_MANTIDWIDGETS_ALGORITHMPROGRESSTEST_H_
-#define MANTIDQT_MANTIDWIDGETS_ALGORITHMPROGRESSTEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmFactory.h"
 #include "MantidAPI/AlgorithmManager.h"
@@ -147,5 +146,4 @@ public:
 
 private:
   std::unique_ptr<NiceMock<MockAlgorithmProgressWidget>> mockView;
-};
-#endif // MANTIDQT_MANTIDWIDGETS_ALGORITHMPROGRESSTEST_H_
+};
\ No newline at end of file
diff --git a/qt/widgets/common/test/AlgorithmProgress/ManualProgressReporter.h b/qt/widgets/common/test/AlgorithmProgress/ManualProgressReporter.h
index 0fc6d571d83..eb6676fd5b5 100644
--- a/qt/widgets/common/test/AlgorithmProgress/ManualProgressReporter.h
+++ b/qt/widgets/common/test/AlgorithmProgress/ManualProgressReporter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_MANUALPROGRESSREPORTER_H_
-#define MANTIDQT_MANTIDWIDGETS_MANUALPROGRESSREPORTER_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidKernel/System.h"
@@ -61,5 +60,3 @@ private:
 
 } // namespace Algorithms
 } // namespace Mantid
-
-#endif /* MANTIDQT_MANTIDWIDGETS_MANUALPROGRESSREPORTER_H_ */
\ No newline at end of file
diff --git a/qt/widgets/common/test/AlgorithmProgress/MockAlgorithmProgressDialogWidget.h b/qt/widgets/common/test/AlgorithmProgress/MockAlgorithmProgressDialogWidget.h
index 7cdf4770dd2..70b463889f1 100644
--- a/qt/widgets/common/test/AlgorithmProgress/MockAlgorithmProgressDialogWidget.h
+++ b/qt/widgets/common/test/AlgorithmProgress/MockAlgorithmProgressDialogWidget.h
@@ -1,5 +1,4 @@
-#ifndef MANTID_MANTIDWIDGETS_MOCKALGORITHMPROGRESSDIALOGWIDGET_H
-#define MANTID_MANTIDWIDGETS_MOCKALGORITHMPROGRESSDIALOGWIDGET_H
+#pragma once
 
 #include "MantidKernel/WarningSuppressions.h"
 #include "MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressDialogPresenter.h"
@@ -35,5 +34,4 @@ public:
   // This is the mocked main progress bar,
   // always shown on the Workbench GUI
   std::shared_ptr<MockAlgorithmProgressWidget> mainProgressBar;
-};
-#endif // MANTID_MANTIDWIDGETS_MOCKALGORITHMPROGRESSWIDGET_H
+};
\ No newline at end of file
diff --git a/qt/widgets/common/test/AlgorithmProgress/MockAlgorithmProgressWidget.h b/qt/widgets/common/test/AlgorithmProgress/MockAlgorithmProgressWidget.h
index d7fb57f5b58..2f74178f29c 100644
--- a/qt/widgets/common/test/AlgorithmProgress/MockAlgorithmProgressWidget.h
+++ b/qt/widgets/common/test/AlgorithmProgress/MockAlgorithmProgressWidget.h
@@ -1,5 +1,4 @@
-#ifndef MANTID_MANTIDWIDGETS_MOCKALGORITHMPROGRESSWIDGET_H
-#define MANTID_MANTIDWIDGETS_MOCKALGORITHMPROGRESSWIDGET_H
+#pragma once
 
 #include "MantidKernel/WarningSuppressions.h"
 #include "MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressPresenter.h"
@@ -30,5 +29,4 @@ public:
   MOCK_METHOD0(showDetailsDialog, void());
 
   std::shared_ptr<AlgorithmProgressPresenter> m_presenter;
-};
-#endif // MANTID_MANTIDWIDGETS_MOCKALGORITHMPROGRESSWIDGET_H
+};
\ No newline at end of file
diff --git a/qt/widgets/common/test/Batch/BuildSubtreeItemsTest.h b/qt/widgets/common/test/Batch/BuildSubtreeItemsTest.h
index 6dd7fecffca..f2edf8c953c 100644
--- a/qt/widgets/common/test/Batch/BuildSubtreeItemsTest.h
+++ b/qt/widgets/common/test/Batch/BuildSubtreeItemsTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_BUILDSUBTREETEST_H
-#define MANTID_MANTIDWIDGETS_BUILDSUBTREETEST_H
+#pragma once
 
 #include "MantidQtWidgets/Common/Batch/BuildSubtreeItems.h"
 #include "MantidQtWidgets/Common/Batch/QtStandardItemTreeAdapter.h"
@@ -160,5 +159,4 @@ public:
       TS_ASSERT_EQUALS(childOfChildItem->rowCount(), 0);
     }
   }
-};
-#endif
+};
\ No newline at end of file
diff --git a/qt/widgets/common/test/Batch/ExtractSubtreesTest.h b/qt/widgets/common/test/Batch/ExtractSubtreesTest.h
index 016c7342ca7..34212087afd 100644
--- a/qt/widgets/common/test/Batch/ExtractSubtreesTest.h
+++ b/qt/widgets/common/test/Batch/ExtractSubtreesTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_EXTRACTSUBTREESTEST_H
-#define MANTID_MANTIDWIDGETS_EXTRACTSUBTREESTEST_H
+#pragma once
 
 #include "MantidQtWidgets/Common/Batch/ExtractSubtrees.h"
 #include "MantidQtWidgets/Common/Batch/Row.h"
@@ -281,5 +280,4 @@ public:
     auto roots = extractSubtrees(region);
     TS_ASSERT(!roots.is_initialized())
   }
-};
-#endif
+};
\ No newline at end of file
diff --git a/qt/widgets/common/test/Batch/FindSubtreeRootsTest.h b/qt/widgets/common/test/Batch/FindSubtreeRootsTest.h
index 2b9025cf571..33359338db3 100644
--- a/qt/widgets/common/test/Batch/FindSubtreeRootsTest.h
+++ b/qt/widgets/common/test/Batch/FindSubtreeRootsTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_FINDSUBTREEROOTS_H
-#define MANTID_MANTIDWIDGETS_FINDSUBTREEROOTS_H
+#pragma once
 
 #include "MantidQtWidgets/Common/Batch/FindSubtreeRoots.h"
 #include "MantidQtWidgets/Common/Batch/RowLocation.h"
@@ -242,5 +241,3 @@ public:
     TS_ASSERT(!roots.is_initialized())
   }
 };
-
-#endif // MANTID_MANTIDWIDGETS_FINDSUBTREEROOTS_H
diff --git a/qt/widgets/common/test/Batch/QtAdaptedModelTest.h b/qt/widgets/common/test/Batch/QtAdaptedModelTest.h
index b4d105d8b01..867cee63bfd 100644
--- a/qt/widgets/common/test/Batch/QtAdaptedModelTest.h
+++ b/qt/widgets/common/test/Batch/QtAdaptedModelTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_QTADAPTEDMODELTEST_H
-#define MANTID_MANTIDWIDGETS_QTADAPTEDMODELTEST_H
+#pragma once
 
 #include "MantidQtWidgets/Common/Batch/QtStandardItemTreeAdapter.h"
 #include <QModelIndex>
@@ -114,5 +113,3 @@ public:
                      QString::fromStdString(cells[1].contentText()));
   }
 };
-
-#endif // MANTID_MANTIDWIDGETS_QTADAPTEDMODELTEST_H
diff --git a/qt/widgets/common/test/Batch/RowLocationTest.h b/qt/widgets/common/test/Batch/RowLocationTest.h
index 804737bb924..5832aab5c4e 100644
--- a/qt/widgets/common/test/Batch/RowLocationTest.h
+++ b/qt/widgets/common/test/Batch/RowLocationTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_ROWLOCATIONTEST_H
-#define MANTID_MANTIDWIDGETS_ROWLOCATIONTEST_H
+#pragma once
 
 #include "MantidQtWidgets/Common/Batch/RowLocation.h"
 #include <algorithm>
@@ -156,5 +155,3 @@ public:
         !pathsSameUntilDepth(1, RowLocation({1, 1}), RowLocation({2, 2})));
   }
 };
-
-#endif // MANTID_MANTIDWIDGETS_ROWLOCATIONTEST_H
diff --git a/qt/widgets/common/test/BatchAlgorithmRunnerTest.h b/qt/widgets/common/test/BatchAlgorithmRunnerTest.h
index b64b705fe51..d588844896b 100644
--- a/qt/widgets/common/test/BatchAlgorithmRunnerTest.h
+++ b/qt/widgets/common/test/BatchAlgorithmRunnerTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_BATCHALGORITHMRUNNERTEST_H_
-#define MANTIDQT_API_BATCHALGORITHMRUNNERTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -177,5 +176,3 @@ private:
   BatchAlgorithmRunner::AlgorithmRuntimeProps inputFromCropProps;
   BatchAlgorithmRunner::AlgorithmRuntimeProps inputFromScaleProps;
 };
-
-#endif /* MANTIDQT_API_BATCHALGORITHMRUNNERTEST_H_ */
diff --git a/qt/widgets/common/test/ConvolutionFunctionModelTest.h b/qt/widgets/common/test/ConvolutionFunctionModelTest.h
index cf0b3759b1b..3174d1359e7 100644
--- a/qt/widgets/common/test/ConvolutionFunctionModelTest.h
+++ b/qt/widgets/common/test/ConvolutionFunctionModelTest.h
@@ -5,8 +5,7 @@
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
 
-#ifndef MANTIDWIDGETS_CONVOLUTIONFUNCTIONMODELTEST_H_
-#define MANTIDWIDGETS_CONVOLUTIONFUNCTIONMODELTEST_H_
+#pragma once
 
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/FunctionFactory.h"
@@ -552,5 +551,3 @@ public:
                      "f1.f1.f0.");
   }
 };
-
-#endif // MANTIDWIDGETS_CONVOLUTIONFUNCTIONMODELTEST_H_
diff --git a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
index 0b16824d1b4..e1c2633d0f5 100644
--- a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_DATAPROCESSORCOMMANDSTEST_H
-#define MANTID_MANTIDWIDGETS_DATAPROCESSORCOMMANDSTEST_H
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
@@ -385,5 +384,4 @@ public:
     // Verify expectations
     TS_ASSERT(Mock::VerifyAndClearExpectations(&mockPresenter));
   }
-};
-#endif /* MANTID_MANTIDWIDGETS_DATAPROCESSORCOMMANDSTEST_H */
+};
\ No newline at end of file
diff --git a/qt/widgets/common/test/DataProcessorUI/GenerateNotebookTest.h b/qt/widgets/common/test/DataProcessorUI/GenerateNotebookTest.h
index 1e2fcb495c2..db7f6452290 100644
--- a/qt/widgets/common/test/DataProcessorUI/GenerateNotebookTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/GenerateNotebookTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_DATAPROCESSORGENERATENOTEBOOKTEST_H
-#define MANTID_MANTIDWIDGETS_DATAPROCESSORGENERATENOTEBOOKTEST_H
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
@@ -911,5 +910,3 @@ public:
     TS_ASSERT_EQUALS(notebookLines[93].toStdString(), groupWorkspacesString);
   }
 };
-
-#endif // MANTID_MANTIDWIDGETS_DATAPROCESSORGENERATENOTEBOOKTEST_H
diff --git a/qt/widgets/common/test/DataProcessorUI/GenericDataProcessorPresenterTest.h b/qt/widgets/common/test/DataProcessorUI/GenericDataProcessorPresenterTest.h
index 492e6339569..074d5397299 100644
--- a/qt/widgets/common/test/DataProcessorUI/GenericDataProcessorPresenterTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/GenericDataProcessorPresenterTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_GENERICDATAPROCESSORPRESENTERTEST_H
-#define MANTID_MANTIDWIDGETS_GENERICDATAPROCESSORPRESENTERTEST_H
+#pragma once
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
@@ -3360,5 +3359,4 @@ public:
 
     TS_ASSERT(Mock::VerifyAndClearExpectations(&mockDataProcessorView));
   }
-};
-#endif /* MANTID_MANTIDWIDGETS_GENERICDATAPROCESSORPRESENTERTEST_H */
+};
\ No newline at end of file
diff --git a/qt/widgets/common/test/DataProcessorUI/OneLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/OneLevelTreeManagerTest.h
index b2f557c5131..289a242cbfd 100644
--- a/qt/widgets/common/test/DataProcessorUI/OneLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/OneLevelTreeManagerTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_DATAPROCESSORONELEVELTREEMANAGERTEST_H
-#define MANTID_MANTIDWIDGETS_DATAPROCESSORONELEVELTREEMANAGERTEST_H
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
@@ -373,5 +372,4 @@ public:
     TS_ASSERT_EQUALS(data[2][2]->data(), newRow);
     TS_ASSERT_EQUALS(data[3][3]->data(), newRow);
   }
-};
-#endif /* MANTID_MANTIDWIDGETS_DATAPROCESSORONELEVELTREEMANAGERTEST_H */
+};
\ No newline at end of file
diff --git a/qt/widgets/common/test/DataProcessorUI/PostprocessingAlgorithmTest.h b/qt/widgets/common/test/DataProcessorUI/PostprocessingAlgorithmTest.h
index a2a59e97595..b028b36061f 100644
--- a/qt/widgets/common/test/DataProcessorUI/PostprocessingAlgorithmTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/PostprocessingAlgorithmTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_DATAPROCESSORPOSTPROCESSINGALGORITHMTEST_H
-#define MANTID_MANTIDWIDGETS_DATAPROCESSORPOSTPROCESSINGALGORITHMTEST_H
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
@@ -66,5 +65,4 @@ public:
   }
 
   // Add more algorithms you want to test here
-};
-#endif /* MANTID_MANTIDWIDGETS_DATAPROCESSORPOSTPROCESSINGALGORITHMTEST_H */
+};
\ No newline at end of file
diff --git a/qt/widgets/common/test/DataProcessorUI/PreprocessMapTest.h b/qt/widgets/common/test/DataProcessorUI/PreprocessMapTest.h
index 8a4f4c88bb9..84f431d1c98 100644
--- a/qt/widgets/common/test/DataProcessorUI/PreprocessMapTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/PreprocessMapTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_DATAPROCESSORPREPROCESSMAPTEST_H
-#define MANTID_MANTIDWIDGETS_DATAPROCESSORPREPROCESSMAPTEST_H
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
@@ -56,5 +55,4 @@ public:
                                    "SecondTransmissionRun"};
     TS_ASSERT_EQUALS(algTrans.blacklist(), blacklist);
   }
-};
-#endif /* MANTID_MANTIDWIDGETS_DATAPROCESSORPREPROCESSMAPTEST_H */
+};
\ No newline at end of file
diff --git a/qt/widgets/common/test/DataProcessorUI/PreprocessingAlgorithmTest.h b/qt/widgets/common/test/DataProcessorUI/PreprocessingAlgorithmTest.h
index 2191516d672..26cd86f34d5 100644
--- a/qt/widgets/common/test/DataProcessorUI/PreprocessingAlgorithmTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/PreprocessingAlgorithmTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_DATAPROCESSORPREPROCESSINGALGORITHMTEST_H
-#define MANTID_MANTIDWIDGETS_DATAPROCESSORPREPROCESSINGALGORITHMTEST_H
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
@@ -85,5 +84,4 @@ public:
   }
 
   // Add specific algorithms you want to test here
-};
-#endif /* MANTID_MANTIDWIDGETS_DATAPROCESSORPREPROCESSINGALGORITHMTEST_H */
+};
\ No newline at end of file
diff --git a/qt/widgets/common/test/DataProcessorUI/ProcessingAlgorithmBaseTest.h b/qt/widgets/common/test/DataProcessorUI/ProcessingAlgorithmBaseTest.h
index 7426dec7aa7..515b1ce1b78 100644
--- a/qt/widgets/common/test/DataProcessorUI/ProcessingAlgorithmBaseTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/ProcessingAlgorithmBaseTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_DATAPROCESSORPROCESSINGALGORITHMBASETEST_H_
-#define MANTID_MANTIDWIDGETS_DATAPROCESSORPROCESSINGALGORITHMBASETEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -55,5 +54,3 @@ public:
     TS_ASSERT_EQUALS(alg.getInputWsProperties(), std::vector<QString>());
   }
 };
-
-#endif /* MANTID_MANTIDWIDGETS_DATAPROCESSORPROCESSINGALGORITHMBASETEST_H_ */
diff --git a/qt/widgets/common/test/DataProcessorUI/ProcessingAlgorithmTest.h b/qt/widgets/common/test/DataProcessorUI/ProcessingAlgorithmTest.h
index 65abea4d287..9ecff7d78a3 100644
--- a/qt/widgets/common/test/DataProcessorUI/ProcessingAlgorithmTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/ProcessingAlgorithmTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_DATAPROCESSORPROCESSINGALGORITHMTEST_H
-#define MANTID_MANTIDWIDGETS_DATAPROCESSORPROCESSINGALGORITHMTEST_H
+#pragma once
 
 #include <QStringList>
 #include <cxxtest/TestSuite.h>
@@ -99,5 +98,4 @@ public:
   }
 
   // Add more tests for specific algorithms here
-};
-#endif /* MANTID_MANTIDWIDGETS_DATAPROCESSORPROCESSINGALGORITHMTEST_H */
+};
\ No newline at end of file
diff --git a/qt/widgets/common/test/DataProcessorUI/QOneLevelTreeModelTest.h b/qt/widgets/common/test/DataProcessorUI/QOneLevelTreeModelTest.h
index c9e2fe13646..542309ee4f8 100644
--- a/qt/widgets/common/test/DataProcessorUI/QOneLevelTreeModelTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/QOneLevelTreeModelTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_QDATAPROCESSORONELEVELTREEMODELTEST_H
-#define MANTID_MANTIDWIDGETS_QDATAPROCESSORONELEVELTREEMODELTEST_H
+#pragma once
 
 #include "MantidAPI/ITableWorkspace.h"
 #include "MantidAPI/TableRow.h"
@@ -285,5 +284,3 @@ public:
 private:
   WhiteList m_whitelist;
 };
-
-#endif /* MANTID_MANTIDWIDGETS_QDATAPROCESSORONELEVELTREEMODELTEST_H */
diff --git a/qt/widgets/common/test/DataProcessorUI/QTwoLevelTreeModelTest.h b/qt/widgets/common/test/DataProcessorUI/QTwoLevelTreeModelTest.h
index f038301583c..e3e9ef0e7a0 100644
--- a/qt/widgets/common/test/DataProcessorUI/QTwoLevelTreeModelTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/QTwoLevelTreeModelTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_QDATAPROCESSORTWOLEVELTREEMODELTEST_H
-#define MANTID_MANTIDWIDGETS_QDATAPROCESSORTWOLEVELTREEMODELTEST_H
+#pragma once
 
 #include "MantidAPI/ITableWorkspace.h"
 #include "MantidAPI/TableRow.h"
@@ -851,5 +850,3 @@ public:
 private:
   WhiteList m_whitelist;
 };
-
-#endif /* MANTID_MANTIDWIDGETS_QDATAPROCESSORTWOLEVELTREEMODELTEST_H */
diff --git a/qt/widgets/common/test/DataProcessorUI/TwoLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/TwoLevelTreeManagerTest.h
index 89218dc5001..e2c44503171 100644
--- a/qt/widgets/common/test/DataProcessorUI/TwoLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/TwoLevelTreeManagerTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_DATAPROCESSORTWOLEVELTREEMANAGERTEST_H
-#define MANTID_MANTIDWIDGETS_DATAPROCESSORTWOLEVELTREEMANAGERTEST_H
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
@@ -474,5 +473,4 @@ public:
     TS_ASSERT_EQUALS(data[1][0]->data(), newRow);
     TS_ASSERT_EQUALS(data[1][1]->data(), newRow);
   }
-};
-#endif /* MANTID_MANTIDWIDGETS_DATAPROCESSORTWOLEVELTREEMANAGERTEST_H */
+};
\ No newline at end of file
diff --git a/qt/widgets/common/test/DataProcessorUI/WhiteListTest.h b/qt/widgets/common/test/DataProcessorUI/WhiteListTest.h
index a7ff5e6976b..3a9db6568ca 100644
--- a/qt/widgets/common/test/DataProcessorUI/WhiteListTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/WhiteListTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_DATAPROCESSORWHITELISTTEST_H
-#define MANTID_MANTIDWIDGETS_DATAPROCESSORWHITELISTTEST_H
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
@@ -127,5 +126,4 @@ public:
     TS_ASSERT_EQUALS(whitelist.prefix(0), "");
     TS_ASSERT_EQUALS(whitelist.prefix(1), "blah");
   }
-};
-#endif /* MANTID_MANTIDWIDGETS_DATAPROCESSORWHITELISTTEST_H */
+};
\ No newline at end of file
diff --git a/qt/widgets/common/test/FileDialogHandlerTest.h b/qt/widgets/common/test/FileDialogHandlerTest.h
index 81af5b9af54..7e517b28ffc 100644
--- a/qt/widgets/common/test/FileDialogHandlerTest.h
+++ b/qt/widgets/common/test/FileDialogHandlerTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_FILEDIALOGHANDLERTEST_H_
-#define MANTIDQT_API_FILEDIALOGHANDLERTEST_H_
+#pragma once
 
 #include "MantidQtWidgets/Common/FileDialogHandler.h"
 #include <cxxtest/TestSuite.h>
@@ -96,5 +95,3 @@ public:
     TS_ASSERT_EQUALS(expected, result4);
   }
 };
-
-#endif /* MANTIDQT_API_FILEDIALOGHANDLERTEST_H_ */
diff --git a/qt/widgets/common/test/FindFilesThreadPoolManagerTest.h b/qt/widgets/common/test/FindFilesThreadPoolManagerTest.h
index cc50d5fc4e2..d01ff276d54 100644
--- a/qt/widgets/common/test/FindFilesThreadPoolManagerTest.h
+++ b/qt/widgets/common/test/FindFilesThreadPoolManagerTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_FINDFILESTHREADPOOLMANAGERTEST_H_
-#define MANTIDQT_API_FINDFILESTHREADPOOLMANAGERTEST_H_
+#pragma once
 
 #include "MantidQtWidgets/Common/FindFilesThreadPoolManager.h"
 #include "MantidQtWidgets/Common/FindFilesThreadPoolManagerMockObjects.h"
@@ -128,5 +127,3 @@ public:
     TS_ASSERT_EQUALS(results.filenames[0], exp_results.filenames[0])
   }
 };
-
-#endif /* MANTIDQT_API_FINDFILESTHREADPOOLMANAGERTEST */
diff --git a/qt/widgets/common/test/FindFilesWorkerTest.h b/qt/widgets/common/test/FindFilesWorkerTest.h
index 83732c822b0..63a0cbe69e9 100644
--- a/qt/widgets/common/test/FindFilesWorkerTest.h
+++ b/qt/widgets/common/test/FindFilesWorkerTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_FINDFILESWORKERTEST_H_
-#define MANTIDQT_API_FINDFILESWORKERTEST_H_
+#pragma once
 
 #include "MantidQtWidgets/Common/FindFilesThreadPoolManagerMockObjects.h"
 #include "MantidQtWidgets/Common/FindFilesWorker.h"
@@ -149,5 +148,3 @@ private:
     QCoreApplication::processEvents();
   }
 };
-
-#endif /* MANTIDQT_API_FINDFILESWORKERTEST */
diff --git a/qt/widgets/common/test/FunctionBrowserUtilsTest.h b/qt/widgets/common/test/FunctionBrowserUtilsTest.h
index e5e9062c4c3..b63311bb16e 100644
--- a/qt/widgets/common/test/FunctionBrowserUtilsTest.h
+++ b/qt/widgets/common/test/FunctionBrowserUtilsTest.h
@@ -5,8 +5,7 @@
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
 
-#ifndef MANTIDWIDGETS_FUNCTIONBROWSERUTILSTEST_H_
-#define MANTIDWIDGETS_FUNCTIONBROWSERUTILSTEST_H_
+#pragma once
 
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidQtWidgets/Common/FunctionBrowser/FunctionBrowserUtils.h"
@@ -58,5 +57,4 @@ public:
         std::make_pair(QString(""), std::make_pair(QString(""), QString("")));
     TS_ASSERT_EQUALS(splitConstraints, expected_value);
   }
-};
-#endif // MANTIDWIDGETS_FUNCTIONBROWSERUTILSTEST_H_
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/qt/widgets/common/test/FunctionModelTest.h b/qt/widgets/common/test/FunctionModelTest.h
index 4f72ba4a930..bd7477a1f10 100644
--- a/qt/widgets/common/test/FunctionModelTest.h
+++ b/qt/widgets/common/test/FunctionModelTest.h
@@ -5,8 +5,7 @@
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
 
-#ifndef MANTIDWIDGETS_FUNCTIONMODELTEST_H_
-#define MANTIDWIDGETS_FUNCTIONMODELTEST_H_
+#pragma once
 
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/FunctionFactory.h"
@@ -252,5 +251,3 @@ public:
     }
   }
 };
-
-#endif // MANTIDWIDGETS_FUNCTIONMODELTEST_H_
diff --git a/qt/widgets/common/test/FunctionMultiDomainPresenterTest.h b/qt/widgets/common/test/FunctionMultiDomainPresenterTest.h
index 541598844cc..b1157c5b1b7 100644
--- a/qt/widgets/common/test/FunctionMultiDomainPresenterTest.h
+++ b/qt/widgets/common/test/FunctionMultiDomainPresenterTest.h
@@ -5,8 +5,7 @@
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
 
-#ifndef MANTIDWIDGETS_FUNCTIONMULTIDOMAINPRESENTERTEST_H_
-#define MANTIDWIDGETS_FUNCTIONMULTIDOMAINPRESENTERTEST_H_
+#pragma once
 
 #include "MantidAPI/CompositeFunction.h"
 #include "MantidAPI/FrameworkManager.h"
@@ -516,5 +515,3 @@ public:
     TS_ASSERT_EQUALS(locals[0], "A1");
   }
 };
-
-#endif // MANTIDWIDGETS_FUNCTIONMULTIDOMAINPRESENTERTEST_H_
diff --git a/qt/widgets/common/test/InterfaceManagerTest.h b/qt/widgets/common/test/InterfaceManagerTest.h
index 68734d15eec..8ecb7ee79f1 100644
--- a/qt/widgets/common/test/InterfaceManagerTest.h
+++ b/qt/widgets/common/test/InterfaceManagerTest.h
@@ -11,8 +11,7 @@
  *      Author: spu92482
  */
 
-#ifndef INTERFACEMANAGERTEST_H_
-#define INTERFACEMANAGERTEST_H_
+#pragma once
 
 #include "MantidKernel/Exception.h"
 #include "MantidQtWidgets/Common/InterfaceManager.h"
@@ -28,5 +27,3 @@ public:
     TS_ASSERT_DIFFERS(&objA, &objB);
   }
 };
-
-#endif /* INTERFACEMANAGERTEST_H_ */
diff --git a/qt/widgets/common/test/LogValueFinderTest.h b/qt/widgets/common/test/LogValueFinderTest.h
index e4b894cc681..d9adbc49d0d 100644
--- a/qt/widgets/common/test/LogValueFinderTest.h
+++ b/qt/widgets/common/test/LogValueFinderTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_CUSTOMINTERFACES_MDFLOGVALUEFINDERTEST_H_
-#define MANTIDQT_CUSTOMINTERFACES_MDFLOGVALUEFINDERTEST_H_
+#pragma once
 
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/Run.h"
@@ -165,5 +164,3 @@ private:
     return ws;
   }
 };
-
-#endif /* MANTIDQT_CUSTOMINTERFACES_MDFLOGVALUEFINDERTEST_H_ */
diff --git a/qt/widgets/common/test/MockScriptRepository.h b/qt/widgets/common/test/MockScriptRepository.h
index ef50f44e21a..5a9821334cc 100644
--- a/qt/widgets/common/test/MockScriptRepository.h
+++ b/qt/widgets/common/test/MockScriptRepository.h
@@ -5,8 +5,7 @@
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
 
-#ifndef MANTIDWIDGETS_MOCKSCRIPTREPOSITORY_H_
-#define MANTIDWIDGETS_MOCKSCRIPTREPOSITORY_H_
+#pragma once
 
 #include "MantidAPI/ScriptRepository.h"
 #include "MantidKernel/WarningSuppressions.h"
@@ -84,5 +83,4 @@ private:
   }
 };
 
-GNU_DIAG_ON_SUGGEST_OVERRIDE
-#endif /*MANTIDWIDGETS_MOCKSCRIPTREPOSITORY_H_ */
+GNU_DIAG_ON_SUGGEST_OVERRIDE
\ No newline at end of file
diff --git a/qt/widgets/common/test/NonOrthogonalTest.h b/qt/widgets/common/test/NonOrthogonalTest.h
index a3efd7f9081..ba816d40ef1 100644
--- a/qt/widgets/common/test/NonOrthogonalTest.h
+++ b/qt/widgets/common/test/NonOrthogonalTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_NONORTHOGONALTEST_H_
-#define MANTIDQT_API_NONORTHOGONALTEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/FrameworkManager.h"
@@ -292,5 +291,3 @@ private:
 
   enum DimensionIndex { DimX = 0, DimY = 1, SliceDim = 2 };
 };
-
-#endif /* MANTIDQT_API_NONORTHOGONALTEST_H_ */
diff --git a/qt/widgets/common/test/ParseKeyValueStringTest.h b/qt/widgets/common/test/ParseKeyValueStringTest.h
index 71eabe79128..153d4535835 100644
--- a/qt/widgets/common/test/ParseKeyValueStringTest.h
+++ b/qt/widgets/common/test/ParseKeyValueStringTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_PARSEKEYVALUESTRINGTEST_H
-#define MANTID_MANTIDWIDGETS_PARSEKEYVALUESTRINGTEST_H
+#pragma once
 
 #include "MantidQtWidgets/Common/ParseKeyValueString.h"
 #include <cxxtest/TestSuite.h>
@@ -102,5 +101,3 @@ private:
     TS_ASSERT_EQUALS(kvp["g"], "'");
   }
 };
-
-#endif // MANTID_MANTIDWIDGETS_PARSEKEYVALUESTRINGTEST_H
diff --git a/qt/widgets/common/test/PlotAxisTest.h b/qt/widgets/common/test/PlotAxisTest.h
index 1d3e667c6d5..38412bc1ff0 100644
--- a/qt/widgets/common/test/PlotAxisTest.h
+++ b/qt/widgets/common/test/PlotAxisTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_API_PLOTAXISLABELTEST_H_
-#define MANTID_API_PLOTAXISLABELTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -198,5 +197,3 @@ public:
     TS_ASSERT_THROWS(PlotAxis(*ws, -1), const std::invalid_argument &);
   }
 };
-
-#endif /* MANTID_API_PLOTAXISLABELTEST_H_ */
diff --git a/qt/widgets/common/test/ProgressableViewTest.h b/qt/widgets/common/test/ProgressableViewTest.h
index 47bfd4a671d..dd3d0d3a577 100644
--- a/qt/widgets/common/test/ProgressableViewTest.h
+++ b/qt/widgets/common/test/ProgressableViewTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_PROGRESSABLEVIEWTEST_H
-#define MANTID_MANTIDWIDGETS_PROGRESSABLEVIEWTEST_H
+#pragma once
 
 #include "MantidQtWidgets/Common/ProgressableView.h"
 #include <cxxtest/TestSuite.h>
@@ -86,5 +85,3 @@ private:
 
   ProgressBar m_progress;
 };
-
-#endif /*MANTID_MANTIDWIDGETS_PROGRESSABLEVIEWTEST_H */
diff --git a/qt/widgets/common/test/ProjectSaveMockObjects.h b/qt/widgets/common/test/ProjectSaveMockObjects.h
index 8f085fe618b..44d2a4027c4 100644
--- a/qt/widgets/common/test/ProjectSaveMockObjects.h
+++ b/qt/widgets/common/test/ProjectSaveMockObjects.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_PROJECTSAVEMOCKOBJECTS_H
-#define MANTIDQT_MANTIDWIDGETS_PROJECTSAVEMOCKOBJECTS_H
+#pragma once
 
 #include "MantidKernel/WarningSuppressions.h"
 #include "MantidQtWidgets/Common/IProjectSaveView.h"
@@ -62,5 +61,3 @@ public:
 
   std::string getWindowType() override { return "Matrix"; }
 };
-
-#endif
diff --git a/qt/widgets/common/test/ProjectSaveModelTest.h b/qt/widgets/common/test/ProjectSaveModelTest.h
index d620980862a..4f00fab4532 100644
--- a/qt/widgets/common/test/ProjectSaveModelTest.h
+++ b/qt/widgets/common/test/ProjectSaveModelTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_PROJECTSAVEMODELTEST_H
-#define MANTIDQT_MANTIDWIDGETS_PROJECTSAVEMODELTEST_H
+#pragma once
 
 #include "MantidAPI/Workspace.h"
 #include "MantidKernel/WarningSuppressions.h"
@@ -322,5 +321,3 @@ public:
     TS_ASSERT_EQUALS(model.getProjectSize(workspaceNames), assumedSize);
   }
 };
-
-#endif // MANTIDQT_MANTIDWIDGETS_PROJECTSAVEMODELTEST_H
diff --git a/qt/widgets/common/test/ProjectSavePresenterTest.h b/qt/widgets/common/test/ProjectSavePresenterTest.h
index 556b546cd19..04630f15d03 100644
--- a/qt/widgets/common/test/ProjectSavePresenterTest.h
+++ b/qt/widgets/common/test/ProjectSavePresenterTest.h
@@ -5,8 +5,7 @@
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
 
-#ifndef MANTIDQT_MANTIDWIDGETS_PROJECTSAVEPRESENTERTEST_H
-#define MANTIDQT_MANTIDWIDGETS_PROJECTSAVEPRESENTERTEST_H
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
@@ -362,5 +361,3 @@ public:
     }
   }
 };
-
-#endif
diff --git a/qt/widgets/common/test/Python/SipTest.h b/qt/widgets/common/test/Python/SipTest.h
index 72b1e27880e..df4238bc0e1 100644
--- a/qt/widgets/common/test/Python/SipTest.h
+++ b/qt/widgets/common/test/Python/SipTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTWIDGETS_SIPTEST_H
-#define MANTIDQTWIDGETS_SIPTEST_H
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -63,5 +62,3 @@ public:
         const std::runtime_error &);
   }
 };
-
-#endif // MANTIDQTWIDGETS_SIPTEST_H
diff --git a/qt/widgets/common/test/QtJSONUtilsTest.h b/qt/widgets/common/test/QtJSONUtilsTest.h
index 751f8bb3d44..a29bd5b9b0f 100644
--- a/qt/widgets/common/test/QtJSONUtilsTest.h
+++ b/qt/widgets/common/test/QtJSONUtilsTest.h
@@ -5,8 +5,7 @@
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
 
-#ifndef MANTIDQT_MANTIDWIDGETS_QTJSONUTILSTEST_H
-#define MANTIDQT_MANTIDWIDGETS_QTJSONUTILSTEST_H
+#pragma once
 
 #include "MantidQtWidgets/Common/QtJSONUtils.h"
 
@@ -78,5 +77,3 @@ private:
                      map1[QString("list")].toList())
   }
 };
-
-#endif /* MANTIDQT_MANTIDWIDGETS_QTJSONUTILSTEST_H */
\ No newline at end of file
diff --git a/qt/widgets/common/test/RepoModelTest.h b/qt/widgets/common/test/RepoModelTest.h
index ec006fd2059..5c59bbdc841 100644
--- a/qt/widgets/common/test/RepoModelTest.h
+++ b/qt/widgets/common/test/RepoModelTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDWIDGETS_REPOMODELTEST_H_
-#define MANTIDWIDGETS_REPOMODELTEST_H_
+#pragma once
 
 #include "MantidKernel/ConfigService.h"
 #include <cxxtest/TestSuite.h>
@@ -229,5 +228,3 @@ private:
     }
   }
 };
-
-#endif /* MANTIDWIDGETS_REPOMODELTEST_H_ */
diff --git a/qt/widgets/common/test/SelectionNotificationServiceTest.h b/qt/widgets/common/test/SelectionNotificationServiceTest.h
index e9fae4e4430..66b3c63b63b 100644
--- a/qt/widgets/common/test/SelectionNotificationServiceTest.h
+++ b/qt/widgets/common/test/SelectionNotificationServiceTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_SELECTION_NOTIFICATION_SERVICE_H_
-#define MANTIDQT_API_SELECTION_NOTIFICATION_SERVICE_H_
+#pragma once
 
 #include "MantidQtWidgets/Common/SelectionNotificationService.h"
 #include <cxxtest/TestSuite.h>
@@ -20,5 +19,3 @@ public:
             .sendQPointSelection(false, 1, 2, 3));
   }
 };
-
-#endif /* MANTIDQT_API_SELECTION_NOTIFICATION_SERVICE_H_ */
diff --git a/qt/widgets/common/test/SignalBlockerTest.h b/qt/widgets/common/test/SignalBlockerTest.h
index c3cb3e5579f..1ec3c539f4f 100644
--- a/qt/widgets/common/test/SignalBlockerTest.h
+++ b/qt/widgets/common/test/SignalBlockerTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_API_SIGNALBLOCKERTEST_H_
-#define MANTID_API_SIGNALBLOCKERTEST_H_
+#pragma once
 
 #include "MantidQtWidgets/Common/SignalBlocker.h"
 #include <QObject>
@@ -30,5 +29,3 @@ public:
     delete toBlock;
   }
 };
-
-#endif /* MANTID_API_SIGNALBLOCKERTEST_H_ */
diff --git a/qt/widgets/common/test/TrackedActionTest.h b/qt/widgets/common/test/TrackedActionTest.h
index 74206f9703e..62e7d23466d 100644
--- a/qt/widgets/common/test/TrackedActionTest.h
+++ b/qt/widgets/common/test/TrackedActionTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_TRACKEDACTIONEST_H_
-#define MANTID_MANTIDWIDGETS_TRACKEDACTIONEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -92,5 +91,3 @@ public:
                       "ShouldNotTrack"); // Should not have tracked
   }
 };
-
-#endif /* MANTID_MANTIDWIDGETS_TRACKEDACTIONEST_H_ */
\ No newline at end of file
diff --git a/qt/widgets/common/test/UserInputValidatorTest.h b/qt/widgets/common/test/UserInputValidatorTest.h
index ab2af23b11c..78cdbbf8f1e 100644
--- a/qt/widgets/common/test/UserInputValidatorTest.h
+++ b/qt/widgets/common/test/UserInputValidatorTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_CUSTOMINTERFACES_USERINPUTVALIDATORTEST_H
-#define MANTID_CUSTOMINTERFACES_USERINPUTVALIDATORTEST_H
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 #include <string>
@@ -143,5 +142,3 @@ public:
                      "completely enclose inner range.");
   }
 };
-
-#endif
diff --git a/qt/widgets/common/test/WidgetsCommonTestInitialization.h b/qt/widgets/common/test/WidgetsCommonTestInitialization.h
index 5ab3f685be6..3c30ac94a19 100644
--- a/qt/widgets/common/test/WidgetsCommonTestInitialization.h
+++ b/qt/widgets/common/test/WidgetsCommonTestInitialization.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef WIDGETSCOMMONTESTINITIALIZATION_H
-#define WIDGETSCOMMONTESTINITIALIZATION_H
+#pragma once
 
 #include "MantidQtWidgets/Common/Testing/QApplicationGlobalFixture.h"
 
@@ -16,5 +15,3 @@
 // statements do not cause multiple-definition errors.
 //------------------------------------------------------------------------------
 static QApplicationGlobalFixture WIDGETS_COMMON_QAPP;
-
-#endif // WIDGETSCOMMONTESTINITIALIZATION_H
diff --git a/qt/widgets/factory/inc/MantidQtWidgets/Factory/DllOption.h b/qt/widgets/factory/inc/MantidQtWidgets/Factory/DllOption.h
index a7404e7f391..510d413c0cc 100644
--- a/qt/widgets/factory/inc/MantidQtWidgets/Factory/DllOption.h
+++ b/qt/widgets/factory/inc/MantidQtWidgets/Factory/DllOption.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_FACTORY_DLLOPTION_H_
-#define MANTIDQT_FACTORY_DLLOPTION_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 
@@ -14,5 +13,3 @@
 #else
 #define EXPORT_OPT_MANTIDQT_FACTORY DLLImport
 #endif /* IN_MANTIDQT_API */
-
-#endif // MANTIDQT_FACTORY_DLLOPTION_H_
diff --git a/qt/widgets/factory/inc/MantidQtWidgets/Factory/WidgetFactory.h b/qt/widgets/factory/inc/MantidQtWidgets/Factory/WidgetFactory.h
index 1153dcada72..c079f3369e2 100644
--- a/qt/widgets/factory/inc/MantidQtWidgets/Factory/WidgetFactory.h
+++ b/qt/widgets/factory/inc/MantidQtWidgets/Factory/WidgetFactory.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_FACTORY_WIDGETFACTORY_H_
-#define MANTID_FACTORY_WIDGETFACTORY_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidKernel/SingletonHolder.h"
@@ -56,5 +55,3 @@ protected:
 
 } // namespace Factory
 } // namespace MantidQt
-
-#endif /* MANTID_FACTORY_WIDGETFACTORY_H_ */
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BankRenderingHelpers.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BankRenderingHelpers.h
index 983ca90acfa..d5cf760e310 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BankRenderingHelpers.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BankRenderingHelpers.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef BANKRENDERINGHELPERS_H
-#define BANKRENDERINGHELPERS_H
+#pragma once
 #include "DllOption.h"
 #include "MantidQtWidgets/InstrumentView/GLColor.h"
 #include "MantidQtWidgets/InstrumentView/GridTextureFace.h"
@@ -58,5 +57,3 @@ renderStructuredBank(const Mantid::Geometry::ComponentInfo &compInfo,
 } // namespace BankRenderingHelpers
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // BANKRENDERINGHELPERS_H
\ No newline at end of file
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BankTextureBuilder.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BankTextureBuilder.h
index d73d1c1acd3..07ec22b7b7c 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BankTextureBuilder.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BankTextureBuilder.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef BANKTEXTUREBUILDER_H
-#define BANKTEXTUREBUILDER_H
+#pragma once
 
 #include "GLColor.h"
 #include "MantidBeamline/ComponentType.h"
@@ -67,5 +66,4 @@ private:
 };
 } // namespace detail
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif
\ No newline at end of file
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BaseCustomInstrumentModel.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BaseCustomInstrumentModel.h
index 7669ac7266d..0a7bacf1fc0 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BaseCustomInstrumentModel.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BaseCustomInstrumentModel.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_INSTRUMENTVIEW_BASECUSTOMINSTRUMENTMODEL_H_
-#define MANTIDQT_INSTRUMENTVIEW_BASECUSTOMINSTRUMENTMODEL_H_
+#pragma once
 
 #include "DllOption.h"
 
@@ -40,5 +39,3 @@ protected:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTIDQT_INSTRUMENTVIEW_BASEINSTRUMENTMODEL_H_ */
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BaseCustomInstrumentPresenter.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BaseCustomInstrumentPresenter.h
index daad1941f38..102bca51e2d 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BaseCustomInstrumentPresenter.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BaseCustomInstrumentPresenter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_INSTRUMENTVIEW_BASECUSTOMINSTRUMENTPRESENTER_H_
-#define MANTIDQT_INSTRUMENTVIEW_BASECUSTOMINSTRUMENTPRESENTER_H_
+#pragma once
 #include "DllOption.h"
 #include "MantidQtWidgets/Common/ObserverPattern.h"
 #include "MantidQtWidgets/InstrumentView/BaseCustomInstrumentModel.h"
@@ -59,5 +58,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTIDQT_INSTRUMENTVIEW_BaseCustomInstrumentPresenter_H_ */
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BaseCustomInstrumentView.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BaseCustomInstrumentView.h
index b1ad37f0995..ad87b4db9e8 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BaseCustomInstrumentView.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BaseCustomInstrumentView.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_INSTRUMENTVIEW_BASECUSTOMINSTRUMENTVIEW_H_
-#define MANTIDQT_INSTRUMENTVIEW_BASECUSTOMINSTRUMENTVIEW_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidQtWidgets/Common/MWRunFiles.h"
@@ -67,5 +66,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTIDQT_INSTRUMENTVIEW_BASECUSTOMINSTRUMENTVIEW_H_ */
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BinDialog.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BinDialog.h
index a437753d122..7dbbe6510fa 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BinDialog.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BinDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef BINDIALOG_H_
-#define BINDIALOG_H_
+#pragma once
 
 #include <QCheckBox>
 #include <QDialog>
@@ -52,5 +51,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*BINDIALOG_H_*/
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/CollapsiblePanel.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/CollapsiblePanel.h
index 749310a614a..42b5d71ab00 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/CollapsiblePanel.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/CollapsiblePanel.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef COLLAPSIBLEPANEL_H_
-#define COLLAPSIBLEPANEL_H_
+#pragma once
 
 #include <QLabel>
 #include <QWidget>
@@ -70,5 +69,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*COLLAPSIBLEPANEL_H_*/
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/ColorBar.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/ColorBar.h
index bd1dc54fe9c..937fe790ca2 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/ColorBar.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/ColorBar.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_WIDGETS_INSTRUMENTVIEW_COLORBAR_H
-#define MANTIDQT_WIDGETS_INSTRUMENTVIEW_COLORBAR_H
+#pragma once
 
 #include <QtGlobal>
 
@@ -24,5 +23,3 @@ using ColorBar = MantidQt::Widgets::MplCpp::ColorbarWidget;
 #endif
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQT_WIDGETS_INSTRUMENTVIEW_COLORBAR_H
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/ColorMap.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/ColorMap.h
index deeb7da80b1..45fdec7d4ed 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/ColorMap.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/ColorMap.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_WIDGETS_INSTRUMENTVIEW_COLORMAP_H
-#define MANTIDQT_WIDGETS_INSTRUMENTVIEW_COLORMAP_H
+#pragma once
 
 #include <QtGlobal>
 
@@ -24,5 +23,3 @@ using ColorMap = MantidQt::Widgets::MplCpp::MantidColorMap;
 #endif
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQT_WIDGETS_INSTRUMENTVIEW_COLORMAP_H
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/DetXMLFile.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/DetXMLFile.h
index 0be2e574607..eeb39a3b6bf 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/DetXMLFile.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/DetXMLFile.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DETXMLFILE_H
-#define DETXMLFILE_H
+#pragma once
 
 #include <QList>
 #include <QString>
@@ -54,5 +53,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // DETXMLFILE_H
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/DllOption.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/DllOption.h
index a74f780ac6d..3a83f5a2a0f 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/DllOption.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/DllOption.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_INSTRUMENTVIEW_DLLOPTION_H_
-#define MANTIDQT_INSTRUMENTVIEW_DLLOPTION_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 
@@ -16,5 +15,3 @@
 #define EXPORT_OPT_MANTIDQT_INSTRUMENTVIEW DLLImport
 #define EXTERN_MANTIDQT_INSTRUMENTVIEW extern
 #endif /* IN_MANTIDQT_INSTRUMENTVIEW */
-
-#endif // MANTIDQT_INSTRUMENTVIEW_DLLOPTION_H_
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/GLColor.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/GLColor.h
index e5091cab89d..4a26ddea452 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/GLColor.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/GLColor.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef GLCOLOR_H_
-#define GLCOLOR_H_
+#pragma once
 
 #include <iosfwd>
 
@@ -55,5 +54,3 @@ private:
 std::ostream &operator<<(std::ostream &ostr, const GLColor &c);
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*GLCOLOR_H_*/
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/GLObject.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/GLObject.h
index b37ab07d21b..7ea9ded44c6 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/GLObject.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/GLObject.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDPLOT_GLOBJECT_H_
-#define MANTIDPLOT_GLOBJECT_H_
+#pragma once
 
 #include "MantidGeometry/Rendering/OpenGL_Headers.h"
 #include <string>
@@ -58,5 +57,3 @@ protected:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*MANTIDPLOT_GLOBJECT_H*/
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/GridTextureFace.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/GridTextureFace.h
index 1b717783bdd..825d58703b4 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/GridTextureFace.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/GridTextureFace.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef GRIDTEXTUREFACE_H
-#define GRIDTEXTUREFACE_H
+#pragma once
 namespace MantidQt {
 namespace MantidWidgets {
 
@@ -14,5 +13,4 @@ namespace detail {
 enum class GridTextureFace { Front = 0, Back, Left, Right, Top, Bottom };
 }
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // GRIDTEXTUREFACE_H
\ No newline at end of file
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentActor.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentActor.h
index ac51905b910..7f23fc3d6a3 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentActor.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentActor.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef INSTRUMENTACTOR_H_
-#define INSTRUMENTACTOR_H_
+#pragma once
 
 #include "MantidQtWidgets/InstrumentView/ColorMap.h"
 #include "MantidQtWidgets/InstrumentView/DllOption.h"
@@ -293,5 +292,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*InstrumentActor_H_*/
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentRenderer.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentRenderer.h
index a9106b111f1..b087d0bb796 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentRenderer.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentRenderer.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef INSTRUMENTRENDERER_H_
-#define INSTRUMENTRENDERER_H_
+#pragma once
 
 #include "ColorMap.h"
 #include "DllOption.h"
@@ -77,5 +76,4 @@ private:
   void drawSingleDetector(size_t detIndex, bool picking);
 };
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif // INSTRUMENTRENDERER_H_
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentTreeModel.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentTreeModel.h
index 813a691bd11..e994cd5cede 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentTreeModel.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentTreeModel.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef INSTRUMENTTREEMODEL_H
-#define INSTRUMENTTREEMODEL_H
+#pragma once
 
 #include "MantidQtWidgets/InstrumentView/InstrumentWidget.h"
 
@@ -48,5 +47,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // INSTRUMENTTREEMODEL_H
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentTreeWidget.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentTreeWidget.h
index 48d2f5e9429..b4ee71e9cb1 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentTreeWidget.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentTreeWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef INSTRUMENTTREEWIDGET_H
-#define INSTRUMENTTREEWIDGET_H
+#pragma once
 
 //---------------------------------------
 // Includes
@@ -50,5 +49,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // INSTRUMENTTREEWIDGET_H
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidget.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidget.h
index 918be2a96c7..a02fa97df25 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidget.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef INSTRUMENTWIDGET_H_
-#define INSTRUMENTWIDGET_H_
+#pragma once
 
 #include "DllOption.h"
 #include "InstrumentWidgetTypes.h"
@@ -346,5 +345,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*INSTRUMENTWIDGET_H_*/
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetDecoder.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetDecoder.h
index 19e979cfa34..5955aa7f931 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetDecoder.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetDecoder.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_WIDGETS_INSTRUMENTWIDGETDECODER_H_
-#define MANTIDQT_WIDGETS_INSTRUMENTWIDGETDECODER_H_
+#pragma once
 
 #include "MantidQtWidgets/InstrumentView/ColorBar.h"
 #include "MantidQtWidgets/InstrumentView/InstrumentActor.h"
@@ -83,5 +82,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*MANTIDQT_WIDGETS_INSTRUMENTWIDGETDECODER_H_*/
\ No newline at end of file
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetEncoder.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetEncoder.h
index e9d0f010c68..a7a76b1c538 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetEncoder.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetEncoder.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_WIDGETS_INSTRUMENTWIDGETENCODER_H_
-#define MANTIDQT_WIDGETS_INSTRUMENTWIDGETENCODER_H_
+#pragma once
 
 #include "MantidQtWidgets/InstrumentView/ColorBar.h"
 #include "MantidQtWidgets/InstrumentView/InstrumentActor.h"
@@ -75,5 +74,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*MANTIDQT_WIDGETS_INSTRUMENTWIDGETENCODER_H_*/
\ No newline at end of file
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetMaskTab.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetMaskTab.h
index e909486d3c3..0ea00c95d45 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetMaskTab.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetMaskTab.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef INSTRUMENTWIDGETMASKTAB_H_
-#define INSTRUMENTWIDGETMASKTAB_H_
+#pragma once
 
 #include "MantidGeometry/Instrument.h"
 #include "MantidQtWidgets/InstrumentView/InstrumentWidgetTab.h"
@@ -214,5 +213,3 @@ protected:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*INSTRUMENTWIDGETMASKTAB_H_*/
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetPickTab.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetPickTab.h
index c01fd660928..7ed82994009 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetPickTab.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetPickTab.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef INSTRUMENTWIDGETPICKTAB_H_
-#define INSTRUMENTWIDGETPICKTAB_H_
+#pragma once
 
 #include "MantidQtWidgets/InstrumentView/InstrumentWidgetTab.h"
 #include "MantidQtWidgets/InstrumentView/MantidGLWidget.h"
@@ -299,5 +298,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*INSTRUMENTWIDGETPICKTAB_H_*/
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetRenderTab.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetRenderTab.h
index 1eb213b0b5a..58d5a627b64 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetRenderTab.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetRenderTab.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef INSTRUMENTWIDGETRENDERTAB_H_
-#define INSTRUMENTWIDGETRENDERTAB_H_
+#pragma once
 
 #include "ColorBar.h"
 #include "ColorMap.h"
@@ -148,5 +147,4 @@ private: // members
   friend class InstrumentWidgetDecoder;
 };
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*INSTRUMENTWIDGETRENDERTAB_H_*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetTab.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetTab.h
index 3f1411a44d1..cc8e44927af 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetTab.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetTab.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef INSTRUMENTWIDGETTAB_H
-#define INSTRUMENTWIDGETTAB_H
+#pragma once
 
 #include "InstrumentWidgetTypes.h"
 
@@ -56,5 +55,3 @@ protected:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // INSTRUMENTWIDGETTAB_H
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetTreeTab.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetTreeTab.h
index b796c5676cf..7377f21dff6 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetTreeTab.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetTreeTab.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef INSTRUMENTWIDGETTREETAB_H_
-#define INSTRUMENTWIDGETTREETAB_H_
+#pragma once
 
 #include "InstrumentWidgetTab.h"
 
@@ -40,5 +39,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*INSTRUMENTWIDGETTREETAB_H_*/
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetTypes.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetTypes.h
index 357423757e4..5fc4b342666 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetTypes.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetTypes.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef INSTRUMENTWIDGETTYPES_H_
-#define INSTRUMENTWIDGETTYPES_H_
+#pragma once
 
 #include "DllOption.h"
 
@@ -28,5 +27,3 @@ public:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*INSTRUMENTWIDGETTYPES_H_*/
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/MantidGLWidget.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/MantidGLWidget.h
index 176e1c54db3..f1a3e03828c 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/MantidGLWidget.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/MantidGLWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDGLWIDGET_H_
-#define MANTIDGLWIDGET_H_
+#pragma once
 
 #include "MantidGeometry/IComponent.h"
 
@@ -72,5 +71,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*MANTIDGLWIDGET_H_*/
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/MaskBinsData.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/MaskBinsData.h
index ccff21c9063..2962920c1e1 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/MaskBinsData.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/MaskBinsData.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MASKBINSDATA_H_
-#define MASKBINSDATA_H_
+#pragma once
 
 #include "MantidAPI/MatrixWorkspace_fwd.h"
 
@@ -50,5 +49,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*MASKBINSDATA_H_*/
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/MiniPlot.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/MiniPlot.h
index a2b830ebc86..ba832de82fb 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/MiniPlot.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/MiniPlot.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_WIDGETS_INSTRUMENTVIEW_MINIPLOT_H
-#define MANTIDQT_WIDGETS_INSTRUMENTVIEW_MINIPLOT_H
+#pragma once
 
 #include <QtGlobal>
 
@@ -24,5 +23,3 @@ using MiniPlot = MiniPlotMpl;
 #endif
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQT_WIDGETS_INSTRUMENTVIEW_MINIPLOT_H
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/MiniPlotMpl.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/MiniPlotMpl.h
index b80a5cd934f..0a01557a069 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/MiniPlotMpl.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/MiniPlotMpl.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTWIDGETS_INSTRUMENTVIEW_MINIPLOTMPL_H
-#define MANTIDQTWIDGETS_INSTRUMENTVIEW_MINIPLOTMPL_H
+#pragma once
 
 #include "MantidQtWidgets/InstrumentView/DllOption.h"
 #include "MantidQtWidgets/MplCpp/Cycler.h"
@@ -79,5 +78,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQTWIDGETS_INSTRUMENTVIEW_MINIPLOTMPL_H
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/MiniPlotQwt.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/MiniPlotQwt.h
index 8fd2afb9f16..a0507b94c33 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/MiniPlotQwt.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/MiniPlotQwt.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MiniPlotQwt_H_
-#define MiniPlotQwt_H_
+#pragma once
 
 #include <QList>
 #include <QMap>
@@ -91,5 +90,4 @@ private:
 };
 
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif /*MiniPlotQwt_H_*/
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/OpenGLError.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/OpenGLError.h
index 8ead2d10486..ca8183aa02e 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/OpenGLError.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/OpenGLError.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef OPENGLERROR_H_
-#define OPENGLERROR_H_
+#pragma once
 
 #include <ostream>
 #include <stdexcept>
@@ -30,5 +29,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*OPENGLERROR_H_*/
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PanelsSurface.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PanelsSurface.h
index 178160f15dd..5993030a3aa 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PanelsSurface.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PanelsSurface.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef PANELSSURFACE_H
-#define PANELSSURFACE_H
+#pragma once
 
 #include "UnwrappedSurface.h"
 
@@ -112,5 +111,3 @@ protected:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // PANELSSURFACE_H
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PeakMarker2D.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PeakMarker2D.h
index 1e3ba4c27a0..0f19de50c3b 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PeakMarker2D.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PeakMarker2D.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDPLOT_PEAKMARKER2D_H_
-#define MANTIDPLOT_PEAKMARKER2D_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/IPeak.h"
 #include "Shape2D.h"
@@ -86,5 +85,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*MANTIDPLOT_PEAKMARKER2D_H_*/
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PeakOverlay.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PeakOverlay.h
index edb5faf473c..c1354b46c31 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PeakOverlay.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PeakOverlay.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDPLOT_PEAKOVERLAY_H_
-#define MANTIDPLOT_PEAKOVERLAY_H_
+#pragma once
 
 #include "PeakMarker2D.h"
 #include "Shape2DCollection.h"
@@ -178,5 +177,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*MANTIDPLOT_PEAKOVERLAY_H_*/
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PlotFitAnalysisPaneModel.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PlotFitAnalysisPaneModel.h
index 83f3a03a0f3..5a100d93960 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PlotFitAnalysisPaneModel.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PlotFitAnalysisPaneModel.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_INSTRUMENTVIEW_PLOTFITANALYSISPANEMODEL_H_
-#define MANTIDQT_INSTRUMENTVIEW_PLOTFITANALYSISPANEMODEL_H_
+#pragma once
 
 #include "MantidAPI/IFunction.h"
 
@@ -25,5 +24,3 @@ public:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTIDQT_INSTRUMENTVIEW_PLOTFITANALYSISPANEMODEL_H_ */
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PlotFitAnalysisPanePresenter.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PlotFitAnalysisPanePresenter.h
index 58c0d1ae869..abaae12a813 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PlotFitAnalysisPanePresenter.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PlotFitAnalysisPanePresenter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_INSTRUMENTVIEW_PLOTFITANALYSISPANEPRESENTER_H_
-#define MANTIDQT_INSTRUMENTVIEW_PLOTFITANALYSISPANEPRESENTER_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidQtWidgets/Common/ObserverPattern.h"
@@ -42,5 +41,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTIDQT_INSTRUMENTVIEW_PLOTFITANALYSISPANEPRESENTER_H_ */
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PlotFitAnalysisPaneView.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PlotFitAnalysisPaneView.h
index 24242f33af3..4c1b6a6d009 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PlotFitAnalysisPaneView.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PlotFitAnalysisPaneView.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_INSTRUMENTVIEW_PLOTFITPANEVIEW_H_
-#define MANTIDQT_INSTRUMENTVIEW_PLOTFITPANEVIEW_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidQtWidgets/Common/FunctionBrowser.h"
@@ -58,5 +57,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTIDQT_INSTRUMENTVIEW_PLOTFITPANEVIEW_H_ */
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/Projection3D.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/Projection3D.h
index 405b47735ad..7547d1b174e 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/Projection3D.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/Projection3D.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef PROJECTION3D_H_
-#define PROJECTION3D_H_
+#pragma once
 
 #include "ProjectionSurface.h"
 #include "Viewport.h"
@@ -86,5 +85,3 @@ protected:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* PROJECTION3D_H_ */
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/ProjectionSurface.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/ProjectionSurface.h
index 971b01bc362..d359cc222d6 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/ProjectionSurface.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/ProjectionSurface.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef PROJECTIONSURFACE_H
-#define PROJECTIONSURFACE_H
+#pragma once
 
 #include "MantidGeometry/IComponent.h"
 #include "MantidKernel/Quat.h"
@@ -395,5 +394,3 @@ using ProjectionSurface_sptr = boost::shared_ptr<ProjectionSurface>;
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // PROJECTIONSURFACE_H
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/RectF.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/RectF.h
index 9559e6d0b28..51872ede0f9 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/RectF.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/RectF.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef RECTF_H
-#define RECTF_H
+#pragma once
 
 #include <QPoint>
 #include <QRectF>
@@ -208,5 +207,3 @@ inline std::ostream &operator<<(std::ostream &ostr, const QPointF &p) {
 }
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // RECTF_H
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/RotationSurface.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/RotationSurface.h
index 50eff9f1776..8834a2878d3 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/RotationSurface.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/RotationSurface.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef ROTATIONSURFACE_H
-#define ROTATIONSURFACE_H
+#pragma once
 
 #include "UnwrappedSurface.h"
 
@@ -75,5 +74,3 @@ protected:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // ROTATIONSURFACE_H
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/Shape2D.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/Shape2D.h
index 1d6a72f20ec..7a590c5bc10 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/Shape2D.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/Shape2D.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDPLOT_SHAPE2D_H_
-#define MANTIDPLOT_SHAPE2D_H_
+#pragma once
 
 #include "RectF.h"
 
@@ -338,5 +337,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*MANTIDPLOT_SHAPE2D_H_*/
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/Shape2DCollection.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/Shape2DCollection.h
index a7c841eb5ef..853c7b1519f 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/Shape2DCollection.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/Shape2DCollection.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDPLOT_SHAPE2DCOLLECTION_H_
-#define MANTIDPLOT_SHAPE2DCOLLECTION_H_
+#pragma once
 
 #include "MantidAPI/ITableWorkspace.h"
 
@@ -164,5 +163,3 @@ protected:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*MANTIDPLOT_SHAPE2DCOLLECTION_H_*/
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/SimpleWidget.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/SimpleWidget.h
index 336858d4017..116bef7db6c 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/SimpleWidget.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/SimpleWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SIMPLEWIDGET_H
-#define SIMPLEWIDGET_H
+#pragma once
 
 #include <QWidget>
 
@@ -50,5 +49,3 @@ protected:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // SIMPLEWIDGET_H
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/UCorrectionDialog.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/UCorrectionDialog.h
index ccdb47c9a67..0aad3b2bfa5 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/UCorrectionDialog.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/UCorrectionDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef UCorrectionDIALOG_H
-#define REMOVEERRORSDIALOG_H
+#pragma once
 
 #include <QDialog>
 #include <QPointF>
@@ -32,5 +31,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // REMOVEERRORSDIALOG_H
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/UnwrappedCylinder.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/UnwrappedCylinder.h
index bc2b6297e3b..ea3623b38c1 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/UnwrappedCylinder.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/UnwrappedCylinder.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef UNWRAPPEDCYLINDER_H
-#define UNWRAPPEDCYLINDER_H
+#pragma once
 
 #include "RotationSurface.h"
 
@@ -29,5 +28,3 @@ protected:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // UNWRAPPEDCYLINDER_H
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/UnwrappedDetector.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/UnwrappedDetector.h
index 2011095f294..74ab6ea0a2c 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/UnwrappedDetector.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/UnwrappedDetector.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef UNWRAPPEDDETECTOR_H
-#define UNWRAPPEDDETECTOR_H
+#pragma once
 
 #include "MantidGeometry/IDTypes.h"
 #include "MantidKernel/Quat.h"
@@ -50,5 +49,4 @@ public:
   ///< ComponentInfo/DetectorInfo.
 };
 } // namespace MantidWidgets
-} // namespace MantidQt
-#endif
\ No newline at end of file
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/UnwrappedSphere.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/UnwrappedSphere.h
index 4ee32fb272a..54c63d1903e 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/UnwrappedSphere.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/UnwrappedSphere.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef UNWRAPPEDSPHERE_H
-#define UNWRAPPEDSPHERE_H
+#pragma once
 
 #include "RotationSurface.h"
 
@@ -30,5 +29,3 @@ protected:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // UNWRAPPEDSPHERE_H
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/UnwrappedSurface.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/UnwrappedSurface.h
index 6a350620064..a22dc607c11 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/UnwrappedSurface.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/UnwrappedSurface.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef UNWRAPPEDSURFACE_H
-#define UNWRAPPEDSURFACE_H
+#pragma once
 
 #include "InstrumentActor.h"
 #include "MantidGeometry/Objects/IObject.h"
@@ -178,5 +177,3 @@ protected:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // UNWRAPPEDSURFACE_H
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/Viewport.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/Viewport.h
index 3ada32e41e6..0126fa2e6ea 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/Viewport.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/Viewport.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef VIEWPORT_H_
-#define VIEWPORT_H_
+#pragma once
 
 #include "MantidKernel/Quat.h"
 #include "MantidKernel/V3D.h"
@@ -183,5 +182,3 @@ protected:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*VIEWPORT_H_*/
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/XIntegrationControl.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/XIntegrationControl.h
index 83e64734bf4..5deac1913d6 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/XIntegrationControl.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/XIntegrationControl.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef XINTEGRATIONCONTROL_H_
-#define XINTEGRATIONCONTROL_H_
+#pragma once
 
 #include <QFrame>
 #include <QScrollBar>
@@ -92,5 +91,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /*XINTEGRATIONCONTROL_H_*/
diff --git a/qt/widgets/instrumentview/test/InstrumentViewTestInitialization.h b/qt/widgets/instrumentview/test/InstrumentViewTestInitialization.h
index 602399bc071..6b3e3195994 100644
--- a/qt/widgets/instrumentview/test/InstrumentViewTestInitialization.h
+++ b/qt/widgets/instrumentview/test/InstrumentViewTestInitialization.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_WIDGETS_INSTRUMENTVIEWTESTINITIALIZATION_H
-#define MANTIDQT_WIDGETS_INSTRUMENTVIEWTESTINITIALIZATION_H
+#pragma once
 
 #include "MantidPythonInterface/core/Testing/PythonInterpreterGlobalFixture.h"
 #include "MantidQtWidgets/Common/Testing/QApplicationGlobalFixture.h"
@@ -18,5 +17,3 @@
 //------------------------------------------------------------------------------
 static PythonInterpreterGlobalFixture PYTHON_INTERPRETER;
 static QApplicationGlobalFixture MAIN_QAPPLICATION;
-
-#endif // MANTIDQT_WIDGETS_INSTRUMENTVIEWTESTINITIALIZATION_H
diff --git a/qt/widgets/instrumentview/test/InstrumentWidgetDecoderTest.h b/qt/widgets/instrumentview/test/InstrumentWidgetDecoderTest.h
index 006d58f8c9c..1cc64920619 100644
--- a/qt/widgets/instrumentview/test/InstrumentWidgetDecoderTest.h
+++ b/qt/widgets/instrumentview/test/InstrumentWidgetDecoderTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_WIDGETS_INSTRUMENTWIDGETDECODERTEST_H_
-#define MANTIDQT_WIDGETS_INSTRUMENTWIDGETDECODERTEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/FrameworkManager.h"
@@ -76,5 +75,3 @@ private:
   InstrumentWidgetDecoder *m_decoder;
   QMap<QString, QVariant> m_infoMap;
 };
-
-#endif /* MANTIDQT_WIDGETS_INSTRUMENTWIDGETDECODERTEST_H_ */
\ No newline at end of file
diff --git a/qt/widgets/instrumentview/test/InstrumentWidgetEncoderTest.h b/qt/widgets/instrumentview/test/InstrumentWidgetEncoderTest.h
index e0f2074de08..384768ff313 100644
--- a/qt/widgets/instrumentview/test/InstrumentWidgetEncoderTest.h
+++ b/qt/widgets/instrumentview/test/InstrumentWidgetEncoderTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_WIDGETS_INSTRUMENTWIDGETENCODERTEST_H_
-#define MANTIDQT_WIDGETS_INSTRUMENTWIDGETENCODERTEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/FrameworkManager.h"
@@ -46,5 +45,3 @@ public:
   InstrumentWidget *m_instrumentWidget;
   InstrumentWidgetEncoder *m_encoder;
 };
-
-#endif /* MANTIDQT_WIDGETS_INSTRUMENTWIDGETDECODERTEST_H_ */
diff --git a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Artist.h b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Artist.h
index 214b47c5d2a..decbaf84975 100644
--- a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Artist.h
+++ b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Artist.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_ARTIST_H
-#define MPLCPP_ARTIST_H
+#pragma once
 
 #include "MantidQtWidgets/Common/Python/Object.h"
 #include "MantidQtWidgets/MplCpp/DllConfig.h"
@@ -29,5 +28,3 @@ public:
 } // namespace MplCpp
 } // namespace Widgets
 } // namespace MantidQt
-
-#endif // MPLCPP_ARTIST_H
diff --git a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Axes.h b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Axes.h
index 76868d8636b..ceb4da9d29f 100644
--- a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Axes.h
+++ b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Axes.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_AXES_H
-#define MPLCPP_AXES_H
+#pragma once
 
 #include "MantidQtWidgets/MplCpp/DllConfig.h"
 #include "MantidQtWidgets/MplCpp/Line2D.h"
@@ -66,5 +65,3 @@ public:
 } // namespace MplCpp
 } // namespace Widgets
 } // namespace MantidQt
-
-#endif // MPLCPP_AXES_H
diff --git a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/BackendQt.h b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/BackendQt.h
index eccc9bf7279..e82cc6c9f45 100644
--- a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/BackendQt.h
+++ b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/BackendQt.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_BACKENDQT_H
-#define MPLCPP_BACKENDQT_H
+#pragma once
 
 #include "MantidQtWidgets/Common/Python/Object.h"
 #include "MantidQtWidgets/MplCpp/DllConfig.h"
@@ -41,5 +40,3 @@ MANTID_MPLCPP_DLL Common::Python::Object backendModule();
 } // namespace MplCpp
 } // namespace Widgets
 } // namespace MantidQt
-
-#endif // MPLCPP_BACKENDQT_H
diff --git a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/ColorConverter.h b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/ColorConverter.h
index 74382da4fbc..9a3316fbd28 100644
--- a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/ColorConverter.h
+++ b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/ColorConverter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_COLORCONVERTER_H
-#define MPLCPP_COLORCONVERTER_H
+#pragma once
 
 #include "MantidQtWidgets/Common/Python/Object.h"
 #include "MantidQtWidgets/MplCpp/DllConfig.h"
@@ -28,5 +27,3 @@ public:
 } // namespace MplCpp
 } // namespace Widgets
 } // namespace MantidQt
-
-#endif // MPLCPP_COLORCONVERTER_H
diff --git a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/ColorbarWidget.h b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/ColorbarWidget.h
index 0b7248e6dc5..8fefdc60271 100644
--- a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/ColorbarWidget.h
+++ b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/ColorbarWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_COLORBARWIDGET_H
-#define MPLCPP_COLORBARWIDGET_H
+#pragma once
 
 #include "MantidQtWidgets/MplCpp/Colors.h"
 #include "MantidQtWidgets/MplCpp/DllConfig.h"
@@ -88,5 +87,3 @@ private: // data
 } // namespace MplCpp
 } // namespace Widgets
 } // namespace MantidQt
-
-#endif // MPLCPP_COLORBARWIDGET_H
diff --git a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Colormap.h b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Colormap.h
index 20c084f1d94..bbdbea09a0b 100644
--- a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Colormap.h
+++ b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Colormap.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_COLORMAP_H
-#define MPLCPP_COLORMAP_H
+#pragma once
 
 #include "MantidQtWidgets/MplCpp/DllConfig.h"
 #pragma push_macro("slots")
@@ -42,5 +41,3 @@ MANTID_MPLCPP_DLL QString defaultCMapName();
 } // namespace MplCpp
 } // namespace Widgets
 } // namespace MantidQt
-
-#endif // MPLCPP_COLORMAP_H
diff --git a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Colors.h b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Colors.h
index aacdaf040b1..447b7994260 100644
--- a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Colors.h
+++ b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Colors.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_COLORS_H
-#define MPLCPP_COLORS_H
+#pragma once
 
 #include "MantidQtWidgets/Common/Python/Object.h"
 #include "MantidQtWidgets/MplCpp/DllConfig.h"
@@ -96,5 +95,4 @@ public:
 
 } // namespace MplCpp
 } // namespace Widgets
-} // namespace MantidQt
-#endif // MPLCPP_COLORS_H
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Cycler.h b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Cycler.h
index fa1abe17561..a4716930d79 100644
--- a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Cycler.h
+++ b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Cycler.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_CYCLER_H
-#define MPLCPP_CYCLER_H
+#pragma once
 
 #include "MantidQtWidgets/MplCpp/DllConfig.h"
 #pragma push_macro("slots")
@@ -37,5 +36,3 @@ MANTID_MPLCPP_DLL Cycler cycler(const char *label, const char *iterable);
 } // namespace MplCpp
 } // namespace Widgets
 } // namespace MantidQt
-
-#endif // MPLCPP_CYCLER_H
diff --git a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/DllConfig.h b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/DllConfig.h
index d1fa98616c6..6b74a5b1aa7 100644
--- a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/DllConfig.h
+++ b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/DllConfig.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MPLCPP_DLLCONFIG_H_
-#define MANTIDQT_MPLCPP_DLLCONFIG_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 
@@ -14,5 +13,3 @@
 #else
 #define MANTID_MPLCPP_DLL DLLImport
 #endif /* IN_MANTIDQT_MPLCPP */
-
-#endif // MANTIDQT_MPLCPP_DLLCONFIG_H_
diff --git a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/ErrorbarContainer.h b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/ErrorbarContainer.h
index 543205d3cd2..5fbfc15111e 100644
--- a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/ErrorbarContainer.h
+++ b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/ErrorbarContainer.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_ERRORBARCONTAINER_H
-#define MPLCPP_ERRORBARCONTAINER_H
+#pragma once
 
 #include "MantidQtWidgets/Common/Python/Object.h"
 #include "MantidQtWidgets/MplCpp/DllConfig.h"
@@ -23,5 +22,3 @@ public:
 } // namespace MplCpp
 } // namespace Widgets
 } // namespace MantidQt
-
-#endif // MPLCPP_ERRORBARCONTAINER_H
diff --git a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Figure.h b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Figure.h
index 01bb84f6842..704783fd356 100644
--- a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Figure.h
+++ b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Figure.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_FIGURE_H
-#define MPLCPP_FIGURE_H
+#pragma once
 
 #include "MantidPythonInterface/core/GlobalInterpreterLock.h"
 #include "MantidQtWidgets/Common/Python/Object.h"
@@ -60,5 +59,3 @@ public:
 } // namespace MplCpp
 } // namespace Widgets
 } // namespace MantidQt
-
-#endif // MPLCPP_FIGURE_H
diff --git a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/FigureCanvasQt.h b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/FigureCanvasQt.h
index fd482a4e025..1eec4671ce4 100644
--- a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/FigureCanvasQt.h
+++ b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/FigureCanvasQt.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_FIGURECANVASQT_H
-#define MPLCPP_FIGURECANVASQT_H
+#pragma once
 
 #include "MantidQtWidgets/MplCpp/DllConfig.h"
 #include "MantidQtWidgets/MplCpp/Figure.h"
@@ -65,5 +64,4 @@ private: // members
 
 } // namespace MplCpp
 } // namespace Widgets
-} // namespace MantidQt
-#endif // MPLCPP_FIGURECANVASQT_H
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Line2D.h b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Line2D.h
index e445d622839..8a8b292a9e8 100644
--- a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Line2D.h
+++ b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Line2D.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_LINE2D_H
-#define MPLCPP_LINE2D_H
+#pragma once
 
 #include "MantidQtWidgets/MplCpp/Artist.h"
 #include "MantidQtWidgets/MplCpp/DllConfig.h"
@@ -54,5 +53,3 @@ private:
 } // namespace MplCpp
 } // namespace Widgets
 } // namespace MantidQt
-
-#endif // MPLCPP_LINE2D_H
diff --git a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/MantidAxes.h b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/MantidAxes.h
index b8fe6481941..0b36514063a 100644
--- a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/MantidAxes.h
+++ b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/MantidAxes.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_MANTID_AXES_H
-#define MPLCPP_MANTID_AXES_H
+#pragma once
 
 #include "MantidAPI/MatrixWorkspace_fwd.h"
 #include "MantidQtWidgets/MplCpp/Axes.h"
@@ -55,5 +54,3 @@ public:
 } // namespace MplCpp
 } // namespace Widgets
 } // namespace MantidQt
-
-#endif // MPLCPP_AXES_H
diff --git a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/MantidColorMap.h b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/MantidColorMap.h
index 053a8914866..aee15437c96 100644
--- a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/MantidColorMap.h
+++ b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/MantidColorMap.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_MANTIDCOLORMAP_H
-#define MPLCPP_MANTIDCOLORMAP_H
+#pragma once
 
 #include "MantidQtWidgets/MplCpp/DllConfig.h"
 #include "MantidQtWidgets/MplCpp/ScalarMappable.h"
@@ -57,5 +56,3 @@ private:
 } // namespace MplCpp
 } // namespace Widgets
 } // namespace MantidQt
-
-#endif // MPLCPP_MANTIDCOLORMAP_H
diff --git a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/PanZoomTool.h b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/PanZoomTool.h
index 46e1a9c6ac9..65e0d2c3b0c 100644
--- a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/PanZoomTool.h
+++ b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/PanZoomTool.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_PANZOOMTOOL_H
-#define MPLCPP_PANZOOMTOOL_H
+#pragma once
 
 #include "MantidQtWidgets/Common/Python/Object.h"
 #include "MantidQtWidgets/MplCpp/DllConfig.h"
@@ -46,5 +45,3 @@ private:
 } // namespace MplCpp
 } // namespace Widgets
 } // namespace MantidQt
-
-#endif // MPLCPP_PANZOOMTOOL_H
diff --git a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/PeakMarker.h b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/PeakMarker.h
index 4ee64f71074..c0492d82a01 100644
--- a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/PeakMarker.h
+++ b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/PeakMarker.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_PEAKMARKER_H
-#define MPLCPP_PEAKMARKER_H
+#pragma once
 
 #include "MantidQtWidgets/Common/Python/Object.h"
 #include "MantidQtWidgets/MplCpp/DllConfig.h"
@@ -47,5 +46,3 @@ public:
 } // namespace MplCpp
 } // namespace Widgets
 } // namespace MantidQt
-
-#endif // MPLCPP_PEAKMARKER_H
diff --git a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Plot.h b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Plot.h
index d84c9a5cbf9..61263fa5f7a 100644
--- a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Plot.h
+++ b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/Plot.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_PLOT_H
-#define MPLCPP_PLOT_H
+#pragma once
 
 #include "MantidQtWidgets/Common/Python/Object.h"
 #include "MantidQtWidgets/MplCpp/DllConfig.h"
@@ -152,5 +151,3 @@ pcolormesh(const QStringList &workspaces,
 } // namespace MplCpp
 } // namespace Widgets
 } // namespace MantidQt
-
-#endif // MPLCPP_PLOT_H
diff --git a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/RangeMarker.h b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/RangeMarker.h
index 1cfd5355497..f8be1a54665 100644
--- a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/RangeMarker.h
+++ b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/RangeMarker.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_RANGEMARKER_H
-#define MPLCPP_RANGEMARKER_H
+#pragma once
 
 #include "MantidQtWidgets/Common/Python/Object.h"
 #include "MantidQtWidgets/MplCpp/DllConfig.h"
@@ -55,5 +54,3 @@ public:
 } // namespace MplCpp
 } // namespace Widgets
 } // namespace MantidQt
-
-#endif // MPLCPP_RANGEMARKER_H
diff --git a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/ScalarMappable.h b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/ScalarMappable.h
index 5e0e1f8d6cb..18d2e56c84b 100644
--- a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/ScalarMappable.h
+++ b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/ScalarMappable.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_SCALARMAPPABLE_H
-#define MPLCPP_SCALARMAPPABLE_H
+#pragma once
 
 #include "MantidQtWidgets/MplCpp/Colormap.h"
 #include "MantidQtWidgets/MplCpp/Colors.h"
@@ -45,5 +44,3 @@ public:
 } // namespace MplCpp
 } // namespace Widgets
 } // namespace MantidQt
-
-#endif // MPLCPP_SCALARMAPPABLE_H
diff --git a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/SingleMarker.h b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/SingleMarker.h
index b5d2f0de860..6c1cc0dbf58 100644
--- a/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/SingleMarker.h
+++ b/qt/widgets/mplcpp/inc/MantidQtWidgets/MplCpp/SingleMarker.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_SINGLEMARKER_H
-#define MPLCPP_SINGLEMARKER_H
+#pragma once
 
 #include "MantidQtWidgets/Common/Python/Object.h"
 #include "MantidQtWidgets/MplCpp/DllConfig.h"
@@ -49,5 +48,3 @@ public:
 } // namespace MplCpp
 } // namespace Widgets
 } // namespace MantidQt
-
-#endif // MPLCPP_SINGLEMARKER_H
diff --git a/qt/widgets/mplcpp/test/ArtistTest.h b/qt/widgets/mplcpp/test/ArtistTest.h
index 314a715e285..757ca092b8d 100644
--- a/qt/widgets/mplcpp/test/ArtistTest.h
+++ b/qt/widgets/mplcpp/test/ArtistTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_ARTISTTEST_H
-#define MPLCPP_ARTISTTEST_H
+#pragma once
 
 #include "MantidQtWidgets/MplCpp/Artist.h"
 
@@ -51,5 +50,3 @@ public:
     TS_ASSERT_THROWS(Artist artist(none), const std::invalid_argument &);
   }
 };
-
-#endif // ARTISTTEST_H
diff --git a/qt/widgets/mplcpp/test/AxesTest.h b/qt/widgets/mplcpp/test/AxesTest.h
index dd6bcdef97c..0960bdeba85 100644
--- a/qt/widgets/mplcpp/test/AxesTest.h
+++ b/qt/widgets/mplcpp/test/AxesTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_AXESTEST_H
-#define MPLCPP_AXESTEST_H
+#pragma once
 
 #include "MantidQtWidgets/MplCpp/Axes.h"
 #include <cxxtest/TestSuite.h>
@@ -189,5 +188,3 @@ private:
     return axesModule.attr("Axes")(figure, rect);
   }
 };
-
-#endif // MPLCPP_AXESTEST_H
diff --git a/qt/widgets/mplcpp/test/ColorConverterTest.h b/qt/widgets/mplcpp/test/ColorConverterTest.h
index 4a7593673d7..b4d02faca1a 100644
--- a/qt/widgets/mplcpp/test/ColorConverterTest.h
+++ b/qt/widgets/mplcpp/test/ColorConverterTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_COLORCONVERTERTEST_H
-#define MPLCPP_COLORCONVERTERTEST_H
+#pragma once
 
 #include "MantidQtWidgets/MplCpp/ColorConverter.h"
 #include <QRgb>
@@ -29,5 +28,3 @@ public:
     TS_ASSERT_EQUALS(191, color.green());
   }
 };
-
-#endif // MPLCPP_COLORCONVERTERTEST_H
diff --git a/qt/widgets/mplcpp/test/ColormapTest.h b/qt/widgets/mplcpp/test/ColormapTest.h
index da4d7a785e1..86ca9a26f59 100644
--- a/qt/widgets/mplcpp/test/ColormapTest.h
+++ b/qt/widgets/mplcpp/test/ColormapTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_COLORMAPTEST_H
-#define MPLCPP_COLORMAPTEST_H
+#pragma once
 
 #include "MantidPythonInterface/core/ErrorHandling.h"
 #include "MantidQtWidgets/MplCpp/Colormap.h"
@@ -49,5 +48,3 @@ public:
                      const std::invalid_argument &);
   }
 };
-
-#endif // MPLCPP_COLORMAPTEST_H
diff --git a/qt/widgets/mplcpp/test/ColorsTest.h b/qt/widgets/mplcpp/test/ColorsTest.h
index f6024bd9a4c..660bca18778 100644
--- a/qt/widgets/mplcpp/test/ColorsTest.h
+++ b/qt/widgets/mplcpp/test/ColorsTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_COLORSTEST_H
-#define MPLCPP_COLORSTEST_H
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -80,5 +79,3 @@ private:
     TS_ASSERT_EQUALS(vmax, norm.pyobj().attr("vmax"));
   }
 };
-
-#endif // MPLCPP_COLORSTEST_H
diff --git a/qt/widgets/mplcpp/test/CyclerTest.h b/qt/widgets/mplcpp/test/CyclerTest.h
index 038b31b0667..1ba5d1985b6 100644
--- a/qt/widgets/mplcpp/test/CyclerTest.h
+++ b/qt/widgets/mplcpp/test/CyclerTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPPTEST_CYCLERTEST_H
-#define MPLCPPTEST_CYCLERTEST_H
+#pragma once
 
 #include "MantidQtWidgets/MplCpp/Cycler.h"
 
@@ -41,5 +40,3 @@ public:
     TS_ASSERT_THROWS(Cycler cycler(none), const std::invalid_argument &);
   }
 };
-
-#endif // MPLCPPTEST_CYCLERTEST_H
diff --git a/qt/widgets/mplcpp/test/FigureCanvasQtTest.h b/qt/widgets/mplcpp/test/FigureCanvasQtTest.h
index 8ac7a896392..e87eef7df05 100644
--- a/qt/widgets/mplcpp/test/FigureCanvasQtTest.h
+++ b/qt/widgets/mplcpp/test/FigureCanvasQtTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_FIGURECANVASQTTEST_H
-#define MPLCPP_FIGURECANVASQTTEST_H
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -62,5 +61,3 @@ public:
       TS_ASSERT_EQUALS(true, legend.pyobj().attr("get_draggable")());
   }
 };
-
-#endif // MPLCPP_FIGURECANVASQTTEST_H
diff --git a/qt/widgets/mplcpp/test/FigureTest.h b/qt/widgets/mplcpp/test/FigureTest.h
index c115bcf89ad..24e373c7429 100644
--- a/qt/widgets/mplcpp/test/FigureTest.h
+++ b/qt/widgets/mplcpp/test/FigureTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_FIGURETEST_H
-#define MPLCPP_FIGURETEST_H
+#pragma once
 
 #include "MantidQtWidgets/MplCpp/Figure.h"
 #include "MantidQtWidgets/MplCpp/ScalarMappable.h"
@@ -87,5 +86,3 @@ public:
                      const std::invalid_argument &);
   }
 };
-
-#endif // FigureTEST_H
diff --git a/qt/widgets/mplcpp/test/Line2DTest.h b/qt/widgets/mplcpp/test/Line2DTest.h
index d3c959ebf42..bf70cc3f1f5 100644
--- a/qt/widgets/mplcpp/test/Line2DTest.h
+++ b/qt/widgets/mplcpp/test/Line2DTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_LINE2DTEST_H
-#define MPLCPP_LINE2DTEST_H
+#pragma once
 
 #include "MantidQtWidgets/MplCpp/Line2D.h"
 #include <QRgb>
@@ -93,5 +92,3 @@ private:
     return linesModule.attr("Line2D")(data, data);
   }
 };
-
-#endif // MPLCPP_LINE2DTEST_H
diff --git a/qt/widgets/mplcpp/test/MantidAxesTest.h b/qt/widgets/mplcpp/test/MantidAxesTest.h
index 46cb4b71f9f..39fac35f9e7 100644
--- a/qt/widgets/mplcpp/test/MantidAxesTest.h
+++ b/qt/widgets/mplcpp/test/MantidAxesTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_MANTIDAXESTEST_H
-#define MPLCPP_MANTIDAXESTEST_H
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidDataObjects/Workspace2D.h"
@@ -112,5 +111,3 @@ private:
     return ws;
   }
 };
-
-#endif // MPLCPP_MANTIDAXESTEST_H
diff --git a/qt/widgets/mplcpp/test/MantidColormapTest.h b/qt/widgets/mplcpp/test/MantidColormapTest.h
index 7ab4d02b2c7..de56fbba375 100644
--- a/qt/widgets/mplcpp/test/MantidColormapTest.h
+++ b/qt/widgets/mplcpp/test/MantidColormapTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDCOLORMAPTEST_H
-#define MANTIDCOLORMAPTEST_H
+#pragma once
 
 #include "MantidQtWidgets/MplCpp/MantidColorMap.h"
 
@@ -32,5 +31,3 @@ public:
                      const PythonException &);
   }
 };
-
-#endif // MANTIDCOLORMAPTEST_H
diff --git a/qt/widgets/mplcpp/test/MplCppTestInitialization.h b/qt/widgets/mplcpp/test/MplCppTestInitialization.h
index 29c7d16ddb0..b35f4d9f141 100644
--- a/qt/widgets/mplcpp/test/MplCppTestInitialization.h
+++ b/qt/widgets/mplcpp/test/MplCppTestInitialization.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPPTESTGLOBALINITIALIZATION_H
-#define MPLCPPTESTGLOBALINITIALIZATION_H
+#pragma once
 
 #include "MantidPythonInterface/core/Testing/PythonInterpreterGlobalFixture.h"
 #include "MantidQtWidgets/Common/Testing/QApplicationGlobalFixture.h"
@@ -18,5 +17,3 @@
 //------------------------------------------------------------------------------
 static PythonInterpreterGlobalFixture PYTHON_INTERPRETER;
 static QApplicationGlobalFixture MAIN_QAPPLICATION;
-
-#endif // MPLCPPTESTGLOBALINITIALIZATION_H
diff --git a/qt/widgets/mplcpp/test/PanZoomToolTest.h b/qt/widgets/mplcpp/test/PanZoomToolTest.h
index b3431837cca..8d45683590b 100644
--- a/qt/widgets/mplcpp/test/PanZoomToolTest.h
+++ b/qt/widgets/mplcpp/test/PanZoomToolTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_PANPanpanZoomToolTest_H
-#define MPLCPP_PANPanpanZoomToolTest_H
+#pragma once
 
 #include "MantidQtWidgets/MplCpp/FigureCanvasQt.h"
 #include "MantidQtWidgets/MplCpp/PanZoomTool.h"
@@ -105,5 +104,3 @@ private:
     }
   }
 };
-
-#endif // MPLCPP_PanpanZoomToolTest_H
diff --git a/qt/widgets/mplcpp/test/PlotTest.h b/qt/widgets/mplcpp/test/PlotTest.h
index d09c6c6cf69..2387c91fd02 100644
--- a/qt/widgets/mplcpp/test/PlotTest.h
+++ b/qt/widgets/mplcpp/test/PlotTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_PLOTTEST_H
-#define MPLCPP_PLOTTEST_H
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -167,5 +166,3 @@ private:
 
   constexpr static auto m_testws_name = "ws";
 };
-
-#endif // MPLCPP_PLOTTEST_H
diff --git a/qt/widgets/mplcpp/test/QBackendExtractTest.h b/qt/widgets/mplcpp/test/QBackendExtractTest.h
index 3e2944a5388..3a89d6f6edf 100644
--- a/qt/widgets/mplcpp/test/QBackendExtractTest.h
+++ b/qt/widgets/mplcpp/test/QBackendExtractTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_QBACKENDEXTRACTTEST_H
-#define MPLCPP_QBACKENDEXTRACTTEST_H
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -45,5 +44,3 @@ public:
                      const std::runtime_error &);
   }
 };
-
-#endif // MPLCPP_QBACKENDEXTRACTTEST_H
diff --git a/qt/widgets/mplcpp/test/ScalarMappableTest.h b/qt/widgets/mplcpp/test/ScalarMappableTest.h
index 0a177a84349..69caae638aa 100644
--- a/qt/widgets/mplcpp/test/ScalarMappableTest.h
+++ b/qt/widgets/mplcpp/test/ScalarMappableTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MPLCPP_SCALARMAPPABLETEST_H
-#define MPLCPP_SCALARMAPPABLETEST_H
+#pragma once
 
 #include "MantidQtWidgets/MplCpp/Colormap.h"
 #include "MantidQtWidgets/MplCpp/Colors.h"
@@ -146,5 +145,3 @@ public:
     TS_ASSERT_EQUALS(static_cast<int>(alpha * 255), qAlpha(rgba[1]));
   }
 };
-
-#endif // MPLCPP_SCALARMAPPABLETEST_H
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/AxisID.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/AxisID.h
index 834bc001dfe..219ae6a217c 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/AxisID.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/AxisID.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_PLOTTING_AXIS_H_
-#define MANTIDQT_PLOTTING_AXIS_H_
+#pragma once
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -25,5 +24,3 @@ inline constexpr int toQwtAxis(const AxisID id) { return static_cast<int>(id); }
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQT_PLOTTING_AXIS_H_
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/ContourPreviewPlot.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/ContourPreviewPlot.h
index 9c4bcb3c767..9426eaf4cc7 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/ContourPreviewPlot.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/ContourPreviewPlot.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_CONTOURPREVIEWPLOT_H_
-#define MANTIDQTMANTIDWIDGETS_CONTOURPREVIEWPLOT_H_
+#pragma once
 
 #include <QtGlobal>
 
@@ -14,5 +13,3 @@
 #else
 #include "MantidQtWidgets/Plotting/Mpl/ContourPreviewPlot.h"
 #endif
-
-#endif // MANTIDQTMANTIDWIDGETS_CONTOURPREVIEWPLOT_H_
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/DllOption.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/DllOption.h
index 43e4f07d851..85dc7ac45ea 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/DllOption.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/DllOption.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_PLOTTING_DLLOPTION_H_
-#define MANTIDQT_PLOTTING_DLLOPTION_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 
@@ -16,5 +15,3 @@
 #define EXPORT_OPT_MANTIDQT_PLOTTING DLLImport
 #define EXTERN_MANTIDQT_PLOTTING extern
 #endif /* IN_MANTIDQT_PLOTTING */
-
-#endif // MANTIDQT_PLOTTING_DLLOPTION_H_
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Mpl/ContourPreviewPlot.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Mpl/ContourPreviewPlot.h
index 82813fe6346..7454b4019ac 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Mpl/ContourPreviewPlot.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Mpl/ContourPreviewPlot.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_PLOTTING_MPL_CONTOURPREVIEWPLOT_H_
-#define MANTIDQT_PLOTTING_MPL_CONTOURPREVIEWPLOT_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/MatrixWorkspace.h"
@@ -65,5 +64,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTIDQT_PLOTTING_MPL_CONTOURPREVIEWPLOT_H_ */
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Mpl/PeakPicker.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Mpl/PeakPicker.h
index 59f25db840f..55843032813 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Mpl/PeakPicker.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Mpl/PeakPicker.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_PLOTTING_MPL_PEAKPICKER_H_
-#define MANTIDQT_PLOTTING_MPL_PEAKPICKER_H_
+#pragma once
 
 #include "MantidAPI/IPeakFunction.h"
 #include "MantidQtWidgets/MplCpp/PeakMarker.h"
@@ -55,5 +54,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQT_PLOTTING_MPL_PEAKPICKER_H_
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Mpl/PreviewPlot.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Mpl/PreviewPlot.h
index bb7a82ca2ff..c8f57203d1e 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Mpl/PreviewPlot.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Mpl/PreviewPlot.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_PLOTTING_MPL_PREVIEWPLOT_H_
-#define MANTIDQT_PLOTTING_MPL_PREVIEWPLOT_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
@@ -175,5 +174,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQT_PLOTTING_MPL_PREVIEWPLOT_H_
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Mpl/RangeSelector.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Mpl/RangeSelector.h
index ff1634af345..81a841f7f24 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Mpl/RangeSelector.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Mpl/RangeSelector.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_PLOTTING_MPL_RANGESELECTOR_H_
-#define MANTIDQT_PLOTTING_MPL_RANGESELECTOR_H_
+#pragma once
 
 #include "MantidQtWidgets/MplCpp/RangeMarker.h"
 #include "MantidQtWidgets/Plotting/DllOption.h"
@@ -76,5 +75,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQT_PLOTTING_MPL_RANGESELECTOR_H_
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Mpl/SingleSelector.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Mpl/SingleSelector.h
index d01e9c3b106..c34af9659b2 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Mpl/SingleSelector.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Mpl/SingleSelector.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_PLOTTING_MPL_SINGLESELECTOR_H_
-#define MANTIDQT_PLOTTING_MPL_SINGLESELECTOR_H_
+#pragma once
 
 #include "MantidQtWidgets/MplCpp/SingleMarker.h"
 #include "MantidQtWidgets/Plotting/DllOption.h"
@@ -73,5 +72,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQT_PLOTTING_MPL_SINGLESELECTOR_H_
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/PeakPicker.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/PeakPicker.h
index b7a138fb386..eb2bc6d725b 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/PeakPicker.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/PeakPicker.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGET_PEAKPICKER_H
-#define MANTIDQT_MANTIDWIDGET_PEAKPICKER_H
+#pragma once
 
 #include <QtGlobal>
 
@@ -14,5 +13,3 @@
 #else
 #include "MantidQtWidgets/Plotting/Mpl/PeakPicker.h"
 #endif
-
-#endif // MANTIDQT_MANTIDWIDGET_PEAKPICKER_H
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/PreviewPlot.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/PreviewPlot.h
index 940ce0ab36b..ccba687a296 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/PreviewPlot.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/PreviewPlot.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_PREVIEWPLOT_H_
-#define MANTIDQTMANTIDWIDGETS_PREVIEWPLOT_H_
+#pragma once
 
 #include <QtGlobal>
 
@@ -14,5 +13,3 @@
 #else
 #include "MantidQtWidgets/Plotting/Mpl/PreviewPlot.h"
 #endif
-
-#endif // MANTIDQTMANTIDWIDGETS_PREVIEWPLOT_H_
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/ColorBarWidget.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/ColorBarWidget.h
index e5e7da1e227..4c53f05d6f2 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/ColorBarWidget.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/ColorBarWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_COLORBARWIDGET_H_
-#define MANTID_MANTIDWIDGETS_COLORBARWIDGET_H_
+#pragma once
 
 #include "MantidQtWidgets/Plotting/DllOption.h"
 #include "MantidQtWidgets/Plotting/Qwt/MantidColorMap.h"
@@ -154,5 +153,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTID_MANTIDWIDGETS_COLORBARWIDGET_H_
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/ContourPreviewPlot.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/ContourPreviewPlot.h
index 75ebdf22467..94509866de6 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/ContourPreviewPlot.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/ContourPreviewPlot.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_CONTOURPREVIEWPLOT_H_
-#define MANTID_MANTIDWIDGETS_CONTOURPREVIEWPLOT_H_
+#pragma once
 
 #include "ui_ContourPreviewPlot.h"
 
@@ -110,5 +109,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTID_MANTIDWIDGETS_CONTOURPREVIEWPLOT_H_ */
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/DisplayCurveFit.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/DisplayCurveFit.h
index a36dd4000e2..03805e94261 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/DisplayCurveFit.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/DisplayCurveFit.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_DISPLAYCURVEFIT_H_
-#define MANTID_MANTIDWIDGETS_DISPLAYCURVEFIT_H_
+#pragma once
 
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidQtWidgets/Common/MantidWidget.h"
@@ -88,5 +87,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTID_MANTIDWIDGETS_DISPLAYCURVEFIT_H_
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/DraggableColorBarWidget.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/DraggableColorBarWidget.h
index f5d99aeb904..0071f971434 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/DraggableColorBarWidget.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/DraggableColorBarWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DRAGGABLECOLORBARWIDGET_H_
-#define DRAGGABLECOLORBARWIDGET_H_
+#pragma once
 
 #include "MantidQtWidgets/Plotting/DllOption.h"
 #include <QFrame>
@@ -84,5 +83,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // DRAGGABLECOLORBARWIDGET_H_
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/ErrorCurve.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/ErrorCurve.h
index 737b50215a2..1964833cb80 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/ErrorCurve.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/ErrorCurve.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDWIDGETS_ERRORCURVE_H
-#define MANTIDWIDGETS_ERRORCURVE_H
+#pragma once
 
 #include "MantidQtWidgets/Plotting/DllOption.h"
 #include <qwt_plot_curve.h>
@@ -38,5 +37,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTIDWIDGETS_ERRORCURVE_H */
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/MWView.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/MWView.h
index 84ba598336c..dcefd8aec6a 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/MWView.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/MWView.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_MWVIEW_H_
-#define MANTID_MANTIDWIDGETS_MWVIEW_H_
+#pragma once
 
 // includes for interface development
 #include "MantidQtWidgets/Common/MdSettings.h"
@@ -108,5 +107,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTID_MANTIDWIDGETS_MWVIEW_H_ */
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/MantidColorMap.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/MantidColorMap.h
index f5390632702..a6c58e99fe5 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/MantidColorMap.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/MantidColorMap.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDCOLORMAP_H_
-#define MANTIDCOLORMAP_H_
+#pragma once
 
 //---------------------------------------------
 // Includes
@@ -120,5 +119,3 @@ private:
 
   double m_nth_power;
 };
-
-#endif // MANTIDCOLORMAP_H_
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/MantidQwtIMDWorkspaceData.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/MantidQwtIMDWorkspaceData.h
index da531a52ea2..2399278fbbc 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/MantidQwtIMDWorkspaceData.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/MantidQwtIMDWorkspaceData.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTAPI_MANTIDQWTIMDWORKSPACEDATA_H
-#define MANTIDQTAPI_MANTIDQWTIMDWORKSPACEDATA_H
+#pragma once
 
 #include "MantidAPI/IMDWorkspace.h"
 #include "MantidKernel/VMD.h"
@@ -115,5 +114,4 @@ private:
   /// This will correspond to -1 (distance)
   /// or the index into the original workspace dimensions
   int m_currentPlotAxis;
-};
-#endif
+};
\ No newline at end of file
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/MantidQwtWorkspaceData.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/MantidQwtWorkspaceData.h
index 19e6c8c61e0..d37bb8b9f18 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/MantidQwtWorkspaceData.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/MantidQwtWorkspaceData.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTAPI_MANTIDQWTWORKSPACEDATA_H
-#define MANTIDQTAPI_MANTIDQWTWORKSPACEDATA_H
+#pragma once
 
 #include "MantidQtWidgets/Plotting/DllOption.h"
 #include "qwt_data.h"
@@ -95,5 +94,3 @@ public:
   virtual MantidQwtMatrixWorkspaceData *
   copyWithNewSource(const Mantid::API::MatrixWorkspace &workspace) const = 0;
 };
-
-#endif
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/PeakPicker.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/PeakPicker.h
index abef919ee42..41d32daa9ec 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/PeakPicker.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/PeakPicker.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGETS_PEAKPICKER_H_
-#define MANTIDQT_MANTIDWIDGETS_PEAKPICKER_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 
@@ -77,5 +76,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTIDQT_MANTIDWIDGETS_PEAKPICKER_H_ */
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/PowerScaleEngine.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/PowerScaleEngine.h
index 52eaf4538b4..b38e5def03a 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/PowerScaleEngine.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/PowerScaleEngine.h
@@ -27,8 +27,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef POWER_SCALE_ENGINE_H
-#define POWER_SCALE_ENGINE_H
+#pragma once
 
 #include "MantidQtWidgets/Plotting/DllOption.h"
 #include "ScaleEngine.h"
@@ -84,5 +83,3 @@ private:
   QwtValueList buildMajorTicks(const QwtDoubleInterval &interval,
                                double stepSize) const;
 };
-
-#endif
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/PreviewPlot.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/PreviewPlot.h
index b32259ce1e0..e34637ed0fd 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/PreviewPlot.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/PreviewPlot.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTMANTIDWIDGETS_QWT_PREVIEWPLOT_H_
-#define MANTIDQTMANTIDWIDGETS_QWT_PREVIEWPLOT_H_
+#pragma once
 
 #include "ui_PreviewPlot.h"
 
@@ -227,5 +226,3 @@ private:
 };
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif // MANTIDQTMANTIDWIDGETS_QWT_PREVIEWPLOT_H_
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/QwtHelper.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/QwtHelper.h
index 02ba028bc83..c82af9b02df 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/QwtHelper.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/QwtHelper.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_API_QWTHELPER_H_
-#define MANTID_API_QWTHELPER_H_
+#pragma once
 
 #include "MantidAPI/IFunction.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
@@ -46,5 +45,3 @@ EXPORT_OPT_MANTIDQT_PLOTTING boost::shared_ptr<QwtData> emptyCurveData();
 } // namespace QwtHelper
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTID_API_QWTHELPER_H_ */
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/QwtRasterDataMD.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/QwtRasterDataMD.h
index 9de029cd60e..a31059b3a78 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/QwtRasterDataMD.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/QwtRasterDataMD.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef QwtRasterDataMD_H_
-#define QwtRasterDataMD_H_
+#pragma once
 
 #include "MantidAPI/IMDWorkspace.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
@@ -124,5 +123,3 @@ protected:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* QwtRasterDataMD_H_ */
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/QwtRasterDataMDNonOrthogonal.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/QwtRasterDataMDNonOrthogonal.h
index be278292905..175c9dc8893 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/QwtRasterDataMDNonOrthogonal.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/QwtRasterDataMDNonOrthogonal.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef QwtRasterDataMDNonOrthogonal_H_
-#define QwtRasterDataMDNonOrthogonal_H_
+#pragma once
 
 #include "MantidAPI/IMDWorkspace.h"
 #include "MantidKernel/Matrix.h"
@@ -41,5 +40,3 @@ protected:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* QwtRasterDataMDNonOrthogonal_H_ */
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/QwtWorkspaceBinData.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/QwtWorkspaceBinData.h
index d8e39c4af4d..3245b7f585b 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/QwtWorkspaceBinData.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/QwtWorkspaceBinData.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTAPI_QWTWORKSPACEBINDATA_H
-#define MANTIDQTAPI_QWTWORKSPACEBINDATA_H
+#pragma once
 
 #include "MantidAPI/MatrixWorkspace_fwd.h"
 #include "MantidKernel/cow_ptr.h"
@@ -79,5 +78,4 @@ private:
   QString m_xTitle;
   /// A title for the Y axis
   QString m_yTitle;
-};
-#endif
+};
\ No newline at end of file
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/QwtWorkspaceSpectrumData.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/QwtWorkspaceSpectrumData.h
index 139e92f6e56..285698743b9 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/QwtWorkspaceSpectrumData.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/QwtWorkspaceSpectrumData.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTAPI_QWTWORKSPACESPECTRUMDATA_H
-#define MANTIDQTAPI_QWTWORKSPACESPECTRUMDATA_H
+#pragma once
 
 #include "MantidAPI/MatrixWorkspace_fwd.h"
 #include "MantidKernel/cow_ptr.h"
@@ -115,5 +114,4 @@ private:
 
   ///// y-axis offset for waterfall plots
   // double m_offsetY;
-};
-#endif
+};
\ No newline at end of file
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/RangeSelector.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/RangeSelector.h
index d6568c9e90c..77f8601eeae 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/RangeSelector.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/RangeSelector.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGET_POSHPLOTTING_H
-#define MANTIDQT_MANTIDWIDGET_POSHPLOTTING_H
+#pragma once
 
 #include "MantidQtWidgets/Plotting/DllOption.h"
 
@@ -113,5 +112,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/SafeQwtPlot.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/SafeQwtPlot.h
index d68c5e69b21..5bed1c3a385 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/SafeQwtPlot.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/SafeQwtPlot.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_SAFEQWTPLOT_H_
-#define MANTID_MANTIDWIDGETS_SAFEQWTPLOT_H_
+#pragma once
 
 #include "MantidAPI/Workspace_fwd.h"
 #include "MantidKernel/WarningSuppressions.h"
@@ -50,5 +49,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTID_MANTIDWIDGETS_SAFEQWTPLOT_H_ */
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/ScaleEngine.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/ScaleEngine.h
index c17d78b257b..8a666705028 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/ScaleEngine.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/ScaleEngine.h
@@ -27,8 +27,7 @@
  *   Boston, MA  02110-1301  USA                                           *
  *                                                                         *
  ***************************************************************************/
-#ifndef SCALE_ENGINE_H
-#define SCALE_ENGINE_H
+#pragma once
 
 #include "MantidQtWidgets/Plotting/DllOption.h"
 #include <float.h>
@@ -131,5 +130,3 @@ private:
   //! Nth Power for a power scale
   double d_nth_power;
 };
-
-#endif
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/SignalRange.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/SignalRange.h
index 50b9954bf5c..6b36b3c3cb7 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/SignalRange.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/SignalRange.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_SIGNALRANGE_H_
-#define MANTIDQT_API_SIGNALRANGE_H_
+#pragma once
 
 #include "MantidAPI/IMDWorkspace.h"
 #include "MantidQtWidgets/Plotting/DllOption.h"
@@ -52,5 +51,3 @@ private:
 
 } // namespace API
 } // namespace MantidQt
-
-#endif /* MANTIDQT_API_SIGNALRANGE_H_ */
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/SingleSelector.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/SingleSelector.h
index a53e1ca9e44..c370de23623 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/SingleSelector.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/SingleSelector.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGET_QWT_SINGLESELECTOR_H
-#define MANTIDQT_MANTIDWIDGET_QWT_SINGLESELECTOR_H
+#pragma once
 
 #include "MantidQtWidgets/Plotting/DllOption.h"
 
@@ -91,5 +90,3 @@ private:
 
 } // namespace MantidWidgets
 } // namespace MantidQt
-
-#endif /* MANTIDQT_MANTIDWIDGET_QWT_SINGLESELECTOR_H */
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/qwt_compat.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/qwt_compat.h
index 224066a8990..a899c2461de 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/qwt_compat.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/Qwt/qwt_compat.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_QWT_COMPAT
-#define MANTID_QWT_COMPAT
+#pragma once
 
 #include <qwt_global.h>
 
@@ -23,5 +22,3 @@
 #define lowerMargin() loMargin()
 #define upperMargin() hiMargin()
 #endif /* QWT_VERSION >= 0x050200 */
-
-#endif /* MANTID_QWT_COMPAT */
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/RangeSelector.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/RangeSelector.h
index 01a2a40ce76..c5dba623ac3 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/RangeSelector.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/RangeSelector.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGET_RANGESELECTOR_H
-#define MANTIDQT_MANTIDWIDGET_RANGESELECTOR_H
+#pragma once
 
 #include <QtGlobal>
 
@@ -14,5 +13,3 @@
 #else
 #include "MantidQtWidgets/Plotting/Mpl/RangeSelector.h"
 #endif
-
-#endif // MANTIDQT_MANTIDWIDGET_RANGESELECTOR_H
diff --git a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/SingleSelector.h b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/SingleSelector.h
index 920f47e2cd5..93195ffa700 100644
--- a/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/SingleSelector.h
+++ b/qt/widgets/plotting/inc/MantidQtWidgets/Plotting/SingleSelector.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDWIDGET_SINGLESELECTOR_H
-#define MANTIDQT_MANTIDWIDGET_SINGLESELECTOR_H
+#pragma once
 
 #include <QtGlobal>
 
@@ -14,5 +13,3 @@
 #else
 #include "MantidQtWidgets/Plotting/Mpl/SingleSelector.h"
 #endif
-
-#endif // MANTIDQT_MANTIDWIDGET_SINGLESELECTOR_H
diff --git a/qt/widgets/plotting/test/ContourPreviewPlotTest.h b/qt/widgets/plotting/test/ContourPreviewPlotTest.h
index dcd84d09ad6..87a8dc58819 100644
--- a/qt/widgets/plotting/test/ContourPreviewPlotTest.h
+++ b/qt/widgets/plotting/test/ContourPreviewPlotTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_MANTIDCONTOURPREVIEWPLOTTEST_H_
-#define MANTIDQT_API_MANTIDCONTOURPREVIEWPLOTTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -68,5 +67,3 @@ public:
 private:
   std::unique_ptr<ContourPreviewPlot> m_contourPlot;
 };
-
-#endif /* MANTIDQT_API_MANTIDCONTOURPREVIEWPLOTTEST_H_ */
diff --git a/qt/widgets/plotting/test/MantidColorMapTest.h b/qt/widgets/plotting/test/MantidColorMapTest.h
index ff874db975b..e719d761b88 100644
--- a/qt/widgets/plotting/test/MantidColorMapTest.h
+++ b/qt/widgets/plotting/test/MantidColorMapTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_MANTIDCOLORMAPTEST_H_
-#define MANTIDQT_API_MANTIDCOLORMAPTEST_H_
+#pragma once
 
 #include "MantidQtWidgets/Plotting/Qwt/MantidColorMap.h"
 #include <QRgb>
@@ -72,5 +71,3 @@ public:
                       map.colorIndex(range, +123.0), 255);
   }
 };
-
-#endif /* MANTIDQT_API_MANTIDCOLORMAPTEST_H_ */
diff --git a/qt/widgets/plotting/test/PlottingTestInitialization.h b/qt/widgets/plotting/test/PlottingTestInitialization.h
index 5535e8570fe..9573415f857 100644
--- a/qt/widgets/plotting/test/PlottingTestInitialization.h
+++ b/qt/widgets/plotting/test/PlottingTestInitialization.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef PLOTTINGTESTINITIALIZATION_H
-#define PLOTTINGTESTINITIALIZATION_H
+#pragma once
 #include "MantidQtWidgets/Common/Testing/QApplicationGlobalFixture.h"
 
 //------------------------------------------------------------------------------
@@ -15,5 +14,3 @@
 // statements do not cause multiple-definition errors.
 //------------------------------------------------------------------------------
 static QApplicationGlobalFixture MAIN_QAPPLICATION;
-
-#endif // PLOTTINGTESTINITIALIZATION_H
diff --git a/qt/widgets/plotting/test/QwtWorkspaceBinDataTest.h b/qt/widgets/plotting/test/QwtWorkspaceBinDataTest.h
index dfca24df44d..066383acdcf 100644
--- a/qt/widgets/plotting/test/QwtWorkspaceBinDataTest.h
+++ b/qt/widgets/plotting/test/QwtWorkspaceBinDataTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_MANTIDQWTWORKSPACEBINDATA_H_
-#define MANTIDQT_API_MANTIDQWTWORKSPACEBINDATA_H_
+#pragma once
 
 #include "MantidQtWidgets/Plotting/Qwt/QwtWorkspaceBinData.h"
 #include <cxxtest/TestSuite.h>
@@ -73,5 +72,3 @@ public:
     TS_ASSERT_DELTA(data.e(2), 0.0, 1e-6);
   }
 };
-
-#endif /* MANTIDQT_API_MANTIDQWTWORKSPACEBINDATA_H_ */
diff --git a/qt/widgets/plotting/test/QwtWorkspaceSpectrumDataTest.h b/qt/widgets/plotting/test/QwtWorkspaceSpectrumDataTest.h
index 15d5f2fe248..684f9680f0f 100644
--- a/qt/widgets/plotting/test/QwtWorkspaceSpectrumDataTest.h
+++ b/qt/widgets/plotting/test/QwtWorkspaceSpectrumDataTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_MANTIDQWTWORKSPACESPECTRUMDATA_H_
-#define MANTIDQT_API_MANTIDQWTWORKSPACESPECTRUMDATA_H_
+#pragma once
 
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidQtWidgets/Plotting/Qwt/QwtWorkspaceSpectrumData.h"
@@ -74,5 +73,3 @@ public:
     TS_ASSERT_DELTA(data.e(2), 0.0, 1e-6);
   }
 };
-
-#endif /* MANTIDQT_API_MANTIDQWTWORKSPACESPECTRUMDATA_H_ */
diff --git a/qt/widgets/plotting/test/SignalRangeTest.h b/qt/widgets/plotting/test/SignalRangeTest.h
index 4365b10d788..ed8bc2870b0 100644
--- a/qt/widgets/plotting/test/SignalRangeTest.h
+++ b/qt/widgets/plotting/test/SignalRangeTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_API_SIGNALRANGETEST_H_
-#define MANTIDQT_API_SIGNALRANGETEST_H_
+#pragma once
 
 #include "MantidAPI/IMDWorkspace.h"
 #include "MantidGeometry/MDGeometry/MDImplicitFunction.h"
@@ -224,5 +223,3 @@ public:
     TS_ASSERT_DELTA(5.0, range.maxValue(), 1e-10);
   }
 };
-
-#endif /* MANTIDQT_API_SIGNALRANGETEST */
diff --git a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CatalogPublishDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CatalogPublishDialog.h
index 4e80ae6c2f8..a427aeef5cc 100644
--- a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CatalogPublishDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CatalogPublishDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_CUSTOM_DIALOGS_CATALOGPUBLISHDIALOG_H
-#define MANTIDQT_CUSTOM_DIALOGS_CATALOGPUBLISHDIALOG_H
+#pragma once
 
 #include "MantidQtWidgets/Common/AlgorithmDialog.h"
 #include "ui_CatalogPublishDialog.h"
@@ -52,5 +51,3 @@ protected:
 };
 } // namespace CustomDialogs
 } // namespace MantidQt
-
-#endif /* MANTIDQT_CUSTOM_DIALOGS_CATALOGPUBLISHDIALOG_H */
diff --git a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/ConvertTableToMatrixWorkspaceDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/ConvertTableToMatrixWorkspaceDialog.h
index 0d35ec8119c..4d04394163a 100644
--- a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/ConvertTableToMatrixWorkspaceDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/ConvertTableToMatrixWorkspaceDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_CUSTOM_DIALOGS_CONVERTTABLETOMATRIXWORKSPACEDIALOG_H
-#define MANTIDQT_CUSTOM_DIALOGS_CONVERTTABLETOMATRIXWORKSPACEDIALOG_H
+#pragma once
 
 //------------------------------------------------------------------------------
 // Includes
@@ -56,5 +55,3 @@ private:
 };
 } // namespace CustomDialogs
 } // namespace MantidQt
-
-#endif // MANTIDQT_CUSTOM_DIALOGS_CONVERTTABLETOMATRIXWORKSPACEDIALOG_H
diff --git a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/FitDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/FitDialog.h
index 17cc4ea440b..f8e067cc89e 100644
--- a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/FitDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/FitDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_CUSTOM_DIALOGS_FITDIALOG_H
-#define MANTIDQT_CUSTOM_DIALOGS_FITDIALOG_H
+#pragma once
 
 //------------------------------------------------------------------------------
 // Includes
@@ -206,5 +205,3 @@ protected:
 };
 } // namespace CustomDialogs
 } // namespace MantidQt
-
-#endif // MANTIDQT_CUSTOM_DIALOGS_FITDIALOG_H
diff --git a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LOQScriptInputDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LOQScriptInputDialog.h
index 9ba16b8309b..f5abc8a928b 100644
--- a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LOQScriptInputDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LOQScriptInputDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_CUSTOMDIALOGS_LOQSCRIPTINPUTDIALOG_H_
-#define MANTIDQT_CUSTOMDIALOGS_LOQSCRIPTINPUTDIALOG_H_
+#pragma once
 
 //---------------------------
 // Includes
@@ -47,5 +46,3 @@ private:
 };
 } // namespace CustomDialogs
 } // namespace MantidQt
-
-#endif // MANTIDQT_CUSTOMDIALOGS_LOQSCRIPTINPUTDIALOG_H_
diff --git a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDAEDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDAEDialog.h
index b219fc8fd98..1d75d6f5e76 100644
--- a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDAEDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDAEDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_CUSTOM_DIALOGSLOADDAEDIALOG_H
-#define MANTIDQT_CUSTOM_DIALOGSLOADDAEDIALOG_H
+#pragma once
 
 //----------------------
 // Includes
@@ -55,5 +54,3 @@ private:
 };
 } // namespace CustomDialogs
 } // namespace MantidQt
-
-#endif /* MANTIDQT_CUSTOM_DIALOGSLOADDAEDIALOG_H */
diff --git a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDialog.h
index 981c08091b4..120e245bf3d 100644
--- a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_CUSTOM_DIALOGS_LOADDIALOG_H
-#define MANTIDQT_CUSTOM_DIALOGS_LOADDIALOG_H
+#pragma once
 
 //------------------------------------------------------------------------------
 // Includes
@@ -99,5 +98,3 @@ private:
 };
 } // namespace CustomDialogs
 } // namespace MantidQt
-
-#endif // MANTIDQT_CUSTOM_DIALOGS_LOADDIALOG_H
diff --git a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadRawDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadRawDialog.h
index 45aeebf801d..114c8716fd7 100644
--- a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadRawDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadRawDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_CUSTOM_DIALOGSLOADRAWDIALOG_H
-#define MANTIDQT_CUSTOM_DIALOGSLOADRAWDIALOG_H
+#pragma once
 
 //----------------------
 // Includes
@@ -59,5 +58,3 @@ private:
 };
 } // namespace CustomDialogs
 } // namespace MantidQt
-
-#endif // MANTIDQT_CUSTOMDIALOGS_LOADRAWDIALOG_H
diff --git a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/MantidGLWidget.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/MantidGLWidget.h
index 760eb696004..8d101ef29c0 100644
--- a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/MantidGLWidget.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/MantidGLWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_CUSTOMDIALOGS_MANTIDGLWIDGET_H_
-#define MANTIDQT_CUSTOMDIALOGS_MANTIDGLWIDGET_H_
+#pragma once
 
 //-----------------------------------------
 // Includes
@@ -87,5 +86,3 @@ private:
 };
 } // namespace CustomDialogs
 } // namespace MantidQt
-
-#endif // MANTIDQT_CUSTOMDIALOGS_MANTIDGLWIDGET_H_
diff --git a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PeriodicTableWidget.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PeriodicTableWidget.h
index e59a2ff2212..f4a45032653 100644
--- a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PeriodicTableWidget.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PeriodicTableWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_MANTIDWIDGETS_PERIODICTABLEWIDGET_H_
-#define MANTID_MANTIDWIDGETS_PERIODICTABLEWIDGET_H_
+#pragma once
 
 #include "MantidQtWidgets/Common/DllOption.h"
 #include "ui_PeriodicTableWidget.h"
@@ -98,5 +97,3 @@ private:
   /// Colour all of the elements by calls to individual group colouring methods
   void ColourElements();
 };
-
-#endif // !MANTID_MANTIDWIDGETS_PERIODICTABLE_H_
diff --git a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PlotAsymmetryByLogValueDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PlotAsymmetryByLogValueDialog.h
index 2bf72204655..24214b9259b 100644
--- a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PlotAsymmetryByLogValueDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PlotAsymmetryByLogValueDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_CUSTOM_DIALOGSLPLOTASYMMETRYBYLOGVALUEDIALOG_H
-#define MANTIDQT_CUSTOM_DIALOGSLPLOTASYMMETRYBYLOGVALUEDIALOG_H
+#pragma once
 
 //----------------------
 // Includes
@@ -70,5 +69,3 @@ private:
 };
 } // namespace CustomDialogs
 } // namespace MantidQt
-
-#endif // MANTIDQT_CUSTOM_DIALOGSLPLOTASYMMETRYBYLOGVALUEDIALOG_H
diff --git a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PrecompiledHeader.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PrecompiledHeader.h
index 0c414a78f6b..615c906d96f 100644
--- a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PrecompiledHeader.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PrecompiledHeader.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_CUSTOMDIALOGS_PRECOMPILEDHEADER_H_
-#define MANTIDQT_CUSTOMDIALOGS_PRECOMPILEDHEADER_H_
+#pragma once
 
 // Mantid
 #include "MantidAPI/Algorithm.h"
@@ -22,5 +21,3 @@
 #include <set>
 #include <string>
 #include <vector>
-
-#endif // MANTIDQT_CUSTOMDIALOGS_PRECOMPILEDHEADER_H_
\ No newline at end of file
diff --git a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SampleShapeHelpers.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SampleShapeHelpers.h
index 84ee29646bb..63cef82cd39 100644
--- a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SampleShapeHelpers.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SampleShapeHelpers.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_CUSTOMDIALOGS_SAMPLESHAPEHELPERS_H_
-#define MANTIDQT_CUSTOMDIALOGS_SAMPLESHAPEHELPERS_H_
+#pragma once
 
 //--------------------------------------
 // Includes
@@ -436,5 +435,3 @@ private:
 // };
 } // namespace CustomDialogs
 } // namespace MantidQt
-
-#endif // MANTIDQT_CUSTOMDIALOGS_SAMPLESHAPEHELPERS_H_
diff --git a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SmoothNeighboursDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SmoothNeighboursDialog.h
index e820baf78c1..6daa898af89 100644
--- a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SmoothNeighboursDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SmoothNeighboursDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SMOOTH_NEIGHBOURS_DIALOG_H_
-#define SMOOTH_NEIGHBOURS_DIALOG_H_
+#pragma once
 
 #include "MantidQtWidgets/Common/AlgorithmDialog.h"
 #include "MantidQtWidgets/Common/AlgorithmPropertiesWidget.h"
@@ -42,5 +41,3 @@ private:
   /// Main layout for the dialog
   QVBoxLayout *m_dialogLayout;
 };
-
-#endif
diff --git a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SortTableWorkspaceDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SortTableWorkspaceDialog.h
index 233aa83493b..1d3490dd44c 100644
--- a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SortTableWorkspaceDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SortTableWorkspaceDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_CUSTOM_DIALOGS_SORTTABLEWORKSPACEDIALOG_H
-#define MANTIDQT_CUSTOM_DIALOGS_SORTTABLEWORKSPACEDIALOG_H
+#pragma once
 
 //------------------------------------------------------------------------------
 // Includes
@@ -61,5 +60,3 @@ private:
 
 } // namespace CustomDialogs
 } // namespace MantidQt
-
-#endif // MANTIDQT_CUSTOM_DIALOGS_SORTTABLEWORKSPACEDIALOG_H
diff --git a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/StartLiveDataDialog.h b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/StartLiveDataDialog.h
index 2f9e3b69cf1..362c4055f9a 100644
--- a/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/StartLiveDataDialog.h
+++ b/qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/StartLiveDataDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQTCUSTOMDIALOGS_STARTLIVEDATADIALOG_H_
-#define MANTIDQTCUSTOMDIALOGS_STARTLIVEDATADIALOG_H_
+#pragma once
 
 //----------------------
 // Includes
@@ -77,5 +76,3 @@ private:
 };
 } // namespace CustomDialogs
 } // namespace MantidQt
-
-#endif // MANTIDQTCUSTOMDIALOGS_STARTLIVEDATADIALOG_H_
diff --git a/qt/widgets/plugins/designer/inc/MantidQtWidgets/Plugins/Designer/DesignerPlugin.h b/qt/widgets/plugins/designer/inc/MantidQtWidgets/Plugins/Designer/DesignerPlugin.h
index 66ae70ef2ba..c210ae8e812 100644
--- a/qt/widgets/plugins/designer/inc/MantidQtWidgets/Plugins/Designer/DesignerPlugin.h
+++ b/qt/widgets/plugins/designer/inc/MantidQtWidgets/Plugins/Designer/DesignerPlugin.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DesignerPlugin_H
-#define DesignerPlugin_H
+#pragma once
 
 #include <QDesignerCustomWidgetInterface>
 
@@ -57,5 +56,3 @@ private:
   /// Are we initialized?
   bool m_initialized;
 };
-
-#endif
diff --git a/qt/widgets/plugins/designer/inc/MantidQtWidgets/Plugins/Designer/PluginCollectionInterface.h b/qt/widgets/plugins/designer/inc/MantidQtWidgets/Plugins/Designer/PluginCollectionInterface.h
index d441d67b124..d919d6656ee 100644
--- a/qt/widgets/plugins/designer/inc/MantidQtWidgets/Plugins/Designer/PluginCollectionInterface.h
+++ b/qt/widgets/plugins/designer/inc/MantidQtWidgets/Plugins/Designer/PluginCollectionInterface.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef PLUGINCOLLECTIONINTERFACE_H_
-#define PLUGINCOLLECTIONINTERFACE_H_
+#pragma once
 
 #include "MantidQtWidgets/Common/AlgorithmPropertiesWidget.h"
 #include "MantidQtWidgets/Common/AlgorithmSelectorWidget.h"
@@ -153,5 +152,3 @@ DECLARE_WIDGET_PLUGIN(MuonFitDataSelectorPlugin,
 DECLARE_WIDGET_PLUGIN(LogValueSelectorPlugin,
                       MantidQt::MantidWidgets::LogValueSelector,
                       "Select a log name and function");
-
-#endif
diff --git a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/DllOption.h b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/DllOption.h
index 6ed5be99e08..675489ce2a1 100644
--- a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/DllOption.h
+++ b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/DllOption.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTID_REFDETECTORVIEWER_DLLOPTION_H_
-#define MANTIDQT_MANTID_REFDETECTORVIEWER_DLLOPTION_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 
@@ -14,5 +13,3 @@
 #else
 #define EXPORT_OPT_MANTIDQT_REFDETECTORVIEWER DLLImport
 #endif
-
-#endif // MANTIDQT_MANTID_REFDETECTORVIEWER_DLLOPTION_H_
diff --git a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefIVConnections.h b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefIVConnections.h
index b07e569e60c..e24fc4a1789 100644
--- a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefIVConnections.h
+++ b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefIVConnections.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef REF_IV_CONNECTIONS_H
-#define REF_IV_CONNECTIONS_H
+#pragma once
 
 #include <QActionGroup>
 #include <QWidget>
@@ -101,5 +100,3 @@ private:
 
 } // namespace RefDetectorViewer
 } // namespace MantidQt
-
-#endif // REF_IV_CONNECTIONS_H
diff --git a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefImageDisplay.h b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefImageDisplay.h
index 74863e29cdc..a2a68e0ff3c 100644
--- a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefImageDisplay.h
+++ b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefImageDisplay.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef REF_IMAGE_DISPLAY_H
-#define REF_IMAGE_DISPLAY_H
+#pragma once
 
 #include "DllOption.h"
 #include "MantidQtWidgets/RefDetectorView/RefLimitsHandler.h"
@@ -46,5 +45,3 @@ private:
 
 } // namespace RefDetectorViewer
 } // namespace MantidQt
-
-#endif // REF_IMAGE_DISPLAY_H
diff --git a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefImagePlotItem.h b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefImagePlotItem.h
index 6ab6665d566..f7d534fde38 100644
--- a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefImagePlotItem.h
+++ b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefImagePlotItem.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef REF_IMAGE_PLOT_ITEM_H
-#define REF_IMAGE_PLOT_ITEM_H
+#pragma once
 
 #include "DllOption.h"
 #include "MantidQtWidgets/RefDetectorView/RefLimitsHandler.h"
@@ -37,5 +36,3 @@ private:
 
 } // namespace RefDetectorViewer
 } // namespace MantidQt
-
-#endif // REF_IMAGE_PLOT_ITEM_H
diff --git a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefImageView.h b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefImageView.h
index e7469182470..1ec75607b00 100644
--- a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefImageView.h
+++ b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefImageView.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef REF_IMAGE_VIEW_H
-#define REF_IMAGE_VIEW_H
+#pragma once
 
 #include <QMainWindow>
 
@@ -58,5 +57,3 @@ private:
 
 } // namespace RefDetectorViewer
 } // namespace MantidQt
-
-#endif // REF_IMAGE_VIEW_H
diff --git a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefLimitsHandler.h b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefLimitsHandler.h
index 3cf3de219ef..cd27e9b1d08 100644
--- a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefLimitsHandler.h
+++ b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefLimitsHandler.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef REF_LIMITS_HANDLER_H
-#define REF_LIMITS_HANDLER_H
+#pragma once
 
 #include "ui_RefImageView.h"
 
@@ -42,5 +41,3 @@ private:
 
 } // namespace RefDetectorViewer
 } // namespace MantidQt
-
-#endif // REF_LIMITS_HANDLER_H
diff --git a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefMatrixWSImageView.h b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefMatrixWSImageView.h
index 9507da07d77..2a8343a38a1 100644
--- a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefMatrixWSImageView.h
+++ b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefMatrixWSImageView.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef REF_MATRIX_WS_IMAGE_VIEW_H
-#define REF_MATRIX_WS_IMAGE_VIEW_H
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/Algorithm.h"
@@ -45,5 +44,3 @@ private:
 
 } // namespace RefDetectorViewer
 } // namespace MantidQt
-
-#endif // REF_MATRIX_WS_IMAGE_VIEW_H
diff --git a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefRangeHandler.h b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefRangeHandler.h
index 02c056952d6..27b0a4e3b35 100644
--- a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefRangeHandler.h
+++ b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefRangeHandler.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef REF_RANGE_HANDLER_H
-#define REF_RANGE_HANDLER_H
+#pragma once
 
 #include "DllOption.h"
 #include "MantidQtWidgets/SpectrumViewer/IRangeHandler.h"
@@ -53,5 +52,3 @@ private:
 
 } // namespace RefDetectorViewer
 } // namespace MantidQt
-
-#endif // REF_RANGE_HANDLER_H
diff --git a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefSliderHandler.h b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefSliderHandler.h
index 7f97ed5fb1d..c70ebc34db9 100644
--- a/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefSliderHandler.h
+++ b/qt/widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefSliderHandler.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef REF_SLIDER_HANDLER_H
-#define REF_SLIDER_HANDLER_H
+#pragma once
 
 #include "MantidQtWidgets/SpectrumViewer/ISliderHandler.h"
 #include <QRect>
@@ -63,5 +62,3 @@ private:
 
 } // namespace RefDetectorViewer
 } // namespace MantidQt
-
-#endif // REF_SLIDER_HANDLER_H
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/CompositePeaksPresenter.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/CompositePeaksPresenter.h
index 38c055f01a3..01bb1d1503a 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/CompositePeaksPresenter.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/CompositePeaksPresenter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_COMPOSITEPEAKSPRESENTER_H_
-#define MANTID_SLICEVIEWER_COMPOSITEPEAKSPRESENTER_H_
+#pragma once
 
 #include "MantidQtWidgets/SliceViewer/NullPeaksPresenter.h"
 #include "MantidQtWidgets/SliceViewer/PeakBoundingBox.h"
@@ -201,5 +200,3 @@ private:
 };
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/ConcretePeaksPresenter.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/ConcretePeaksPresenter.h
index 154122bd757..ad0af8ebc7b 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/ConcretePeaksPresenter.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/ConcretePeaksPresenter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_CONCRETEPEAKSPRESENTER_H_
-#define MANTID_SLICEVIEWER_CONCRETEPEAKSPRESENTER_H_
+#pragma once
 #include "MantidAPI/IPeaksWorkspace_fwd.h"
 #include "MantidAPI/MDGeometry.h"
 #include "MantidGeometry/Crystal/PeakTransform.h"
@@ -122,5 +121,3 @@ private:
 };
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif /* MANTID_SLICEVIEWER_CONCRETEPEAKSPRESENTER_H_ */
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/CoordinateTransform.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/CoordinateTransform.h
index 456cec53833..e73a4c2cde6 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/CoordinateTransform.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/CoordinateTransform.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_SLICEVIEWER_COORDINATETRANSFORM_H
-#define MANTIDQT_SLICEVIEWER_COORDINATETRANSFORM_H
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/IMDWorkspace.h"
@@ -53,5 +52,4 @@ std::unique_ptr<CoordinateTransform> EXPORT_OPT_MANTIDQT_SLICEVIEWER
 createCoordinateTransform(const Mantid::API::IMDWorkspace &ws, size_t dimX,
                           size_t dimY);
 } // namespace SliceViewer
-} // namespace MantidQt
-#endif
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/CustomTools.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/CustomTools.h
index 856afcf4223..dad053a099e 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/CustomTools.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/CustomTools.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef CUSTOMTOOLS_H_
-#define CUSTOMTOOLS_H_
+#pragma once
 #include <QMouseEvent>
 #include <qwt_picker_machine.h>
 #include <qwt_plot_canvas.h>
@@ -96,5 +95,3 @@ protected:
 
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif /* CUSTOMTOOLS_H_ */
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/DimensionSliceWidget.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/DimensionSliceWidget.h
index 89d4278ce49..9c8d23f5b4b 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/DimensionSliceWidget.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/DimensionSliceWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DIMENSIONSLICEWIDGET_H
-#define DIMENSIONSLICEWIDGET_H
+#pragma once
 
 #include "DllOption.h"
 #include "MantidGeometry/MDGeometry/IMDDimension.h"
@@ -97,5 +96,3 @@ private:
 
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif // DIMENSIONSLICEWIDGET_H
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/DllOption.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/DllOption.h
index 18bcf56599f..7297da09506 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/DllOption.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/DllOption.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTIDSLICEVIEWER_DLLOPTION_H_
-#define MANTIDQT_MANTIDSLICEVIEWER_DLLOPTION_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 
@@ -14,5 +13,3 @@
 #else
 #define EXPORT_OPT_MANTIDQT_SLICEVIEWER DLLImport
 #endif
-
-#endif // MANTIDQT_MANTIDSLICEVIEWER_DLLOPTION_H_
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/EllipsoidPlaneSliceCalculator.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/EllipsoidPlaneSliceCalculator.h
index 76883473cb4..c2e57bab98f 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/EllipsoidPlaneSliceCalculator.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/EllipsoidPlaneSliceCalculator.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_ELLIPSOID_PLANE_SLICE_CALCULATOR_H_
-#define MANTID_SLICEVIEWER_ELLIPSOID_PLANE_SLICE_CALCULATOR_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidKernel/Matrix.h"
@@ -74,5 +73,3 @@ private:
 };
 } // namespace SliceViewer
 } // namespace Mantid
-
-#endif
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/FirstExperimentInfoQuery.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/FirstExperimentInfoQuery.h
index 79d2db844ba..f7455609247 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/FirstExperimentInfoQuery.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/FirstExperimentInfoQuery.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_FIRSTEXPERIMENTINFOQUERY_H_
-#define MANTID_SLICEVIEWER_FIRSTEXPERIMENTINFOQUERY_H_
+#pragma once
 
 #include "MantidAPI/IMDWorkspace.h"
 #include "MantidAPI/MultipleExperimentInfos.h"
@@ -75,5 +74,3 @@ public:
 };
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif /* MANTID_SLICEVIEWER_FIRSTEXPERIMENTINFOQUERY_H_ */
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LineOverlay.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LineOverlay.h
index 276a687a45d..cb071cda05d 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LineOverlay.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LineOverlay.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_LINEOVERLAY_H_
-#define MANTID_SLICEVIEWER_LINEOVERLAY_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidKernel/System.h"
@@ -158,5 +157,3 @@ protected:
 
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif /* MANTID_SLICEVIEWER_LINEOVERLAY_H_ */
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LinePlotOptions.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LinePlotOptions.h
index 8ea943b4a1a..1eb3df3d6e3 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LinePlotOptions.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LinePlotOptions.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LINEPLOTOPTIONS_H
-#define LINEPLOTOPTIONS_H
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/IMDWorkspace.h"
@@ -61,5 +60,3 @@ private:
   /// Chosen normalization method
   Mantid::API::MDNormalization m_normalize;
 };
-
-#endif // LINEPLOTOPTIONS_H
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LineViewer.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LineViewer.h
index 3ac480e46b1..93321e86a3e 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LineViewer.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/LineViewer.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef LINEVIEWER_H
-#define LINEVIEWER_H
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/CoordTransform.h"
@@ -183,5 +182,4 @@ private:
 };
 
 } // namespace SliceViewer
-} // namespace MantidQt
-#endif // LINEVIEWER_H
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/NonOrthogonalAxis.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/NonOrthogonalAxis.h
index f09b1a66365..c5ee98aa14d 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/NonOrthogonalAxis.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/NonOrthogonalAxis.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_NONORTHOGONAL_AXIS_H_
-#define MANTID_SLICEVIEWER_NONORTHOGONAL_AXIS_H_
+#pragma once
 
 #include "MantidGeometry/MDGeometry/MDTypes.h"
 #include <array>
@@ -22,5 +21,3 @@ struct NonOrthogonalAxis {
 
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/NonOrthogonalOverlay.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/NonOrthogonalOverlay.h
index 3bb4fb880cc..6f00e2648ec 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/NonOrthogonalOverlay.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/NonOrthogonalOverlay.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_NONORTHOGONALOVERLAY_H_
-#define MANTID_SLICEVIEWER_NONORTHOGONALOVERLAY_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/IMDEventWorkspace.h"
@@ -73,5 +72,3 @@ private:
 
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif /* MANTID_SLICEVIEWER_NONORTHOGONALOVERLAY_H_ */
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/NullPeaksPresenter.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/NullPeaksPresenter.h
index 6dba37ae31c..408a0a30e6c 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/NullPeaksPresenter.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/NullPeaksPresenter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_NULLPEAKSPRESENTER_H_
-#define MANTID_SLICEVIEWER_NULLPEAKSPRESENTER_H_
+#pragma once
 
 #include "MantidQtWidgets/SliceViewer/PeakBoundingBox.h"
 #include "MantidQtWidgets/SliceViewer/PeaksPresenter.h"
@@ -89,5 +88,3 @@ public:
 };
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif /* MANTID_SLICEVIEWER_NULLPEAKSPRESENTER_H_ */
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakBoundingBox.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakBoundingBox.h
index 44dc3df81b2..8ffff34e9e1 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakBoundingBox.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakBoundingBox.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_PEAK_BOUNDING_BOX_H_
-#define MANTID_SLICEVIEWER_PEAK_BOUNDING_BOX_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidGeometry/Crystal/PeakTransform.h"
@@ -111,5 +110,3 @@ public:
 };
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif /* MANTID_SLICEVIEWER_PEAK_BOUNDING_BOX_H_ */
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakEditMode.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakEditMode.h
index e3ba411f789..23f0e929495 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakEditMode.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakEditMode.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_EDITMODE_H_
-#define MANTID_SLICEVIEWER_EDITMODE_H_
+#pragma once
 
 namespace MantidQt {
 namespace SliceViewer {
@@ -13,5 +12,4 @@ namespace SliceViewer {
 // Possible edit modes.
 enum EditMode { None = 0, AddPeaks = 1, DeletePeaks = 2 };
 } // namespace SliceViewer
-} // namespace MantidQt
-#endif
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayInteractive.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayInteractive.h
index 850019eff3d..2d05dfacf41 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayInteractive.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayInteractive.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_PEAKOVERLAYINTERACTIVE_H_
-#define MANTID_SLICEVIEWER_PEAKOVERLAYINTERACTIVE_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidQtWidgets/SliceViewer/PeakOverlayView.h"
@@ -91,5 +90,3 @@ private slots:
 };
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif // MANTID_SLICEVIEWER_PEAKOVERLAYINTERACTIVE_H_
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayView.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayView.h
index 49ed01ad95b..e526c9f7dbf 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayView.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayView.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_PEAKOVERLAY_VIEW_H_
-#define MANTID_SLICEVIEWER_PEAKOVERLAY_VIEW_H_
+#pragma once
 
 #include "MantidDataObjects/AffineMatrixParameter.h"
 #include "MantidGeometry/Crystal/PeakTransform.h"
@@ -86,5 +85,3 @@ using PeakOverlayView_const_sptr = boost::shared_ptr<const PeakOverlayView>;
 using PeakOverlayView_sptr = boost::shared_ptr<PeakOverlayView>;
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif /* MANTID_SLICEVIEWER_PEAKOVERLAY_VIEW_H_ */
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayViewFactory.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayViewFactory.h
index b8194fed2e4..66551555073 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayViewFactory.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayViewFactory.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_PEAKOVERLAY_VIEW_FACTORY_H_
-#define MANTID_SLICEVIEWER_PEAKOVERLAY_VIEW_FACTORY_H_
+#pragma once
 
 #include "MantidGeometry/Crystal/PeakTransform.h"
 #include "MantidKernel/V3D.h"
@@ -54,5 +53,3 @@ public:
 using PeakOverlayViewFactory_sptr = boost::shared_ptr<PeakOverlayViewFactory>;
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif /* MANTID_SLICEVIEWER_PEAKOVERLAY_VIEW_FACTORY_H_ */
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayViewFactoryBase.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayViewFactoryBase.h
index 495b4b26a3f..14a2e09d158 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayViewFactoryBase.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakOverlayViewFactoryBase.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_PEAKOVERLAYVIEWFACTORYBASE_H_
-#define MANTID_SLICEVIEWER_PEAKOVERLAYVIEWFACTORYBASE_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidQtWidgets/SliceViewer/PeakOverlayViewFactory.h"
@@ -41,5 +40,3 @@ public:
 };
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif /*MANTID_SLICEVIEWER_PEAKOVERLAYVIEWFACTORYBASE_H_*/
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakPalette.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakPalette.h
index a363ac2e504..4a4c1020e15 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakPalette.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakPalette.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_PEAKPALETTE_H
-#define MANTID_SLICEVIEWER_PEAKPALETTE_H
+#pragma once
 
 #include "MantidKernel/System.h"
 #include "MantidQtWidgets/SliceViewer/PeakViewColor.h"
@@ -140,5 +139,4 @@ template <> DLLExport PeakPalette<QColor>::PeakPalette();
 template <> DLLExport PeakPalette<PeakViewColor>::PeakPalette();
 
 } // namespace SliceViewer
-} // namespace MantidQt
-#endif // MANTID_SLICEVIEWER_PEAKSPALETTE_H
\ No newline at end of file
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakPrimitives.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakPrimitives.h
index 8a7a321b620..77dcebf7916 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakPrimitives.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakPrimitives.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_PEAK_PRIMITIVES_H
-#define MANTID_SLICEVIEWER_PEAK_PRIMITIVES_H
+#pragma once
 
 #include "DllOption.h"
 #include "MantidKernel/V3D.h"
@@ -86,5 +85,3 @@ struct EXPORT_OPT_MANTIDQT_SLICEVIEWER PeakPrimitivesEllipse
 };
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakRepresentation.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakRepresentation.h
index 9c1cfb8e4bd..0dcd0060b72 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakRepresentation.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakRepresentation.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_PEAK_REPRESENTATION_H
-#define MANTID_SLICEVIEWER_PEAK_REPRESENTATION_H
+#pragma once
 
 #include "MantidDataObjects/AffineMatrixParameter.h"
 #include "MantidGeometry/Crystal/PeakTransform.h"
@@ -76,5 +75,3 @@ using PeakRepresentation_sptr = std::shared_ptr<PeakRepresentation>;
 using VecPeakRepresentation = std::vector<PeakRepresentation_sptr>;
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakRepresentationCross.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakRepresentationCross.h
index 789c81c9a58..2807b3e4bd4 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakRepresentationCross.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakRepresentationCross.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_PEAK_REPRESENTATION_CROSS_H
-#define MANTID_SLICEVIEWER_PEAK_REPRESENTATION_CROSS_H
+#pragma once
 
 #include "MantidQtWidgets/SliceViewer/NonOrthogonalAxis.h"
 #include "MantidQtWidgets/SliceViewer/PeakRepresentation.h"
@@ -86,5 +85,4 @@ private:
   double m_slicePoint;
 };
 } // namespace SliceViewer
-} // namespace MantidQt
-#endif
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakRepresentationEllipsoid.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakRepresentationEllipsoid.h
index 47682a1ba0c..886fee6a083 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakRepresentationEllipsoid.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakRepresentationEllipsoid.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_PEAK_REPRESENTATION_ELLIPSOID_H
-#define MANTID_SLICEVIEWER_PEAK_REPRESENTATION_ELLIPSOID_H
+#pragma once
 
 #include "MantidKernel/V2D.h"
 #include "MantidQtWidgets/SliceViewer/EllipsoidPlaneSliceCalculator.h"
@@ -114,5 +113,4 @@ private:
       m_calculator;
 };
 } // namespace SliceViewer
-} // namespace MantidQt
-#endif
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakRepresentationSphere.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakRepresentationSphere.h
index fa6a5317a64..fe6ce19466f 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakRepresentationSphere.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakRepresentationSphere.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_PEAK_REPRESENTATION_SPHERE_H
-#define MANTID_SLICEVIEWER_PEAK_REPRESENTATION_SPHERE_H
+#pragma once
 
 #include "MantidQtWidgets/SliceViewer/PeakRepresentation.h"
 
@@ -97,5 +96,4 @@ private:
   const double zoomOutFactor = 2.;
 };
 } // namespace SliceViewer
-} // namespace MantidQt
-#endif
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakView.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakView.h
index 350783b589d..cf59b94983b 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakView.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakView.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_PEAK_VIEW_H_
-#define MANTID_SLICEVIEWER_PEAK_VIEW_H_
+#pragma once
 
 #include "MantidQtWidgets/SliceViewer/NonOrthogonalAxis.h"
 #include "MantidQtWidgets/SliceViewer/PeakOverlayInteractive.h"
@@ -121,5 +120,3 @@ private:
 };
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakViewColor.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakViewColor.h
index e1fe062a2ea..d2740f6c6ec 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakViewColor.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakViewColor.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_PEAK_VIEW_COLOR_H_
-#define MANTID_SLICEVIEWER_PEAK_VIEW_COLOR_H_
+#pragma once
 
 #include <QColor>
 
@@ -44,5 +43,3 @@ struct PeakViewColor {
   QColor colorSphere;
   QColor colorEllipsoid;
 };
-
-#endif
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakViewFactory.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakViewFactory.h
index 1609d831b29..5e5799d23bc 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakViewFactory.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeakViewFactory.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_PEAK_VIEW_FACTORY_H_
-#define MANTID_SLICEVIEWER_PEAK_VIEW_FACTORY_H_
+#pragma once
 
 #include "MantidAPI/IMDWorkspace.h"
 #include "MantidAPI/IPeaksWorkspace.h"
@@ -79,5 +78,3 @@ private:
 };
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksPresenter.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksPresenter.h
index b454d771176..7ba22e4ae0b 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksPresenter.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksPresenter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_PEAKSPRESENTER_H_
-#define MANTID_SLICEVIEWER_PEAKSPRESENTER_H_
+#pragma once
 
 #include "DllOption.h"
 #include "MantidQtWidgets/SliceViewer/PeakBoundingBox.h"
@@ -91,5 +90,3 @@ using PeaksPresenter_sptr = boost::shared_ptr<PeaksPresenter>;
 using PeaksPresenter_const_sptr = boost::shared_ptr<const PeaksPresenter>;
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif /* MANTID_SLICEVIEWER_PEAKSPRESENTER_H_ */
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksTableColumnsDialog.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksTableColumnsDialog.h
index 5e6cc73fa36..2ef42460586 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksTableColumnsDialog.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksTableColumnsDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef PEAKSTABLECOLUMNSDIALOG_H
-#define PEAKSTABLECOLUMNSDIALOG_H
+#pragma once
 
 #include <QDialog>
 #include <set>
@@ -34,5 +33,3 @@ private:
 
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif // PEAKSTABLECOLUMNSDIALOG_H
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksViewer.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksViewer.h
index f6f93f1cd1f..45b9303e24d 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksViewer.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksViewer.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef PEAKSVIEWER_H
-#define PEAKSVIEWER_H
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/IPeaksWorkspace_fwd.h"
@@ -93,5 +92,4 @@ private:
 };
 
 } // namespace SliceViewer
-} // namespace MantidQt
-#endif // PEAKSVIEWER_H
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksViewerOverlayDialog.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksViewerOverlayDialog.h
index 772620a3488..793d25046de 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksViewerOverlayDialog.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksViewerOverlayDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDSLICEVIEWER_PEAKSVIEWEROVERLAYDIALOG_H
-#define MANTIDSLICEVIEWER_PEAKSVIEWEROVERLAYDIALOG_H
+#pragma once
 
 #include "MantidQtWidgets/SliceViewer/PeaksPresenter.h"
 #include <QDialog>
@@ -45,5 +44,3 @@ private:
 };
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif // MANTIDSLICEVIEWER_PEAKSVIEWEROVERLAYDIALOG_H
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksWorkspaceWidget.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksWorkspaceWidget.h
index a1635fa1495..0051e201fe3 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksWorkspaceWidget.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/PeaksWorkspaceWidget.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef PEAKSWORKSPACEWIDGET_H
-#define PEAKSWORKSPACEWIDGET_H
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/IPeaksWorkspace_fwd.h"
@@ -102,5 +101,4 @@ private slots:
 };
 
 } // namespace SliceViewer
-} // namespace MantidQt
-#endif // PEAKSWORKSPACEWIDGET_H
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/ProxyCompositePeaksPresenter.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/ProxyCompositePeaksPresenter.h
index 5ff62a12fce..a4179d76c8c 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/ProxyCompositePeaksPresenter.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/ProxyCompositePeaksPresenter.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_PROXYCOMPOSITEPEAKSPRESENTER_H_
-#define MANTID_SLICEVIEWER_PROXYCOMPOSITEPEAKSPRESENTER_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 #include "MantidQtWidgets/SliceViewer/CompositePeaksPresenter.h"
@@ -107,5 +106,3 @@ private:
 };
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/QwtScaleDrawNonOrthogonal.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/QwtScaleDrawNonOrthogonal.h
index 89db433075b..755ac9bdb1e 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/QwtScaleDrawNonOrthogonal.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/QwtScaleDrawNonOrthogonal.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef QWT_SCALE_DRAW_NON_ORTHOGONAL_H
-#define QWT_SCALE_DRAW_NON_ORTHOGONAL_H
+#pragma once
 
 #include "MantidAPI/IMDWorkspace.h"
 #include "MantidGeometry/MDGeometry/MDTypes.h"
@@ -65,5 +64,3 @@ private:
   double m_angleY;
   MantidQt::SliceViewer::NonOrthogonalOverlay *m_gridPlot;
 };
-
-#endif
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SliceViewer.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SliceViewer.h
index 14cdfd78354..3b66df3d5d3 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SliceViewer.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SliceViewer.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SLICEVIEWER_H
-#define SLICEVIEWER_H
+#pragma once
 
 #include "DimensionSliceWidget.h"
 #include "DllOption.h"
@@ -436,5 +435,3 @@ private:
 
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif // SLICEVIEWER_H
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SliceViewerFunctions.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SliceViewerFunctions.h
index 6ff3edf70cd..62bf681919e 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SliceViewerFunctions.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SliceViewerFunctions.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SLICEVIEWER_FUNCTIONS_H
-#define SLICEVIEWER_FUNCTIONS_H
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/IMDWorkspace.h"
@@ -28,5 +27,4 @@ bool EXPORT_OPT_MANTIDQT_SLICEVIEWER isRebinInConsistentState(
 bool EXPORT_OPT_MANTIDQT_SLICEVIEWER shouldAutoScaleForNewlySetWorkspace(
     bool isFirstWorkspaceOpen, bool isAutoScalingOnLoad);
 } // namespace SliceViewer
-} // namespace MantidQt
-#endif
+} // namespace MantidQt
\ No newline at end of file
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SliceViewerWindow.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SliceViewerWindow.h
index 91d35ddacb6..b78e3bcad6a 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SliceViewerWindow.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SliceViewerWindow.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SLICEVIEWERWINDOW_H
-#define SLICEVIEWERWINDOW_H
+#pragma once
 
 #include "DllOption.h"
 #include "MantidAPI/IMDWorkspace.h"
@@ -122,5 +121,3 @@ protected:
 
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif // SLICEVIEWERWINDOW_H
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SnapToGridDialog.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SnapToGridDialog.h
index b5a837670bb..68e34555d6f 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SnapToGridDialog.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/SnapToGridDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SNAPTOGRIDDIALOG_H
-#define SNAPTOGRIDDIALOG_H
+#pragma once
 
 #include "DllOption.h"
 #include "ui_SnapToGridDialog.h"
@@ -31,5 +30,3 @@ public:
 private:
   Ui::SnapToGridDialogClass ui;
 };
-
-#endif // SNAPTOGRIDDIALOG_H
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/UpdateableOnDemand.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/UpdateableOnDemand.h
index ee89827e346..785b7fa76d4 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/UpdateableOnDemand.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/UpdateableOnDemand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef UPDATEABLEONDEMAND_H_
-#define UPDATEABLEONDEMAND_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 #include <boost/shared_ptr.hpp>
@@ -35,5 +34,3 @@ public:
 };
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif /* UPDATEABLEONDEMAND_H_ */
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/XYLimitsDialog.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/XYLimitsDialog.h
index 03e9f23d2f2..68c01fa980e 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/XYLimitsDialog.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/XYLimitsDialog.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef XYLIMITSDIALOG_H
-#define XYLIMITSDIALOG_H
+#pragma once
 
 #include "DllOption.h"
 #include "MantidGeometry/MDGeometry/IMDDimension.h"
@@ -35,5 +34,3 @@ public:
 private:
   Ui::XYLimitsDialogClass ui;
 };
-
-#endif // XYLIMITSDIALOG_H
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/ZoomableOnDemand.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/ZoomableOnDemand.h
index be8951d21ed..a11e570e634 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/ZoomableOnDemand.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/ZoomableOnDemand.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef ZOOMABLEONDEMAND_H_
-#define ZOOMABLEONDEMAND_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 
@@ -31,5 +30,3 @@ public:
 };
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif /* ZOOMABLEONDEMAND_H_ */
diff --git a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/ZoomablePeaksView.h b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/ZoomablePeaksView.h
index 990263a1c7b..e3e6e6b7ed6 100644
--- a/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/ZoomablePeaksView.h
+++ b/qt/widgets/sliceviewer/inc/MantidQtWidgets/SliceViewer/ZoomablePeaksView.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_SLICEVIEWER_ZOOMABLE_PEAKS_VIEW_H_
-#define MANTID_SLICEVIEWER_ZOOMABLE_PEAKS_VIEW_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 #include "MantidKernel/V2D.h"
@@ -34,5 +33,3 @@ public:
 };
 } // namespace SliceViewer
 } // namespace MantidQt
-
-#endif /* MANTID_SLICEVIEWER_ZOOMABLE_PEAKS_VIEW_H_ */
diff --git a/qt/widgets/sliceviewer/test/CompositePeaksPresenterTest.h b/qt/widgets/sliceviewer/test/CompositePeaksPresenterTest.h
index 67f05531cee..6df4a9a06f8 100644
--- a/qt/widgets/sliceviewer/test/CompositePeaksPresenterTest.h
+++ b/qt/widgets/sliceviewer/test/CompositePeaksPresenterTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SLICE_VIEWER_COMPOSITEPEAKSPRESENTER_TEST_H_
-#define SLICE_VIEWER_COMPOSITEPEAKSPRESENTER_TEST_H_
+#pragma once
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidDataObjects/PeaksWorkspace.h"
@@ -1070,5 +1069,3 @@ public:
     TS_ASSERT(Mock::VerifyAndClearExpectations(pSubjectB));
   }
 };
-
-#endif
diff --git a/qt/widgets/sliceviewer/test/ConcretePeaksPresenterTest.h b/qt/widgets/sliceviewer/test/ConcretePeaksPresenterTest.h
index 89acc3faf87..9eafeaf3903 100644
--- a/qt/widgets/sliceviewer/test/ConcretePeaksPresenterTest.h
+++ b/qt/widgets/sliceviewer/test/ConcretePeaksPresenterTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SLICE_VIEWER_PEAKS_PRESENTER_TEST_H_
-#define SLICE_VIEWER_PEAKS_PRESENTER_TEST_H_
+#pragma once
 
 #include "MantidAPI/ExperimentInfo.h"
 #include "MantidAPI/FrameworkManager.h"
@@ -880,5 +879,3 @@ public:
     TSM_ASSERT_EQUALS("One peaks should remain", 1, peaksWS->getNumberPeaks());
   }
 };
-
-#endif
diff --git a/qt/widgets/sliceviewer/test/CoordinateTransformTest.h b/qt/widgets/sliceviewer/test/CoordinateTransformTest.h
index fe1cf160fa9..c9733ca942f 100644
--- a/qt/widgets/sliceviewer/test/CoordinateTransformTest.h
+++ b/qt/widgets/sliceviewer/test/CoordinateTransformTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_SLICEVIEWER_COORDINATETRANSFORM_TEST_H
-#define MANTIDQT_SLICEVIEWER_COORDINATETRANSFORM_TEST_H
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/ExperimentInfo.h"
@@ -263,5 +262,4 @@ public:
                dynamic_cast<MantidQt::SliceViewer::NonOrthogonalTransform *>(
                    m_coordinateTransform.get()));
   }
-};
-#endif
+};
\ No newline at end of file
diff --git a/qt/widgets/sliceviewer/test/EllipsoidPlaneSliceCalculatorTest.h b/qt/widgets/sliceviewer/test/EllipsoidPlaneSliceCalculatorTest.h
index cbb82e7fd59..56fcd86de3c 100644
--- a/qt/widgets/sliceviewer/test/EllipsoidPlaneSliceCalculatorTest.h
+++ b/qt/widgets/sliceviewer/test/EllipsoidPlaneSliceCalculatorTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SLICE_VIEWER_ELLIPSOID_PLANE_SLICE_CALCULATOR_TEST_H_
-#define SLICE_VIEWER_ELLIPSOID_PLANE_SLICE_CALCULATOR_TEST_H_
+#pragma once
 
 #include "MantidKernel/Matrix.h"
 #include "MantidKernel/V3D.h"
@@ -637,5 +636,3 @@ private:
                      info.origin.Z(), 1.5, delta);
   }
 };
-
-#endif
diff --git a/qt/widgets/sliceviewer/test/MockObjects.h b/qt/widgets/sliceviewer/test/MockObjects.h
index 67e19e6eef4..d22b07db82b 100644
--- a/qt/widgets/sliceviewer/test/MockObjects.h
+++ b/qt/widgets/sliceviewer/test/MockObjects.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SLICE_VIEWER_MOCKOBJECTS_H_
-#define SLICE_VIEWER_MOCKOBJECTS_H_
+#pragma once
 
 #include "MantidAPI/IMDWorkspace.h"
 #include "MantidAPI/IPeaksWorkspace.h"
@@ -204,5 +203,3 @@ public:
 } // namespace
 
 GNU_DIAG_ON_SUGGEST_OVERRIDE
-
-#endif
diff --git a/qt/widgets/sliceviewer/test/NullPeaksPresenterTest.h b/qt/widgets/sliceviewer/test/NullPeaksPresenterTest.h
index c82079c029d..e4aff1d7c42 100644
--- a/qt/widgets/sliceviewer/test/NullPeaksPresenterTest.h
+++ b/qt/widgets/sliceviewer/test/NullPeaksPresenterTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SLICE_VIEWER_NULLPEAKSPRESENTER_TEST_H_
-#define SLICE_VIEWER_NULLPEAKSPRESENTER_TEST_H_
+#pragma once
 
 #include "MantidQtWidgets/SliceViewer/NullPeaksPresenter.h"
 #include "MockObjects.h"
@@ -119,5 +118,3 @@ public:
     TS_ASSERT_THROWS_NOTHING(presenter.deletePeaksIn(fake));
   }
 };
-
-#endif
diff --git a/qt/widgets/sliceviewer/test/PeakBoundingBoxTest.h b/qt/widgets/sliceviewer/test/PeakBoundingBoxTest.h
index 83a25e69fbd..bf0e69cfa52 100644
--- a/qt/widgets/sliceviewer/test/PeakBoundingBoxTest.h
+++ b/qt/widgets/sliceviewer/test/PeakBoundingBoxTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SLICE_VIEWER_PEAKBOUNDINGBOX_TEST_H_
-#define SLICE_VIEWER_PEAKBOUNDINGBOX_TEST_H_
+#pragma once
 
 #include "MantidQtWidgets/SliceViewer/PeakBoundingBox.h"
 #include <cxxtest/TestSuite.h>
@@ -202,5 +201,3 @@ public:
     TS_ASSERT_EQUALS("-1.23,1.23,-20.23,2.23,3.12,4.12", extents);
   }
 };
-
-#endif
diff --git a/qt/widgets/sliceviewer/test/PeakPaletteTest.h b/qt/widgets/sliceviewer/test/PeakPaletteTest.h
index 47256d1a6a9..92f6ddf0123 100644
--- a/qt/widgets/sliceviewer/test/PeakPaletteTest.h
+++ b/qt/widgets/sliceviewer/test/PeakPaletteTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SLICE_VIEWER_PEAKPALETTE_TEST_H_
-#define SLICE_VIEWER_PEAKPALETTE_TEST_H_
+#pragma once
 
 #include "MantidQtWidgets/SliceViewer/PeakPalette.h"
 #include <cxxtest/TestSuite.h>
@@ -268,5 +267,3 @@ public:
                                   palette.backgroundIndexToColour(index));
   }
 };
-
-#endif
diff --git a/qt/widgets/sliceviewer/test/PeakRepresentationCrossTest.h b/qt/widgets/sliceviewer/test/PeakRepresentationCrossTest.h
index ee1159de113..bf4bbc19ae4 100644
--- a/qt/widgets/sliceviewer/test/PeakRepresentationCrossTest.h
+++ b/qt/widgets/sliceviewer/test/PeakRepresentationCrossTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SLICE_VIEWER_PEAK_REPRESENTATION_CROSS_TEST_H_
-#define SLICE_VIEWER_PEAK_REPRESENTATION_CROSS_TEST_H_
+#pragma once
 
 #include "MantidQtWidgets/SliceViewer/PeakRepresentationCross.h"
 #include "MockObjects.h"
@@ -279,5 +278,3 @@ public:
     }
   }
 };
-
-#endif
diff --git a/qt/widgets/sliceviewer/test/PeakRepresentationEllipsoidTest.h b/qt/widgets/sliceviewer/test/PeakRepresentationEllipsoidTest.h
index 15c8701db42..256bdd4e959 100644
--- a/qt/widgets/sliceviewer/test/PeakRepresentationEllipsoidTest.h
+++ b/qt/widgets/sliceviewer/test/PeakRepresentationEllipsoidTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SLICE_VIEWER_PEAK_REPRESENTATION_CROSS_TEST_H_
-#define SLICE_VIEWER_PEAK_REPRESENTATION_CROSS_TEST_H_
+#pragma once
 
 #include "MantidQtWidgets/SliceViewer/PeakRepresentationEllipsoid.h"
 #include "MockObjects.h"
@@ -225,5 +224,3 @@ private:
         directions, calculator);
   }
 };
-
-#endif
diff --git a/qt/widgets/sliceviewer/test/PeakRepresentationSphereTest.h b/qt/widgets/sliceviewer/test/PeakRepresentationSphereTest.h
index c96855c9998..422f75f341a 100644
--- a/qt/widgets/sliceviewer/test/PeakRepresentationSphereTest.h
+++ b/qt/widgets/sliceviewer/test/PeakRepresentationSphereTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SLICE_VIEWER_PEAK_REPRESENTATION_SPHERE_TEST_H_
-#define SLICE_VIEWER_PEAK_REPRESENTATION_SPHERE_TEST_H_
+#pragma once
 
 #include "MantidQtWidgets/SliceViewer/PeakRepresentationSphere.h"
 #include "MockObjects.h"
@@ -331,5 +330,3 @@ private:
   VecPeaksRepresentationSphere m_peaks;
   PeakRepresentationViewInformation m_viewInformation;
 };
-
-#endif
diff --git a/qt/widgets/sliceviewer/test/SliceViewerFunctionsTest.h b/qt/widgets/sliceviewer/test/SliceViewerFunctionsTest.h
index f82ed6ff9af..b966b3e2110 100644
--- a/qt/widgets/sliceviewer/test/SliceViewerFunctionsTest.h
+++ b/qt/widgets/sliceviewer/test/SliceViewerFunctionsTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SLICE_VIEWER_SLICE_VIEWER_FUNCTIONS_TEST_H_
-#define SLICE_VIEWER_SLICE_VIEWER_FUNCTIONS_TEST_H_
+#pragma once
 
 #include "MantidGeometry/MDGeometry/GeneralFrame.h"
 #include "MantidGeometry/MDGeometry/MDHistoDimension.h"
@@ -119,6 +118,4 @@ public:
   }
 };
 
-#endif
-
 // end SLICE_VIEWER_SLICE_VIEWER_FUNCTIONS_TEST_H_
diff --git a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/ArrayDataSource.h b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/ArrayDataSource.h
index 2a6cfabd328..9a125a5e001 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/ArrayDataSource.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/ArrayDataSource.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef ARRAY_DATA_SOURCE_H
-#define ARRAY_DATA_SOURCE_H
+#pragma once
 
 #include "MantidQtWidgets/SpectrumViewer/DataArray.h"
 #include "MantidQtWidgets/SpectrumViewer/SpectrumDataSource.h"
@@ -58,5 +57,3 @@ using ArrayDataSource_const_sptr = boost::shared_ptr<const ArrayDataSource>;
 
 } // namespace SpectrumView
 } // namespace MantidQt
-
-#endif // ARRAY_DATA_SOURCE_H
diff --git a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/ColorMaps.h b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/ColorMaps.h
index 9d554a2bdc2..0edd9c54ef0 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/ColorMaps.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/ColorMaps.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef COLOR_MAPS_H
-#define COLOR_MAPS_H
+#pragma once
 
 #include "MantidQtWidgets/SpectrumViewer/DllOptionSV.h"
 #include <QColor>
@@ -57,5 +56,3 @@ private:
 
 } // namespace SpectrumView
 } // namespace MantidQt
-
-#endif // COLOR_MAPS_H
diff --git a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/DataArray.h b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/DataArray.h
index dcd9f508b26..bd425b050b0 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/DataArray.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/DataArray.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef DATA_ARRAY_H
-#define DATA_ARRAY_H
+#pragma once
 
 #include <cstddef>
 #include <vector>
@@ -115,5 +114,3 @@ using DataArray_const_sptr = boost::shared_ptr<const DataArray>;
 
 } // namespace SpectrumView
 } // namespace MantidQt
-
-#endif // DATA_ARRAY_H
diff --git a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/DllOptionSV.h b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/DllOptionSV.h
index 58602550286..d8a2b568ec8 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/DllOptionSV.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/DllOptionSV.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTIDQT_MANTID_SPECTRUM_VIEWER_DLLOPTION_H_
-#define MANTIDQT_MANTID_SPECTRUM_VIEWER_DLLOPTION_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 
@@ -14,5 +13,3 @@
 #else
 #define EXPORT_OPT_MANTIDQT_SPECTRUMVIEWER DLLImport
 #endif
-
-#endif // MANTIDQT_MANTID_SPECTRUM_VIEWER_DLLOPTION_H_
diff --git a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/EModeHandler.h b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/EModeHandler.h
index 79755c9028a..f2ae2a13d7c 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/EModeHandler.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/EModeHandler.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef EMODE_HANDLER_H
-#define EMODE_HANDLER_H
+#pragma once
 
 #include "MantidQtWidgets/SpectrumViewer/DllOptionSV.h"
 #include "MantidQtWidgets/SpectrumViewer/SpectrumDataSource.h"
@@ -47,5 +46,3 @@ private:
 
 } // namespace SpectrumView
 } // namespace MantidQt
-
-#endif // EMODE_HANDLER_H
diff --git a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/GraphDisplay.h b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/GraphDisplay.h
index f99a65b4564..66f03b6f100 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/GraphDisplay.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/GraphDisplay.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef GRAPH_DISPLAY_H
-#define GRAPH_DISPLAY_H
+#pragma once
 
 #include <QTableWidget>
 #include <qwt_plot.h>
@@ -83,5 +82,3 @@ private:
 
 } // namespace SpectrumView
 } // namespace MantidQt
-
-#endif // GRAPH_DISPLAY_H
diff --git a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/IRangeHandler.h b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/IRangeHandler.h
index d078778ca5d..db48664f952 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/IRangeHandler.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/IRangeHandler.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef IRANGE_HANDLER_H
-#define IRANGE_HANDLER_H
+#pragma once
 
 #include "MantidQtWidgets/SpectrumViewer/DllOptionSV.h"
 #include "MantidQtWidgets/SpectrumViewer/SpectrumDataSource.h"
@@ -33,5 +32,3 @@ public:
 
 } // namespace SpectrumView
 } // namespace MantidQt
-
-#endif // IRANGE_HANDLER_H
diff --git a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/ISliderHandler.h b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/ISliderHandler.h
index 101917f638f..e3113db1376 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/ISliderHandler.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/ISliderHandler.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef ISLIDER_HANDLER_H
-#define ISLIDER_HANDLER_H
+#pragma once
 
 #include "MantidQtWidgets/SpectrumViewer/DllOptionSV.h"
 #include "MantidQtWidgets/SpectrumViewer/SpectrumDataSource.h"
@@ -47,5 +46,3 @@ public:
 
 } // namespace SpectrumView
 } // namespace MantidQt
-
-#endif // ISLIDER_HANDLER_H
diff --git a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/MatrixWSDataSource.h b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/MatrixWSDataSource.h
index a7db0ffc8a4..c88b40cafdf 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/MatrixWSDataSource.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/MatrixWSDataSource.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MATRIX_WS_DATA_SOURCE_H
-#define MATRIX_WS_DATA_SOURCE_H
+#pragma once
 
 #include <cstddef>
 
@@ -95,5 +94,3 @@ using MatrixWSDataSource_const_sptr =
 
 } // namespace SpectrumView
 } // namespace MantidQt
-
-#endif // MATRIX_WS_DATA_SOURCE_H
diff --git a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/QtUtils.h b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/QtUtils.h
index c10c8143751..fff6969183f 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/QtUtils.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/QtUtils.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef QT_UTILS_H
-#define QT_UTILS_H
+#pragma once
 
 #include <QLineEdit>
 #include <QTableWidget>
@@ -45,5 +44,3 @@ public:
 
 } // namespace SpectrumView
 } // namespace MantidQt
-
-#endif // QT_UTILS_H
diff --git a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/RangeHandler.h b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/RangeHandler.h
index ab9f3dbbb7f..8f1f8430e21 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/RangeHandler.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/RangeHandler.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef RANGE_HANDLER_H
-#define RANGE_HANDLER_H
+#pragma once
 
 #include "MantidQtWidgets/SpectrumViewer/DllOptionSV.h"
 #include "MantidQtWidgets/SpectrumViewer/IRangeHandler.h"
@@ -48,5 +47,3 @@ private:
 
 } // namespace SpectrumView
 } // namespace MantidQt
-
-#endif // RANGE_HANDLER_H
diff --git a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SVConnections.h b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SVConnections.h
index b1bfb6ee186..d34986ecd51 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SVConnections.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SVConnections.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SV_CONNECTIONS_H
-#define SV_CONNECTIONS_H
+#pragma once
 
 #include <QActionGroup>
 #include <QWidget>
@@ -113,5 +112,3 @@ private:
 
 } // namespace SpectrumView
 } // namespace MantidQt
-
-#endif // SV_CONNECTIONS_H
diff --git a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SVUtils.h b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SVUtils.h
index 031972919b2..3629759fefc 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SVUtils.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SVUtils.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SV_UTILS_H
-#define SV_UTILS_H
+#pragma once
 
 #include <QVector>
 
@@ -66,5 +65,3 @@ public:
 
 } // namespace SpectrumView
 } // namespace MantidQt
-
-#endif // SV_UTILS_H
diff --git a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SliderHandler.h b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SliderHandler.h
index 4f1d7c8b78b..b61c1f3fd45 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SliderHandler.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SliderHandler.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SLIDER_HANDLER_H
-#define SLIDER_HANDLER_H
+#pragma once
 
 #include "MantidQtWidgets/SpectrumViewer/ISliderHandler.h"
 #include <QRect>
@@ -64,5 +63,3 @@ private:
 
 } // namespace SpectrumView
 } // namespace MantidQt
-
-#endif // SLIDER_HANDLER_H
diff --git a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SpectrumDataSource.h b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SpectrumDataSource.h
index 7755a9efac7..7b934f9a1e2 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SpectrumDataSource.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SpectrumDataSource.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SPECTRUM_DATA_SOURCE_H
-#define SPECTRUM_DATA_SOURCE_H
+#pragma once
 
 #include "MantidAPI/Workspace_fwd.h"
 #include "MantidQtWidgets/SpectrumViewer/DataArray.h"
@@ -98,5 +97,3 @@ using SpectrumDataSource_const_sptr =
 
 } // namespace SpectrumView
 } // namespace MantidQt
-
-#endif // SPECTRUM_DATA_SOURCE_H
diff --git a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SpectrumDisplay.h b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SpectrumDisplay.h
index cebb5b3cc42..211e8dbf77e 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SpectrumDisplay.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SpectrumDisplay.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SPECTRUM_DISPLAY_H
-#define SPECTRUM_DISPLAY_H
+#pragma once
 
 #include <QColor>
 #include <QPoint>
@@ -158,5 +157,3 @@ private:
 
 } // namespace SpectrumView
 } // namespace MantidQt
-
-#endif // SPECTRUM_DISPLAY_H
diff --git a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SpectrumPlotItem.h b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SpectrumPlotItem.h
index eb939275353..dfb9716a776 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SpectrumPlotItem.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SpectrumPlotItem.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SPECTRUM_PLOT_ITEM_H
-#define SPECTRUM_PLOT_ITEM_H
+#pragma once
 
 #include <QPainter>
 #include <QRect>
@@ -65,5 +64,3 @@ private:
 
 } // namespace SpectrumView
 } // namespace MantidQt
-
-#endif // SPECTRUM_PLOT_ITEM_H
diff --git a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SpectrumView.h b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SpectrumView.h
index c804f474deb..20f84f73994 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SpectrumView.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/SpectrumView.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef SPECTRUM_VIEW_H
-#define SPECTRUM_VIEW_H
+#pragma once
 
 #include <QList>
 #include <QMainWindow>
@@ -126,5 +125,3 @@ signals:
 
 } // namespace SpectrumView
 } // namespace MantidQt
-
-#endif // SPECTRUM_VIEW_H
diff --git a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/TrackingPicker.h b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/TrackingPicker.h
index cb3ce3bc3ad..67ddf5f1db8 100644
--- a/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/TrackingPicker.h
+++ b/qt/widgets/spectrumviewer/inc/MantidQtWidgets/SpectrumViewer/TrackingPicker.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef TRACKING_PICKER_H
-#define TRACKING_PICKER_H
+#pragma once
 
 #include "MantidQtWidgets/SpectrumViewer/DllOptionSV.h"
 #include <qwt_plot_canvas.h>
@@ -51,5 +50,3 @@ private:
 
 } // namespace SpectrumView
 } // namespace MantidQt
-
-#endif // TRACKING_PICKER_H
-- 
GitLab