diff --git a/modules/autonavigation/autonavigationhandler.h b/modules/autonavigation/autonavigationhandler.h
index 50cba52006..b257927a7a 100644
--- a/modules/autonavigation/autonavigationhandler.h
+++ b/modules/autonavigation/autonavigationhandler.h
@@ -22,8 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __OPENSPACE_MODULE___AUTONAVIGATIONHANDLER___H__
-#define __OPENSPACE_MODULE___AUTONAVIGATIONHANDLER___H__
+#ifndef __OPENSPACE_MODULE_AUTONAVIGATION___AUTONAVIGATIONHANDLER___H__
+#define __OPENSPACE_MODULE_AUTONAVIGATION___AUTONAVIGATIONHANDLER___H__
 
 #include <modules/autonavigation/path.h>
 #include <openspace/properties/list/stringlistproperty.h>
@@ -92,4 +92,4 @@ private:
 
 } // namespace openspace::autonavigation
 
-#endif // __OPENSPACE_MODULE___AUTONAVIGATIONHANDLER___H__
+#endif // __OPENSPACE_MODULE_AUTONAVIGATION___AUTONAVIGATIONHANDLER___H__
diff --git a/modules/autonavigation/helperfunctions.h b/modules/autonavigation/helperfunctions.h
index 714ce67b86..330d84b23a 100644
--- a/modules/autonavigation/helperfunctions.h
+++ b/modules/autonavigation/helperfunctions.h
@@ -22,8 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __OPENSPACE_MODULE___EASINGFUNCTIONS___H__
-#define __OPENSPACE_MODULE___EASINGFUNCTIONS___H__
+#ifndef __OPENSPACE_MODULE_AUTONAVIGATION___HELPERFUNCTIONS___H__
+#define __OPENSPACE_MODULE_AUTONAVIGATION___HELPERFUNCTIONS___H__
 
 #include <ghoul/glm.h>
 #include <ghoul/logging/logmanager.h>
@@ -51,7 +51,7 @@ namespace openspace::autonavigation::helpers {
 
     double fivePointGaussianQuadrature(double t0, double t1,
         std::function<double(double)> f);
-} // namespace
+} // namespace openspace::autonavigation::helpers
 
 namespace openspace::autonavigation::interpolation {
 
@@ -79,5 +79,5 @@ namespace openspace::autonavigation::interpolation {
     glm::dvec3 piecewiseLinear(double t, const std::vector<glm::dvec3>& points,
         const std::vector<double>& tKnots);
 
-} // namespace
-#endif
+} // namespace openspace::autonavigation::interpolation 
+#endif // __OPENSPACE_MODULE_AUTONAVIGATION___HELPERFUNCTIONS___H__
diff --git a/modules/autonavigation/path.h b/modules/autonavigation/path.h
index f50e5d3edc..09b4bb155b 100644
--- a/modules/autonavigation/path.h
+++ b/modules/autonavigation/path.h
@@ -22,8 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __OPENSPACE_MODULE___PATHSEGMENT___H__
-#define __OPENSPACE_MODULE___PATHSEGMENT___H__
+#ifndef __OPENSPACE_MODULE_AUTONAVIGATION___PATH___H__
+#define __OPENSPACE_MODULE_AUTONAVIGATION___PATH___H__
 
 #include <modules/autonavigation/pathcurve.h>
 #include <modules/autonavigation/speedfunction.h>
@@ -76,4 +76,4 @@ private:
 
 } // namespace openspace::autonavigation
 
-#endif // __OPENSPACE_MODULE___PATHSEGMENT___H__
+#endif // __OPENSPACE_MODULE_AUTONAVIGATION___PATH___H__
diff --git a/modules/autonavigation/pathinstruction.h b/modules/autonavigation/pathinstruction.h
index a17fdaf523..fa5483881c 100644
--- a/modules/autonavigation/pathinstruction.h
+++ b/modules/autonavigation/pathinstruction.h
@@ -22,8 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __OPENSPACE_MODULE___PATHINSTRUCTION___H__
-#define __OPENSPACE_MODULE___PATHINSTRUCTION___H__
+#ifndef __OPENSPACE_MODULE_AUTONAVIGATION___PATHINSTRUCTION___H__
+#define __OPENSPACE_MODULE_AUTONAVIGATION___PATHINSTRUCTION___H__
 
 #include <modules/autonavigation/waypoint.h>
 #include <optional>
@@ -59,4 +59,4 @@ private:
 
 } // namespace openspace::autonavigation
 
-#endif // __OPENSPACE_MODULE___PATHINSTRUCTION___H__
+#endif // __OPENSPACE_MODULE_AUTONAVIGATION___PATHINSTRUCTION___H__
diff --git a/modules/autonavigation/waypoint.h b/modules/autonavigation/waypoint.h
index cb54e94cd9..eef7cc8e5c 100644
--- a/modules/autonavigation/waypoint.h
+++ b/modules/autonavigation/waypoint.h
@@ -22,8 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __OPENSPACE_MODULE___WAYPOINT___H__
-#define __OPENSPACE_MODULE___WAYPOINT___H__
+#ifndef __OPENSPACE_MODULE_AUTONAVIGATION___WAYPOINT___H__
+#define __OPENSPACE_MODULE_AUTONAVIGATION___WAYPOINT___H__
 
 #include <openspace/interaction/navigationhandler.h>
 #include <ghoul/glm.h>
@@ -57,4 +57,4 @@ struct Waypoint {
 
 } // namespace openspace::autonavigation
 
-#endif // __OPENSPACE_MODULE___WAYPOINT___H__
+#endif // __OPENSPACE_MODULE_AUTONAVIGATION___WAYPOINT___H__