diff --git a/app/common/define.h b/app/common/define.h
index aa968fcf7..4421b9f3a 100644
--- a/app/common/define.h
+++ b/app/common/define.h
@@ -27,6 +27,8 @@
 
 #define OLIVE_NAMESPACE_EXIT }
 
+#define OTIO opentimelineio::OPENTIMELINEIO_VERSION
+
 OLIVE_NAMESPACE_ENTER
 
 const int kHSVChannels = 3;
diff --git a/app/task/project/loadotio/loadotio.cpp b/app/task/project/loadotio/loadotio.cpp
index 25b83658f..763139560 100644
--- a/app/task/project/loadotio/loadotio.cpp
+++ b/app/task/project/loadotio/loadotio.cpp
@@ -34,8 +34,6 @@
 #include "project/item/folder/folder.h"
 #include "project/item/sequence/sequence.h"
 
-#define OTIO opentimelineio::OPENTIMELINEIO_VERSION
-
 OLIVE_NAMESPACE_ENTER
 
 LoadOTIOTask::LoadOTIOTask(const QString& s) :
diff --git a/app/task/project/saveotio/saveotio.cpp b/app/task/project/saveotio/saveotio.cpp
index 37e8f5f90..bc706fcef 100644
--- a/app/task/project/saveotio/saveotio.cpp
+++ b/app/task/project/saveotio/saveotio.cpp
@@ -95,7 +95,7 @@ bool SaveOTIOTask::Run()
 OTIO::Timeline *SaveOTIOTask::SerializeTimeline(SequencePtr sequence)
 {
   auto otio_timeline = new OTIO::Timeline(sequence->name().toStdString());
-  OTIO::Timeline::Retainer<OTIO::Timeline>* time_retainer = new OTIO::Timeline::Retainer<OTIO::Timeline>(otio_timeline);
+  OTIO::Timeline::Retainer<OTIO::Timeline>* timeline_retainer = new OTIO::Timeline::Retainer<OTIO::Timeline>(otio_timeline);
 
   if (!SerializeTrackList(sequence->viewer_output()->track_list(Timeline::kTrackTypeVideo), otio_timeline)
       || !SerializeTrackList(sequence->viewer_output()->track_list(Timeline::kTrackTypeAudio), otio_timeline)) {
@@ -147,8 +147,8 @@ OTIO::Track *SaveOTIOTask::SerializeTrack(TrackOutput *track)
     case Block::kGap:
     {
       otio_block = new OTIO::Gap(OTIO::TimeRange(block->in().toRationalTime(),
-                                          block->length().toRationalTime()),
-            block->GetLabel().toStdString()
+                                 block->length().toRationalTime()),
+                                 block->GetLabel().toStdString()
       );
       break;
     }
diff --git a/app/task/project/saveotio/saveotio.h b/app/task/project/saveotio/saveotio.h
index b939739d9..69338f16a 100644
--- a/app/task/project/saveotio/saveotio.h
+++ b/app/task/project/saveotio/saveotio.h
@@ -27,8 +27,6 @@
 #include "project/project.h"
 #include "task/task.h"
 
-#define OTIO opentimelineio::OPENTIMELINEIO_VERSION
-
 OLIVE_NAMESPACE_ENTER
 
 class SaveOTIOTask : public Task