diff --git a/core/ass_dialogue.cpp b/core/ass_dialogue.cpp
index fdb973130..625f96517 100644
--- a/core/ass_dialogue.cpp
+++ b/core/ass_dialogue.cpp
@@ -42,15 +42,18 @@
 #include "utils.h"
 #include <fstream>
 #include <wx/tokenzr.h>
+#ifndef NO_FEX
 #include "FexTracker.h"
 #include "FexMovement.h"
-
+#endif
 
 ////////////////////// AssDialogue //////////////////////
 // Constructs AssDialogue
 AssDialogue::AssDialogue() {
+#ifndef NO_FEX
 	Tracker = 0;
 	Movement = 0;
+#endif
 
 	Type = ENTRY_DIALOGUE;
 	group = _T("[Events]");
@@ -72,8 +75,10 @@ AssDialogue::AssDialogue() {
 
 
 AssDialogue::AssDialogue(wxString _data,bool IsSSA) {
+#ifndef NO_FEX
 	Tracker = 0;
 	Movement = 0;
+#endif
 
 	Type = ENTRY_DIALOGUE;
 	group = _T("[Events]");
@@ -97,6 +102,7 @@ AssDialogue::~AssDialogue () {
 // Clear
 void AssDialogue::Clear () {
 	ClearBlocks();
+#ifndef NO_FEX
 	if( Tracker )
 	{
 		delete Tracker;
@@ -107,6 +113,7 @@ void AssDialogue::Clear () {
 		DeleteMovement( Movement );
 		Movement = 0;
 	}
+#endif
 }
 
 
diff --git a/core/ass_dialogue.h b/core/ass_dialogue.h
index fc82bf29b..8ca2e7088 100644
--- a/core/ass_dialogue.h
+++ b/core/ass_dialogue.h
@@ -42,8 +42,10 @@
 #include <vector>
 #include "ass_entry.h"
 #include "ass_time.h"
+#ifndef NO_FEX
 class FexTracker;
 class FexMovement;
+#endif
 
 
 //////////////
@@ -167,8 +169,10 @@ public:
 	wxString Actor;					// Actor name
 	wxString Effect;				// Effect name
 	wxString Text;					// Raw text data
+#ifndef NO_FEX
 	FexTracker *Tracker;			// Point tracker
 	FexMovement *Movement;			// Point tracker generated movement
+#endif
 
 	bool Parse(bool IsSSA=false);	// Parses raw ASS data into everything else
 	void ParseASSTags();			// Parses text to generate block information (doesn't update data)
diff --git a/core/frame_main_events.cpp b/core/frame_main_events.cpp
index e685561ff..fbfbf7aa4 100644
--- a/core/frame_main_events.cpp
+++ b/core/frame_main_events.cpp
@@ -72,11 +72,13 @@
 #include "toggle_bitmap.h"
 #include "dialog_hotkeys.h"
 #include "dialog_timing_processor.h"
+#ifndef NO_FEX
 #include "FexTracker.h"
 #include "FexTrackingFeature.h"
 #include "FexMovement.h"
-#include "dialog_progress.h"
 #include "dialog_fextracker.h"
+#endif
+#include "dialog_progress.h"
 
 
 ////////////////////
@@ -90,6 +92,7 @@ BEGIN_EVENT_TABLE(FrameMain, wxFrame)
 	EVT_BUTTON(Video_Stop, FrameMain::OnVideoStop)
 	EVT_TOGGLEBUTTON(Video_Auto_Scroll, FrameMain::OnVideoToggleScroll)
 
+#ifndef NO_FEX
 	EVT_BUTTON(Video_Tracker_Menu, FrameMain::OnVideoTrackerMenu)
 	EVT_MENU(Video_Track_Points, FrameMain::OnVideoTrackPoints)
 	EVT_MENU(Video_Track_Point_Add, FrameMain::OnVideoTrackPointAdd)
@@ -101,6 +104,7 @@ BEGIN_EVENT_TABLE(FrameMain, wxFrame)
 	EVT_MENU(Video_Track_Movement_MoveBefore, FrameMain::OnVideoTrackMovementMoveBefore)
 	EVT_MENU(Video_Track_Movement_MoveAfter, FrameMain::OnVideoTrackMovementMoveAfter)
 	EVT_MENU(Video_Track_Split_Line, FrameMain::OnVideoTrackSplitLine)
+#endif
 
 	EVT_CLOSE(FrameMain::OnCloseWindow)
 
diff --git a/core/video_display.cpp b/core/video_display.cpp
index f5d88f649..39d9dfc82 100644
--- a/core/video_display.cpp
+++ b/core/video_display.cpp
@@ -55,9 +55,11 @@
 #include <wx/clipbrd.h>
 #include <wx/filename.h>
 #include <wx/config.h>
+#ifndef NO_FEX
 #include "FexTracker.h"
 #include "FexTrackingFeature.h"
 #include "FexMovement.h"
+#endif
 
 
 ///////
@@ -267,6 +269,7 @@ void VideoDisplay::OnMouseEvent(wxMouseEvent& event) {
 	int x = event.GetX();
 	int y = event.GetY();
 
+#ifndef NO_FEX
 	if( event.ButtonDown(wxMOUSE_BTN_LEFT) )
 	{
 		MouseDownX = x;
@@ -325,6 +328,7 @@ void VideoDisplay::OnMouseEvent(wxMouseEvent& event) {
 			MouseDownY = y;
 		}
 	}
+#endif
 
 	// Text of current coords
 	int sw,sh;
@@ -627,6 +631,7 @@ void VideoDisplay::OnCopyCoords(wxCommandEvent &event) {
 // Draw Tracking Overlay
 void VideoDisplay::DrawTrackingOverlay( wxDC &dc )
 {
+#ifndef NO_FEX
 	if( IsPlaying ) return;
 
 	// Get line
@@ -706,6 +711,7 @@ void VideoDisplay::DrawTrackingOverlay( wxDC &dc )
 			f3 = f2;
 		}
 	}
+#endif
 }