diff --git a/AudioUnit/AmuseContainingApp.hpp b/AudioUnit/AmuseContainingApp.hpp
index e4f04b7..7b51f37 100644
--- a/AudioUnit/AmuseContainingApp.hpp
+++ b/AudioUnit/AmuseContainingApp.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_AUDIOUNIT_CONTAININGAPP_HPP__
-#define __AMUSE_AUDIOUNIT_CONTAININGAPP_HPP__
+#pragma once
 
 #import <AppKit/AppKit.h>
 #import "AudioGroupFilePresenter.hpp"
@@ -58,4 +57,3 @@
 - (void)startSample:(int)sampId;
 @end
 
-#endif // __AMUSE_AUDIOUNIT_CONTAININGAPP_HPP__
\ No newline at end of file
diff --git a/AudioUnit/AudioGroupFilePresenter.hpp b/AudioUnit/AudioGroupFilePresenter.hpp
index 28970bb..3ff8991 100644
--- a/AudioUnit/AudioGroupFilePresenter.hpp
+++ b/AudioUnit/AudioGroupFilePresenter.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_AUDIOUNIT_AUDIOGROUPFILEPRESENTER_HPP__
-#define __AMUSE_AUDIOUNIT_AUDIOGROUPFILEPRESENTER_HPP__
+#pragma once
 
 #import <Foundation/Foundation.h>
 #import <AppKit/AppKit.h>
@@ -166,4 +165,3 @@ initWithName:(NSAttributedString*)name
 - (void)removeSelectedItem;
 @end
 
-#endif // __AMUSE_AUDIOUNIT_AUDIOGROUPFILEPRESENTER_HPP__
diff --git a/AudioUnit/AudioUnitBackend.hpp b/AudioUnit/AudioUnitBackend.hpp
index 6e5c390..0a393d0 100644
--- a/AudioUnit/AudioUnitBackend.hpp
+++ b/AudioUnit/AudioUnitBackend.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_AUDIOUNIT_BACKEND_HPP__
-#define __AMUSE_AUDIOUNIT_BACKEND_HPP__
+#pragma once
 #ifdef __APPLE__
 
 #include <Availability.h>
@@ -52,4 +51,3 @@ void RegisterAudioUnit();
 
 #endif
 #endif
-#endif // __AMUSE_AUDIOUNIT_BACKEND_HPP__
diff --git a/AudioUnit/AudioUnitViewController.hpp b/AudioUnit/AudioUnitViewController.hpp
index a3b4831..e5e5c0f 100644
--- a/AudioUnit/AudioUnitViewController.hpp
+++ b/AudioUnit/AudioUnitViewController.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_AUDIOUNIT_VIEWCONTROLLER_HPP__
-#define __AMUSE_AUDIOUNIT_VIEWCONTROLLER_HPP__
+#pragma once
 
 #import <CoreAudioKit/CoreAudioKit.h>
 #import "AudioGroupFilePresenter.hpp"
@@ -22,4 +21,3 @@
 }
 @end
 
-#endif // __AMUSE_AUDIOUNIT_VIEWCONTROLLER_HPP__
diff --git a/Editor/ADSREditor.hpp b/Editor/ADSREditor.hpp
index 46bfae1..7da8770 100644
--- a/Editor/ADSREditor.hpp
+++ b/Editor/ADSREditor.hpp
@@ -1,5 +1,4 @@
-#ifndef AMUSE_ADSR_EDITOR_HPP
-#define AMUSE_ADSR_EDITOR_HPP
+#pragma once
 
 #include "EditorWidget.hpp"
 #include <QFrame>
@@ -81,4 +80,3 @@ public:
 };
 
 
-#endif //AMUSE_ADSR_EDITOR_HPP
diff --git a/Editor/Common.hpp b/Editor/Common.hpp
index 9a0e902..6bbc2ee 100644
--- a/Editor/Common.hpp
+++ b/Editor/Common.hpp
@@ -1,5 +1,4 @@
-#ifndef AMUSE_COMMON_HPP
-#define AMUSE_COMMON_HPP
+#pragma once
 
 #include "boo/System.hpp"
 #include <QString>
@@ -65,4 +64,3 @@ template<> struct hash<QString>
 };
 }
 
-#endif //AMUSE_COMMON_HPP
diff --git a/Editor/CurveEditor.hpp b/Editor/CurveEditor.hpp
index e0cdba3..af5ccb2 100644
--- a/Editor/CurveEditor.hpp
+++ b/Editor/CurveEditor.hpp
@@ -1,5 +1,4 @@
-#ifndef AMUSE_CURVE_EDITOR_HPP
-#define AMUSE_CURVE_EDITOR_HPP
+#pragma once
 
 #include "EditorWidget.hpp"
 #include <QFrame>
@@ -63,4 +62,3 @@ public:
     ProjectModel::INode* currentNode() const;
 };
 
-#endif //AMUSE_CURVE_EDITOR_HPP
diff --git a/Editor/EditorWidget.hpp b/Editor/EditorWidget.hpp
index a8f037d..b5dd58f 100644
--- a/Editor/EditorWidget.hpp
+++ b/Editor/EditorWidget.hpp
@@ -1,5 +1,4 @@
-#ifndef AMUSE_EDITOR_WIDGET_HPP
-#define AMUSE_EDITOR_WIDGET_HPP
+#pragma once
 
 #include <QWidget>
 #include <QUndoCommand>
@@ -251,4 +250,3 @@ private slots:
     void doFindUsages();
 };
 
-#endif //AMUSE_EDITOR_WIDGET_HPP
diff --git a/Editor/KeyboardWidget.hpp b/Editor/KeyboardWidget.hpp
index f25db79..c1e8f06 100644
--- a/Editor/KeyboardWidget.hpp
+++ b/Editor/KeyboardWidget.hpp
@@ -1,5 +1,4 @@
-#ifndef AMUSE_KEYBOARD_WIDGET_HPP
-#define AMUSE_KEYBOARD_WIDGET_HPP
+#pragma once
 
 #include <QWidget>
 #include <QSvgWidget>
@@ -103,4 +102,3 @@ public:
     void wheelEvent(QWheelEvent* ev) { ev->ignore(); }
 };
 
-#endif //AMUSE_KEYBOARD_WIDGET_HPP
diff --git a/Editor/KeymapEditor.hpp b/Editor/KeymapEditor.hpp
index fe93053..8905b55 100644
--- a/Editor/KeymapEditor.hpp
+++ b/Editor/KeymapEditor.hpp
@@ -1,5 +1,4 @@
-#ifndef AMUSE_KEYMAP_EDITOR_HPP
-#define AMUSE_KEYMAP_EDITOR_HPP
+#pragma once
 
 #include "EditorWidget.hpp"
 #include <QFrame>
@@ -106,4 +105,3 @@ public:
     void keyPressEvent(QKeyEvent* event);
 };
 
-#endif //AMUSE_KEYMAP_EDITOR_HPP
diff --git a/Editor/LayersEditor.hpp b/Editor/LayersEditor.hpp
index dfd7f66..a842fbc 100644
--- a/Editor/LayersEditor.hpp
+++ b/Editor/LayersEditor.hpp
@@ -1,5 +1,4 @@
-#ifndef AMUSE_LAYERS_EDITOR_HPP
-#define AMUSE_LAYERS_EDITOR_HPP
+#pragma once
 
 #include "EditorWidget.hpp"
 #include <QAbstractTableModel>
@@ -89,4 +88,3 @@ private slots:
     void itemDeleteAction();
 };
 
-#endif //AMUSE_LAYERS_EDITOR_HPP
diff --git a/Editor/MIDIReader.hpp b/Editor/MIDIReader.hpp
index 4f5a64f..1eca0c7 100644
--- a/Editor/MIDIReader.hpp
+++ b/Editor/MIDIReader.hpp
@@ -1,5 +1,4 @@
-#ifndef AMUSE_MIDI_READER_HPP
-#define AMUSE_MIDI_READER_HPP
+#pragma once
 
 #include "amuse/Voice.hpp"
 #include "amuse/BooBackend.hpp"
@@ -49,4 +48,3 @@ public:
     std::unique_ptr<amuse::IMIDIReader> allocateMIDIReader(amuse::Engine& engine);
 };
 
-#endif // AMUSE_MIDI_READER_HPP
diff --git a/Editor/MainWindow.hpp b/Editor/MainWindow.hpp
index 97f433b..43bed49 100644
--- a/Editor/MainWindow.hpp
+++ b/Editor/MainWindow.hpp
@@ -1,5 +1,4 @@
-#ifndef AMUSE_MAINWINDOW_HPP
-#define AMUSE_MAINWINDOW_HPP
+#pragma once
 
 #include <QMainWindow>
 #include <QUndoStack>
@@ -306,4 +305,3 @@ public slots:
 };
 
 
-#endif //AMUSE_MAINWINDOW_HPP
diff --git a/Editor/NewSoundMacroDialog.hpp b/Editor/NewSoundMacroDialog.hpp
index e38b7c7..2421c74 100644
--- a/Editor/NewSoundMacroDialog.hpp
+++ b/Editor/NewSoundMacroDialog.hpp
@@ -1,5 +1,4 @@
-#ifndef AMUSE_NEW_SOUND_MACRO_DIALOG_HPP
-#define AMUSE_NEW_SOUND_MACRO_DIALOG_HPP
+#pragma once
 
 #include <QDialog>
 #include <QLineEdit>
@@ -25,4 +24,3 @@ public:
     const SoundMacroTemplateEntry* getSelectedTemplate() const;
 };
 
-#endif // AMUSE_NEW_SOUND_MACRO_DIALOG_HPP
diff --git a/Editor/ProjectModel.hpp b/Editor/ProjectModel.hpp
index 7dd0c9b..6a5c39b 100644
--- a/Editor/ProjectModel.hpp
+++ b/Editor/ProjectModel.hpp
@@ -1,5 +1,4 @@
-#ifndef AMUSE_PROJECT_MODEL_HPP
-#define AMUSE_PROJECT_MODEL_HPP
+#pragma once
 
 #include <QAbstractItemModel>
 #include <QIdentityProxyModel>
@@ -513,4 +512,3 @@ public:
 };
 
 
-#endif //AMUSE_PROJECT_MODEL_HPP
diff --git a/Editor/SampleEditor.hpp b/Editor/SampleEditor.hpp
index ab5967f..5a5f536 100644
--- a/Editor/SampleEditor.hpp
+++ b/Editor/SampleEditor.hpp
@@ -1,5 +1,4 @@
-#ifndef AMUSE_SAMPLE_EDITOR_HPP
-#define AMUSE_SAMPLE_EDITOR_HPP
+#pragma once
 
 #include "EditorWidget.hpp"
 #include "ProjectModel.hpp"
@@ -113,4 +112,3 @@ public:
 };
 
 
-#endif //AMUSE_SAMPLE_EDITOR_HPP
diff --git a/Editor/SongGroupEditor.hpp b/Editor/SongGroupEditor.hpp
index c1a8530..e9c353f 100644
--- a/Editor/SongGroupEditor.hpp
+++ b/Editor/SongGroupEditor.hpp
@@ -1,5 +1,4 @@
-#ifndef AMUSE_SONG_GROUP_EDITOR_HPP
-#define AMUSE_SONG_GROUP_EDITOR_HPP
+#pragma once
 
 #include "EditorWidget.hpp"
 #include <QTabWidget>
@@ -298,4 +297,3 @@ private slots:
     void itemDeleteAction();
 };
 
-#endif //AMUSE_SONG_GROUP_EDITOR_HPP
diff --git a/Editor/SoundGroupEditor.hpp b/Editor/SoundGroupEditor.hpp
index f712032..aaaaedd 100644
--- a/Editor/SoundGroupEditor.hpp
+++ b/Editor/SoundGroupEditor.hpp
@@ -1,5 +1,4 @@
-#ifndef AMUSE_SOUND_GROUP_EDITOR_HPP
-#define AMUSE_SOUND_GROUP_EDITOR_HPP
+#pragma once
 
 #include "EditorWidget.hpp"
 #include <QStyledItemDelegate>
@@ -130,4 +129,3 @@ private slots:
     void itemDeleteAction();
 };
 
-#endif //AMUSE_SOUND_GROUP_EDITOR_HPP
diff --git a/Editor/SoundMacroEditor.hpp b/Editor/SoundMacroEditor.hpp
index 5686283..5394fcf 100644
--- a/Editor/SoundMacroEditor.hpp
+++ b/Editor/SoundMacroEditor.hpp
@@ -1,5 +1,4 @@
-#ifndef AMUSE_SOUND_MACRO_EDITOR_HPP
-#define AMUSE_SOUND_MACRO_EDITOR_HPP
+#pragma once
 
 #include "EditorWidget.hpp"
 #include <QStaticText>
@@ -187,4 +186,3 @@ public slots:
 };
 
 
-#endif //AMUSE_SOUND_MACRO_EDITOR_HPP
diff --git a/Editor/StatusBarWidget.hpp b/Editor/StatusBarWidget.hpp
index 43018b0..6613fa6 100644
--- a/Editor/StatusBarWidget.hpp
+++ b/Editor/StatusBarWidget.hpp
@@ -1,5 +1,4 @@
-#ifndef AMUSE_STATUSBAR_WIDGET_HPP
-#define AMUSE_STATUSBAR_WIDGET_HPP
+#pragma once
 
 #include <QStatusBar>
 #include <QLabel>
@@ -74,4 +73,3 @@ public:
     void exit();
 };
 
-#endif //AMUSE_STATUSBAR_WIDGET_HPP
diff --git a/Editor/StudioSetupWidget.hpp b/Editor/StudioSetupWidget.hpp
index 953ce9c..14341db 100644
--- a/Editor/StudioSetupWidget.hpp
+++ b/Editor/StudioSetupWidget.hpp
@@ -1,5 +1,4 @@
-#ifndef AMUSE_STUDIO_SETUP_WIDGET_HPP
-#define AMUSE_STUDIO_SETUP_WIDGET_HPP
+#pragma once
 
 #include "EditorWidget.hpp"
 #include <QWidget>
@@ -202,4 +201,3 @@ signals:
     void shown();
 };
 
-#endif // AMUSE_STUDIO_SETUP_WIDGET_HPP
diff --git a/VST/AudioGroupFilePresenter.hpp b/VST/AudioGroupFilePresenter.hpp
index 618adc1..e46f268 100644
--- a/VST/AudioGroupFilePresenter.hpp
+++ b/VST/AudioGroupFilePresenter.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_AUDIOGROUPFILEPRESENTER_HPP__
-#define __AMUSE_AUDIOGROUPFILEPRESENTER_HPP__
+#pragma once
 
 #include <map>
 #include <memory>
@@ -113,4 +112,3 @@ public:
 };
 }
 
-#endif // __AMUSE_AUDIOGROUPFILEPRESENTER_HPP__
diff --git a/VST/FileOpenDialog.hpp b/VST/FileOpenDialog.hpp
index e0a8a49..6324286 100644
--- a/VST/FileOpenDialog.hpp
+++ b/VST/FileOpenDialog.hpp
@@ -1,8 +1,6 @@
-#ifndef __AMUSE_FILEOPENDIALOG_HPP__
-#define __AMUSE_FILEOPENDIALOG_HPP__
+#pragma once
 
 #include <string>
 
 std::wstring openDB();
 
-#endif // __AMUSE_FILEOPENDIALOG_HPP__
diff --git a/VST/VSTBackend.hpp b/VST/VSTBackend.hpp
index 2db8f20..23d10cb 100644
--- a/VST/VSTBackend.hpp
+++ b/VST/VSTBackend.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_VSTBACKEND_HPP__
-#define __AMUSE_VSTBACKEND_HPP__
+#pragma once
 
 #include "audioeffectx.h"
 #include "VSTEditor.hpp"
@@ -74,4 +73,3 @@ public:
 };
 }
 
-#endif // __AMUSE_VSTBACKEND_HPP__
diff --git a/VST/VSTEditor.hpp b/VST/VSTEditor.hpp
index e7ee4c0..26585fc 100644
--- a/VST/VSTEditor.hpp
+++ b/VST/VSTEditor.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_VSTEDITOR_HPP__
-#define __AMUSE_VSTEDITOR_HPP__
+#pragma once
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -61,4 +60,3 @@ public:
 };
 }
 
-#endif // __AMUSE_VSTEDITOR_HPP__
diff --git a/include/amuse/AudioGroup.hpp b/include/amuse/AudioGroup.hpp
index 34bef07..2d86f15 100644
--- a/include/amuse/AudioGroup.hpp
+++ b/include/amuse/AudioGroup.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_AUDIOGROUP_HPP__
-#define __AMUSE_AUDIOGROUP_HPP__
+#pragma once
 
 #include "AudioGroupPool.hpp"
 #include "AudioGroupProject.hpp"
@@ -116,4 +115,3 @@ public:
 };
 }
 
-#endif // __AMUSE_AUDIOGROUP_HPP__
diff --git a/include/amuse/AudioGroupData.hpp b/include/amuse/AudioGroupData.hpp
index 15ff8e6..96fdc32 100644
--- a/include/amuse/AudioGroupData.hpp
+++ b/include/amuse/AudioGroupData.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_AUDIOGROUPDATA_HPP__
-#define __AMUSE_AUDIOGROUPDATA_HPP__
+#pragma once
 
 #include "Common.hpp"
 
@@ -123,4 +122,3 @@ public:
 };
 }
 
-#endif // __AMUSE_AUDIOGROUPDATA_HPP__
diff --git a/include/amuse/AudioGroupPool.hpp b/include/amuse/AudioGroupPool.hpp
index 4542393..fc190ea 100644
--- a/include/amuse/AudioGroupPool.hpp
+++ b/include/amuse/AudioGroupPool.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_AUDIOGROUPPOOL_HPP__
-#define __AMUSE_AUDIOGROUPPOOL_HPP__
+#pragma once
 
 #include <cstdint>
 #include <vector>
@@ -1459,4 +1458,3 @@ public:
 };
 }
 
-#endif // __AMUSE_AUDIOGROUPPOOL_HPP__
diff --git a/include/amuse/AudioGroupProject.hpp b/include/amuse/AudioGroupProject.hpp
index bd58de2..44505d9 100644
--- a/include/amuse/AudioGroupProject.hpp
+++ b/include/amuse/AudioGroupProject.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_AUDIOGROUPPROJECT_HPP__
-#define __AMUSE_AUDIOGROUPPROJECT_HPP__
+#pragma once
 
 #include "Entity.hpp"
 #include "Common.hpp"
@@ -226,4 +225,3 @@ public:
 };
 }
 
-#endif // __AMUSE_AUDIOGROUPPROJECT_HPP__
diff --git a/include/amuse/AudioGroupSampleDirectory.hpp b/include/amuse/AudioGroupSampleDirectory.hpp
index 1002246..6f6de3d 100644
--- a/include/amuse/AudioGroupSampleDirectory.hpp
+++ b/include/amuse/AudioGroupSampleDirectory.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_AUDIOGROUPSAMPLEDIR_HPP__
-#define __AMUSE_AUDIOGROUPSAMPLEDIR_HPP__
+#pragma once
 
 #include <unordered_map>
 #include <cstdint>
@@ -383,4 +382,3 @@ using SampleEntry = AudioGroupSampleDirectory::Entry;
 using SampleEntryData = AudioGroupSampleDirectory::EntryData;
 }
 
-#endif // __AMUSE_AUDIOGROUPSAMPLEDIR_HPP__
diff --git a/include/amuse/BooBackend.hpp b/include/amuse/BooBackend.hpp
index b1e7e78..9078edc 100644
--- a/include/amuse/BooBackend.hpp
+++ b/include/amuse/BooBackend.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_BOO_BACKEND_HPP__
-#define __AMUSE_BOO_BACKEND_HPP__
+#pragma once
 
 #include <boo/audiodev/IAudioVoiceEngine.hpp>
 #include <boo/audiodev/IAudioSubmix.hpp>
@@ -144,4 +143,3 @@ public:
 };
 }
 
-#endif // __AMUSE_BOO_BACKEND_HPP__
diff --git a/include/amuse/Common.hpp b/include/amuse/Common.hpp
index 2e02e69..bc1f666 100644
--- a/include/amuse/Common.hpp
+++ b/include/amuse/Common.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_COMMON_HPP__
-#define __AMUSE_COMMON_HPP__
+#pragma once
 
 #include <algorithm>
 #include <limits>
@@ -676,4 +675,3 @@ struct NameDB
 };
 }
 
-#endif // __AMUSE_COMMON_HPP__
diff --git a/include/amuse/ContainerRegistry.hpp b/include/amuse/ContainerRegistry.hpp
index 3bc050e..6fb4cbe 100644
--- a/include/amuse/ContainerRegistry.hpp
+++ b/include/amuse/ContainerRegistry.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_CONTAINERREGISTRY_HPP__
-#define __AMUSE_CONTAINERREGISTRY_HPP__
+#pragma once
 
 #include "AudioGroupData.hpp"
 #include "Common.hpp"
@@ -45,4 +44,3 @@ public:
 };
 }
 
-#endif // __AMUSE_CONTAINERREGISTRY_HPP__
diff --git a/include/amuse/DSPCodec.hpp b/include/amuse/DSPCodec.hpp
index 9705093..ceaf3e6 100644
--- a/include/amuse/DSPCodec.hpp
+++ b/include/amuse/DSPCodec.hpp
@@ -1,5 +1,4 @@
-#ifndef _DSPCODEC_h
-#define _DSPCODEC_h
+#pragma once
 
 #include <cstdint>
 #include <cfloat>
@@ -37,4 +36,3 @@ void DSPCorrelateCoefs(const short* source, int samples, short coefsOut[8][2]);
 
 void DSPEncodeFrame(short pcmInOut[16], int sampleCount, unsigned char adpcmOut[8], const short coefsIn[8][2]);
 
-#endif // _DSPCODEC_h
diff --git a/include/amuse/DirectoryEnumerator.hpp b/include/amuse/DirectoryEnumerator.hpp
index d56e04f..4618c29 100644
--- a/include/amuse/DirectoryEnumerator.hpp
+++ b/include/amuse/DirectoryEnumerator.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_DIRECTORY_ENUMERATOR__
-#define __AMUSE_DIRECTORY_ENUMERATOR__
+#pragma once
 
 #include "Common.hpp"
 #include <vector>
@@ -65,4 +64,3 @@ public:
 };
 }
 
-#endif // __AMUSE_DIRECTORY_ENUMERATOR__
diff --git a/include/amuse/EffectBase.hpp b/include/amuse/EffectBase.hpp
index 2f45064..7bc7fa6 100644
--- a/include/amuse/EffectBase.hpp
+++ b/include/amuse/EffectBase.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_EFFECTBASE_HPP__
-#define __AMUSE_EFFECTBASE_HPP__
+#pragma once
 
 #include <cstdint>
 #include <cstdlib>
@@ -34,4 +33,3 @@ public:
 };
 }
 
-#endif // __AMUSE_EFFECTBASE_HPP__
diff --git a/include/amuse/EffectChorus.hpp b/include/amuse/EffectChorus.hpp
index ffcd13d..b7ebc53 100644
--- a/include/amuse/EffectChorus.hpp
+++ b/include/amuse/EffectChorus.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_EFFECTCHORUS_HPP__
-#define __AMUSE_EFFECTCHORUS_HPP__
+#pragma once
 
 #include "EffectBase.hpp"
 #include "Common.hpp"
@@ -123,4 +122,3 @@ public:
 };
 }
 
-#endif // __AMUSE_EFFECTCHORUS_HPP__
diff --git a/include/amuse/EffectDelay.hpp b/include/amuse/EffectDelay.hpp
index 44838bb..390c5ee 100644
--- a/include/amuse/EffectDelay.hpp
+++ b/include/amuse/EffectDelay.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_EFFECTDELAY_HPP__
-#define __AMUSE_EFFECTDELAY_HPP__
+#pragma once
 
 #include "EffectBase.hpp"
 #include "IBackendVoice.hpp"
@@ -142,4 +141,3 @@ public:
 };
 }
 
-#endif // __AMUSE_EFFECTDELAY_HPP__
diff --git a/include/amuse/EffectReverb.hpp b/include/amuse/EffectReverb.hpp
index 7ea664b..f496b6a 100644
--- a/include/amuse/EffectReverb.hpp
+++ b/include/amuse/EffectReverb.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_EFFECTREVERB_HPP__
-#define __AMUSE_EFFECTREVERB_HPP__
+#pragma once
 
 #include "EffectBase.hpp"
 #include "amuse/Common.hpp"
@@ -220,4 +219,3 @@ public:
 };
 }
 
-#endif // __AMUSE_EFFECTREVERB_HPP__
diff --git a/include/amuse/Emitter.hpp b/include/amuse/Emitter.hpp
index 048fef5..cb72d82 100644
--- a/include/amuse/Emitter.hpp
+++ b/include/amuse/Emitter.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_EMITTER_HPP__
-#define __AMUSE_EMITTER_HPP__
+#pragma once
 
 #include "Entity.hpp"
 #include "Common.hpp"
@@ -64,4 +63,3 @@ public:
 };
 }
 
-#endif // __AMUSE_EMITTER_HPP__
diff --git a/include/amuse/Engine.hpp b/include/amuse/Engine.hpp
index 11a7743..1718128 100644
--- a/include/amuse/Engine.hpp
+++ b/include/amuse/Engine.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_ENGINE_HPP__
-#define __AMUSE_ENGINE_HPP__
+#pragma once
 
 #include <memory>
 #include <list>
@@ -195,4 +194,3 @@ public:
 };
 }
 
-#endif // __AMUSE_ENGINE_HPP__
diff --git a/include/amuse/Entity.hpp b/include/amuse/Entity.hpp
index 2e9c8be..9986ec8 100644
--- a/include/amuse/Entity.hpp
+++ b/include/amuse/Entity.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_ENTITY_HPP__
-#define __AMUSE_ENTITY_HPP__
+#pragma once
 
 #include <cstdint>
 #include <functional>
@@ -50,4 +49,3 @@ public:
 
 }
 
-#endif // __AMUSE_ENTITY_HPP__
diff --git a/include/amuse/Envelope.hpp b/include/amuse/Envelope.hpp
index bb39f82..264f2c8 100644
--- a/include/amuse/Envelope.hpp
+++ b/include/amuse/Envelope.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_ENVELOPE_HPP__
-#define __AMUSE_ENVELOPE_HPP__
+#pragma once
 
 #include "AudioGroupPool.hpp"
 
@@ -42,4 +41,3 @@ public:
 };
 }
 
-#endif // __AMUSE_ENVELOPE_HPP__
diff --git a/include/amuse/IBackendSubmix.hpp b/include/amuse/IBackendSubmix.hpp
index b6655df..4a38364 100644
--- a/include/amuse/IBackendSubmix.hpp
+++ b/include/amuse/IBackendSubmix.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_IBACKENDSUBMIX_HPP__
-#define __AMUSE_IBACKENDSUBMIX_HPP__
+#pragma once
 
 #include <memory>
 
@@ -32,4 +31,3 @@ public:
 };
 }
 
-#endif // __AMUSE_IBACKENDSUBMIX_HPP__
diff --git a/include/amuse/IBackendVoice.hpp b/include/amuse/IBackendVoice.hpp
index 2e55f26..1e17aad 100644
--- a/include/amuse/IBackendVoice.hpp
+++ b/include/amuse/IBackendVoice.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_IBACKENDVOICE_HPP__
-#define __AMUSE_IBACKENDVOICE_HPP__
+#pragma once
 
 namespace amuse
 {
@@ -52,4 +51,3 @@ public:
 };
 }
 
-#endif // __AMUSE_IBACKENDVOICE_HPP__
diff --git a/include/amuse/IBackendVoiceAllocator.hpp b/include/amuse/IBackendVoiceAllocator.hpp
index a4abd82..8c7ea2c 100644
--- a/include/amuse/IBackendVoiceAllocator.hpp
+++ b/include/amuse/IBackendVoiceAllocator.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_IBACKENDVOICEALLOCATOR_HPP__
-#define __AMUSE_IBACKENDVOICEALLOCATOR_HPP__
+#pragma once
 
 #include <memory>
 #include <functional>
@@ -60,4 +59,3 @@ public:
 };
 }
 
-#endif // __AMUSE_IBACKENDVOICEALLOCATOR_HPP__
diff --git a/include/amuse/Listener.hpp b/include/amuse/Listener.hpp
index 4d787cf..f436730 100644
--- a/include/amuse/Listener.hpp
+++ b/include/amuse/Listener.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_LISTENER_HPP__
-#define __AMUSE_LISTENER_HPP__
+#pragma once
 
 #include "amuse/Emitter.hpp"
 
@@ -27,4 +26,3 @@ public:
 };
 }
 
-#endif // __AMUSE_LISTENER_HPP__
diff --git a/include/amuse/N64MusyXCodec.hpp b/include/amuse/N64MusyXCodec.hpp
index ccf29be..bc34880 100644
--- a/include/amuse/N64MusyXCodec.hpp
+++ b/include/amuse/N64MusyXCodec.hpp
@@ -1,5 +1,4 @@
-#ifndef _N64MUSYXCODEC_h
-#define _N64MUSYXCODEC_h
+#pragma once
 
 #include <cstdint>
 
@@ -18,4 +17,3 @@ unsigned N64MusyXDecompressFrameRanged(int16_t* out, const uint8_t* in,
                                        const int16_t coefs[8][2][8],
                                        unsigned firstSample, unsigned lastSample);
 
-#endif // _N64MUSYXCODEC_h
diff --git a/include/amuse/Sequencer.hpp b/include/amuse/Sequencer.hpp
index 0ab39c7..20ba9eb 100644
--- a/include/amuse/Sequencer.hpp
+++ b/include/amuse/Sequencer.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_SEQUENCER_HPP__
-#define __AMUSE_SEQUENCER_HPP__
+#pragma once
 
 #include "Entity.hpp"
 #include "AudioGroupProject.hpp"
@@ -166,4 +165,3 @@ public:
 };
 }
 
-#endif // __AMUSE_SEQUENCER_HPP__
diff --git a/include/amuse/SongConverter.hpp b/include/amuse/SongConverter.hpp
index e2b5e8f..db9786f 100644
--- a/include/amuse/SongConverter.hpp
+++ b/include/amuse/SongConverter.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_SONGCONVERTER_HPP__
-#define __AMUSE_SONGCONVERTER_HPP__
+#pragma once
 
 #include <vector>
 #include <cstdint>
@@ -15,4 +14,3 @@ public:
 };
 }
 
-#endif // __AMUSE_SONGCONVERTER_HPP__
diff --git a/include/amuse/SongState.hpp b/include/amuse/SongState.hpp
index 03c66e0..3f52c49 100644
--- a/include/amuse/SongState.hpp
+++ b/include/amuse/SongState.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_SONGSTATE_HPP__
-#define __AMUSE_SONGSTATE_HPP__
+#pragma once
 
 #include <cstdint>
 #include <vector>
@@ -137,4 +136,3 @@ public:
 };
 }
 
-#endif // __AMUSE_SONGSTATE_HPP__
diff --git a/include/amuse/SoundMacroState.hpp b/include/amuse/SoundMacroState.hpp
index b81a814..57e2993 100644
--- a/include/amuse/SoundMacroState.hpp
+++ b/include/amuse/SoundMacroState.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_SOUNDMACROSTATE_HPP__
-#define __AMUSE_SOUNDMACROSTATE_HPP__
+#pragma once
 
 #include <cstdint>
 #include <vector>
@@ -143,4 +142,3 @@ public:
 };
 }
 
-#endif // __AMUSE_SOUNDMACROSTATE_HPP__
diff --git a/include/amuse/Studio.hpp b/include/amuse/Studio.hpp
index 941fdf4..75ace19 100644
--- a/include/amuse/Studio.hpp
+++ b/include/amuse/Studio.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_STUDIO_HPP__
-#define __AMUSE_STUDIO_HPP__
+#pragma once
 
 #include <memory>
 #include <list>
@@ -54,4 +53,3 @@ struct StudioSend
 
 }
 
-#endif // __AMUSE_STUDIO_HPP__
diff --git a/include/amuse/Submix.hpp b/include/amuse/Submix.hpp
index ade93bb..7236e1f 100644
--- a/include/amuse/Submix.hpp
+++ b/include/amuse/Submix.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_SUBMIX_HPP__
-#define __AMUSE_SUBMIX_HPP__
+#pragma once
 
 #include <memory>
 #include "SoundMacroState.hpp"
@@ -111,4 +110,3 @@ public:
 };
 }
 
-#endif // __AMUSE_SUBMIX_HPP__
diff --git a/include/amuse/Voice.hpp b/include/amuse/Voice.hpp
index 1116a97..3fd65bf 100644
--- a/include/amuse/Voice.hpp
+++ b/include/amuse/Voice.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_VOICE_HPP__
-#define __AMUSE_VOICE_HPP__
+#pragma once
 
 #include <cstdint>
 #include <cstdlib>
@@ -393,4 +392,3 @@ public:
 };
 }
 
-#endif // __AMUSE_VOICE_HPP__
diff --git a/include/amuse/VolumeTable.hpp b/include/amuse/VolumeTable.hpp
index 625b667..defa23c 100644
--- a/include/amuse/VolumeTable.hpp
+++ b/include/amuse/VolumeTable.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_VOLUME_TABLE_HPP__
-#define __AMUSE_VOLUME_TABLE_HPP__
+#pragma once
 
 namespace amuse
 {
@@ -7,4 +6,3 @@ float LookupVolume(float vol);
 float LookupDLSVolume(float vol);
 }
 
-#endif // __AMUSE_VOLUME_TABLE_HPP__
\ No newline at end of file
diff --git a/include/amuse/amuse.hpp b/include/amuse/amuse.hpp
index 091399b..44fcb80 100644
--- a/include/amuse/amuse.hpp
+++ b/include/amuse/amuse.hpp
@@ -1,5 +1,4 @@
-#ifndef __AMUSE_AMUSE_HPP__
-#define __AMUSE_AMUSE_HPP__
+#pragma once
 
 
 #include "AudioGroup.hpp"
@@ -22,4 +21,3 @@
 #include "Submix.hpp"
 #include "Voice.hpp"
 
-#endif // __AMUSE_AMUSE_HPP__
diff --git a/include/switch_math.hpp b/include/switch_math.hpp
index efbca3a..adb54a1 100644
--- a/include/switch_math.hpp
+++ b/include/switch_math.hpp
@@ -1,5 +1,4 @@
-#ifndef SWITCH_MATH_HPP
-#define SWITCH_MATH_HPP
+#pragma once
 
 /* Properly forward math defines to std:: */
 #ifdef __SWITCH__
@@ -19,4 +18,3 @@ namespace std
 }
 #endif
 
-#endif //TEST_SWITCH_MATH_HPP