diff --git a/src/LabelTrack.cpp b/src/LabelTrack.cpp
index b865b64fa..2fbb6333b 100644
--- a/src/LabelTrack.cpp
+++ b/src/LabelTrack.cpp
@@ -1595,7 +1595,7 @@ void LabelTrack::HandleGlyphClick
          float t = 0.0;
          // We move if we hit the centre, we adjust one edge if we hit a chevron.
          // This is if we are moving just one edge.
-         hit.mbIsMoving = hit.mEdge & 4;
+         hit.mbIsMoving = (hit.mEdge & 4)!=0;
          // When we start dragging the label(s) we don't want them to jump.
          // so we calculate the displacement of the mouse from the drag center
          // and use that in subsequent dragging calculations.  The mouse stays
diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index 680a07c46..29d29c57d 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -3214,7 +3214,7 @@ void TrackInfo::DrawBordersWithin
 
    GetMuteSoloRect( rect, buttonRect, false, true, &track );
 
-   bool bHasMuteSolo = dynamic_cast<const PlayableTrack*>( &track );
+   bool bHasMuteSolo = dynamic_cast<const PlayableTrack*>( &track ) != NULL;
    if( bHasMuteSolo && !TrackInfo::HideTopItem( rect, buttonRect ) )
    {
       // above mute/solo
diff --git a/src/WaveTrack.cpp b/src/WaveTrack.cpp
index 2893c4881..cde1e9a1a 100644
--- a/src/WaveTrack.cpp
+++ b/src/WaveTrack.cpp
@@ -2437,7 +2437,6 @@ void WaveTrack::SplitAt(double t)
    {
       if (c->WithinClip(t))
       {
-         double val;
          t = LongSamplesToTime(TimeToLongSamples(t)); // put t on a sample
          auto newClip = make_movable<WaveClip>( *c, mDirManager, true );
          c->Clear(t, c->GetEndTime());
diff --git a/src/blockfile/ODDecodeBlockFile.cpp b/src/blockfile/ODDecodeBlockFile.cpp
index 406f0d762..5fbd3a413 100644
--- a/src/blockfile/ODDecodeBlockFile.cpp
+++ b/src/blockfile/ODDecodeBlockFile.cpp
@@ -53,7 +53,7 @@ try
    mAudioFileName = std::move(audioFileName);
    mFormat = int16Sample;
 }
-catch ( const FileException & e )
+catch ( const FileException & WXUNUSED(e) )
 {
    // The constructor SimpleBlockFile sometimes throws this,
    // but it never will for the arguments that were passed to it here.
@@ -319,7 +319,7 @@ bool ODDecodeBlockFile::IsSummaryAvailable() const
 
 bool ODDecodeBlockFile::IsDataAvailable() const
 {
-   return mDataAvailable;
+   return mDataAvailable != 0;
 }
 
 /// Write the summary to disk, using the derived ReadData() to get the data
diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp
index 961cc5567..646e5b505 100644
--- a/src/effects/Effect.cpp
+++ b/src/effects/Effect.cpp
@@ -1641,7 +1641,7 @@ bool Effect::ProcessTrack(int count,
       {
          processed = ProcessBlock(inBufPos.get(), outBufPos.get(), curBlockSize);
       }
-      catch( const AudacityException &e )
+      catch( const AudacityException & WXUNUSED(e) )
       {
          // PRL: Bug 437:
          // Pass this along to our application-level handler
diff --git a/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp b/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp
index a4d7516f0..f8351bd56 100644
--- a/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp
+++ b/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp
@@ -129,7 +129,7 @@ UIHandle::Result LabelGlyphHandle::Drag
 HitTestPreview LabelGlyphHandle::Preview
 (const TrackPanelMouseState &, const AudacityProject *)
 {
-   return HitPreview( mHit.mEdge & 4 );
+   return HitPreview( (mHit.mEdge & 4 )!=0);
 }
 
 UIHandle::Result LabelGlyphHandle::Release
diff --git a/src/tracks/ui/SelectHandle.cpp b/src/tracks/ui/SelectHandle.cpp
index 242a37b42..9f51c5404 100644
--- a/src/tracks/ui/SelectHandle.cpp
+++ b/src/tracks/ui/SelectHandle.cpp
@@ -54,7 +54,7 @@ enum {
 
 bool SelectHandle::IsClicked() const
 {
-   return mSelectionStateChanger.get();
+   return mSelectionStateChanger.get() != NULL;
 }
 
 namespace
diff --git a/src/widgets/LinkingHtmlWindow.cpp b/src/widgets/LinkingHtmlWindow.cpp
index 231038e15..0b385d370 100644
--- a/src/widgets/LinkingHtmlWindow.cpp
+++ b/src/widgets/LinkingHtmlWindow.cpp
@@ -144,7 +144,7 @@ void LinkingHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link)
          wxFileName( FileNames::HtmlHelpDir(), href.Mid( 10 ) + wxT(".htm") ).GetFullPath();
       if( wxFileExists( FileName ) )
       {
-         HelpSystem::ShowHelp(this, FileName, wxEmptyString);
+         HelpSystem::ShowHelp(this, FileName, wxEmptyString, false);
          return;
       }
       else
diff --git a/src/widgets/NumericTextCtrl.cpp b/src/widgets/NumericTextCtrl.cpp
index 75e15ee02..0d635ee4e 100644
--- a/src/widgets/NumericTextCtrl.cpp
+++ b/src/widgets/NumericTextCtrl.cpp
@@ -596,6 +596,7 @@ return theArray.Get();
       (NumericConverter::Type type)
    {
       switch (type) {
+         default:
          case NumericConverter::TIME:
             return TimeConverterFormats();
          case NumericConverter::FREQUENCY: