diff --git a/bazel/config/BUILD.bazel b/bazel/config/BUILD.bazel
index f2547bde..bb1b8baa 100644
--- a/bazel/config/BUILD.bazel
+++ b/bazel/config/BUILD.bazel
@@ -4,4 +4,5 @@ cc_library(
         "config.h",
         "config-paths.h",
     ],
+    visibility = ["//visibility:public"],
 )
diff --git a/bazel/wrlib/BUILD.bazel b/bazel/wrlib/BUILD.bazel
new file mode 100644
index 00000000..bd107778
--- /dev/null
+++ b/bazel/wrlib/BUILD.bazel
@@ -0,0 +1,23 @@
+cc_library(
+    name = "wrlib",
+    srcs = [
+        "alpha_combine.c",
+        "context.c",
+        "convert.c",
+        "gradient.c",
+        "load.c",
+        "misc.c",
+        "raster.c",
+    ],
+    hdrs = [
+        "convert.h",
+        "imgformat.h",
+        "rotate.h",
+        "scale.h",
+        "wr_i18n.h",
+        "wraster.h",
+        "xutil.h",
+    ],
+    deps = ["//config"],
+    visibility = ["//visibility:public"],
+)
diff --git a/bazel/wrlib/alpha_combine.c b/bazel/wrlib/alpha_combine.c
index 915f65b9..21e3e4fd 100644
--- a/bazel/wrlib/alpha_combine.c
+++ b/bazel/wrlib/alpha_combine.c
@@ -18,7 +18,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include "config.h"
+#include "config/config.h"
 
 #include "wraster.h"
 #include "wr_i18n.h"
diff --git a/bazel/wrlib/color.c b/bazel/wrlib/color.c
index 3403e898..a42cd59a 100644
--- a/bazel/wrlib/color.c
+++ b/bazel/wrlib/color.c
@@ -20,7 +20,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/bazel/wrlib/context.c b/bazel/wrlib/context.c
index 73044506..72bd914b 100644
--- a/bazel/wrlib/context.c
+++ b/bazel/wrlib/context.c
@@ -20,7 +20,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/bazel/wrlib/convert.c b/bazel/wrlib/convert.c
index 400234f0..8f6e00a5 100644
--- a/bazel/wrlib/convert.c
+++ b/bazel/wrlib/convert.c
@@ -25,7 +25,7 @@
  *   2. Ghost dock/appicon is wrong in Pseudocolor, Staticgray, Grayscale
  */
 
-#include <config.h>
+#include "config/config.h"
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <stdlib.h>
diff --git a/bazel/wrlib/convolve.c b/bazel/wrlib/convolve.c
index 8873a620..51bd0e59 100644
--- a/bazel/wrlib/convolve.c
+++ b/bazel/wrlib/convolve.c
@@ -19,7 +19,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/bazel/wrlib/draw.c b/bazel/wrlib/draw.c
index 49992600..ce7153ab 100644
--- a/bazel/wrlib/draw.c
+++ b/bazel/wrlib/draw.c
@@ -21,7 +21,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/bazel/wrlib/flip.c b/bazel/wrlib/flip.c
index 13b10961..33a53fe5 100644
--- a/bazel/wrlib/flip.c
+++ b/bazel/wrlib/flip.c
@@ -20,7 +20,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include "config.h"
+#include "config/config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/bazel/wrlib/gradient.c b/bazel/wrlib/gradient.c
index 84db1ce0..34fdc6d3 100644
--- a/bazel/wrlib/gradient.c
+++ b/bazel/wrlib/gradient.c
@@ -21,7 +21,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/bazel/wrlib/load.c b/bazel/wrlib/load.c
index 1f94f0e4..052dd6a1 100644
--- a/bazel/wrlib/load.c
+++ b/bazel/wrlib/load.c
@@ -21,7 +21,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 #include <errno.h>
 #include <X11/Xlib.h>
diff --git a/bazel/wrlib/load_gif.c b/bazel/wrlib/load_gif.c
index 5921735f..8ea48eb9 100644
--- a/bazel/wrlib/load_gif.c
+++ b/bazel/wrlib/load_gif.c
@@ -20,7 +20,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/bazel/wrlib/load_jpeg.c b/bazel/wrlib/load_jpeg.c
index 9c2ef6be..ab24a0eb 100644
--- a/bazel/wrlib/load_jpeg.c
+++ b/bazel/wrlib/load_jpeg.c
@@ -20,7 +20,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 /* Avoid a compiler warning */
 #undef HAVE_STDLIB_H
diff --git a/bazel/wrlib/load_magick.c b/bazel/wrlib/load_magick.c
index 5602d64d..50f703c3 100644
--- a/bazel/wrlib/load_magick.c
+++ b/bazel/wrlib/load_magick.c
@@ -20,7 +20,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include "config.h"
+#include "config/config.h"
 
 #ifdef USE_MAGICK
 #if USE_MAGICK < 7
diff --git a/bazel/wrlib/load_png.c b/bazel/wrlib/load_png.c
index 50135b51..25e183d8 100644
--- a/bazel/wrlib/load_png.c
+++ b/bazel/wrlib/load_png.c
@@ -20,7 +20,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/bazel/wrlib/load_ppm.c b/bazel/wrlib/load_ppm.c
index 2f01c8ad..12324504 100644
--- a/bazel/wrlib/load_ppm.c
+++ b/bazel/wrlib/load_ppm.c
@@ -21,7 +21,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 #include <X11/Xlib.h>
 #include <stdlib.h>
diff --git a/bazel/wrlib/load_tiff.c b/bazel/wrlib/load_tiff.c
index 8e86baa1..85eda104 100644
--- a/bazel/wrlib/load_tiff.c
+++ b/bazel/wrlib/load_tiff.c
@@ -20,7 +20,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/bazel/wrlib/load_webp.c b/bazel/wrlib/load_webp.c
index ac8ff4f7..1b23e6e4 100644
--- a/bazel/wrlib/load_webp.c
+++ b/bazel/wrlib/load_webp.c
@@ -20,7 +20,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include "config.h"
+#include "config/config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/bazel/wrlib/load_xpm.c b/bazel/wrlib/load_xpm.c
index 54697acf..47392461 100644
--- a/bazel/wrlib/load_xpm.c
+++ b/bazel/wrlib/load_xpm.c
@@ -21,7 +21,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 #include <X11/Xlib.h>
 #include <stdlib.h>
diff --git a/bazel/wrlib/load_xpm_normalized.c b/bazel/wrlib/load_xpm_normalized.c
index 82be3c4e..00c4bdb0 100644
--- a/bazel/wrlib/load_xpm_normalized.c
+++ b/bazel/wrlib/load_xpm_normalized.c
@@ -20,7 +20,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/bazel/wrlib/misc.c b/bazel/wrlib/misc.c
index 922c73d6..627c0f82 100644
--- a/bazel/wrlib/misc.c
+++ b/bazel/wrlib/misc.c
@@ -18,7 +18,7 @@
  *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  *  MA 02110-1301, USA.
  */
-#include <config.h>
+#include "config/config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/bazel/wrlib/raster.c b/bazel/wrlib/raster.c
index 0f8fdd11..03905297 100644
--- a/bazel/wrlib/raster.c
+++ b/bazel/wrlib/raster.c
@@ -20,7 +20,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/bazel/wrlib/rotate.c b/bazel/wrlib/rotate.c
index 12cd41fd..339e8234 100644
--- a/bazel/wrlib/rotate.c
+++ b/bazel/wrlib/rotate.c
@@ -20,7 +20,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/bazel/wrlib/save.c b/bazel/wrlib/save.c
index eee8ce54..7d25a3c0 100644
--- a/bazel/wrlib/save.c
+++ b/bazel/wrlib/save.c
@@ -21,7 +21,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 #include <X11/Xlib.h>
 #include <stdlib.h>
diff --git a/bazel/wrlib/save_jpeg.c b/bazel/wrlib/save_jpeg.c
index 5320ba47..ac51a7ae 100644
--- a/bazel/wrlib/save_jpeg.c
+++ b/bazel/wrlib/save_jpeg.c
@@ -20,7 +20,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/bazel/wrlib/save_png.c b/bazel/wrlib/save_png.c
index 40d3b996..dcffaa67 100644
--- a/bazel/wrlib/save_png.c
+++ b/bazel/wrlib/save_png.c
@@ -20,7 +20,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/bazel/wrlib/save_xpm.c b/bazel/wrlib/save_xpm.c
index 243f9506..614a5b11 100644
--- a/bazel/wrlib/save_xpm.c
+++ b/bazel/wrlib/save_xpm.c
@@ -20,7 +20,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/bazel/wrlib/scale.c b/bazel/wrlib/scale.c
index 93c5172d..0b2a7075 100644
--- a/bazel/wrlib/scale.c
+++ b/bazel/wrlib/scale.c
@@ -20,7 +20,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/bazel/wrlib/xpixmap.c b/bazel/wrlib/xpixmap.c
index 9cb95257..a148ae6c 100644
--- a/bazel/wrlib/xpixmap.c
+++ b/bazel/wrlib/xpixmap.c
@@ -20,7 +20,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/bazel/wrlib/xutil.c b/bazel/wrlib/xutil.c
index 2ca872ae..da01136b 100644
--- a/bazel/wrlib/xutil.c
+++ b/bazel/wrlib/xutil.c
@@ -20,7 +20,7 @@
  *  MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config/config.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>