diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index d3e40f23c3..c23c25a304 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -301,7 +301,10 @@ set(DIRTY_ASN1_DISSECTOR_SRC
 set(DISSECTOR_SRC
 	dissectors/file-elf.c
 	dissectors/file-file.c
+	dissectors/file-gif.c
+	dissectors/file-jpeg.c
 	dissectors/file-mp4.c
+	dissectors/file-png.c
 	dissectors/packet-2dparityfec.c
 	dissectors/packet-3com-njack.c
 	dissectors/packet-3com-xns.c
@@ -784,9 +787,6 @@ set(DISSECTOR_SRC
 	dissectors/packet-igap.c
 	dissectors/packet-igmp.c
 	dissectors/packet-igrp.c
-	dissectors/packet-image-gif.c
-	dissectors/packet-image-jfif.c
-	dissectors/packet-image-png.c
 	dissectors/packet-imap.c
 	dissectors/packet-imf.c
 	dissectors/packet-infiniband.c
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 4296b083af..4cca67d275 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -217,8 +217,10 @@ DIRTY_ASN1_DISSECTOR_SRC = \
 FILE_DISSECTOR_SRC = \
 	file-elf.c \
 	file-file.c \
-	file-mp4.c
-
+	file-gif.c \
+	file-jpeg.c \
+	file-mp4.c \
+	file-png.c
 #
 # Dissectors without warnings.
 #
@@ -706,9 +708,6 @@ DISSECTOR_SRC = \
 	packet-igap.c		\
 	packet-igmp.c		\
 	packet-igrp.c		\
-	packet-image-gif.c	\
-	packet-image-jfif.c	\
-	packet-image-png.c	\
 	packet-imap.c		\
 	packet-imf.c		\
 	packet-infiniband.c	\
diff --git a/epan/dissectors/packet-image-gif.c b/epan/dissectors/file-gif.c
similarity index 99%
rename from epan/dissectors/packet-image-gif.c
rename to epan/dissectors/file-gif.c
index 332223e4bd..a9ea349237 100644
--- a/epan/dissectors/packet-image-gif.c
+++ b/epan/dissectors/file-gif.c
@@ -1,4 +1,4 @@
-/* packet-image-gif.c
+/* file-gif.c
  *
  * Routines for image/gif media dissection
  * Copyright 2003, 2004, Olivier Biot.
diff --git a/epan/dissectors/packet-image-jfif.c b/epan/dissectors/file-jpeg.c
similarity index 99%
rename from epan/dissectors/packet-image-jfif.c
rename to epan/dissectors/file-jpeg.c
index 4474577320..a30d9a41d8 100644
--- a/epan/dissectors/packet-image-jfif.c
+++ b/epan/dissectors/file-jpeg.c
@@ -1,4 +1,4 @@
-/* packet-image-jfif.c
+/* file-jpeg.c
  *
  * Routines for JFIF image/jpeg media dissection
  * Copyright 2004, Olivier Biot.
diff --git a/epan/dissectors/packet-image-png.c b/epan/dissectors/file-png.c
similarity index 99%
rename from epan/dissectors/packet-image-png.c
rename to epan/dissectors/file-png.c
index aae586e49c..09431197e1 100644
--- a/epan/dissectors/packet-image-png.c
+++ b/epan/dissectors/file-png.c
@@ -1,4 +1,4 @@
-/* packet-image-png.c
+/* file-png.c
  *
  * Routines for PNG (Portable Network Graphics) image file dissection
  *