# HG changeset patch
# User Chris Cannam
# Date 1543240296 0
# Node ID ad5f892c0c4d35ec8b48dccbf7cfc59478127121
# Parent  c01cbe41aeb5ee271267a9a1cdfc254f2908b915
Header guards

diff -r c01cbe41aeb5 -r ad5f892c0c4d base/AudioLevel.h
--- a/base/AudioLevel.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/base/AudioLevel.h	Mon Nov 26 13:51:36 2018 +0000
@@ -18,8 +18,8 @@
    This file copyright 2000-2006 Chris Cannam.
 */
 
-#ifndef _AUDIO_LEVEL_H_
-#define _AUDIO_LEVEL_H_
+#ifndef SV_AUDIO_LEVEL_H
+#define SV_AUDIO_LEVEL_H
 
 /**
  * AudioLevel converts audio sample levels between various scales:
diff -r c01cbe41aeb5 -r ad5f892c0c4d base/Clipboard.h
--- a/base/Clipboard.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/base/Clipboard.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _CLIPBOARD_H_
-#define _CLIPBOARD_H_
+#ifndef SV_CLIPBOARD_H
+#define SV_CLIPBOARD_H
 
 #include <QString>
 #include <vector>
diff -r c01cbe41aeb5 -r ad5f892c0c4d base/FrameTimer.h
--- a/base/FrameTimer.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/base/FrameTimer.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _FRAME_TIMER_H_
-#define _FRAME_TIMER_H_
+#ifndef SV_FRAME_TIMER_H
+#define SV_FRAME_TIMER_H
 
 #include "BaseTypes.h"
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d base/LogRange.h
--- a/base/LogRange.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/base/LogRange.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _LOG_RANGE_H_
-#define _LOG_RANGE_H_
+#ifndef SV_LOG_RANGE_H
+#define SV_LOG_RANGE_H
 
 #include <vector>
 #include "Debug.h"
diff -r c01cbe41aeb5 -r ad5f892c0c4d base/Pitch.h
--- a/base/Pitch.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/base/Pitch.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _PITCH_H_
-#define _PITCH_H_
+#ifndef SV_PITCH_H
+#define SV_PITCH_H
 
 #include <QString>
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d base/Playable.h
--- a/base/Playable.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/base/Playable.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _PLAYABLE_H_
-#define _PLAYABLE_H_
+#ifndef SV_PLAYABLE_H
+#define SV_PLAYABLE_H
 
 #include <QString>
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d base/Preferences.h
--- a/base/Preferences.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/base/Preferences.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _PREFERENCES_H_
-#define _PREFERENCES_H_
+#ifndef SV_PREFERENCES_H
+#define SV_PREFERENCES_H
 
 #include "PropertyContainer.h"
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d base/Profiler.h
--- a/base/Profiler.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/base/Profiler.h	Mon Nov 26 13:51:36 2018 +0000
@@ -20,8 +20,8 @@
 */
 
 
-#ifndef _PROFILER_H_
-#define _PROFILER_H_
+#ifndef SV_PROFILER_H
+#define SV_PROFILER_H
 
 #include "system/System.h"
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d base/ProgressPrinter.h
--- a/base/ProgressPrinter.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/base/ProgressPrinter.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _PROGRESS_PRINTER_H_
-#define _PROGRESS_PRINTER_H_
+#ifndef SV_PROGRESS_PRINTER_H
+#define SV_PROGRESS_PRINTER_H
 
 #include "ProgressReporter.h"
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d base/RangeMapper.h
--- a/base/RangeMapper.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/base/RangeMapper.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RANGE_MAPPER_H_
-#define _RANGE_MAPPER_H_
+#ifndef SV_RANGE_MAPPER_H
+#define SV_RANGE_MAPPER_H
 
 #include <QString>
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d base/RecentFiles.h
--- a/base/RecentFiles.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/base/RecentFiles.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RECENT_FILES_H_
-#define _RECENT_FILES_H_
+#ifndef SV_RECENT_FILES_H
+#define SV_RECENT_FILES_H
 
 #include <QObject>
 #include <QString>
diff -r c01cbe41aeb5 -r ad5f892c0c4d base/ResourceFinder.h
--- a/base/ResourceFinder.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/base/ResourceFinder.h	Mon Nov 26 13:51:36 2018 +0000
@@ -19,8 +19,8 @@
    development team.
 */
 
-#ifndef _RESOURCE_FINDER_H_
-#define _RESOURCE_FINDER_H_
+#ifndef SV_RESOURCE_FINDER_H
+#define SV_RESOURCE_FINDER_H
 
 #include <QString>
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d base/Scavenger.h
--- a/base/Scavenger.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/base/Scavenger.h	Mon Nov 26 13:51:36 2018 +0000
@@ -19,8 +19,8 @@
    This file copyright 2000-2006 Chris Cannam.
 */
 
-#ifndef _SCAVENGER_H_
-#define _SCAVENGER_H_
+#ifndef SV_SCAVENGER_H
+#define SV_SCAVENGER_H
 
 #include "system/System.h"
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d base/Serialiser.h
--- a/base/Serialiser.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/base/Serialiser.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _SERIALISER_H_
-#define _SERIALISER_H_
+#ifndef SV_SERIALISER_H
+#define SV_SERIALISER_H
 
 #include <QString>
 #include <QMutex>
diff -r c01cbe41aeb5 -r ad5f892c0c4d base/TextMatcher.h
--- a/base/TextMatcher.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/base/TextMatcher.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _TEXT_MATCHER_H_
-#define _TEXT_MATCHER_H_
+#ifndef SV_TEXT_MATCHER_H
+#define SV_TEXT_MATCHER_H
 
 #include <QString>
 #include <QStringList>
diff -r c01cbe41aeb5 -r ad5f892c0c4d base/Thread.h
--- a/base/Thread.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/base/Thread.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _THREAD_H_
-#define _THREAD_H_
+#ifndef SV_THREAD_H
+#define SV_THREAD_H
 
 #include <QThread>
 #include <QMutexLocker>
diff -r c01cbe41aeb5 -r ad5f892c0c4d base/UnitDatabase.h
--- a/base/UnitDatabase.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/base/UnitDatabase.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _UNIT_DATABASE_H_
-#define _UNIT_DATABASE_H_
+#ifndef SV_UNIT_DATABASE_H
+#define SV_UNIT_DATABASE_H
 
 #include <QObject>
 #include <QString>
diff -r c01cbe41aeb5 -r ad5f892c0c4d base/Window.h
--- a/base/Window.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/base/Window.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _WINDOW_H_
-#define _WINDOW_H_
+#ifndef SV_WINDOW_H
+#define SV_WINDOW_H
 
 #include <cmath>
 #include <iostream>
diff -r c01cbe41aeb5 -r ad5f892c0c4d base/XmlExportable.h
--- a/base/XmlExportable.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/base/XmlExportable.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _XML_EXPORTABLE_H_
-#define _XML_EXPORTABLE_H_
+#ifndef SV_XML_EXPORTABLE_H
+#define SV_XML_EXPORTABLE_H
 
 #include <QString>
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/fileio/AudioFileReader.h
--- a/data/fileio/AudioFileReader.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/fileio/AudioFileReader.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _AUDIO_FILE_READER_H_
-#define _AUDIO_FILE_READER_H_
+#ifndef SV_AUDIO_FILE_READER_H
+#define SV_AUDIO_FILE_READER_H
 
 #include <QString>
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/fileio/CachedFile.h
--- a/data/fileio/CachedFile.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/fileio/CachedFile.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _CACHED_FILE_H_
-#define _CACHED_FILE_H_
+#ifndef SV_CACHED_FILE_H
+#define SV_CACHED_FILE_H
 
 #include <QString>
 #include <QUrl>
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/fileio/CoreAudioFileReader.h
--- a/data/fileio/CoreAudioFileReader.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/fileio/CoreAudioFileReader.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _COREAUDIO_FILE_READER_H_
-#define _COREAUDIO_FILE_READER_H_
+#ifndef SV_COREAUDIO_FILE_READER_H
+#define SV_COREAUDIO_FILE_READER_H
 
 #ifdef HAVE_COREAUDIO
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/fileio/DataFileReader.h
--- a/data/fileio/DataFileReader.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/fileio/DataFileReader.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _DATA_FILE_READER_H_
-#define _DATA_FILE_READER_H_
+#ifndef SV_DATA_FILE_READER_H
+#define SV_DATA_FILE_READER_H
 
 #include <QString>
 #include <QObject>
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/fileio/DecodingWavFileReader.h
--- a/data/fileio/DecodingWavFileReader.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/fileio/DecodingWavFileReader.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _DECODING_WAV_FILE_READER_H_
-#define _DECODING_WAV_FILE_READER_H_
+#ifndef SV_DECODING_WAV_FILE_READER_H
+#define SV_DECODING_WAV_FILE_READER_H
 
 #include "CodedAudioFileReader.h"
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/fileio/FileReadThread.h
--- a/data/fileio/FileReadThread.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/fileio/FileReadThread.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _FILE_READ_THREAD_H_
-#define _FILE_READ_THREAD_H_
+#ifndef SV_FILE_READ_THREAD_H
+#define SV_FILE_READ_THREAD_H
 
 #include "base/Thread.h"
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/fileio/FileSource.h
--- a/data/fileio/FileSource.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/fileio/FileSource.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _FILE_SOURCE_H_
-#define _FILE_SOURCE_H_
+#ifndef SV_FILE_SOURCE_H
+#define SV_FILE_SOURCE_H
 
 #include <QUrl>
 #include <QMutex>
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/fileio/MIDIFileWriter.h
--- a/data/fileio/MIDIFileWriter.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/fileio/MIDIFileWriter.h	Mon Nov 26 13:51:36 2018 +0000
@@ -20,8 +20,8 @@
    and copyright 2007 QMUL.
 */
 
-#ifndef _MIDI_FILE_WRITER_H_
-#define _MIDI_FILE_WRITER_H_
+#ifndef SV_MIDI_FILE_WRITER_H
+#define SV_MIDI_FILE_WRITER_H
 
 #include "base/RealTime.h"
 #include "base/BaseTypes.h"
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/fileio/MP3FileReader.h
--- a/data/fileio/MP3FileReader.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/fileio/MP3FileReader.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _MP3_FILE_READER_H_
-#define _MP3_FILE_READER_H_
+#ifndef SV_MP3_FILE_READER_H
+#define SV_MP3_FILE_READER_H
 
 #ifdef HAVE_MAD
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/fileio/PlaylistFileReader.h
--- a/data/fileio/PlaylistFileReader.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/fileio/PlaylistFileReader.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _PLAYLIST_FILE_READER_H_
-#define _PLAYLIST_FILE_READER_H_
+#ifndef SV_PLAYLIST_FILE_READER_H
+#define SV_PLAYLIST_FILE_READER_H
 
 #include "FileSource.h"
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/midi/MIDIEvent.h
--- a/data/midi/MIDIEvent.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/midi/MIDIEvent.h	Mon Nov 26 13:51:36 2018 +0000
@@ -19,8 +19,8 @@
    This file copyright 2000-2006 Richard Bown and Chris Cannam.
 */
 
-#ifndef _MIDI_EVENT_H_
-#define _MIDI_EVENT_H_
+#ifndef SV_MIDI_EVENT_H
+#define SV_MIDI_EVENT_H
 
 #include <QString>
 #include <string>
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/midi/MIDIInput.h
--- a/data/midi/MIDIInput.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/midi/MIDIInput.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _MIDI_INPUT_H_
-#define _MIDI_INPUT_H_
+#ifndef SV_MIDI_INPUT_H
+#define SV_MIDI_INPUT_H
 
 #include <QObject>
 #include "MIDIEvent.h"
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/model/AggregateWaveModel.h
--- a/data/model/AggregateWaveModel.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/model/AggregateWaveModel.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _AGGREGATE_WAVE_MODEL_H_
-#define _AGGREGATE_WAVE_MODEL_H_
+#ifndef SV_AGGREGATE_WAVE_MODEL_H
+#define SV_AGGREGATE_WAVE_MODEL_H
 
 #include "RangeSummarisableTimeValueModel.h"
 #include "PowerOfSqrtTwoZoomConstraint.h"
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/model/AlignmentModel.h
--- a/data/model/AlignmentModel.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/model/AlignmentModel.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _ALIGNMENT_MODEL_H_
-#define _ALIGNMENT_MODEL_H_
+#ifndef SV_ALIGNMENT_MODEL_H
+#define SV_ALIGNMENT_MODEL_H
 
 #include "Model.h"
 #include "PathModel.h"
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/model/DenseThreeDimensionalModel.h
--- a/data/model/DenseThreeDimensionalModel.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/model/DenseThreeDimensionalModel.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _DENSE_THREE_DIMENSIONAL_MODEL_H_
-#define _DENSE_THREE_DIMENSIONAL_MODEL_H_
+#ifndef SV_DENSE_THREE_DIMENSIONAL_MODEL_H
+#define SV_DENSE_THREE_DIMENSIONAL_MODEL_H
 
 #include "Model.h"
 #include "TabularModel.h"
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/model/EditableDenseThreeDimensionalModel.h
--- a/data/model/EditableDenseThreeDimensionalModel.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/model/EditableDenseThreeDimensionalModel.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _EDITABLE_DENSE_THREE_DIMENSIONAL_MODEL_H_
-#define _EDITABLE_DENSE_THREE_DIMENSIONAL_MODEL_H_
+#ifndef SV_EDITABLE_DENSE_THREE_DIMENSIONAL_MODEL_H
+#define SV_EDITABLE_DENSE_THREE_DIMENSIONAL_MODEL_H
 
 #include "DenseThreeDimensionalModel.h"
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/model/FlexiNoteModel.h
--- a/data/model/FlexiNoteModel.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/model/FlexiNoteModel.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _FLEXINOTE_MODEL_H_
-#define _FLEXINOTE_MODEL_H_
+#ifndef SV_FLEXINOTE_MODEL_H
+#define SV_FLEXINOTE_MODEL_H
 
 #include "IntervalModel.h"
 #include "NoteData.h"
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/model/ImageModel.h
--- a/data/model/ImageModel.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/model/ImageModel.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _IMAGE_MODEL_H_
-#define _IMAGE_MODEL_H_
+#ifndef SV_IMAGE_MODEL_H
+#define SV_IMAGE_MODEL_H
 
 #include "SparseModel.h"
 #include "base/XmlExportable.h"
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/model/IntervalModel.h
--- a/data/model/IntervalModel.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/model/IntervalModel.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _INTERVAL_MODEL_H_
-#define _INTERVAL_MODEL_H_
+#ifndef SV_INTERVAL_MODEL_H
+#define SV_INTERVAL_MODEL_H
 
 #include "SparseValueModel.h"
 #include "base/RealTime.h"
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/model/Labeller.h
--- a/data/model/Labeller.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/model/Labeller.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _LABELLER_H_
-#define _LABELLER_H_
+#ifndef SV_LABELLER_H
+#define SV_LABELLER_H
 
 #include "SparseModel.h"
 #include "SparseValueModel.h"
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/model/PathModel.h
--- a/data/model/PathModel.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/model/PathModel.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _PATH_MODEL_H_
-#define _PATH_MODEL_H_
+#ifndef SV_PATH_MODEL_H
+#define SV_PATH_MODEL_H
 
 #include "Model.h"
 #include "SparseModel.h"
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/model/RegionModel.h
--- a/data/model/RegionModel.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/model/RegionModel.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _REGION_MODEL_H_
-#define _REGION_MODEL_H_
+#ifndef SV_REGION_MODEL_H
+#define SV_REGION_MODEL_H
 
 #include "IntervalModel.h"
 #include "base/RealTime.h"
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/model/SparseOneDimensionalModel.h
--- a/data/model/SparseOneDimensionalModel.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/model/SparseOneDimensionalModel.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _SPARSE_ONE_DIMENSIONAL_MODEL_H_
-#define _SPARSE_ONE_DIMENSIONAL_MODEL_H_
+#ifndef SV_SPARSE_ONE_DIMENSIONAL_MODEL_H
+#define SV_SPARSE_ONE_DIMENSIONAL_MODEL_H
 
 #include "SparseModel.h"
 #include "NoteData.h"
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/model/SparseTimeValueModel.h
--- a/data/model/SparseTimeValueModel.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/model/SparseTimeValueModel.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _SPARSE_TIME_VALUE_MODEL_H_
-#define _SPARSE_TIME_VALUE_MODEL_H_
+#ifndef SV_SPARSE_TIME_VALUE_MODEL_H
+#define SV_SPARSE_TIME_VALUE_MODEL_H
 
 #include "SparseValueModel.h"
 #include "base/PlayParameterRepository.h"
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/model/SparseValueModel.h
--- a/data/model/SparseValueModel.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/model/SparseValueModel.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _SPARSE_VALUE_MODEL_H_
-#define _SPARSE_VALUE_MODEL_H_
+#ifndef SV_SPARSE_VALUE_MODEL_H
+#define SV_SPARSE_VALUE_MODEL_H
 
 #include "SparseModel.h"
 #include "base/UnitDatabase.h"
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/model/TabularModel.h
--- a/data/model/TabularModel.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/model/TabularModel.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _TABULAR_MODEL_H_
-#define _TABULAR_MODEL_H_
+#ifndef SV_TABULAR_MODEL_H
+#define SV_TABULAR_MODEL_H
 
 #include <QVariant>
 #include <QString>
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/model/TextModel.h
--- a/data/model/TextModel.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/model/TextModel.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _TEXT_MODEL_H_
-#define _TEXT_MODEL_H_
+#ifndef SV_TEXT_MODEL_H
+#define SV_TEXT_MODEL_H
 
 #include "SparseModel.h"
 #include "base/XmlExportable.h"
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/osc/OSCMessage.h
--- a/data/osc/OSCMessage.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/osc/OSCMessage.h	Mon Nov 26 13:51:36 2018 +0000
@@ -18,8 +18,8 @@
    This file copyright 2000-2006 Chris Cannam.
 */
 
-#ifndef _OSC_MESSAGE_H_
-#define _OSC_MESSAGE_H_
+#ifndef SV_OSC_MESSAGE_H
+#define SV_OSC_MESSAGE_H
 
 #include <QString>
 #include <QVariant>
diff -r c01cbe41aeb5 -r ad5f892c0c4d data/osc/OSCQueue.h
--- a/data/osc/OSCQueue.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/data/osc/OSCQueue.h	Mon Nov 26 13:51:36 2018 +0000
@@ -18,8 +18,8 @@
    This file copyright 2000-2006 Chris Cannam and QMUL.
 */
 
-#ifndef _OSC_QUEUE_H_
-#define _OSC_QUEUE_H_
+#ifndef SV_OSC_QUEUE_H
+#define SV_OSC_QUEUE_H
 
 #include "OSCMessage.h"
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d plugin/DSSIPluginFactory.h
--- a/plugin/DSSIPluginFactory.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/plugin/DSSIPluginFactory.h	Mon Nov 26 13:51:36 2018 +0000
@@ -18,8 +18,8 @@
    This file copyright 2000-2006 Chris Cannam.
 */
 
-#ifndef _DSSI_PLUGIN_FACTORY_H_
-#define _DSSI_PLUGIN_FACTORY_H_
+#ifndef SV_DSSI_PLUGIN_FACTORY_H
+#define SV_DSSI_PLUGIN_FACTORY_H
 
 #define DSSI_API_LEVEL 2
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d plugin/DSSIPluginInstance.h
--- a/plugin/DSSIPluginInstance.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/plugin/DSSIPluginInstance.h	Mon Nov 26 13:51:36 2018 +0000
@@ -18,8 +18,8 @@
    This file copyright 2000-2006 Chris Cannam.
 */
 
-#ifndef _DSSIPLUGININSTANCE_H_
-#define _DSSIPLUGININSTANCE_H_
+#ifndef SV_DSSIPLUGININSTANCE_H
+#define SV_DSSIPLUGININSTANCE_H
 
 #define DSSI_API_LEVEL 2
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d plugin/LADSPAPluginFactory.h
--- a/plugin/LADSPAPluginFactory.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/plugin/LADSPAPluginFactory.h	Mon Nov 26 13:51:36 2018 +0000
@@ -18,8 +18,8 @@
    This file copyright 2000-2006 Chris Cannam and Richard Bown.
 */
 
-#ifndef _LADSPA_PLUGIN_FACTORY_H_
-#define _LADSPA_PLUGIN_FACTORY_H_
+#ifndef SV_LADSPA_PLUGIN_FACTORY_H
+#define SV_LADSPA_PLUGIN_FACTORY_H
 
 #include "RealTimePluginFactory.h"
 #include "api/ladspa.h"
diff -r c01cbe41aeb5 -r ad5f892c0c4d plugin/LADSPAPluginInstance.h
--- a/plugin/LADSPAPluginInstance.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/plugin/LADSPAPluginInstance.h	Mon Nov 26 13:51:36 2018 +0000
@@ -18,8 +18,8 @@
    This file copyright 2000-2006 Chris Cannam and Richard Bown.
 */
 
-#ifndef _LADSPAPLUGININSTANCE_H_
-#define _LADSPAPLUGININSTANCE_H_
+#ifndef SV_LADSPAPLUGININSTANCE_H
+#define SV_LADSPAPLUGININSTANCE_H
 
 #include <vector>
 #include <set>
diff -r c01cbe41aeb5 -r ad5f892c0c4d plugin/PluginIdentifier.h
--- a/plugin/PluginIdentifier.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/plugin/PluginIdentifier.h	Mon Nov 26 13:51:36 2018 +0000
@@ -18,8 +18,8 @@
    This file copyright 2000-2006 Chris Cannam and QMUL.
 */
 
-#ifndef _PLUGIN_IDENTIFIER_H_
-#define _PLUGIN_IDENTIFIER_H_
+#ifndef SV_PLUGIN_IDENTIFIER_H
+#define SV_PLUGIN_IDENTIFIER_H
 
 #include <QString>
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d plugin/PluginXml.h
--- a/plugin/PluginXml.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/plugin/PluginXml.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _PLUGIN_XML_H_
-#define _PLUGIN_XML_H_
+#ifndef SV_PLUGIN_XML_H
+#define SV_PLUGIN_XML_H
 
 #include "base/XmlExportable.h"
 #include <vamp-hostsdk/PluginBase.h>
diff -r c01cbe41aeb5 -r ad5f892c0c4d plugin/RealTimePluginFactory.h
--- a/plugin/RealTimePluginFactory.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/plugin/RealTimePluginFactory.h	Mon Nov 26 13:51:36 2018 +0000
@@ -19,8 +19,8 @@
    This file copyright 2000-2006 Chris Cannam.
 */
 
-#ifndef _REALTIME_PLUGIN_FACTORY_H_
-#define _REALTIME_PLUGIN_FACTORY_H_
+#ifndef SV_REALTIME_PLUGIN_FACTORY_H
+#define SV_REALTIME_PLUGIN_FACTORY_H
 
 #include <QString>
 #include <vector>
diff -r c01cbe41aeb5 -r ad5f892c0c4d plugin/RealTimePluginInstance.h
--- a/plugin/RealTimePluginInstance.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/plugin/RealTimePluginInstance.h	Mon Nov 26 13:51:36 2018 +0000
@@ -18,8 +18,8 @@
    This file copyright 2000-2006 Chris Cannam.
 */
 
-#ifndef _REALTIME_PLUGIN_INSTANCE_H_
-#define _REALTIME_PLUGIN_INSTANCE_H_
+#ifndef SV_REALTIME_PLUGIN_INSTANCE_H
+#define SV_REALTIME_PLUGIN_INSTANCE_H
 
 #include <vamp-hostsdk/PluginBase.h>
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d plugin/plugins/SamplePlayer.h
--- a/plugin/plugins/SamplePlayer.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/plugin/plugins/SamplePlayer.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _SAMPLE_PLAYER_H_
-#define _SAMPLE_PLAYER_H_
+#ifndef SV_SAMPLE_PLAYER_H
+#define SV_SAMPLE_PLAYER_H
 
 #define DSSI_API_LEVEL 2
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d rdf/PluginRDFDescription.h
--- a/rdf/PluginRDFDescription.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/rdf/PluginRDFDescription.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _PLUGIN_RDF_DESCRIPTION_H_
-#define _PLUGIN_RDF_DESCRIPTION_H_
+#ifndef SV_PLUGIN_RDF_DESCRIPTION_H
+#define SV_PLUGIN_RDF_DESCRIPTION_H
 
 #include <QString>
 #include <QStringList>
diff -r c01cbe41aeb5 -r ad5f892c0c4d rdf/PluginRDFIndexer.h
--- a/rdf/PluginRDFIndexer.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/rdf/PluginRDFIndexer.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _PLUGIN_RDF_INDEXER_H_
-#define _PLUGIN_RDF_INDEXER_H_
+#ifndef SV_PLUGIN_RDF_INDEXER_H
+#define SV_PLUGIN_RDF_INDEXER_H
 
 #include <QString>
 #include <QStringList>
diff -r c01cbe41aeb5 -r ad5f892c0c4d rdf/RDFExporter.h
--- a/rdf/RDFExporter.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/rdf/RDFExporter.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RDF_EXPORTER_H_
-#define _RDF_EXPORTER_H_
+#ifndef SV_RDF_EXPORTER_H
+#define SV_RDF_EXPORTER_H
 
 #include <QString>
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d rdf/RDFFeatureWriter.h
--- a/rdf/RDFFeatureWriter.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/rdf/RDFFeatureWriter.h	Mon Nov 26 13:51:36 2018 +0000
@@ -17,8 +17,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RDF_FEATURE_WRITER_H_
-#define _RDF_FEATURE_WRITER_H_
+#ifndef SV_RDF_FEATURE_WRITER_H
+#define SV_RDF_FEATURE_WRITER_H
 
 #include <string>
 #include <map>
diff -r c01cbe41aeb5 -r ad5f892c0c4d rdf/RDFImporter.h
--- a/rdf/RDFImporter.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/rdf/RDFImporter.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RDF_IMPORTER_H_
-#define _RDF_IMPORTER_H_
+#ifndef SV_RDF_IMPORTER_H
+#define SV_RDF_IMPORTER_H
 
 #include <QObject>
 #include <QString>
diff -r c01cbe41aeb5 -r ad5f892c0c4d rdf/RDFTransformFactory.h
--- a/rdf/RDFTransformFactory.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/rdf/RDFTransformFactory.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _RDF_TRANSFORM_FACTORY_H_
-#define _RDF_TRANSFORM_FACTORY_H_
+#ifndef SV_RDF_TRANSFORM_FACTORY_H
+#define SV_RDF_TRANSFORM_FACTORY_H
 
 #include <QObject>
 #include <QString>
diff -r c01cbe41aeb5 -r ad5f892c0c4d system/Init.h
--- a/system/Init.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/system/Init.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _SV_SYSTEM_INIT_H_
-#define _SV_SYSTEM_INIT_H_
+#ifndef SV_SYSTEM_INIT_H
+#define SV_SYSTEM_INIT_H
 
 extern void svSystemSpecificInitialisation();
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d transform/CSVFeatureWriter.h
--- a/transform/CSVFeatureWriter.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/transform/CSVFeatureWriter.h	Mon Nov 26 13:51:36 2018 +0000
@@ -17,8 +17,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _CSV_FEATURE_WRITER_H_
-#define _CSV_FEATURE_WRITER_H_
+#ifndef SV_CSV_FEATURE_WRITER_H
+#define SV_CSV_FEATURE_WRITER_H
 
 #include <string>
 #include <map>
diff -r c01cbe41aeb5 -r ad5f892c0c4d transform/FeatureExtractionModelTransformer.h
--- a/transform/FeatureExtractionModelTransformer.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/transform/FeatureExtractionModelTransformer.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _FEATURE_EXTRACTION_MODEL_TRANSFORMER_H_
-#define _FEATURE_EXTRACTION_MODEL_TRANSFORMER_H_
+#ifndef SV_FEATURE_EXTRACTION_MODEL_TRANSFORMER_H
+#define SV_FEATURE_EXTRACTION_MODEL_TRANSFORMER_H
 
 #include "ModelTransformer.h"
 
diff -r c01cbe41aeb5 -r ad5f892c0c4d transform/FeatureWriter.h
--- a/transform/FeatureWriter.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/transform/FeatureWriter.h	Mon Nov 26 13:51:36 2018 +0000
@@ -17,8 +17,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _FEATURE_WRITER_H_
-#define _FEATURE_WRITER_H_
+#ifndef SV_FEATURE_WRITER_H
+#define SV_FEATURE_WRITER_H
 
 #include <string>
 #include <map>
diff -r c01cbe41aeb5 -r ad5f892c0c4d transform/FileFeatureWriter.h
--- a/transform/FileFeatureWriter.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/transform/FileFeatureWriter.h	Mon Nov 26 13:51:36 2018 +0000
@@ -17,8 +17,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _FILE_FEATURE_WRITER_H_
-#define _FILE_FEATURE_WRITER_H_
+#ifndef SV_FILE_FEATURE_WRITER_H
+#define SV_FILE_FEATURE_WRITER_H
 
 #include <string>
 #include <map>
diff -r c01cbe41aeb5 -r ad5f892c0c4d transform/ModelTransformerFactory.h
--- a/transform/ModelTransformerFactory.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/transform/ModelTransformerFactory.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _MODEL_TRANSFORMER_FACTORY_H_
-#define _MODEL_TRANSFORMER_FACTORY_H_
+#ifndef SV_MODEL_TRANSFORMER_FACTORY_H
+#define SV_MODEL_TRANSFORMER_FACTORY_H
 
 #include "Transform.h"
 #include "TransformDescription.h"
diff -r c01cbe41aeb5 -r ad5f892c0c4d transform/RealTimeEffectModelTransformer.h
--- a/transform/RealTimeEffectModelTransformer.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/transform/RealTimeEffectModelTransformer.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _REAL_TIME_EFFECT_TRANSFORMER_H_
-#define _REAL_TIME_EFFECT_TRANSFORMER_H_
+#ifndef SV_REAL_TIME_EFFECT_TRANSFORMER_H
+#define SV_REAL_TIME_EFFECT_TRANSFORMER_H
 
 #include "ModelTransformer.h"
 #include "plugin/RealTimePluginInstance.h"
diff -r c01cbe41aeb5 -r ad5f892c0c4d transform/Transform.h
--- a/transform/Transform.h	Mon Nov 26 13:48:45 2018 +0000
+++ b/transform/Transform.h	Mon Nov 26 13:51:36 2018 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _TRANSFORM_H_
-#define _TRANSFORM_H_
+#ifndef SV_TRANSFORM_H
+#define SV_TRANSFORM_H
 
 #include "base/XmlExportable.h"
 #include "base/Window.h"