diff --git a/src/Application/Application.h b/src/Application/Application.h
index 9dcb000..b3ffb2a 100644
--- a/src/Application/Application.h
+++ b/src/Application/Application.h
@@ -9,6 +9,8 @@
 #include "RmSurfaceCmd.h"
 #include "MvLayerUpCmd.h"
 #include "MvLayerDnCmd.h"
+#include "DuplicateSurfaceCmd.h"
+#include "SetNextSourceCmd.h"
 #include "ApplicationBaseMode.h"
 #include "PresentationMode.h"
 #include "ProjectionMappingMode.h"
diff --git a/src/Application/Modes/ProjectionMappingMode.h b/src/Application/Modes/ProjectionMappingMode.h
index c71ed72..9e2f926 100644
--- a/src/Application/Modes/ProjectionMappingMode.h
+++ b/src/Application/Modes/ProjectionMappingMode.h
@@ -20,8 +20,6 @@
 #include "StartDragSurfaceCmd.h"
 #include "TogglePerspectiveCmd.h"
 #include "DeselectSurfaceCmd.h"
-#include "SetNextSourceCmd.h"
-#include "DuplicateSurfaceCmd.h"
 #include "ToggleAnimatedSourceCmd.h"
 #include "ScaleSurfaceFromToCmd.h"
 #include "MvSurfaceVertCmd.h"
@@ -29,7 +27,6 @@
 #include "Gui.h"
 
 #include "ScaleWidget.h"
-//#include "LayerPanelWidget.h"
 
 namespace ofx {
 namespace piMapper {
diff --git a/src/Application/Modes/TextureMappingMode.h b/src/Application/Modes/TextureMappingMode.h
index c5c9792..5b26034 100644
--- a/src/Application/Modes/TextureMappingMode.h
+++ b/src/Application/Modes/TextureMappingMode.h
@@ -7,7 +7,6 @@
 #include "SelNextTexCoordCmd.h"
 #include "SelPrevTexCoordCmd.h"
 #include "DeselectTexCoordCmd.h"
-#include "SetNextSourceCmd.h"
 #include "SelNextSurfaceCmd.h"
 #include "ToggleAnimatedSourceCmd.h"
 #include "TranslateCanvasCmd.h"