micro-manager · marktsuchida · Jul 20, 2026 · Jul 17, 2026 · Jul 17, 2026 · Jul 17, 2026
diff --git a/DeviceAdapters/89NorthLDI/LDI.cpp b/DeviceAdapters/89NorthLDI/LDI.cpp
@@ -2,6 +2,9 @@
 
 #include <ctime>
 
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
 const char* g_LDI_name = "89 North Laser Diode Illuminator";
 const char* g_LDI_description = "Multi-line, Solid-State Laser Illuminator";
 #define LDI_ERROR 108901

diff --git a/DeviceAdapters/ABS/AbsImgBuffer.h b/DeviceAdapters/ABS/AbsImgBuffer.h
@@ -2,6 +2,9 @@
 #include "ImgBuffer.h"              //!< base  class
 #include "DeviceThreads.h"          //!< MMThreadLock class
 
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
 // ---------------------------Camera - API ------------------------------------
 #include "common_structs_exp.h"     //!< ABS Camera API structs
 

diff --git a/DeviceAdapters/AndorShamrock/AndorShamrock.cpp b/DeviceAdapters/AndorShamrock/AndorShamrock.cpp
@@ -1,7 +1,10 @@
 #include "AndorShamrock.h"
 #include "ModuleAPIFunctions.h"
+
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
 #include "ShamrockCIF.h"
-//#include "ShamrockConstants.h"
 #include <sstream>
 
 using namespace std;

diff --git a/DeviceAdapters/BaumerOptronic/BaumerOptronic.h b/DeviceAdapters/BaumerOptronic/BaumerOptronic.h
@@ -27,6 +27,9 @@
 #include "ImgBuffer.h"
 #include "DeviceThreads.h"
 
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
 #pragma warning(push)
 #pragma warning(disable: 4245)
 #include "FxApi.h"

diff --git a/DeviceAdapters/DemoCamera/DemoCamera.cpp b/DeviceAdapters/DemoCamera/DemoCamera.cpp
@@ -37,6 +37,8 @@
 #include <future>
 
 #ifdef _WIN32
+   #define WIN32_LEAN_AND_MEAN
+   #include <Windows.h>
    #include <timeapi.h>
 #endif
 

diff --git a/DeviceAdapters/Dragonfly/TIRFIntensity.cpp b/DeviceAdapters/Dragonfly/TIRFIntensity.cpp
@@ -4,6 +4,9 @@
 #include "ConfocalMode.h"
 #include "Dragonfly.h"
 
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
 const char* const g_TIRFIntensityPropertyName = "TIRF | Optical Feedback";
 const char* const g_TIRFIntensityLimitsReadError = "Failed to retrieve TIRF intensity limits";
 const char* const g_TIRFIntensityValueReadError = "Failed to retrieve the current TIRF intensity";

diff --git a/DeviceAdapters/Elveflow/mux_distrib.cpp b/DeviceAdapters/Elveflow/mux_distrib.cpp
@@ -1,9 +1,11 @@
 #include "ModuleInterface.h"
 #include "mux_distrib.h"
-#include "iostream"
+#include <iostream>
 #include <vector>
 #include <string>
-#include <windows.h>
+
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
 
 using namespace std;
 

diff --git a/DeviceAdapters/Elveflow/mux_wire_v3.cpp b/DeviceAdapters/Elveflow/mux_wire_v3.cpp
@@ -1,9 +1,8 @@
 #include "ModuleInterface.h"
 #include "mux_wire_v3.h"
-#include "iostream"
+#include <iostream>
 #include <vector>
 #include <string>
-#include <windows.h>
 
 using namespace std;
 

diff --git a/DeviceAdapters/Elveflow/mux_wire_v3.h b/DeviceAdapters/Elveflow/mux_wire_v3.h
@@ -2,6 +2,9 @@
 #include "DeviceUtils.h"
 #include <vector>
 
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
 using namespace std;
 
 class MuxWireV3 : public CGenericBase<MuxWireV3> {

diff --git a/DeviceAdapters/Elveflow/ob1_mk4.cpp b/DeviceAdapters/Elveflow/ob1_mk4.cpp
@@ -1,9 +1,8 @@
 #include "ModuleInterface.h"
 #include "ob1_mk4.h"
-#include "iostream"
+#include <iostream>
 #include <vector>
 #include <string>
-#include <windows.h>
 
 using namespace std;
 

diff --git a/DeviceAdapters/Elveflow/ob1_mk4.h b/DeviceAdapters/Elveflow/ob1_mk4.h
@@ -2,6 +2,9 @@
 #include "DeviceUtils.h"
 #include <vector>
 
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
 using namespace std;
 
 class Ob1Mk4 : public CGenericBase<Ob1Mk4> {

diff --git a/DeviceAdapters/Hikrobot/HikrobotCamera.h b/DeviceAdapters/Hikrobot/HikrobotCamera.h
@@ -43,6 +43,9 @@
 #include <iostream>
 #include "MvCamera.h"
 
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
 
 //////////////////////////////////////////////////////////////////////////////
 // Error codes

diff --git a/DeviceAdapters/IntegratedLaserEngine/ILEWrapper/ALC_REVOject3Wrapper.cpp b/DeviceAdapters/IntegratedLaserEngine/ILEWrapper/ALC_REVOject3Wrapper.cpp
@@ -4,8 +4,9 @@
 // SUBSYSTEM:     DeviceAdapters
 //-----------------------------------------------------------------------------
 
-#ifdef WIN32
-#include <windows.h>
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
 #endif
 
 #include "ALC_REVOject3Wrapper.h"

diff --git a/DeviceAdapters/IntegratedLaserEngine/ILEWrapper/ALC_REV_ILE2Wrapper.cpp b/DeviceAdapters/IntegratedLaserEngine/ILEWrapper/ALC_REV_ILE2Wrapper.cpp
@@ -3,8 +3,9 @@
 // PROJECT:       Micro-Manager
 // SUBSYSTEM:     DeviceAdapters
 //-----------------------------------------------------------------------------
-#ifdef WIN32
-#include <windows.h>
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
 #endif
 #include "ALC_REV_ILE2Wrapper.h"
 #include "ILESDKLock.h"

diff --git a/DeviceAdapters/IntegratedLaserEngine/ILEWrapper/ALC_REV_ILE4Wrapper.cpp b/DeviceAdapters/IntegratedLaserEngine/ILEWrapper/ALC_REV_ILE4Wrapper.cpp
@@ -3,8 +3,9 @@
 // PROJECT:       Micro-Manager
 // SUBSYSTEM:     DeviceAdapters
 //-----------------------------------------------------------------------------
-#ifdef WIN32
-#include <windows.h>
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
 #endif
 #include "ALC_REV_ILE4Wrapper.h"
 #include "ILESDKLock.h"

diff --git a/DeviceAdapters/IntegratedLaserEngine/ILEWrapper/ILEWrapper.cpp b/DeviceAdapters/IntegratedLaserEngine/ILEWrapper/ILEWrapper.cpp
@@ -8,8 +8,9 @@
 // Based off the AndorLaserCombiner adapter from Karl Hoover, UCSF
 //
 
-#ifdef WIN32
-#include <windows.h>
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
 #endif
 
 #include "ALC_REV.h"
@@ -22,7 +23,7 @@
 #include "ALC_REV_ILE4Wrapper.h"
 #include "ILESDKLock.h"
 #include "../IntegratedLaserEngine.h"
-#include "../../../MMDevice/DeviceThreads.h"
+#include "DeviceThreads.h"
 #include <sstream>
 #include <exception>
 

diff --git a/DeviceAdapters/IntegratedLaserEngine/ILEWrapper/ILEWrapper.h b/DeviceAdapters/IntegratedLaserEngine/ILEWrapper/ILEWrapper.h
@@ -15,6 +15,9 @@
 #include "..\ILEWrapperInterface.h"
 #include <map>
 
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
 class CALC_REV_ILEActiveBlankingManagementWrapper;
 class CALC_REV_ILEPowerManagementWrapper;
 class CALC_REV_ILEPowerManagement2Wrapper;

diff --git a/DeviceAdapters/IntegratedLaserEngine/IntegratedLaserEngine.cpp b/DeviceAdapters/IntegratedLaserEngine/IntegratedLaserEngine.cpp
@@ -15,6 +15,7 @@
 #include "ILEWrapper/ILEWrapper.h"
 #include "Lasers.h"
 #include "VeryLowPower.h"
+#include "MMDevice.h"
 
 
 // Properties
@@ -619,7 +620,7 @@ void CIntegratedLaserEngine::LogMMMessage( std::string Message, bool DebugOnly )
   LogMessage( Message, DebugOnly );
 }
 
-MM::MMTime CIntegratedLaserEngine::GetCurrentTime()
+MM::MMTime CIntegratedLaserEngine::GetCurrentTimeMM()
 {
   return GetCurrentMMTime();
 }

diff --git a/DeviceAdapters/IntegratedLaserEngine/IntegratedLaserEngine.h b/DeviceAdapters/IntegratedLaserEngine/IntegratedLaserEngine.h
@@ -12,7 +12,7 @@
 #ifndef _INTEGRATEDLASERENGINE_H_
 #define _INTEGRATEDLASERENGINE_H_
 
-#include "../../MMDevice/DeviceBase.h"
+#include "DeviceBase.h"
 #include <string>
 #include <vector>
 #include "ILEWrapperInterface.h"
@@ -85,7 +85,7 @@ class CIntegratedLaserEngine : public CShutterBase<CIntegratedLaserEngine>
 
   // Helper functions
   void LogMMMessage( std::string Message, bool DebugOnly = false );
-  MM::MMTime GetCurrentTime();
+  MM::MMTime GetCurrentTimeMM();
 
   void CheckAndUpdateLasers();
   virtual void CheckAndUpdateLowPowerMode() = 0;

diff --git a/DeviceAdapters/IntegratedLaserEngine/Lasers.cpp b/DeviceAdapters/IntegratedLaserEngine/Lasers.cpp
@@ -80,7 +80,7 @@ void CLasers::WaitOnLaserWarmingUp()
   std::vector<TLaserState> vState( NumberOfLasers_ + 1, ALC_NOT_AVAILABLE );
 
   // Lasers can take up to 90 seconds to initialize
-  MM::TimeoutMs vTimerOut( MMILE_->GetCurrentTime(), 91000 );
+  MM::TimeoutMs vTimerOut( MMILE_->GetCurrentTimeMM(), 91000 );
 
   while ( true )
   {
@@ -119,7 +119,7 @@ void CLasers::WaitOnLaserWarmingUp()
       break;
     }
 
-    if ( vTimerOut.expired( MMILE_->GetCurrentTime() ) )
+    if ( vTimerOut.expired( MMILE_->GetCurrentTimeMM() ) )
     {
       MMILE_->LogMMMessage( " some lasers did not respond", false );
       break;

diff --git a/DeviceAdapters/IntegratedLaserEngine/Lasers.h b/DeviceAdapters/IntegratedLaserEngine/Lasers.h
@@ -13,7 +13,10 @@
 #define _LASERS_H_
 
 #include "Property.h"
-#include "../../MMDevice/DeviceThreads.h"
+#include "DeviceThreads.h"
+
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
 
 class IALC_REV_Laser2;
 class IALC_REV_ILEPowerManagement;

diff --git a/DeviceAdapters/IntegratedLaserEngine/PortsConfiguration.cpp b/DeviceAdapters/IntegratedLaserEngine/PortsConfiguration.cpp
@@ -6,7 +6,8 @@
 
 #include "PortsConfiguration.h"
 #include "IntegratedLaserEngine.h"
-#include <windows.h>
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
 #include <Shlobj.h>
 #include <fstream>
 #include "boost\filesystem.hpp"

diff --git a/DeviceAdapters/JAI/JAI.h b/DeviceAdapters/JAI/JAI.h
@@ -26,17 +26,8 @@
 #include <DeviceThreads.h>
 #include <cstdint>
 
-#ifdef WIN32
-//...
-#endif
-
-#ifdef __APPLE__
-//...
-#endif
-
-#ifdef __linux__
-//...
-#endif
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
 
 #include <string>
 #include <vector>

diff --git a/DeviceAdapters/LaserQuantumLaser/LaserQuantumLaser.cpp b/DeviceAdapters/LaserQuantumLaser/LaserQuantumLaser.cpp
@@ -13,8 +13,9 @@
 #include <iostream>
 #include <fstream>
 
-#ifdef WIN32
-#include "winuser.h"
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
 #endif
 
 const char* g_DeviceName = "Laser";

diff --git a/DeviceAdapters/MCCDAQ/MCCDAQ.cpp b/DeviceAdapters/MCCDAQ/MCCDAQ.cpp
@@ -21,7 +21,10 @@
 
 #include "MCCDAQ.h"
 #include "ModuleInterface.h"
+
+#define WIN32_LEAN_AND_MEAN
 #include "cbw.h"
+
 #include <sstream>
 
 

diff --git a/DeviceAdapters/MCL_MicroDrive/MicroDriveXYStage.h b/DeviceAdapters/MCL_MicroDrive/MicroDriveXYStage.h
@@ -20,6 +20,9 @@ License:	Distributed under the BSD license.
 #include "handle_list_if.h"
 #include "HandleListType.h"
 
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
 #define ERR_UNKNOWN_MODE         102
 #define ERR_UNKNOWN_POSITION     103
 #define ERR_NOT_VALID_INPUT      104

diff --git a/DeviceAdapters/MCL_MicroDrive/MicroDriveZStage.h b/DeviceAdapters/MCL_MicroDrive/MicroDriveZStage.h
@@ -19,6 +19,9 @@ License:	Distributed under the BSD license.
 #include "handle_list_if.h"
 #include "HandleListType.h"
 
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
 #define ERR_UNKNOWN_MODE         102
 #define ERR_UNKNOWN_POSITION     103
 #define ERR_NOT_VALID_INPUT      104

diff --git a/DeviceAdapters/MCL_NanoDrive/MCL_NanoDrive_XYStage.cpp b/DeviceAdapters/MCL_NanoDrive/MCL_NanoDrive_XYStage.cpp
@@ -9,6 +9,9 @@ License:	Distributed under the BSD license.
 #include <vector>
 #include <string>
 
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
 MCL_NanoDrive_XYStage::MCL_NanoDrive_XYStage():
 	calibrationX_(0),
 	calibrationY_(0),

diff --git a/DeviceAdapters/MCL_NanoDrive/MCL_NanoDrive_ZStage.cpp b/DeviceAdapters/MCL_NanoDrive/MCL_NanoDrive_ZStage.cpp
@@ -9,6 +9,9 @@ License:	Distributed under the BSD license.
 #include <vector>
 #include <string>
 
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
 MCL_NanoDrive_ZStage::MCL_NanoDrive_ZStage() :	
 	axis_(0),
 	calibration_(0.0),

diff --git a/DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.h b/DeviceAdapters/Mightex_C_Cam/Mightex_USBCamera.h
@@ -35,6 +35,9 @@
 #include <map>
 #include <algorithm>
 
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
 //////////////////////////////////////////////////////////////////////////////
 // Error codes
 //

diff --git a/DeviceAdapters/Mightex_SB_Cam/Mightex_SB_Camera.h b/DeviceAdapters/Mightex_SB_Cam/Mightex_SB_Camera.h
@@ -35,6 +35,9 @@
 #include <map>
 #include <algorithm>
 
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
 //////////////////////////////////////////////////////////////////////////////
 // Error codes
 //

diff --git a/DeviceAdapters/Motic/MoticCamera.h b/DeviceAdapters/Motic/MoticCamera.h
@@ -35,6 +35,10 @@
 #include "ImgBuffer.h"
 #include "DeviceThreads.h"
 #include "ImgBuffer.h"
+
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
 using namespace std;
 //////////////////////////////////////////////////////////////////////////////
 // Error codes

diff --git a/DeviceAdapters/MoticMicroscope/MoticMicroscope.h b/DeviceAdapters/MoticMicroscope/MoticMicroscope.h
@@ -32,9 +32,13 @@
 
 #include <map>
 #include <set>
-using namespace std;
 #include "DeviceBase.h"
 
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
+using namespace std;
+
 // Error codes
 #define ERR_HUB_PATH (900)