diff --git a/datalogtool/src/main/native/cpp/App.cpp b/datalogtool/src/main/native/cpp/App.cpp
index a9e2e0c7da..7a5cd4e11e 100644
--- a/datalogtool/src/main/native/cpp/App.cpp
+++ b/datalogtool/src/main/native/cpp/App.cpp
@@ -7,13 +7,12 @@
 #include <memory>
 #include <string_view>
 
-#include <libssh/libssh.h>
-
-#define IMGUI_DEFINE_MATH_OPERATORS
-
 #include <glass/Context.h>
 #include <glass/MainMenuBar.h>
 #include <glass/Storage.h>
+#include <libssh/libssh.h>
+
+#define IMGUI_DEFINE_MATH_OPERATORS
 #include <imgui.h>
 #include <imgui_internal.h>
 #include <wpigui.h>
diff --git a/datalogtool/src/main/native/cpp/App.h b/datalogtool/src/main/native/cpp/App.h
index 9d1520c8a0..a9978daf30 100644
--- a/datalogtool/src/main/native/cpp/App.h
+++ b/datalogtool/src/main/native/cpp/App.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#define IMGUI_DEFINE_MATH_OPERATORS
 #include <imgui.h>
 
 void SetNextWindowPos(const ImVec2& pos, ImGuiCond cond = 0,
diff --git a/glass/src/lib/native/cpp/support/ExtraGuiWidgets.cpp b/glass/src/lib/native/cpp/support/ExtraGuiWidgets.cpp
index 191634e461..dede4a0b7d 100644
--- a/glass/src/lib/native/cpp/support/ExtraGuiWidgets.cpp
+++ b/glass/src/lib/native/cpp/support/ExtraGuiWidgets.cpp
@@ -4,9 +4,8 @@
 
 #include "glass/support/ExtraGuiWidgets.h"
 
-#include <imgui.h>
-
 #define IMGUI_DEFINE_MATH_OPERATORS
+#include <imgui.h>
 #include <imgui_internal.h>
 
 #include "glass/DataSource.h"
diff --git a/glass/src/lib/native/include/glass/Window.h b/glass/src/lib/native/include/glass/Window.h
index 0a37f9ae88..62b369cdd4 100644
--- a/glass/src/lib/native/include/glass/Window.h
+++ b/glass/src/lib/native/include/glass/Window.h
@@ -9,6 +9,7 @@
 #include <string_view>
 #include <utility>
 
+#define IMGUI_DEFINE_MATH_OPERATORS
 #include <imgui.h>
 
 #include "glass/View.h"
diff --git a/glass/src/lib/native/include/glass/other/Field2D.h b/glass/src/lib/native/include/glass/other/Field2D.h
index 9c9f72ae6f..2b0f9a8ef0 100644
--- a/glass/src/lib/native/include/glass/other/Field2D.h
+++ b/glass/src/lib/native/include/glass/other/Field2D.h
@@ -10,6 +10,8 @@
 #include <frc/geometry/Pose2d.h>
 #include <frc/geometry/Rotation2d.h>
 #include <frc/geometry/Translation2d.h>
+
+#define IMGUI_DEFINE_MATH_OPERATORS
 #include <imgui.h>
 #include <wpi/function_ref.h>
 
diff --git a/glass/src/lib/native/include/glass/other/Mechanism2D.h b/glass/src/lib/native/include/glass/other/Mechanism2D.h
index ab5ccdce54..440fed38b0 100644
--- a/glass/src/lib/native/include/glass/other/Mechanism2D.h
+++ b/glass/src/lib/native/include/glass/other/Mechanism2D.h
@@ -6,6 +6,8 @@
 
 #include <frc/geometry/Rotation2d.h>
 #include <frc/geometry/Translation2d.h>
+
+#define IMGUI_DEFINE_MATH_OPERATORS
 #include <imgui.h>
 #include <wpi/function_ref.h>
 
diff --git a/glass/src/lib/native/include/glass/support/ExtraGuiWidgets.h b/glass/src/lib/native/include/glass/support/ExtraGuiWidgets.h
index 678843403b..d56f3426f7 100644
--- a/glass/src/lib/native/include/glass/support/ExtraGuiWidgets.h
+++ b/glass/src/lib/native/include/glass/support/ExtraGuiWidgets.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#define IMGUI_DEFINE_MATH_OPERATORS
 #include <imgui.h>
 
 namespace glass {
diff --git a/imgui/CMakeLists.txt b/imgui/CMakeLists.txt
index 17f6f64acc..36fcb0e806 100644
--- a/imgui/CMakeLists.txt
+++ b/imgui/CMakeLists.txt
@@ -13,12 +13,14 @@ FetchContent_Declare(
 FetchContent_Declare(
     imgui
     GIT_REPOSITORY  https://github.com/ocornut/imgui.git
-    GIT_TAG         3ea0fad204e994d669f79ed29dcaf61cd5cb571d
+                    # docking branch
+    GIT_TAG         64b1e448d20c9be9275af731c34b4c7bf14a8e95
 )
 FetchContent_Declare(
     implot
     GIT_REPOSITORY  https://github.com/epezent/implot.git
-    GIT_TAG         e80e42e8b4136ddb84ccfe04fa28d0c745828952
+                    # v0.16
+    GIT_TAG         18c72431f8265e2b0b5378a3a73d8a883b2175ff
 )
 FetchContent_Declare(
     fonts
diff --git a/shared/imgui.gradle b/shared/imgui.gradle
index e4aa6889a3..5ffdc52156 100644
--- a/shared/imgui.gradle
+++ b/shared/imgui.gradle
@@ -1,12 +1,12 @@
 nativeUtils {
     nativeDependencyContainer {
         imgui(getNativeDependencyTypeClass('WPIStaticMavenDependency')) {
-            groupId = "edu.wpi.first.thirdparty.frc2023"
+            groupId = "edu.wpi.first.thirdparty.frc2024"
             artifactId = "imgui"
             headerClassifier = "headers"
             sourceClassifier = "sources"
             ext = "zip"
-            version = '1.89.1-2'
+            version = '1.89.9-1'
             targetPlatforms.addAll(nativeUtils.wpi.platforms.allPlatforms)
         }
     }