diff --git a/bazel/wmaker/BUILD.bazel b/bazel/wmaker/BUILD.bazel
index 335d38ed..9f13efed 100644
--- a/bazel/wmaker/BUILD.bazel
+++ b/bazel/wmaker/BUILD.bazel
@@ -1,11 +1,21 @@
 package(default_visibility = ["//visibility:public"])
 
+cc_library(
+    name = "appearance_settings",
+    hdrs = ["appearance_settings.h"],
+)
+
 cc_library(
     name = "gnustep_compat",
     hdrs = ["GNUstep.h"],
     visibility = ["//visibility:public"],
 )
 
+cc_library(
+    name = "notifications",
+    hdrs = ["notifications.h"]
+)
+
 cc_library(
     name = "globals",
     hdrs = ["globals.h"],
diff --git a/bazel/wmaker/WindowMaker.h b/bazel/wmaker/WindowMaker.h
index 9d5ff4a6..0128679b 100644
--- a/bazel/wmaker/WindowMaker.h
+++ b/bazel/wmaker/WindowMaker.h
@@ -240,48 +240,6 @@ typedef enum {
 #define WFLAGS_CRASHED    (1<<0)
 
 
-/* notifications */
-
-#ifdef MAINFILE
-#define NOTIFICATION(n) const char WN##n [] = #n
-#else
-#define NOTIFICATION(n) extern const char WN##n []
-#endif
-
-NOTIFICATION(WindowAppearanceSettingsChanged);
-
-NOTIFICATION(IconAppearanceSettingsChanged);
-
-NOTIFICATION(IconTileSettingsChanged);
-
-NOTIFICATION(MenuAppearanceSettingsChanged);
-
-NOTIFICATION(MenuTitleAppearanceSettingsChanged);
-
-
-/* appearance settings clientdata flags */
-enum {
-	WFontSettings = 1 << 0,
-	WTextureSettings = 1 << 1,
-	WColorSettings = 1 << 2
-};
-
 /****** Global Variables  ******/
 
-/****** Notifications ******/
-extern const char WMNManaged[];
-extern const char WMNUnmanaged[];
-extern const char WMNChangedWorkspace[];
-extern const char WMNChangedState[];
-extern const char WMNChangedFocus[];
-extern const char WMNChangedStacking[];
-extern const char WMNChangedName[];
-
-extern const char WMNWorkspaceCreated[];
-extern const char WMNWorkspaceDestroyed[];
-extern const char WMNWorkspaceChanged[];
-extern const char WMNWorkspaceNameChanged[];
-
-extern const char WMNResetStacking[];
-
 #endif
diff --git a/bazel/wmaker/appearance_settings.h b/bazel/wmaker/appearance_settings.h
new file mode 100644
index 00000000..013ec418
--- /dev/null
+++ b/bazel/wmaker/appearance_settings.h
@@ -0,0 +1,11 @@
+#ifndef WAPPEARANCE_SETTINGS_H_
+#define WAPPEARANCE_SETTINGS_H_
+
+/* appearance settings clientdata flags */
+enum {
+	WFontSettings = 1 << 0,
+	WTextureSettings = 1 << 1,
+	WColorSettings = 1 << 2
+};
+
+#endif  // WAPPEARANCE_SETTINGS_H_
diff --git a/bazel/wmaker/notifications.h b/bazel/wmaker/notifications.h
new file mode 100644
index 00000000..9d1fc802
--- /dev/null
+++ b/bazel/wmaker/notifications.h
@@ -0,0 +1,35 @@
+#ifndef WNOTIFICATIONS_H_
+#define WNOTIFICATIONS_H_
+
+#ifdef MAINFILE
+#define NOTIFICATION(n) const char WN##n [] = #n
+#else
+#define NOTIFICATION(n) extern const char WN##n []
+#endif
+
+NOTIFICATION(WindowAppearanceSettingsChanged);
+
+NOTIFICATION(IconAppearanceSettingsChanged);
+
+NOTIFICATION(IconTileSettingsChanged);
+
+NOTIFICATION(MenuAppearanceSettingsChanged);
+
+NOTIFICATION(MenuTitleAppearanceSettingsChanged);
+
+extern const char WMNManaged[];
+extern const char WMNUnmanaged[];
+extern const char WMNChangedWorkspace[];
+extern const char WMNChangedState[];
+extern const char WMNChangedFocus[];
+extern const char WMNChangedStacking[];
+extern const char WMNChangedName[];
+
+extern const char WMNWorkspaceCreated[];
+extern const char WMNWorkspaceDestroyed[];
+extern const char WMNWorkspaceChanged[];
+extern const char WMNWorkspaceNameChanged[];
+
+extern const char WMNResetStacking[];
+
+#endif  // WNOTIFICATIONS_H_