diff --git a/src/apps/terminal/TermApp.cpp b/src/apps/terminal/TermApp.cpp
index 8d5a89dd84..decec216ff 100644
--- a/src/apps/terminal/TermApp.cpp
+++ b/src/apps/terminal/TermApp.cpp
@@ -32,8 +32,8 @@
 #include <unistd.h>
 
 
-// Preference temporary
-extern PrefHandler *gTermPref;
+// Globals
+PrefHandler *gTermPref;
 extern char gWindowName[];
 
 bool gUsageRequested = false;
@@ -101,6 +101,7 @@ TermApp::TermApp()
 
 TermApp::~TermApp()
 {
+	delete gTermPref;
 }
 
 
@@ -140,7 +141,6 @@ TermApp::Quit()
 		_UnregisterTerminal();
 	}
 
-	delete gTermPref;
 	BApplication::Quit();
 }
 
diff --git a/src/apps/terminal/Terminal.cpp b/src/apps/terminal/Terminal.cpp
index 78e04f254c..010c1259ce 100644
--- a/src/apps/terminal/Terminal.cpp
+++ b/src/apps/terminal/Terminal.cpp
@@ -31,10 +31,6 @@
 #include <stdio.h>
 
 #include "TermApp.h"
-#include "PrefHandler.h"
-
-
-PrefHandler *gTermPref;		/* Preference temporary */
 
 
 int