diff --git a/commands/search.c b/commands/search.c
index 60b5bbf04..e885391cf 100644
--- a/commands/search.c
+++ b/commands/search.c
@@ -25,7 +25,7 @@
 #include <grub/device.h>
 #include <grub/file.h>
 #include <grub/env.h>
-#include <grub/extcmd.h>
+#include <grub/command.h>
 
 void
 FUNC_NAME (const char *key, const char *var, int no_floppy)
diff --git a/commands/search_wrap.c b/commands/search_wrap.c
index 35cce3f5e..d28bb744e 100644
--- a/commands/search_wrap.c
+++ b/commands/search_wrap.c
@@ -17,6 +17,14 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <grub/types.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/err.h>
+#include <grub/dl.h>
+#include <grub/env.h>
+#include <grub/extcmd.h>
+
 static const struct grub_arg_option options[] =
   {
     {"file",		'f', 0, "search devices by a file", 0, 0},
@@ -36,6 +44,10 @@ enum options
     SEARCH_NO_FLOPPY,
  };
 
+void grub_search_fs_file (const char *key, const char *var, int no_floppy);
+void grub_search_fs_uuid (const char *key, const char *var, int no_floppy);
+void grub_search_label (const char *key, const char *var, int no_floppy);
+
 static grub_err_t
 grub_cmd_search (grub_extcmd_t cmd, int argc, char **args)
 {
diff --git a/conf/common.rmk b/conf/common.rmk
index 00830e54d..f27c837b8 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -370,8 +370,7 @@ scsi_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # Commands.
 pkglib_MODULES += minicmd.mod extcmd.mod hello.mod handler.mod	\
-	ls.mod cmp.mod cat.mod help.mod search_file.mod \
-	search_fs_uuid.mod search_fs_label.mod search.mod loopback.mod	\
+	ls.mod cmp.mod cat.mod help.mod search.mod loopback.mod	\
 	configfile.mod echo.mod		\
 	terminfo.mod test.mod blocklist.mod hexdump.mod		\
 	read.mod sleep.mod loadenv.mod crc.mod parttool.mod	\
@@ -449,10 +448,12 @@ search_mod_SOURCES = commands/search_wrap.c
 search_mod_CFLAGS = $(COMMON_CFLAGS)
 search_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+pkglib_MODULES += search_fs_file.mod search_fs_uuid.mod search_label.mod
+
 # For search.mod.
-search_file_mod_SOURCES = commands/search_file.c
-search_file_mod_CFLAGS = $(COMMON_CFLAGS)
-search_file_mod_LDFLAGS = $(COMMON_LDFLAGS)
+search_fs_file_mod_SOURCES = commands/search_file.c
+search_fs_file_mod_CFLAGS = $(COMMON_CFLAGS)
+search_fs_file_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For search.mod.
 search_label_mod_SOURCES = commands/search_label.c
@@ -460,9 +461,9 @@ search_label_mod_CFLAGS = $(COMMON_CFLAGS)
 search_label_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For search.mod.
-search_uuid_mod_SOURCES = commands/search_uuid.c
-search_uuid_mod_CFLAGS = $(COMMON_CFLAGS)
-search_uuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
+search_fs_uuid_mod_SOURCES = commands/search_uuid.c
+search_fs_uuid_mod_CFLAGS = $(COMMON_CFLAGS)
+search_fs_uuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For test.mod.
 test_mod_SOURCES = commands/test.c