diff --git a/include/Vector3.mac b/include/Vector3.mac
index c2fc44fc..7cd4e818 100644
--- a/include/Vector3.mac
+++ b/include/Vector3.mac
@@ -1,9 +1,3 @@
-#pragma safe
-
-module VECTOR3;
-
-export all;
-
 struct VECTOR3 {
     REAL VX;
     REAL VY;
@@ -16,7 +10,7 @@ l2norm(struct VECTOR3 v)
     x = _mul_SxS_(v.VX, v.VX);
     y = _mul_SxS_(v.VY, v.VY);
     z = _mul_SxS_(v.VZ, v.VZ);
-    return Math::sqrt(_add_SxS_(_add_SxS_(x, y), z));
+    return sqrt(_add_SxS_(_add_SxS_(x, y), z));
 }
 
 /******************************************************************************
diff --git a/src/structures/Vector3d.xsac b/src/structures/Vector3d.xsac
index 569a8c75..8618bd5c 100644
--- a/src/structures/Vector3d.xsac
+++ b/src/structures/Vector3d.xsac
@@ -1,3 +1,11 @@
+#pragma safe
+
+module Vector3d;
+
+use Math: { sqrt };
+
+export all;
+
 #define REAL double
 #define VECTOR3 Vector3d
 #define VX xd
diff --git a/src/structures/Vector3f.xsac b/src/structures/Vector3f.xsac
index e10563a7..096f7ab4 100644
--- a/src/structures/Vector3f.xsac
+++ b/src/structures/Vector3f.xsac
@@ -1,3 +1,11 @@
+#pragma safe
+
+module Vector3f;
+
+use Math: { sqrt };
+
+export all;
+
 #define REAL float
 #define VECTOR3 Vector3f
 #define VX xf