diff --git a/src/shape_square.scad b/src/shape_square.scad
index f5364c36..ccede75f 100644
--- a/src/shape_square.scad
+++ b/src/shape_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>;
  
 function shape_square(size, corner_r = 0) = 
     let(
diff --git a/test/test_shape_square.scad b/test/test_shape_square.scad
index 448b1261..5e859462 100644
--- a/test/test_shape_square.scad
+++ b/test/test_shape_square.scad
@@ -1,5 +1,5 @@
-include <unittest.scad>;
-include <shape_square.scad>;
+use <unittest.scad>;
+use <shape_square.scad>;
 
 module test_shape_square() {
     echo("==== test_shape_square ====");