diff --git a/include/GammaLib.hpp b/include/GammaLib.hpp
index 335e843..971b3a4 100644
--- a/include/GammaLib.hpp
+++ b/include/GammaLib.hpp
@@ -135,21 +135,21 @@
 #include "GModelDiffuseSource.hpp"
 #include "GModelSpatial.hpp"
 #include "GModelSpatialRegistry.hpp"
-#include "GModelSpatialPtsrc.hpp"
-#include "GModelSpatialGauss.hpp"
 #include "GModelSpatialConst.hpp"
 #include "GModelSpatialCube.hpp"
+#include "GModelSpatialPtsrc.hpp"
 #include "GModelRadial.hpp"
 #include "GModelRadialRegistry.hpp"
 #include "GModelRadialDisk.hpp"
+#include "GModelRadialGauss.hpp"
 #include "GModelRadialShell.hpp"
 #include "GModelSpectral.hpp"
 #include "GModelSpectralRegistry.hpp"
-#include "GModelSpectralPlaw.hpp"
-#include "GModelSpectralPlaw2.hpp"
+#include "GModelSpectralConst.hpp"
 #include "GModelSpectralExpPlaw.hpp"
 #include "GModelSpectralFunc.hpp"
-#include "GModelSpectralConst.hpp"
+#include "GModelSpectralPlaw.hpp"
+#include "GModelSpectralPlaw2.hpp"
 #include "GModelTemporal.hpp"
 #include "GModelTemporalRegistry.hpp"
 #include "GModelTemporalConst.hpp"
diff --git a/include/Makefile.am b/include/Makefile.am
index 74c50c5..455e400 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -40,12 +40,12 @@ pkginclude_HEADERS = GammaLib.hpp \
                      GModelSpatial.hpp \
                      GModelSpatialRegistry.hpp \
                      GModelSpatialPtsrc.hpp \
-                     GModelSpatialGauss.hpp \
                      GModelSpatialConst.hpp \
                      GModelSpatialCube.hpp \
                      GModelRadial.hpp \
                      GModelRadialRegistry.hpp \
                      GModelRadialDisk.hpp \
+                     GModelRadialGauss.hpp \
                      GModelRadialShell.hpp \
                      GModelSpectral.hpp \
                      GModelSpectralRegistry.hpp \
diff --git a/src/model/Makefile.am b/src/model/Makefile.am
index 49dd377..8f41d2f 100644
--- a/src/model/Makefile.am
+++ b/src/model/Makefile.am
@@ -17,21 +17,21 @@ sources = GModelPar.cpp \
           GModelDiffuseSource.cpp \
           GModelSpatial.cpp \
           GModelSpatialRegistry.cpp \
-          GModelSpatialPtsrc.cpp \
-          GModelSpatialGauss.cpp \
           GModelSpatialConst.cpp \
           GModelSpatialCube.cpp \
+          GModelSpatialPtsrc.cpp \
           GModelRadial.cpp \
           GModelRadialRegistry.cpp \
           GModelRadialDisk.cpp \
+          GModelRadialGauss.cpp \
           GModelRadialShell.cpp \
           GModelSpectral.cpp \
           GModelSpectralRegistry.cpp \
-          GModelSpectralPlaw.cpp \
-          GModelSpectralPlaw2.cpp \
+          GModelSpectralConst.cpp \
           GModelSpectralExpPlaw.cpp \
           GModelSpectralFunc.cpp \
-          GModelSpectralConst.cpp \
+          GModelSpectralPlaw.cpp \
+          GModelSpectralPlaw2.cpp \
           GModelTemporal.cpp \
           GModelTemporalRegistry.cpp \
           GModelTemporalConst.cpp \