diff --git a/modules/LIST b/modules/LIST
index 69932ac4a5ebe1f25a6a83d3e7a72d09c31e4b97..89f101d3dc4a6e3666ea8e70cffc173c5027b3a6 100644
--- a/modules/LIST
+++ b/modules/LIST
@@ -106,7 +106,7 @@ $Id$
* dtstofloat32: DTS Audio converter
* dtstospdif: Audio converter that encapsulates DTS into S/PDIF
* dtv: DVB support (superseds bda module for Windows)
- * dummy: dummy audio output, video output, interface and input modules
+ * dummy: dummy interface
* dvb: input module for DVB-S/C/T streaming using v4l2 API
* dvbsub: decoder module for subs in dvb streams
* dvdnav: access module for DVDs with libdvdnav
diff --git a/modules/control/Modules.am b/modules/control/Modules.am
index a7fc36028a0e659fdf766eed0b3e9b8f89bcd7a8..f9bad1d7ccc0d41ecb969d55378a203ec39b88d4 100644
--- a/modules/control/Modules.am
+++ b/modules/control/Modules.am
@@ -1,4 +1,5 @@
SUBDIRS = globalhotkeys dbus
+SOURCES_dummy = dummy.c
SOURCES_gestures = gestures.c
SOURCES_netsync = netsync.c
SOURCES_ntservice = ntservice.c
@@ -16,6 +17,7 @@ SOURCES_motion = \
$(NULL)
libvlc_LTLIBRARIES += \
+ libdummy_plugin.la \
libgestures_plugin.la \
libnetsync_plugin.la \
libhotkeys_plugin.la
diff --git a/modules/misc/dummy/interface.c b/modules/control/dummy.c
similarity index 71%
rename from modules/misc/dummy/interface.c
rename to modules/control/dummy.c
index 11e46889b9ccf877a65990d4a121d70f5c092f8e..7311414d0e33a42812f99a545a946020885fab09 100644
--- a/modules/misc/dummy/interface.c
+++ b/modules/control/dummy.c
@@ -30,14 +30,34 @@
#endif
#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_interface.h>
-#include "dummy.h"
+#ifdef WIN32
+#define QUIET_TEXT N_("Do not open a DOS command box interface")
+#define QUIET_LONGTEXT N_( \
+ "By default the dummy interface plugin will start a DOS command box. " \
+ "Enabling the quiet mode will not bring this command box but can also " \
+ "be pretty annoying when you want to stop VLC and no video window is " \
+ "open." )
+#endif
+
+static int Open( vlc_object_t * );
+
+vlc_module_begin ()
+ set_shortname( N_("Dummy") )
+ set_description( N_("Dummy interface") )
+ set_capability( "interface", 0 )
+ set_callbacks( Open, NULL )
+#ifdef WIN32
+ add_bool( "dummy-quiet", false, QUIET_TEXT, QUIET_LONGTEXT, false )
+#endif
+vlc_module_end ()
/*****************************************************************************
* Open: initialize dummy interface
*****************************************************************************/
-int OpenIntf ( vlc_object_t *p_this )
+static int Open( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t*) p_this;
diff --git a/modules/misc/dummy/Modules.am b/modules/misc/dummy/Modules.am
index 961ecb155a66b81f32bcbb2cba697a8f2a7e3606..7bc7f17fcdeb26ae6f67eedf204590a2e713c1da 100644
--- a/modules/misc/dummy/Modules.am
+++ b/modules/misc/dummy/Modules.am
@@ -1,7 +1,5 @@
SOURCES_dummy = \
dummy.c \
- dummy.h \
- interface.c \
$(NULL)
libvlc_LTLIBRARIES += libdummy_plugin.la
diff --git a/modules/misc/dummy/dummy.c b/modules/misc/dummy/dummy.c
index 8e081f109ebf5a8739e3f4e310eb1eb2a6bf7eb0..a3403b2f04ae73d6751ab2d6ae05cc2ad8eb2563 100644
--- a/modules/misc/dummy/dummy.c
+++ b/modules/misc/dummy/dummy.c
@@ -32,37 +32,17 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
-#include "dummy.h"
-
static int OpenDummy(vlc_object_t *);
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#ifdef WIN32
-#define QUIET_TEXT N_("Do not open a DOS command box interface")
-#define QUIET_LONGTEXT N_( \
- "By default the dummy interface plugin will start a DOS command box. " \
- "Enabling the quiet mode will not bring this command box but can also " \
- "be pretty annoying when you want to stop VLC and no video window is " \
- "open." )
-#endif
-
vlc_module_begin ()
set_shortname( N_("Dummy"))
- set_description( N_("Dummy interface function") )
- set_capability( "interface", 0 )
- set_callbacks( OpenIntf, NULL )
-#ifdef WIN32
- set_section( N_( "Dummy Interface" ), NULL )
- add_category_hint( N_("Interface"), NULL, false )
- add_bool( "dummy-quiet", false, QUIET_TEXT, QUIET_LONGTEXT, false )
-#endif
- add_submodule ()
- set_description( N_("libc memcpy") )
- set_capability( "memcpy", 50 )
- set_callbacks( OpenDummy, NULL )
- add_shortcut( "c", "libc" )
+ set_description( N_("libc memcpy") )
+ set_capability( "memcpy", 50 )
+ set_callbacks( OpenDummy, NULL )
+ add_shortcut( "c", "libc" )
vlc_module_end ()
static int OpenDummy( vlc_object_t *obj )
diff --git a/modules/misc/dummy/dummy.h b/modules/misc/dummy/dummy.h
deleted file mode 100644
index ba058af8fcb53542b5f426dbd44f82a99c6abf51..0000000000000000000000000000000000000000
--- a/modules/misc/dummy/dummy.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*****************************************************************************
- * dummy.h : dummy plugin for vlc
- *****************************************************************************
- * Copyright (C) 2000, 2001, 2002 the VideoLAN team
- * $Id$
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
- *
- * 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 Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-/*****************************************************************************
- * External prototypes
- *****************************************************************************/
-int OpenIntf ( vlc_object_t * );
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2c2134638c42dccd4c929bac66de4765edb6c5db..e202d6076237975264b8c79de2cc6c209c347771 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -397,6 +397,7 @@ modules/control/dbus/dbus_root.c
modules/control/dbus/dbus_root.h
modules/control/dbus/dbus_tracklist.c
modules/control/dbus/dbus_tracklist.h
+modules/control/dummy.c
modules/control/gestures.c
modules/control/globalhotkeys/win32.c
modules/control/globalhotkeys/xcb.c
@@ -911,8 +912,6 @@ modules/meta_engine/taglib.cpp
modules/misc/audioscrobbler.c
modules/misc/dhparams.h
modules/misc/dummy/dummy.c
-modules/misc/dummy/dummy.h
-modules/misc/dummy/interface.c
modules/misc/gnutls.c
modules/misc/inhibit.c
modules/misc/inhibit/osso.c