diff --git a/examples/maze/cube_maze.scad b/examples/maze/cube_maze.scad
index 0caf1894..1c94af88 100644
--- a/examples/maze/cube_maze.scad
+++ b/examples/maze/cube_maze.scad
@@ -1,5 +1,4 @@
-include <line2d.scad>;
-include <square_maze.scad>;
+use <square_maze.scad>;
 
 maze_rows = 8;
 block_width = 2;
diff --git a/examples/maze/cylinder_maze.scad b/examples/maze/cylinder_maze.scad
index b9a44434..31d6a7c4 100644
--- a/examples/maze/cylinder_maze.scad
+++ b/examples/maze/cylinder_maze.scad
@@ -1,6 +1,5 @@
-include <hollow_out.scad>;
-include <bend.scad>;
-include <square_maze.scad>;
+use <bend.scad>;
+use <square_maze.scad>;
 
 radius = 30; 
 height = 60;
diff --git a/examples/maze/euler_maze.scad b/examples/maze/euler_maze.scad
index dd227e37..266ac126 100644
--- a/examples/maze/euler_maze.scad
+++ b/examples/maze/euler_maze.scad
@@ -1,5 +1,5 @@
-include <line2d.scad>;
-include <arc.scad>;
+use <line2d.scad>;
+use <arc.scad>;
 
 number_of_circles = 15;
 minimum_radius = 3;
diff --git a/examples/maze/heart2heart_maze.scad b/examples/maze/heart2heart_maze.scad
index 9a5209ad..71104d51 100644
--- a/examples/maze/heart2heart_maze.scad
+++ b/examples/maze/heart2heart_maze.scad
@@ -1,3 +1,5 @@
+use <arc.scad>;
+use <square_maze.scad>;
 use <heart_maze.scad>;
 
 names = ["Justin", "Monica"];
diff --git a/examples/maze/heart_maze.scad b/examples/maze/heart_maze.scad
index ada68020..dfd13761 100644
--- a/examples/maze/heart_maze.scad
+++ b/examples/maze/heart_maze.scad
@@ -1,8 +1,8 @@
-include <line2d.scad>;
-include <hollow_out.scad>;
-include <square_maze.scad>;
-include <ellipse_extrude.scad>;
-include <arc.scad>;
+use <line2d.scad>;
+use <hollow_out.scad>;
+use <square_maze.scad>;
+use <ellipse_extrude.scad>;
+use <arc.scad>;
 
 radius_of_heart = 12;
 height_of_heart = 25;
diff --git a/examples/maze/mobius_maze.scad b/examples/maze/mobius_maze.scad
index 07599e8c..ace0e8eb 100644
--- a/examples/maze/mobius_maze.scad
+++ b/examples/maze/mobius_maze.scad
@@ -1,6 +1,6 @@
-include <hull_polyline3d.scad>;
-include <rotate_p.scad>;
-include <square_maze.scad>;
+use <hull_polyline3d.scad>;
+use <rotate_p.scad>;
+use <square_maze.scad>;
 use <twisted_maze.scad>;
 
 rows = 48;
diff --git a/examples/maze/pyramid_maze.scad b/examples/maze/pyramid_maze.scad
index 106fcda6..b3c76041 100644
--- a/examples/maze/pyramid_maze.scad
+++ b/examples/maze/pyramid_maze.scad
@@ -1,5 +1,4 @@
-include <line2d.scad>;
-include <square_maze.scad>;
+use <square_maze.scad>;
 
 maze_rows = 10;
 block_width = 2;
diff --git a/examples/maze/regular_polygon_maze.scad b/examples/maze/regular_polygon_maze.scad
index 2662e4bb..a70518fd 100644
--- a/examples/maze/regular_polygon_maze.scad
+++ b/examples/maze/regular_polygon_maze.scad
@@ -1,6 +1,6 @@
-include <line2d.scad>;
-include <hollow_out.scad>;
-include <square_maze.scad>;
+use <line2d.scad>;
+use <hollow_out.scad>;
+use <square_maze.scad>;
 
 // only for creating a small maze
 
diff --git a/examples/maze/square_maze.scad b/examples/maze/square_maze.scad
index 524c99fc..5920a718 100644
--- a/examples/maze/square_maze.scad
+++ b/examples/maze/square_maze.scad
@@ -1,3 +1,6 @@
+use <line2d.scad>;
+use <polyline2d.scad>;
+
 // NO_WALL = 0;       
 // UPPER_WALL = 1;    
 // RIGHT_WALL = 2;    
diff --git a/examples/maze/step_pyramid_maze.scad b/examples/maze/step_pyramid_maze.scad
index 8c46d317..926508bc 100644
--- a/examples/maze/step_pyramid_maze.scad
+++ b/examples/maze/step_pyramid_maze.scad
@@ -1,5 +1,4 @@
-include <line2d.scad>;
-include <square_maze.scad>;
+use <square_maze.scad>;
 
 maze_rows = 8;
 block_width = 10;
diff --git a/examples/maze/stereographic_hex_maze.scad b/examples/maze/stereographic_hex_maze.scad
index 7dd561fd..17176733 100644
--- a/examples/maze/stereographic_hex_maze.scad
+++ b/examples/maze/stereographic_hex_maze.scad
@@ -1,7 +1,5 @@
-include <line2d.scad>;
-include <polyline2d.scad>;
-include <stereographic_extrude.scad>;
-include <square_maze.scad>;
+use <stereographic_extrude.scad>;
+use <square_maze.scad>;
 
 x_cells = 10;
 cell_radius = 20;
diff --git a/examples/maze/stereographic_square_maze.scad b/examples/maze/stereographic_square_maze.scad
index f43a664b..880fb662 100644
--- a/examples/maze/stereographic_square_maze.scad
+++ b/examples/maze/stereographic_square_maze.scad
@@ -1,6 +1,5 @@
-include <line2d.scad>;
-include <stereographic_extrude.scad>;
-include <square_maze.scad>;
+use <stereographic_extrude.scad>;
+use <square_maze.scad>;
 
 maze_rows = 10;
 block_width = 40;
diff --git a/examples/maze/twisted_maze.scad b/examples/maze/twisted_maze.scad
index ed8c6641..08e14c50 100644
--- a/examples/maze/twisted_maze.scad
+++ b/examples/maze/twisted_maze.scad
@@ -1,6 +1,6 @@
-include <hull_polyline3d.scad>;
-include <rotate_p.scad>;
-include <square_maze.scad>;
+use <hull_polyline3d.scad>;
+use <rotate_p.scad>;
+use <square_maze.scad>;
 
 rows = 16;
 columns = 8;