diff --git a/libraries/Projector/src/main/java/org/micromanager/projector/internal/MosaicSequencingFrame.java b/libraries/Projector/src/main/java/org/micromanager/projector/internal/MosaicSequencingFrame.java
index 51445c366a..70b7704ac8 100644
--- a/libraries/Projector/src/main/java/org/micromanager/projector/internal/MosaicSequencingFrame.java
+++ b/libraries/Projector/src/main/java/org/micromanager/projector/internal/MosaicSequencingFrame.java
@@ -63,9 +63,9 @@
 import mmcorej.CMMCore;
 import mmcorej.DeviceType;
 import mmcorej.StrVector;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONArray;
+import mmcorej.org.json.JSONException;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.Studio;
 import org.micromanager.internal.utils.FileDialogs;
 import org.micromanager.internal.utils.GUIUtils;
diff --git a/plugins/ASIdiSPIM/src/main/java/org/micromanager/asidispim/AcquisitionPanel.java b/plugins/ASIdiSPIM/src/main/java/org/micromanager/asidispim/AcquisitionPanel.java
index 53b5d753b8..297b7690c2 100644
--- a/plugins/ASIdiSPIM/src/main/java/org/micromanager/asidispim/AcquisitionPanel.java
+++ b/plugins/ASIdiSPIM/src/main/java/org/micromanager/asidispim/AcquisitionPanel.java
@@ -66,7 +66,7 @@
 
 import net.miginfocom.swing.MigLayout;
 
-import org.json.JSONException;
+import mmcorej.org.json.JSONException;
 
 import mmcorej.CMMCore;
 import mmcorej.StrVector;
diff --git a/plugins/ASIdiSPIM/src/main/java/org/micromanager/asidispim/utils/AutofocusUtils.java b/plugins/ASIdiSPIM/src/main/java/org/micromanager/asidispim/utils/AutofocusUtils.java
index 25c64c9a2c..b7d0000bba 100644
--- a/plugins/ASIdiSPIM/src/main/java/org/micromanager/asidispim/utils/AutofocusUtils.java
+++ b/plugins/ASIdiSPIM/src/main/java/org/micromanager/asidispim/utils/AutofocusUtils.java
@@ -37,8 +37,8 @@
 import mmcorej.TaggedImage;
 
 import org.jfree.data.xy.XYSeries;
-import org.json.JSONException;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONException;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.AutofocusPlugin;
 
 import org.micromanager.asidispim.data.AcquisitionModes;
diff --git a/plugins/ASIdiSPIM/src/main/java/org/micromanager/asidispim/utils/MovementDetector.java b/plugins/ASIdiSPIM/src/main/java/org/micromanager/asidispim/utils/MovementDetector.java
index 456772bfcc..41071c2bdb 100644
--- a/plugins/ASIdiSPIM/src/main/java/org/micromanager/asidispim/utils/MovementDetector.java
+++ b/plugins/ASIdiSPIM/src/main/java/org/micromanager/asidispim/utils/MovementDetector.java
@@ -3,7 +3,7 @@
 
 import org.apache.commons.math3.geometry.euclidean.threed.Rotation;
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
-import org.json.JSONException;
+import mmcorej.org.json.JSONException;
 import org.micromanager.asidispim.data.MyStrings;
 import org.micromanager.asidispim.data.Prefs;
 import org.micromanager.asidispim.data.Properties;
diff --git a/plugins/HCS/src/main/java/org/micromanager/hcs/SBSPlate.java b/plugins/HCS/src/main/java/org/micromanager/hcs/SBSPlate.java
index 5f411df388..7c3d263816 100644
--- a/plugins/HCS/src/main/java/org/micromanager/hcs/SBSPlate.java
+++ b/plugins/HCS/src/main/java/org/micromanager/hcs/SBSPlate.java
@@ -28,8 +28,8 @@
 import java.io.IOException;
 import java.util.HashMap;
 
-import org.json.JSONException;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONException;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.MultiStagePosition;
 import org.micromanager.PositionList;
 import org.micromanager.StagePosition;
diff --git a/plugins/IlluminateLED/src/main/java/org/wallerlab/illuminate/IlluminateControllerFrame.java b/plugins/IlluminateLED/src/main/java/org/wallerlab/illuminate/IlluminateControllerFrame.java
index 9468be876e..d40868f86d 100644
--- a/plugins/IlluminateLED/src/main/java/org/wallerlab/illuminate/IlluminateControllerFrame.java
+++ b/plugins/IlluminateLED/src/main/java/org/wallerlab/illuminate/IlluminateControllerFrame.java
@@ -43,7 +43,7 @@
 import javax.swing.JPanel;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
-import org.json.*;
+import mmcorej.org.json.*;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/plugins/IlluminateLED/src/main/java/org/wallerlab/illuminate/IlluminateInterface.java b/plugins/IlluminateLED/src/main/java/org/wallerlab/illuminate/IlluminateInterface.java
index ab25a54698..561c66e1e0 100644
--- a/plugins/IlluminateLED/src/main/java/org/wallerlab/illuminate/IlluminateInterface.java
+++ b/plugins/IlluminateLED/src/main/java/org/wallerlab/illuminate/IlluminateInterface.java
@@ -33,8 +33,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import mmcorej.CMMCore;
-import org.json.JSONArray;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONArray;
+import mmcorej.org.json.JSONObject;
 
 /**
  *
diff --git a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/acq/Acquisition.java b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/acq/Acquisition.java
index a8fe299a72..83819a93d5 100644
--- a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/acq/Acquisition.java
+++ b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/acq/Acquisition.java
@@ -39,9 +39,9 @@
 import org.micromanager.magellan.internal.misc.MD;
 import mmcorej.CMMCore;
 import mmcorej.TaggedImage;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONArray;
+import mmcorej.org.json.JSONException;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.magellan.api.MagellanAcquisitionAPI;
 import org.micromanager.magellan.internal.imagedisplay.DisplaySettings;
 import org.micromanager.magellan.internal.imagedisplay.events.ImageCacheClosingEvent;
diff --git a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/acq/AcquisitionEvent.java b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/acq/AcquisitionEvent.java
index c4def362a1..7566991900 100644
--- a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/acq/AcquisitionEvent.java
+++ b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/acq/AcquisitionEvent.java
@@ -18,8 +18,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.json.JSONException;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONException;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.magellan.internal.coordinates.XYStagePosition;
 
 /**
diff --git a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/acq/ExploreAcquisition.java b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/acq/ExploreAcquisition.java
index e5cf8b85dd..e6ca9698b8 100644
--- a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/acq/ExploreAcquisition.java
+++ b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/acq/ExploreAcquisition.java
@@ -30,7 +30,7 @@
 import java.util.stream.Stream;
 import org.micromanager.magellan.internal.main.Magellan;
 import org.micromanager.magellan.internal.misc.Log;
-import org.json.JSONArray;
+import mmcorej.org.json.JSONArray;
 import org.micromanager.data.DataProvider;
 
 /**
diff --git a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/acq/MagellanGUIAcquisition.java b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/acq/MagellanGUIAcquisition.java
index be37570646..09dea09f22 100644
--- a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/acq/MagellanGUIAcquisition.java
+++ b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/acq/MagellanGUIAcquisition.java
@@ -24,7 +24,7 @@
 import java.util.function.Function;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
-import org.json.JSONArray;
+import mmcorej.org.json.JSONArray;
 import org.micromanager.magellan.internal.coordinates.MagellanAffineUtils;
 import org.micromanager.magellan.internal.coordinates.XYStagePosition;
 import org.micromanager.magellan.internal.main.Magellan;
diff --git a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/coordinates/PositionManager.java b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/coordinates/PositionManager.java
index eb1a74057b..03ab5b738e 100644
--- a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/coordinates/PositionManager.java
+++ b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/coordinates/PositionManager.java
@@ -24,9 +24,9 @@
 import java.util.List;
 import java.util.TreeMap;
 import java.util.TreeSet;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONArray;
+import mmcorej.org.json.JSONException;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.magellan.internal.main.Magellan;
 import org.micromanager.magellan.internal.misc.Log;
 import org.micromanager.magellan.internal.misc.LongPoint;
diff --git a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/coordinates/XYStagePosition.java b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/coordinates/XYStagePosition.java
index 06599f2b1c..3eb2293015 100644
--- a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/coordinates/XYStagePosition.java
+++ b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/coordinates/XYStagePosition.java
@@ -22,8 +22,8 @@
 import org.micromanager.magellan.internal.main.Magellan;
 import org.micromanager.magellan.internal.misc.Log;
 import mmcorej.CMMCore;
-import org.json.JSONArray;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONArray;
+import mmcorej.org.json.JSONObject;
 
 /**
  * Immutable object representing single XY stage position
diff --git a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/datasaving/MultiResMultipageTiffStorage.java b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/datasaving/MultiResMultipageTiffStorage.java
index f4ca18e0d6..ae7946284c 100644
--- a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/datasaving/MultiResMultipageTiffStorage.java
+++ b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/datasaving/MultiResMultipageTiffStorage.java
@@ -41,9 +41,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import mmcorej.TaggedImage;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONArray;
+import mmcorej.org.json.JSONException;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.magellan.internal.imagedisplay.DisplaySettings;
 import org.micromanager.magellan.internal.misc.JavaUtils;
 import org.micromanager.magellan.internal.misc.Log;
diff --git a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/datasaving/MultipageTiffReader.java b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/datasaving/MultipageTiffReader.java
index b8e26b4d03..03544f6219 100644
--- a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/datasaving/MultipageTiffReader.java
+++ b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/datasaving/MultipageTiffReader.java
@@ -33,9 +33,9 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import mmcorej.TaggedImage;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONArray;
+import mmcorej.org.json.JSONException;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.magellan.internal.imagedisplay.DisplaySettings;
 import org.micromanager.magellan.internal.misc.Log;
 import org.micromanager.magellan.internal.misc.MD;
diff --git a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/datasaving/MultipageTiffWriter.java b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/datasaving/MultipageTiffWriter.java
index 53b096e893..8afe0103b1 100644
--- a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/datasaving/MultipageTiffWriter.java
+++ b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/datasaving/MultipageTiffWriter.java
@@ -42,9 +42,9 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import mmcorej.TaggedImage;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONArray;
+import mmcorej.org.json.JSONException;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.magellan.internal.misc.Log;
 import org.micromanager.magellan.internal.misc.MD;
 
diff --git a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/datasaving/TaggedImageStorageMultipageTiff.java b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/datasaving/TaggedImageStorageMultipageTiff.java
index 7831dfeb3a..f7916b822d 100644
--- a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/datasaving/TaggedImageStorageMultipageTiff.java
+++ b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/datasaving/TaggedImageStorageMultipageTiff.java
@@ -39,8 +39,8 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import javax.swing.SwingUtilities;
 import mmcorej.TaggedImage;
-import org.json.JSONException;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONException;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.magellan.internal.misc.JavaUtils;
 import org.micromanager.magellan.internal.misc.Log;
 import org.micromanager.magellan.internal.misc.MD;
diff --git a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/DisplaySettings.java b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/DisplaySettings.java
index 8d246cf6cb..2fdc6413b7 100644
--- a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/DisplaySettings.java
+++ b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/DisplaySettings.java
@@ -21,8 +21,8 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.json.JSONException;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONException;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.magellan.internal.channels.MagellanChannelSpec;
 import org.micromanager.magellan.internal.misc.Log;
 import org.micromanager.magellan.internal.misc.MD;
diff --git a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/DisplayWindowControlsNew.java b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/DisplayWindowControlsNew.java
index 464825017a..b8a2282fe5 100644
--- a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/DisplayWindowControlsNew.java
+++ b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/DisplayWindowControlsNew.java
@@ -19,7 +19,7 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.table.DefaultTableCellRenderer;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.display.DisplaySettingsChangedEvent;
 import org.micromanager.magellan.internal.channels.MagellanChannelSpec;
 import org.micromanager.magellan.internal.coordinates.NoPositionsDefinedYetException;
diff --git a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/DisplayWindowNew.java b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/DisplayWindowNew.java
index 1a5dfe694b..8dab7271ec 100644
--- a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/DisplayWindowNew.java
+++ b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/DisplayWindowNew.java
@@ -37,7 +37,7 @@
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.magellan.internal.imagedisplay.events.DisplayClosingEvent;
 import org.micromanager.magellan.internal.imagedisplay.events.MagellanScrollbarPosition;
 import org.micromanager.magellan.internal.misc.Log;
diff --git a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/ImageMaker.java b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/ImageMaker.java
index 3ed96f046a..dbaece291c 100644
--- a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/ImageMaker.java
+++ b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/ImageMaker.java
@@ -13,7 +13,7 @@
 import java.util.HashMap;
 import java.util.TreeMap;
 import mmcorej.TaggedImage;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.magellan.internal.misc.HistogramUtils;
 import org.micromanager.magellan.internal.misc.Log;
 
diff --git a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/MagellanDisplayController.java b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/MagellanDisplayController.java
index 7c4be3273a..ae96d661ea 100644
--- a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/MagellanDisplayController.java
+++ b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/MagellanDisplayController.java
@@ -35,8 +35,8 @@
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import javax.swing.Timer;
-import org.json.JSONException;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONException;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.magellan.internal.acq.Acquisition;
 import org.micromanager.magellan.internal.acq.ExploreAcquisition;
 import org.micromanager.magellan.internal.channels.MagellanChannelSpec;
diff --git a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/MagellanImageCache.java b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/MagellanImageCache.java
index 6caf548050..ec1e49239d 100644
--- a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/MagellanImageCache.java
+++ b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/MagellanImageCache.java
@@ -30,8 +30,8 @@
 import org.micromanager.magellan.internal.datasaving.MultiResMultipageTiffStorage;
 import javax.swing.SwingUtilities;
 import mmcorej.TaggedImage;
-import org.json.JSONException;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONException;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.magellan.internal.coordinates.XYStagePosition;
 import org.micromanager.magellan.internal.imagedisplay.events.ImageCacheClosingEvent;
 import org.micromanager.magellan.internal.imagedisplay.events.ImageCacheFinishedEvent;
diff --git a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/MetadataPanel.java b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/MetadataPanel.java
index 927b9b3428..10c97e37fe 100644
--- a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/MetadataPanel.java
+++ b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/MetadataPanel.java
@@ -8,7 +8,7 @@
 import ij.ImagePlus;
 import java.util.Timer;
 import java.util.TimerTask;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.magellan.internal.imagedisplay.MagellanImageCache;
 
 /**
diff --git a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/MetadataTableModel.java b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/MetadataTableModel.java
index 03384f01f0..0747dc4c30 100644
--- a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/MetadataTableModel.java
+++ b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/MetadataTableModel.java
@@ -8,8 +8,8 @@
 import java.util.Arrays;
 import java.util.Vector;
 import javax.swing.table.AbstractTableModel;
-import org.json.JSONException;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONException;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.magellan.internal.misc.MD;
 
 /**
diff --git a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/events/MagellanNewImageEvent.java b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/events/MagellanNewImageEvent.java
index 7050c03b23..4abaac4915 100644
--- a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/events/MagellanNewImageEvent.java
+++ b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/events/MagellanNewImageEvent.java
@@ -7,7 +7,7 @@
 
 import java.util.HashMap;
 import mmcorej.TaggedImage;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.magellan.internal.misc.MD;
 
 /**
diff --git a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/events/SetImageEvent.java b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/events/SetImageEvent.java
index a0d8ca9062..fa36242f18 100644
--- a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/events/SetImageEvent.java
+++ b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/imagedisplay/events/SetImageEvent.java
@@ -6,7 +6,7 @@
 package org.micromanager.magellan.internal.imagedisplay.events;
 
 import java.util.HashMap;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONObject;
 
    /**
     * This class signifies that the currently-displayed image needs to be
diff --git a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/misc/MD.java b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/misc/MD.java
index 45c6fc9760..601a153d32 100644
--- a/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/misc/MD.java
+++ b/plugins/Magellan/src/main/java/org/micromanager/magellan/internal/misc/MD.java
@@ -19,9 +19,9 @@
 
 import ij.ImagePlus;
 import java.util.Iterator;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONArray;
+import mmcorej.org.json.JSONException;
+import mmcorej.org.json.JSONObject;
 
 
 
diff --git a/plugins/Recall/src/main/java/org/micromanager/recall/RecallPlugin.java b/plugins/Recall/src/main/java/org/micromanager/recall/RecallPlugin.java
index 9feb6f01d8..ed2cd1eaf3 100644
--- a/plugins/Recall/src/main/java/org/micromanager/recall/RecallPlugin.java
+++ b/plugins/Recall/src/main/java/org/micromanager/recall/RecallPlugin.java
@@ -38,7 +38,7 @@
 import java.util.List;
 import mmcorej.CMMCore;
 import mmcorej.TaggedImage;
-import org.json.JSONException;
+import mmcorej.org.json.JSONException;
 import org.micromanager.MenuPlugin;
 import org.micromanager.Studio;
 import org.micromanager.internal.MMStudio;
@@ -220,4 +220,4 @@ public String getCopyright() {
       return "University of California, 2010-2017";
    }
    
-}
\ No newline at end of file
+}
diff --git a/plugins/Tracker/src/main/java/com/imaging100x/tracker/TrackerControl.java b/plugins/Tracker/src/main/java/com/imaging100x/tracker/TrackerControl.java
index 13498766ea..bc9adab22c 100644
--- a/plugins/Tracker/src/main/java/com/imaging100x/tracker/TrackerControl.java
+++ b/plugins/Tracker/src/main/java/com/imaging100x/tracker/TrackerControl.java
@@ -51,7 +51,7 @@
 import mmcorej.MMCoreJ;
 import mmcorej.TaggedImage;
 import org.jfree.data.xy.XYSeries;
-import org.json.JSONException;
+import mmcorej.org.json.JSONException;
 
 import org.micromanager.data.Datastore;
 import org.micromanager.data.Image;