diff --git a/DSView/pv/data/analogsnapshot.cpp b/DSView/pv/data/analogsnapshot.cpp
index 329bafdf..6498a1aa 100755
--- a/DSView/pv/data/analogsnapshot.cpp
+++ b/DSView/pv/data/analogsnapshot.cpp
@@ -27,7 +27,7 @@
 #include <algorithm>
  
 #include "analogsnapshot.h"
-#include "../extdef.h"
+#include "../dsvdef.h"
 
 using namespace std;
 
diff --git a/DSView/pv/data/dsosnapshot.cpp b/DSView/pv/data/dsosnapshot.cpp
index 62642a94..6388eadd 100755
--- a/DSView/pv/data/dsosnapshot.cpp
+++ b/DSView/pv/data/dsosnapshot.cpp
@@ -26,7 +26,7 @@
 #include <algorithm>
  
 #include "dsosnapshot.h"
-#include "../extdef.h"
+#include "../dsvdef.h"
 
 using namespace std;
 
diff --git a/DSView/pv/data/groupsnapshot.cpp b/DSView/pv/data/groupsnapshot.cpp
index 1e8430a4..13b56fb4 100755
--- a/DSView/pv/data/groupsnapshot.cpp
+++ b/DSView/pv/data/groupsnapshot.cpp
@@ -28,7 +28,7 @@
 
 #include "logicsnapshot.h"
 #include "groupsnapshot.h"
-#include "../extdef.h"
+#include "../dsvdef.h"
 
 using namespace std;
 
diff --git a/DSView/pv/data/logicsnapshot.cpp b/DSView/pv/data/logicsnapshot.cpp
index f4e42584..be0aab80 100755
--- a/DSView/pv/data/logicsnapshot.cpp
+++ b/DSView/pv/data/logicsnapshot.cpp
@@ -28,7 +28,7 @@
 #include <math.h>
  
 #include "logicsnapshot.h"
-#include "../extdef.h"
+#include "../dsvdef.h"
 
 using namespace std;
 
diff --git a/DSView/pv/dsvdef.h b/DSView/pv/dsvdef.h
index b5c118d7..6c87ae53 100644
--- a/DSView/pv/dsvdef.h
+++ b/DSView/pv/dsvdef.h
@@ -24,6 +24,17 @@
 #include "../config.h"
 #include <QString>
 
+#define countof(x) (sizeof(x)/sizeof(x[0]))
+
+#define begin_element(x) (&x[0])
+#define end_element(x) (&x[countof(x)])
+
+enum View_type {
+    TIME_VIEW,
+    FFT_VIEW,
+    ALL_VIEW
+};
+
 
 #ifdef DS_DEBUG_TRACE
     void ds_print(const char *s);
diff --git a/DSView/pv/extdef.h b/DSView/pv/extdef.h
deleted file mode 100755
index 7fc608fe..00000000
--- a/DSView/pv/extdef.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is part of the DSView project.
- * DSView is based on PulseView.
- *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- * Copyright (C) 2013 DreamSourceLab <support@dreamsourcelab.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-
-#ifndef DSVIEW_EXTDEF_H
-#define DSVIEW_EXTDEF_H
-
-#define countof(x) (sizeof(x)/sizeof(x[0]))
-
-#define begin_element(x) (&x[0])
-#define end_element(x) (&x[countof(x)])
-
-enum View_type {
-    TIME_VIEW,
-    FFT_VIEW,
-    ALL_VIEW
-};
-
-#endif // DSVIEW_EXTDEF_H
diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp
index ac91bc4c..5a466263 100755
--- a/DSView/pv/toolbars/samplingbar.cpp
+++ b/DSView/pv/toolbars/samplingbar.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "samplingbar.h"
-#include "../extdef.h"
+#include "../dsvdef.h"
 
 #include <assert.h> 
 #include <QAction>
diff --git a/DSView/pv/view/analogsignal.cpp b/DSView/pv/view/analogsignal.cpp
index 498d46f9..4098735b 100755
--- a/DSView/pv/view/analogsignal.cpp
+++ b/DSView/pv/view/analogsignal.cpp
@@ -29,7 +29,7 @@
 #include "../data/analogsnapshot.h"
 #include "../view/view.h"
 #include "../device/devinst.h"
-#include "../extdef.h"
+#include "../dsvdef.h"
 
 
 using namespace std;
diff --git a/DSView/pv/view/cursor.cpp b/DSView/pv/view/cursor.cpp
index a4b667a3..1d2e5268 100755
--- a/DSView/pv/view/cursor.cpp
+++ b/DSView/pv/view/cursor.cpp
@@ -35,7 +35,7 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include "../extdef.h"
+#include "../dsvdef.h"
 
 namespace pv {
 namespace view {
diff --git a/DSView/pv/view/decodetrace.cpp b/DSView/pv/view/decodetrace.cpp
index 415eb081..57e9ddd2 100755
--- a/DSView/pv/view/decodetrace.cpp
+++ b/DSView/pv/view/decodetrace.cpp
@@ -22,7 +22,7 @@
 
 #include <libsigrokdecode4DSL/libsigrokdecode.h>
 
-#include "../extdef.h"
+#include "../dsvdef.h"
 
  
 #include <boost/functional/hash.hpp>
diff --git a/DSView/pv/view/dsosignal.cpp b/DSView/pv/view/dsosignal.cpp
index 65e5fb59..c3847f51 100755
--- a/DSView/pv/view/dsosignal.cpp
+++ b/DSView/pv/view/dsosignal.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "../extdef.h"
+#include "../dsvdef.h"
 #include "dsosignal.h"
 #include "../data/dso.h"
 #include "../data/dsosnapshot.h"
diff --git a/DSView/pv/view/groupsignal.cpp b/DSView/pv/view/groupsignal.cpp
index b33ae478..b8f9555c 100755
--- a/DSView/pv/view/groupsignal.cpp
+++ b/DSView/pv/view/groupsignal.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "../extdef.h"
+#include "../dsvdef.h"
 #include "groupsignal.h"
 #include "../data/group.h"
 #include "../data/groupsnapshot.h"
diff --git a/DSView/pv/view/header.cpp b/DSView/pv/view/header.cpp
index 58563dd3..370ed412 100755
--- a/DSView/pv/view/header.cpp
+++ b/DSView/pv/view/header.cpp
@@ -41,7 +41,6 @@
 #include "decodetrace.h"
 #include "../sigsession.h"
 #include "../device/devinst.h"
-#include "../extdef.h"
 #include "../dsvdef.h"
 
  
diff --git a/DSView/pv/view/lissajoustrace.cpp b/DSView/pv/view/lissajoustrace.cpp
index a39a66e7..4dc17ed3 100755
--- a/DSView/pv/view/lissajoustrace.cpp
+++ b/DSView/pv/view/lissajoustrace.cpp
@@ -23,7 +23,7 @@
 #include <math.h>
 
 #include "view.h"
-#include "../extdef.h"
+#include "../dsvdef.h"
 #include "lissajoustrace.h"
 #include "../data/dso.h"
 #include "../data/dsosnapshot.h"
diff --git a/DSView/pv/view/logicsignal.cpp b/DSView/pv/view/logicsignal.cpp
index cc5f8685..636f4db9 100755
--- a/DSView/pv/view/logicsignal.cpp
+++ b/DSView/pv/view/logicsignal.cpp
@@ -29,7 +29,7 @@
 #include "../data/logic.h"
 #include "../data/logicsnapshot.h"
 #include "view.h"
-#include "../extdef.h"
+#include "../dsvdef.h"
 
 using namespace std;
 
diff --git a/DSView/pv/view/mathtrace.cpp b/DSView/pv/view/mathtrace.cpp
index 8ea5d8ff..e96a025b 100755
--- a/DSView/pv/view/mathtrace.cpp
+++ b/DSView/pv/view/mathtrace.cpp
@@ -31,7 +31,6 @@
 #include "../device/devinst.h"
 #include "../view/dsosignal.h"
 #include "../dsvdef.h"
-#include "../extdef.h"
   
 #include <QDebug>
 #include <QTimer>
diff --git a/DSView/pv/view/ruler.cpp b/DSView/pv/view/ruler.cpp
index 4d75bd65..612c56ed 100755
--- a/DSView/pv/view/ruler.cpp
+++ b/DSView/pv/view/ruler.cpp
@@ -28,7 +28,7 @@
 #include "../sigsession.h"
 #include "../device/devinst.h"
 #include "dsosignal.h"
-#include "../extdef.h"
+#include "../dsvdef.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/DSView/pv/view/signal.cpp b/DSView/pv/view/signal.cpp
index f8146bef..34e8374b 100755
--- a/DSView/pv/view/signal.cpp
+++ b/DSView/pv/view/signal.cpp
@@ -25,7 +25,7 @@
 #include "signal.h"
 #include "view.h"
 #include "../device/devinst.h"
-#include "../extdef.h"
+#include "../dsvdef.h"
 
 namespace pv {
 namespace view {
diff --git a/DSView/pv/view/spectrumtrace.cpp b/DSView/pv/view/spectrumtrace.cpp
index e639e5a2..7e2c3f48 100755
--- a/DSView/pv/view/spectrumtrace.cpp
+++ b/DSView/pv/view/spectrumtrace.cpp
@@ -35,7 +35,6 @@
 #include "../device/devinst.h"
 #include "../data/spectrumstack.h"
 #include "../dsvdef.h"
-#include "../extdef.h"
 
 using namespace boost;
 using namespace std;
diff --git a/DSView/pv/view/trace.cpp b/DSView/pv/view/trace.cpp
index cf6f17e3..2f6b109b 100755
--- a/DSView/pv/view/trace.cpp
+++ b/DSView/pv/view/trace.cpp
@@ -31,7 +31,7 @@
 #include "view.h"
 #include "../device/devinst.h"
 #include "../sigsession.h"
-#include "../extdef.h"
+#include "../dsvdef.h"
 
 
 namespace pv {
diff --git a/DSView/pv/view/view.h b/DSView/pv/view/view.h
index 6475cd7d..213d3436 100755
--- a/DSView/pv/view/view.h
+++ b/DSView/pv/view/view.h
@@ -41,7 +41,7 @@
 #include "xcursor.h"
 #include "signal.h"
 #include "viewstatus.h"
-#include "../extdef.h"
+#include "../dsvdef.h"
 
 namespace pv {
 
diff --git a/DSView/pv/view/viewport.h b/DSView/pv/view/viewport.h
index 0442645d..bd1e1840 100755
--- a/DSView/pv/view/viewport.h
+++ b/DSView/pv/view/viewport.h
@@ -33,7 +33,7 @@
 #include <QElapsedTimer>
 
 #include "../view/view.h"
-#include "../extdef.h"
+#include "../dsvdef.h"
 
 class QPainter;
 class QPaintEvent;