diff --git a/src/__comm__/__trapezium.scad b/src/__comm__/__trapezium.scad
index 5715ff5e..146025cd 100644
--- a/src/__comm__/__trapezium.scad
+++ b/src/__comm__/__trapezium.scad
@@ -1,3 +1,5 @@
+use <__comm__/__half_trapezium.scad>;
+
 function __trapezium(length, h, round_r) =
     let(
         r_half_trapezium = __half_trapezium(length / 2, h, round_r),
diff --git a/src/rounded_square.scad b/src/rounded_square.scad
index 22bfce1e..575692c3 100644
--- a/src/rounded_square.scad
+++ b/src/rounded_square.scad
@@ -8,10 +8,7 @@
 *
 **/
 
-include <__comm__/__frags.scad>;
-include <__comm__/__pie_for_rounding.scad>;
-include <__comm__/__half_trapezium.scad>;
-include <__comm__/__trapezium.scad>;
+use <__comm__/__trapezium.scad>;
 
 module rounded_square(size, corner_r, center = false) {
     is_flt = is_num(size);
diff --git a/test/test_rounded_square.scad b/test/test_rounded_square.scad
index 462394b9..a39794c3 100644
--- a/test/test_rounded_square.scad
+++ b/test/test_rounded_square.scad
@@ -1,62 +1,17 @@
-include <unittest.scad>;
+use <unittest.scad>;
+use <rounded_square.scad>;
+
+module test_rounded_square(position, points) {
+    assertEqualPoint([25, 25], position);
+    assertEqualPoints(
+            [[20, -25], [21.9471, -24.6053], [23.5868, -23.4835], [24.6602, -21.8118], [25, -20], [25, 20], [24.6053, 21.9471], [23.4835, 23.5868], [21.8118, 24.6602], [20, 25], [-20, 25], [-21.8118, 24.6602], [-23.4835, 23.5868], [-24.6053, 21.9471], [-25, 20], [-25, -20], [-24.6602, -21.8118], [-23.5868, -23.4835], [-21.9471, -24.6053], [-20, -25]],
+        points
+    );
+}
 
 module test_rounded_square_size_corner() {
     echo("==== test_rounded_square_size_corner ====");
-
-    include <rounded_square.scad>;
-    
-    module test_rounded_square(position, points) {
-        assertEqualPoint([25, 25], position);
-        assertEqualPoints(
-              [[20, -25], [21.9471, -24.6053], [23.5868, -23.4835], [24.6602, -21.8118], [25, -20], [25, 20], [24.6053, 21.9471], [23.4835, 23.5868], [21.8118, 24.6602], [20, 25], [-20, 25], [-21.8118, 24.6602], [-23.4835, 23.5868], [-24.6053, 21.9471], [-25, 20], [-25, -20], [-24.6602, -21.8118], [-23.5868, -23.4835], [-21.9471, -24.6053], [-20, -25]],
-            points
-        );
-    }
-
     rounded_square(size = 50, corner_r = 5);
 }
 
-module test_rounded_square_size_corner_center() {
-    echo("==== test_rounded_square_size_corner_center ====");
-
-    include <rounded_square.scad>;
-    
-    module test_rounded_square(position, points) {
-        assertEqualPoint([0, 0], position);
-        assertEqualPoints(
-             [[20, -12.5], [21.9471, -12.1053], [23.5868, -10.9835], [24.6602, -9.3118], [25, -7.5], [25, 7.5], [24.6053, 9.4471], [23.4835, 11.0868], [21.8118, 12.1602], [20, 12.5], [-20, 12.5], [-21.8118, 12.1602], [-23.4835, 11.0868], [-24.6053, 9.4471], [-25, 7.5], [-25, -7.5], [-24.6602, -9.3118], [-23.5868, -10.9835], [-21.9471, -12.1053], [-20, -12.5]],
-            points
-        );
-    }
-    
-    rounded_square(
-        size = [50, 25],
-        corner_r = 5, 
-        center = true
-    );
-}
-
-module test_rounded_square_size_corner_center_fn() {
-    echo("==== test_rounded_square_size_corner_center_fn ====");
-
-    include <rounded_square.scad>;
-    
-    module test_rounded_square(position, points) {
-        assertEqualPoint([0, 0], position);
-        assertEqualPoints(
-              [[20, -12.5], [25, -7.5], [25, 7.5], [20, 12.5], [-20, 12.5], [-25, 7.5], [-25, -7.5], [-20, -12.5]],
-            points
-        );
-    }
-    
-    $fn = 4;
-    rounded_square(
-        size = [50, 25],
-        corner_r = 5, 
-        center = true
-    );
-}
-
-test_rounded_square_size_corner();
-test_rounded_square_size_corner_center();
-test_rounded_square_size_corner_center_fn();
\ No newline at end of file
+test_rounded_square_size_corner();
\ No newline at end of file