diff --git a/Makefile.common b/Makefile.common
index f3433a950e..1d3207cf34 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -86,7 +86,6 @@ ETHEREAL_COMMON_SRC =	\
 	pcap-util.c	\
 	print.c	\
 	ps.c	\
-	range.c	\
 	ringbuffer.c	\
 	timestats.c	\
 	version_info.c
@@ -105,7 +104,6 @@ ETHEREAL_COMMON_INCLUDES =	\
 	pcap-util-int.h	\
 	print.h	\
 	ps.h	\
-	range.h	\
 	register.h	\
 	ringbuffer.h	\
 	timestats.h	\
diff --git a/epan/Makefile.common b/epan/Makefile.common
index b1da34b1a9..8ebf9a803d 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -38,6 +38,7 @@ LIBETHEREAL_SRC = 		\
 	ipv4.c			\
 	osi-utils.c		\
 	packet.c		\
+	packet-range.c		\
 	plugins.c		\
 	proto.c			\
 	sna-utils.c		\
@@ -69,6 +70,7 @@ LIBETHEREAL_INCLUDES = 		\
 	nstime.h		\
 	osi-utils.h		\
 	packet.h		\
+	packet-range.h		\
 	packet_info.h		\
 	pint.h			\
 	plugins.h		\
diff --git a/epan/libethereal.def b/epan/libethereal.def
index 2e3a456b6a..d3296d03ee 100644
--- a/epan/libethereal.def
+++ b/epan/libethereal.def
@@ -308,6 +308,11 @@ new_register_dissector
 nt_cmd_vals                     DATA
 num_tap_filters                 DATA
 num_tree_types                  DATA
+packet_range_convert_str
+packet_range_init
+packet_range_process_all
+packet_range_process_init
+packet_range_process_packet
 plugin_list                     DATA
 postseq_cleanup_all_protocols
 prefs                           DATA
diff --git a/range.c b/epan/packet-range.c
similarity index 99%
rename from range.c
rename to epan/packet-range.c
index d5d507b902..c786afb3f9 100644
--- a/range.c
+++ b/epan/packet-range.c
@@ -1,4 +1,4 @@
-/* range.c
+/* packet-range.c
  * Packet range routines (save, print, ...)
  *
  * $Id$
@@ -36,8 +36,7 @@
 
 #include <epan/frame_data.h>
 
-
-#include "range.h"
+#include <epan/packet-range.h>
 
 #include "globals.h"
 
diff --git a/range.h b/epan/packet-range.h
similarity index 97%
rename from range.h
rename to epan/packet-range.h
index fe13aa01f0..24789c2743 100644
--- a/range.h
+++ b/epan/packet-range.h
@@ -1,4 +1,4 @@
-/* range.h
+/* packet-range.h
  * Packet range routines (save, print, ...)
  *
  * $Id$
@@ -25,8 +25,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef __PRINT_RANGE_H__
-#define __PRINT_RANGE_H__
+#ifndef __PACKET_RANGE_H__
+#define __PACKET_RANGE_H__
 
 #include <glib.h>
 
@@ -103,4 +103,4 @@ extern range_process_e packet_range_process_packet(packet_range_t *range, frame_
 extern void packet_range_convert_str(packet_range_t *range, const gchar *es);
 
 
-#endif /* __PRINT_RANGE_H__ */
+#endif /* __PACKET_RANGE_H__ */
diff --git a/file.c b/file.c
index 0524cf3a5e..f817fbd60c 100644
--- a/file.c
+++ b/file.c
@@ -70,7 +70,7 @@
 #include "color_filters.h"
 #include "column.h"
 #include <epan/packet.h>
-#include "range.h"
+#include <epan/packet-range.h>
 #include "print.h"
 #include "file.h"
 #include "menu.h"
diff --git a/file.h b/file.h
index 10688b9fbb..7509e1dd10 100644
--- a/file.h
+++ b/file.h
@@ -25,7 +25,7 @@
 #ifndef __FILE_H__
 #define __FILE_H__
 
-#include "range.h"
+#include <epan/packet-range.h>
 #include "wiretap/wtap.h"
 #include <epan/dfilter/dfilter.h>
 #include "print.h"
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c
index 9593e86b2f..8584acc2fe 100644
--- a/gtk/file_dlg.c
+++ b/gtk/file_dlg.c
@@ -30,7 +30,7 @@
 
 #include <gtk/gtk.h>
 
-#include "range.h"
+#include <epan/packet-range.h>
 #include <epan/filesystem.h>
 
 #include "globals.h"
diff --git a/gtk/range_utils.c b/gtk/range_utils.c
index 498d495cb8..b924c0e772 100644
--- a/gtk/range_utils.c
+++ b/gtk/range_utils.c
@@ -32,7 +32,7 @@
 
 #include "globals.h"
 
-#include "range.h"
+#include <epan/packet-range.h>
 #include "ui_util.h"
 #include "dlg_utils.h"
 #include "compat_macros.h"
diff --git a/print.c b/print.c
index 64a88fe15d..e36b09e4ba 100644
--- a/print.c
+++ b/print.c
@@ -39,8 +39,8 @@
 #include <epan/epan_dissect.h>
 #include <epan/tvbuff.h>
 #include <epan/packet.h>
+#include <epan/packet-range.h>
 
-#include "range.h"
 #include "print.h"
 #include "ps.h"
 #include "util.h"