diff --git a/.gitignore b/.gitignore
index 3b34c7ef5..e3d1b69fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .*
+*~
 Makefile
 Debug/
 Build
diff --git a/src/AIModel/AIBallistic.cxx b/src/AIModel/AIBallistic.cxx
index 15ccad0ad..9d499454d 100644
--- a/src/AIModel/AIBallistic.cxx
+++ b/src/AIModel/AIBallistic.cxx
@@ -23,7 +23,7 @@
 #  include <config.h>
 #endif
 
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/scene/model/modellib.hxx>
 
diff --git a/src/AIModel/AIEscort.cxx b/src/AIModel/AIEscort.cxx
index 088c89996..ac66f9454 100644
--- a/src/AIModel/AIEscort.cxx
+++ b/src/AIModel/AIEscort.cxx
@@ -28,7 +28,7 @@
 
 #include <simgear/sg_inlines.h>
 #include <simgear/math/sg_geodesy.hxx>
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 
 #include <cmath>
 #include <Main/util.hxx>
diff --git a/src/AIModel/AIShip.cxx b/src/AIModel/AIShip.cxx
index 6d4bb2c0f..9e9640b1c 100644
--- a/src/AIModel/AIShip.cxx
+++ b/src/AIModel/AIShip.cxx
@@ -33,7 +33,7 @@
 #include <simgear/sg_inlines.h>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/timing/sg_time.hxx>
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 
 #include <simgear/scene/util/SGNodeMasks.hxx>
 #include <Scenery/scenery.hxx>
diff --git a/src/Environment/fgmetar.cxx b/src/Environment/fgmetar.cxx
index d4dacdde1..221e77305 100644
--- a/src/Environment/fgmetar.cxx
+++ b/src/Environment/fgmetar.cxx
@@ -36,7 +36,7 @@
 #include <config.h>
 #endif
 
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 #include <simgear/timing/sg_time.hxx>
 #include <simgear/timing/lowleveltime.h>
 
diff --git a/src/Environment/terrainsampler.cxx b/src/Environment/terrainsampler.cxx
index 0f4e0ba36..fc32bcd7d 100644
--- a/src/Environment/terrainsampler.cxx
+++ b/src/Environment/terrainsampler.cxx
@@ -25,7 +25,7 @@
 #endif
 
 #include <Main/fg_props.hxx>
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 #include <Scenery/scenery.hxx>
 #include <deque>
 
diff --git a/src/Instrumentation/adf.cxx b/src/Instrumentation/adf.cxx
index ce9bac76e..73dab674c 100644
--- a/src/Instrumentation/adf.cxx
+++ b/src/Instrumentation/adf.cxx
@@ -9,7 +9,7 @@
 
 #include <simgear/compiler.h>
 #include <simgear/math/sg_geodesy.hxx>
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 #include <simgear/timing/sg_time.hxx>
 
 #include <Main/fg_props.hxx>
diff --git a/src/Instrumentation/dme.cxx b/src/Instrumentation/dme.cxx
index a0e7fb45d..8bc183b9a 100644
--- a/src/Instrumentation/dme.cxx
+++ b/src/Instrumentation/dme.cxx
@@ -10,7 +10,7 @@
 #include <simgear/compiler.h>
 #include <simgear/sg_inlines.h>
 #include <simgear/math/sg_geodesy.hxx>
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 #include <simgear/sound/sample_group.hxx>
 
 #include <Main/fg_props.hxx>
diff --git a/src/Instrumentation/gps.cxx b/src/Instrumentation/gps.cxx
index dcc39a231..9c0598d7f 100644
--- a/src/Instrumentation/gps.cxx
+++ b/src/Instrumentation/gps.cxx
@@ -28,7 +28,7 @@
 #include "Airports/runways.hxx"
 #include "Autopilot/route_mgr.hxx"
 
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 #include <simgear/sg_inlines.h>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/structure/exception.hxx>
diff --git a/src/Instrumentation/heading_indicator_dg.hxx b/src/Instrumentation/heading_indicator_dg.hxx
index 029a2cd2b..6895403ac 100644
--- a/src/Instrumentation/heading_indicator_dg.hxx
+++ b/src/Instrumentation/heading_indicator_dg.hxx
@@ -10,7 +10,7 @@
 
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 
 #include "gyro.hxx"
 
diff --git a/src/Instrumentation/kr_87.cxx b/src/Instrumentation/kr_87.cxx
index 64833675e..f7774bf92 100644
--- a/src/Instrumentation/kr_87.cxx
+++ b/src/Instrumentation/kr_87.cxx
@@ -27,7 +27,7 @@
 #include <stdio.h>	// snprintf
 
 #include <simgear/compiler.h>
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/timing/sg_time.hxx>
 #include <simgear/sound/sample_group.hxx>
diff --git a/src/Instrumentation/marker_beacon.cxx b/src/Instrumentation/marker_beacon.cxx
index 485f72e39..816017a46 100644
--- a/src/Instrumentation/marker_beacon.cxx
+++ b/src/Instrumentation/marker_beacon.cxx
@@ -26,7 +26,7 @@
 #include <stdio.h>	// snprintf
 
 #include <simgear/compiler.h>
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/sound/sample_group.hxx>
 
diff --git a/src/Instrumentation/mk_viii.cxx b/src/Instrumentation/mk_viii.cxx
index 58542a7c7..efb819095 100644
--- a/src/Instrumentation/mk_viii.cxx
+++ b/src/Instrumentation/mk_viii.cxx
@@ -68,7 +68,7 @@
 #include <simgear/math/SGLimits.hxx>
 #include <simgear/math/SGGeometryFwd.hxx>
 #include <simgear/math/SGGeodesy.hxx>
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 #include <simgear/math/SGLineSegment.hxx>
 #include <simgear/math/SGIntersect.hxx>
 #include <simgear/misc/sg_path.hxx>
diff --git a/src/Instrumentation/navradio.cxx b/src/Instrumentation/navradio.cxx
index d448d7fdf..cc3fbf367 100644
--- a/src/Instrumentation/navradio.cxx
+++ b/src/Instrumentation/navradio.cxx
@@ -29,7 +29,7 @@
 
 #include <simgear/sg_inlines.h>
 #include <simgear/timing/sg_time.hxx>
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/structure/exception.hxx>
diff --git a/src/Instrumentation/tacan.cxx b/src/Instrumentation/tacan.cxx
index 4f7f5df61..7993608da 100644
--- a/src/Instrumentation/tacan.cxx
+++ b/src/Instrumentation/tacan.cxx
@@ -12,7 +12,7 @@
 
 #include <simgear/compiler.h>
 #include <simgear/math/sg_geodesy.hxx>
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 
 #include <Main/fg_props.hxx>
 #include <Navaids/navlist.hxx>
diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index e63952bec..6744362dc 100644
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -14,7 +14,7 @@
 #include <simgear/debug/ErrorReportingCallback.hxx>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iostreams/sgstream.hxx>
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 #include <simgear/props/props.hxx>
 #include <simgear/props/props_io.hxx>
 #include <simgear/sg_inlines.h>
diff --git a/src/Main/fg_scene_commands.cxx b/src/Main/fg_scene_commands.cxx
index c00af6499..a1d8c1261 100644
--- a/src/Main/fg_scene_commands.cxx
+++ b/src/Main/fg_scene_commands.cxx
@@ -11,7 +11,7 @@
 
 #include <simgear/sg_inlines.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 #include <simgear/io/iostreams/sgstream.hxx>
 #include <simgear/scene/material/mat.hxx>
 #include <simgear/scene/material/matlib.hxx>
diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index abfee4ea1..085978586 100755
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -39,7 +39,7 @@
 #include <simgear/emesary/notifications.hxx>
 #include <simgear/io/raw_socket.hxx>
 #include <simgear/math/SGMath.hxx>
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 #include <simgear/misc/strutils.hxx>
 #include <simgear/nasal/NasalEmesaryInterface.hxx>
 #include <simgear/props/AtomicChangeListener.hxx>
diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 06f3f5b96..6c9165669 100644
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -44,7 +44,7 @@
 
 #include <simgear/io/HTTPClient.hxx>
 #include <simgear/io/HTTPFileRequest.hxx>
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 #include <simgear/props/props_io.hxx>
 #include <simgear/io/iostreams/sgstream.hxx>
 #include <simgear/misc/sg_path.hxx>
diff --git a/src/MultiPlayer/multiplaymgr.cxx b/src/MultiPlayer/multiplaymgr.cxx
index 174ff70e4..2f0c935c7 100644
--- a/src/MultiPlayer/multiplaymgr.cxx
+++ b/src/MultiPlayer/multiplaymgr.cxx
@@ -36,7 +36,7 @@
 #include <memory>
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 #include <simgear/misc/sg_dir.hxx>
 #include <simgear/misc/stdint.hxx>
 #include <simgear/misc/strutils.hxx>
diff --git a/src/Scripting/NasalSys.cxx b/src/Scripting/NasalSys.cxx
index 08668f619..14457a128 100644
--- a/src/Scripting/NasalSys.cxx
+++ b/src/Scripting/NasalSys.cxx
@@ -37,7 +37,7 @@
 #include <simgear/debug/ErrorReportingCallback.hxx>
 #include <simgear/io/iostreams/sgstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 #include <simgear/misc/SimpleMarkdown.hxx>
 #include <simgear/misc/sg_dir.hxx>
 #include <simgear/misc/sg_path.hxx>
diff --git a/src/Viewer/renderer.cxx b/src/Viewer/renderer.cxx
index 697fccb84..87c568f47 100644
--- a/src/Viewer/renderer.cxx
+++ b/src/Viewer/renderer.cxx
@@ -81,7 +81,7 @@
 #include <simgear/props/props.hxx>
 #include <simgear/timing/sg_time.hxx>
 #include <simgear/ephemeris/ephemeris.hxx>
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 
 #include <Time/light.hxx>
 #include <Time/light.hxx>
diff --git a/src/Viewer/splash.cxx b/src/Viewer/splash.cxx
index 5941cfcbf..2305f30e4 100644
--- a/src/Viewer/splash.cxx
+++ b/src/Viewer/splash.cxx
@@ -43,7 +43,7 @@
 #include <simgear/compiler.h>
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_random.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/misc/sg_dir.hxx>
 #include <simgear/scene/util/SGReaderWriterOptions.hxx>