diff --git a/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj b/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj
index da977bb4c..38c796fc4 100644
--- a/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj	
+++ b/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj	
@@ -1348,7 +1348,6 @@
 				ABD0A5341501AA5A0074A094 /* coreaudiosound.cpp */,
 				ABD0A5351501AA5A0074A094 /* ringbuffer.cpp */,
 				ABD104141346652500AF11D1 /* sndOSX.cpp */,
-				AB817A35143EE2DB00A7DFE9 /* videofilter.cpp */,
 				ABA6574914511EC90077E5E9 /* cocoa_cheat.h */,
 				ABD103FE1346652500AF11D1 /* cocoa_core.h */,
 				AB58F32B1364F44B0074C376 /* cocoa_file.h */,
@@ -1364,7 +1363,6 @@
 				ABD0A5361501AA5A0074A094 /* coreaudiosound.h */,
 				ABD0A5371501AA5A0074A094 /* ringbuffer.h */,
 				ABD104011346652500AF11D1 /* sndOSX.h */,
-				AB817A34143EE2DB00A7DFE9 /* videofilter.h */,
 				ABA6574A14511EC90077E5E9 /* cocoa_cheat.mm */,
 				ABD104121346652500AF11D1 /* cocoa_core.mm */,
 				AB58F32C1364F44B0074C376 /* cocoa_file.mm */,
@@ -1938,11 +1936,13 @@
 				ABFE150014C92FF5005D6699 /* hq4x.cpp */,
 				ABFE150414C92FF5005D6699 /* lq2x.cpp */,
 				ABFE150614C92FF5005D6699 /* scanline.cpp */,
+				AB817A35143EE2DB00A7DFE9 /* videofilter.cpp */,
 				ABFE14FD14C92FF5005D6699 /* filter.h */,
 				ABFE14FF14C92FF5005D6699 /* hq2x.h */,
 				ABFE150214C92FF5005D6699 /* hq4x.h */,
 				ABFE150314C92FF5005D6699 /* interp.h */,
 				ABFE150514C92FF5005D6699 /* lq2x.h */,
+				AB817A34143EE2DB00A7DFE9 /* videofilter.h */,
 			);
 			name = filter;
 			path = ../filter;
diff --git a/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj b/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj
index a253dd89e..16905764e 100644
--- a/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj	
+++ b/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj	
@@ -1101,7 +1101,6 @@
 				AB23567216C2F6F400DA782E /* macosx_10_5_compat.cpp */,
 				AB1B9E601501A78000464647 /* ringbuffer.cpp */,
 				ABD104141346652500AF11D1 /* sndOSX.cpp */,
-				AB817A35143EE2DB00A7DFE9 /* videofilter.cpp */,
 				ABA6574914511EC90077E5E9 /* cocoa_cheat.h */,
 				ABD103FE1346652500AF11D1 /* cocoa_core.h */,
 				AB58F32B1364F44B0074C376 /* cocoa_file.h */,
@@ -1117,7 +1116,6 @@
 				AB1B9E611501A78000464647 /* coreaudiosound.h */,
 				AB1B9E621501A78000464647 /* ringbuffer.h */,
 				ABD104011346652500AF11D1 /* sndOSX.h */,
-				AB817A34143EE2DB00A7DFE9 /* videofilter.h */,
 				ABA6574A14511EC90077E5E9 /* cocoa_cheat.mm */,
 				ABD104121346652500AF11D1 /* cocoa_core.mm */,
 				AB58F32C1364F44B0074C376 /* cocoa_file.mm */,
@@ -1707,11 +1705,13 @@
 				ABFE150014C92FF5005D6699 /* hq4x.cpp */,
 				ABFE150414C92FF5005D6699 /* lq2x.cpp */,
 				ABFE150614C92FF5005D6699 /* scanline.cpp */,
+				AB817A35143EE2DB00A7DFE9 /* videofilter.cpp */,
 				ABFE14FD14C92FF5005D6699 /* filter.h */,
 				ABFE14FF14C92FF5005D6699 /* hq2x.h */,
 				ABFE150214C92FF5005D6699 /* hq4x.h */,
 				ABFE150314C92FF5005D6699 /* interp.h */,
 				ABFE150514C92FF5005D6699 /* lq2x.h */,
+				AB817A34143EE2DB00A7DFE9 /* videofilter.h */,
 			);
 			name = filter;
 			path = ../filter;
diff --git a/desmume/src/cocoa/cocoa_videofilter.h b/desmume/src/cocoa/cocoa_videofilter.h
index b7db42e16..147bc0e5f 100644
--- a/desmume/src/cocoa/cocoa_videofilter.h
+++ b/desmume/src/cocoa/cocoa_videofilter.h
@@ -16,9 +16,11 @@
 	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#import <Cocoa/Cocoa.h>
-#include "videofilter.h"
+#import <Foundation/Foundation.h>
+#include "../filter/videofilter.h"
 
+@class NSImage;
+@class NSBitmapImageRep;
 
 /********************************************************************************************
 	CocoaVideoFilter - OBJECTIVE-C CLASS
diff --git a/desmume/src/cocoa/cocoa_videofilter.mm b/desmume/src/cocoa/cocoa_videofilter.mm
index 491525427..1e6a306b3 100644
--- a/desmume/src/cocoa/cocoa_videofilter.mm
+++ b/desmume/src/cocoa/cocoa_videofilter.mm
@@ -18,7 +18,7 @@
 
 #import "cocoa_videofilter.h"
 #import "cocoa_util.h"
-
+#import <Cocoa/Cocoa.h>
 
 @implementation CocoaVideoFilter
 
diff --git a/desmume/src/cocoa/videofilter.cpp b/desmume/src/filter/videofilter.cpp
similarity index 100%
rename from desmume/src/cocoa/videofilter.cpp
rename to desmume/src/filter/videofilter.cpp
diff --git a/desmume/src/cocoa/videofilter.h b/desmume/src/filter/videofilter.h
similarity index 99%
rename from desmume/src/cocoa/videofilter.h
rename to desmume/src/filter/videofilter.h
index 19babdbac..8d9a3dc01 100644
--- a/desmume/src/cocoa/videofilter.h
+++ b/desmume/src/filter/videofilter.h
@@ -24,7 +24,7 @@
 #include <string>
 #include <vector>
 #include <pthread.h>
-#include "../filter/filter.h"
+#include "filter.h"
 #include "../utils/task.h"