diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 869771ee58..c7fd27c729 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -162,11 +162,13 @@ set(PIDL_DISSECTOR_SRC
 	dissectors/packet-dcerpc-atsvc.c
 #	dissectors/packet-dcerpc-budb.c
 #	dissectors/packet-dcerpc-butc.c
+	dissectors/packet-dcerpc-dfs.c
 #	dissectors/packet-dcerpc-drsuapi.c
 	dissectors/packet-dcerpc-dssetup.c
 	dissectors/packet-dcerpc-efs.c
 	dissectors/packet-dcerpc-frstrans.c
 	dissectors/packet-dcerpc-initshutdown.c
+	dissectors/packet-dcerpc-mapi.c
 	dissectors/packet-dcerpc-nspi.c
 	dissectors/packet-dcerpc-rfr.c
 	dissectors/packet-dcerpc-srvsvc.c
@@ -175,10 +177,8 @@ set(PIDL_DISSECTOR_SRC
 )
 set(DIRTY_PIDL_DISSECTOR_SRC
 	dissectors/packet-dcerpc-dnsserver.c
-	dissectors/packet-dcerpc-dfs.c
 	dissectors/packet-dcerpc-eventlog.c
 	dissectors/packet-dcerpc-lsa.c
-	dissectors/packet-dcerpc-mapi.c
 	dissectors/packet-dcerpc-winreg.c
 )
 set(ASN1_DISSECTOR_SRC
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 6503740708..bc5f536a64 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -50,11 +50,13 @@ PIDL_DISSECTOR_SRC = \
 	packet-dcerpc-atsvc.c \
 	packet-dcerpc-budb.c	\
 	packet-dcerpc-butc.c	\
+	packet-dcerpc-dfs.c \
 	packet-dcerpc-drsuapi.c	\
 	packet-dcerpc-dssetup.c \
 	packet-dcerpc-efs.c \
 	packet-dcerpc-frstrans.c \
 	packet-dcerpc-initshutdown.c \
+	packet-dcerpc-mapi.c \
 	packet-dcerpc-nspi.c \
 	packet-dcerpc-rfr.c \
 	packet-dcerpc-srvsvc.c \
@@ -65,11 +67,9 @@ PIDL_DISSECTOR_SRC = \
 # PIDL-generated DCE RPC dissectors with warnings.
 #
 DIRTY_PIDL_DISSECTOR_SRC = \
-	packet-dcerpc-dfs.c \
 	packet-dcerpc-dnsserver.c	\
 	packet-dcerpc-eventlog.c \
 	packet-dcerpc-lsa.c \
-	packet-dcerpc-mapi.c \
 	packet-dcerpc-winreg.c
 
 #
@@ -366,7 +366,6 @@ DISSECTOR_SRC = \
 	packet-dcerpc-icl_rpc.c		\
 	packet-dcerpc-krb5rpc.c		\
 	packet-dcerpc-llb.c		\
-	packet-dcerpc-mapi.c		\
 	packet-dcerpc-messenger.c	\
 	packet-dcerpc-mgmt.c		\
 	packet-dcerpc-ndr.c		\
@@ -1140,7 +1139,6 @@ DISSECTOR_INCLUDES =	\
 	packet-dcerpc-drsuapi.h	\
 	packet-dcerpc-frsapi.h	\
 	packet-dcerpc-frsrpc.h	\
-	packet-dcerpc-mapi.h	\
 	packet-dcerpc-netlogon.h	\
 	packet-dcerpc-nt.h	\
 	packet-dcerpc-pnp.h	\