diff --git a/toonz/sources/stopmotion/stopmotion.cpp b/toonz/sources/stopmotion/stopmotion.cpp
index daee3804..83e794c3 100644
--- a/toonz/sources/stopmotion/stopmotion.cpp
+++ b/toonz/sources/stopmotion/stopmotion.cpp
@@ -2745,10 +2745,10 @@ bool StopMotion::toggleLiveView() {
   bool sessionOpen = false;
 
 #if WITH_CANON
-  sessionOpen = m_sessionOpen
+  sessionOpen = m_sessionOpen;
 #endif
 
-      if ((sessionOpen || m_usingWebcam) && m_liveViewStatus == 0) {
+  if ((sessionOpen || m_usingWebcam) && m_liveViewStatus == 0) {
     m_liveViewDpi             = TPointD(0.0, 0.0);
     m_liveViewImageDimensions = TDimension(0, 0);
     if (!m_usingWebcam) {
@@ -2763,8 +2763,7 @@ bool StopMotion::toggleLiveView() {
     Preferences::instance()->setValue(rewindAfterPlayback, false);
     TApp::instance()->getCurrentXsheet()->notifyXsheetChanged();
     return true;
-  }
-  else if ((sessionOpen || m_usingWebcam) && m_liveViewStatus > 0) {
+  } else if ((sessionOpen || m_usingWebcam) && m_liveViewStatus > 0) {
     if (!m_usingWebcam) {
 #if WITH_CANON
       endLiveView();
@@ -2778,8 +2777,7 @@ bool StopMotion::toggleLiveView() {
     }
     TApp::instance()->getCurrentXsheet()->notifyXsheetChanged();
     return false;
-  }
-  else {
+  } else {
     DVGui::warning(tr("No camera selected."));
     return false;
   }
@@ -2798,10 +2796,19 @@ void StopMotion::pauseLiveView() {
   }
 }
 
-#if WITH_CANON
+//-----------------------------------------------------------------
+
+void StopMotion::onImageReady(const bool &status) {
+  m_converterSucceeded = status;
+}
 
 //-----------------------------------------------------------------
 
+void StopMotion::onFinished() { l_quitLoop = true; }
+
+//-----------------------------------------------------------------
+
+#if WITH_CANON
 EdsError StopMotion::initializeCanonSDK() {
   m_error = EdsInitializeSDK();
   if (m_error == EDS_ERR_OK) {
@@ -3946,17 +3953,6 @@ EdsError StopMotion::focusFar3() {
 
 //-----------------------------------------------------------------
 
-void StopMotion::onImageReady(const bool &status) {
-  m_converterSucceeded = status;
-}
-
-//-----------------------------------------------------------------
-
-void StopMotion::onFinished() { l_quitLoop = true; }
-
-//-----------------------------------------------------------------
-//-----------------------------------------------------------------
-
 EdsError StopMotion::handleObjectEvent(EdsObjectEvent event, EdsBaseRef object,
                                        EdsVoid *context) {
   if (event == kEdsObjectEvent_DirItemRequestTransfer) {
diff --git a/toonz/sources/stopmotion/stopmotion.h b/toonz/sources/stopmotion/stopmotion.h
index d2b22ed8..fceaba41 100644
--- a/toonz/sources/stopmotion/stopmotion.h
+++ b/toonz/sources/stopmotion/stopmotion.h
@@ -31,10 +31,12 @@ enum ASPECT_RATIO { FOUR_THREE = 0, THREE_TWO, SIXTEEN_NINE, OTHER_RATIO };
 //=============================================================================
 // JpgConverter
 //-----------------------------------------------------------------------------
-#if WITH_CANON
+//#if WITH_CANON
 class JpgConverter : public QThread {
   Q_OBJECT
+#if WITH_CANON
   EdsStreamRef m_stream;
+#endif
   TRaster32P m_finalImage;
   bool m_scale     = false;
   int m_scaleWidth = 0;
@@ -42,6 +44,7 @@ class JpgConverter : public QThread {
 public:
   JpgConverter();
   ~JpgConverter();
+#if WITH_CANON
   void setStream(EdsStreamRef stream);
   void setScale(bool scale) { m_scale = scale; }
   void setScaleWidth(bool scaleWidth) { m_scaleWidth = scaleWidth; }
@@ -50,12 +53,13 @@ public:
 
 protected:
   void run() override;
+#endif
 
 signals:
   void imageReady(bool);
 };
 
-#endif
+//#endif
 
 class StopMotion : public QObject {  // Singleton
   Q_OBJECT
@@ -335,10 +339,8 @@ public:
 #endif
 
 public slots:
-#if WITH_CANON
   void onImageReady(const bool&);
   void onFinished();
-#endif
   void onTimeout();
   void onReviewTimeout();
   void update();
@@ -357,7 +359,7 @@ signals:
   void webcamResolutionsChanged();
   void newWebcamResolutionSelected(int);
 
-#if WITH_CANON
+  // canon signals
   void apertureOptionsChanged();
   void isoOptionsChanged();
   void shutterSpeedOptionsChanged();
@@ -375,7 +377,6 @@ signals:
   void imageQualityChangedSignal(QString);
   void pictureStyleChangedSignal(QString);
   void modeChanged();
-#endif
 
   void newDimensions();
   void subsamplingChanged(int);
diff --git a/toonz/sources/stopmotion/stopmotioncontroller.cpp b/toonz/sources/stopmotion/stopmotioncontroller.cpp
index cfbe477b..b7b81480 100644
--- a/toonz/sources/stopmotion/stopmotioncontroller.cpp
+++ b/toonz/sources/stopmotion/stopmotioncontroller.cpp
@@ -778,8 +778,7 @@ StopMotionController::StopMotionController(QWidget *parent) : QWidget(parent) {
   ret = ret && connect(m_stopMotion, SIGNAL(optionsChanged()), this,
                        SLOT(refreshOptionsLists()));
 
-// EOS Connections
-#if WITH_CANON
+  // EOS Connections
   ret = ret &&
         connect(m_zoomButton, SIGNAL(pressed()), this, SLOT(onZoomPressed()));
   ret = ret && connect(m_pickZoomButton, SIGNAL(pressed()), this,
@@ -845,7 +844,6 @@ StopMotionController::StopMotionController(QWidget *parent) : QWidget(parent) {
                        SLOT(refreshPictureStyleList()));
   ret = ret &&
         connect(m_stopMotion, SIGNAL(modeChanged()), this, SLOT(refreshMode()));
-#endif
 
   // Webcam Specific Connections
   ret = ret && connect(m_stopMotion, SIGNAL(webcamResolutionsChanged()), this,
@@ -1154,8 +1152,9 @@ void StopMotionController::refreshOptionsLists() {
 }
 
 //-----------------------------------------------------------------------------
-#if WITH_CANON
+
 void StopMotionController::refreshMode() {
+#if WITH_CANON
   if (m_stopMotion->getCameraCount() == 0) {
     m_cameraModeLabel->setText("");
     m_cameraStatusLabel->hide();
@@ -1165,11 +1164,13 @@ void StopMotionController::refreshMode() {
   QString battery = m_stopMotion->getCurrentBatteryLevel();
   m_cameraModeLabel->setText(tr("Mode: ") + mode);
   m_cameraStatusLabel->setText("Mode: " + mode + " - Battery: " + battery);
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::refreshApertureList() {
+#if WITH_CANON
   m_apertureCombo->blockSignals(true);
   m_apertureCombo->clear();
   m_stopMotion->getAvailableApertures();
@@ -1183,11 +1184,13 @@ void StopMotionController::refreshApertureList() {
     m_apertureCombo->setCurrentText(m_stopMotion->getCurrentAperture());
   }
   m_apertureCombo->blockSignals(false);
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::refreshShutterSpeedList() {
+#if WITH_CANON
   m_shutterSpeedCombo->blockSignals(true);
   m_shutterSpeedCombo->clear();
   m_stopMotion->getAvailableShutterSpeeds();
@@ -1201,11 +1204,13 @@ void StopMotionController::refreshShutterSpeedList() {
     m_shutterSpeedCombo->setCurrentText(m_stopMotion->getCurrentShutterSpeed());
   }
   m_shutterSpeedCombo->blockSignals(false);
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::refreshIsoList() {
+#if WITH_CANON
   m_isoCombo->blockSignals(true);
   m_isoCombo->clear();
   m_stopMotion->getAvailableIso();
@@ -1220,11 +1225,13 @@ void StopMotionController::refreshIsoList() {
     m_isoCombo->setCurrentText(m_stopMotion->getCurrentIso());
   }
   m_isoCombo->blockSignals(false);
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::refreshExposureList() {
+#if WITH_CANON
   m_exposureCombo->blockSignals(true);
   m_exposureCombo->clear();
   m_stopMotion->getAvailableExposureCompensations();
@@ -1239,11 +1246,13 @@ void StopMotionController::refreshExposureList() {
         m_stopMotion->getCurrentExposureCompensation());
   }
   m_exposureCombo->blockSignals(false);
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::refreshWhiteBalanceList() {
+#if WITH_CANON
   m_whiteBalanceCombo->blockSignals(true);
   m_whiteBalanceCombo->clear();
   m_stopMotion->getAvailableWhiteBalances();
@@ -1258,11 +1267,13 @@ void StopMotionController::refreshWhiteBalanceList() {
   }
   m_whiteBalanceCombo->blockSignals(false);
   refreshColorTemperatureList();
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::refreshColorTemperatureList() {
+#if WITH_CANON
   m_kelvinCombo->blockSignals(true);
   m_kelvinCombo->clear();
   m_kelvinCombo->addItems(m_stopMotion->getColorTemperatureOptions());
@@ -1281,11 +1292,13 @@ void StopMotionController::refreshColorTemperatureList() {
     m_kelvinCombo->setCurrentText(m_stopMotion->getCurrentColorTemperature());
   }
   m_kelvinCombo->blockSignals(false);
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::refreshImageQualityList() {
+#if WITH_CANON
   m_imageQualityCombo->blockSignals(true);
   m_imageQualityCombo->clear();
   m_stopMotion->getAvailableImageQualities();
@@ -1299,11 +1312,13 @@ void StopMotionController::refreshImageQualityList() {
     m_imageQualityCombo->setCurrentText(m_stopMotion->getCurrentImageQuality());
   }
   m_imageQualityCombo->blockSignals(false);
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::refreshPictureStyleList() {
+#if WITH_CANON
   m_pictureStyleCombo->blockSignals(true);
   m_pictureStyleCombo->clear();
   m_stopMotion->getAvailablePictureStyles();
@@ -1317,8 +1332,8 @@ void StopMotionController::refreshPictureStyleList() {
     m_pictureStyleCombo->setCurrentText(m_stopMotion->getCurrentPictureStyle());
   }
   m_pictureStyleCombo->blockSignals(false);
-}
 #endif
+}
 
 //-----------------------------------------------------------------------------
 
@@ -1479,138 +1494,197 @@ void StopMotionController::onFrameCaptured(QImage &image) {}
 
 //-----------------------------------------------------------------------------
 
-#if WITH_CANON
-
 void StopMotionController::onApertureChanged(int index) {
+#if WITH_CANON
   m_stopMotion->setAperture(m_apertureCombo->currentText());
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::onApertureChangedSignal(QString text) {
+#if WITH_CANON
   m_apertureCombo->setCurrentText(m_stopMotion->getCurrentAperture());
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::onShutterSpeedChanged(int index) {
+#if WITH_CANON
   m_stopMotion->setShutterSpeed(m_shutterSpeedCombo->currentText());
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::onShutterSpeedChangedSignal(QString text) {
+#if WITH_CANON
   m_shutterSpeedCombo->setCurrentText(m_stopMotion->getCurrentShutterSpeed());
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::onIsoChanged(int index) {
+#if WITH_CANON
   m_stopMotion->setIso(m_isoCombo->currentText());
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::onIsoChangedSignal(QString text) {
+#if WITH_CANON
   m_isoCombo->setCurrentText(m_stopMotion->getCurrentIso());
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::onExposureChanged(int index) {
+#if WITH_CANON
   m_stopMotion->setExposureCompensation(m_exposureCombo->currentText());
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::onExposureChangedSignal(QString text) {
+#if WITH_CANON
   m_exposureCombo->setCurrentText(
       m_stopMotion->getCurrentExposureCompensation());
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::onWhiteBalanceChanged(int index) {
+#if WITH_CANON
   m_stopMotion->setWhiteBalance(m_whiteBalanceCombo->currentText());
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::onWhiteBalanceChangedSignal(QString text) {
+#if WITH_CANON
   m_whiteBalanceCombo->setCurrentText(m_stopMotion->getCurrentWhiteBalance());
   refreshColorTemperatureList();
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::onColorTemperatureChanged(int index) {
+#if WITH_CANON
   m_stopMotion->setColorTemperature(m_kelvinCombo->currentText());
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::onColorTemperatureChangedSignal(QString text) {
+#if WITH_CANON
   m_kelvinCombo->setCurrentText(m_stopMotion->getCurrentColorTemperature());
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::onImageQualityChanged(int index) {
+#if WITH_CANON
   m_stopMotion->setImageQuality(m_imageQualityCombo->currentText());
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::onImageQualityChangedSignal(QString text) {
+#if WITH_CANON
   m_imageQualityCombo->setCurrentText(m_stopMotion->getCurrentImageQuality());
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::onPictureStyleChanged(int index) {
+#if WITH_CANON
   m_stopMotion->setPictureStyle(m_pictureStyleCombo->currentText());
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::onPictureStyleChangedSignal(QString text) {
+#if WITH_CANON
   m_pictureStyleCombo->setCurrentText(m_stopMotion->getCurrentPictureStyle());
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
-void StopMotionController::onZoomPressed() { m_stopMotion->zoomLiveView(); }
+void StopMotionController::onZoomPressed() {
+#if WITH_CANON
+  m_stopMotion->zoomLiveView();
+#endif
+}
 
 //-----------------------------------------------------------------------------
 
 void StopMotionController::onPickZoomPressed() {
+#if WITH_CANON
   m_stopMotion->toggleZoomPicking();
+#endif
 }
 
 //-----------------------------------------------------------------------------
 
-void StopMotionController::onFocusNear() { m_stopMotion->focusNear(); }
-
-//-----------------------------------------------------------------------------
-
-void StopMotionController::onFocusFar() { m_stopMotion->focusFar(); }
-
-//-----------------------------------------------------------------------------
-
-void StopMotionController::onFocusNear2() { m_stopMotion->focusNear2(); }
-
-//-----------------------------------------------------------------------------
-
-void StopMotionController::onFocusFar2() { m_stopMotion->focusFar2(); }
-
-//-----------------------------------------------------------------------------
-
-void StopMotionController::onFocusNear3() { m_stopMotion->focusNear3(); }
-
-//-----------------------------------------------------------------------------
-
-void StopMotionController::onFocusFar3() { m_stopMotion->focusFar3(); }
+void StopMotionController::onFocusNear() {
+#if WITH_CANON
+  m_stopMotion->focusNear();
 #endif
+}
+
+//-----------------------------------------------------------------------------
+
+void StopMotionController::onFocusFar() {
+#if WITH_CANON
+  m_stopMotion->focusFar();
+#endif
+}
+
+//-----------------------------------------------------------------------------
+
+void StopMotionController::onFocusNear2() {
+#if WITH_CANON
+  m_stopMotion->focusNear2();
+#endif
+}
+
+//-----------------------------------------------------------------------------
+
+void StopMotionController::onFocusFar2() {
+#if WITH_CANON
+  m_stopMotion->focusFar2();
+#endif
+}
+
+//-----------------------------------------------------------------------------
+
+void StopMotionController::onFocusNear3() {
+#if WITH_CANON
+  m_stopMotion->focusNear3();
+#endif
+}
+
+//-----------------------------------------------------------------------------
+
+void StopMotionController::onFocusFar3() {
+#if WITH_CANON
+  m_stopMotion->focusFar3();
+#endif
+}
 
 //-----------------------------------------------------------------------------
 
diff --git a/toonz/sources/stopmotion/stopmotioncontroller.h b/toonz/sources/stopmotion/stopmotioncontroller.h
index 68bde693..cada7739 100644
--- a/toonz/sources/stopmotion/stopmotioncontroller.h
+++ b/toonz/sources/stopmotion/stopmotioncontroller.h
@@ -145,7 +145,7 @@ protected slots:
   void onNextXSheetFrame();
   void setToCurrentXSheetFrame();
 
-#if WITH_CANON
+  // canon stuff
   void onApertureChanged(int index);
   void onShutterSpeedChanged(int index);
   void onIsoChanged(int index);
@@ -180,8 +180,6 @@ protected slots:
   void refreshPictureStyleList();
   void refreshMode();
 
-#endif
-
   void onCaptureReviewFldEdited();
   void onCaptureReviewSliderChanged(bool ignore);
   void onSubsamplingFldEdited();
diff --git a/toonz/sources/toonz/CMakeLists.txt b/toonz/sources/toonz/CMakeLists.txt
index 95994baa..c954ad76 100644
--- a/toonz/sources/toonz/CMakeLists.txt
+++ b/toonz/sources/toonz/CMakeLists.txt
@@ -125,12 +125,6 @@ set(MOC_HEADERS
     cameracapturelevelcontrol.h
     penciltestpopup.h
 )
-else()
-set(MOC_HEADERS
-    ${MOC_HEADERS}
-    cameracapturelevelcontrol_qt.h
-    penciltestpopup_qt.h
-)
 
 set(HEADERS
     ${MOC_HEADERS}
@@ -361,12 +355,6 @@ set(SOURCES
 	cameracapturelevelcontrol.cpp
     penciltestpopup.cpp
 )
-else()
-set(SOURCES
-    ${SOURCES}
-	cameracapturelevelcontrol_qt.cpp
-    penciltestpopup_qt.cpp
-)
 
 add_translation(toonz ${HEADERS} ${SOURCES})
 
diff --git a/toonz/sources/toonz/autoinputcellnumberpopup.cpp b/toonz/sources/toonz/autoinputcellnumberpopup.cpp
index afb5ff41..84e240c1 100644
--- a/toonz/sources/toonz/autoinputcellnumberpopup.cpp
+++ b/toonz/sources/toonz/autoinputcellnumberpopup.cpp
@@ -5,12 +5,7 @@
 #include "menubarcommandids.h"
 #include "cellselection.h"
 #include "columnselection.h"
-
-#ifdef WITH_STOPMOTION
 #include "penciltestpopup.h"
-#else
-#include "penciltestpopup_qt.h"
-#endif
 
 // TnzQt includes
 #include "toonzqt/intfield.h"
@@ -277,7 +272,7 @@ AutoInputCellNumberPopup::AutoInputCellNumberPopup()
   bool ret = true;
   ret      = ret && connect(m_overwriteBtn, SIGNAL(clicked()), this,
                        SLOT(onOverwritePressed()));
-  ret      = ret &&
+  ret = ret &&
         connect(m_insertBtn, SIGNAL(clicked()), this, SLOT(onInsertPressed()));
   ret = ret && connect(cancelBtn, SIGNAL(clicked()), this, SLOT(close()));
   assert(ret);
diff --git a/toonz/sources/toonz/sceneviewer.cpp b/toonz/sources/toonz/sceneviewer.cpp
index 2a167459..0cc7547a 100644
--- a/toonz/sources/toonz/sceneviewer.cpp
+++ b/toonz/sources/toonz/sceneviewer.cpp
@@ -2000,7 +2000,7 @@ void SceneViewer::drawScene() {
         smPlayer.m_dpiAff = TScale(Stage::inch / dpiX, Stage::inch / dpiY);
         bool hide_opacity = false;
 #if WITH_CANON
-        hide opacity =
+        hide_opacity =
             m_stopMotion->m_zooming || m_stopMotion->m_pickLiveViewZoom;
 #endif
         smPlayer.m_opacity = hide_opacity ? 255.0 : m_stopMotion->getOpacity();