diff --git a/mediachanger/castorrmc/h/rmc_procreq.h b/mediachanger/castorrmc/h/rmc_procreq.h
new file mode 100644
index 0000000000000000000000000000000000000000..123e66611bfabd652abb57bab601211b768e68be
--- /dev/null
+++ b/mediachanger/castorrmc/h/rmc_procreq.h
@@ -0,0 +1,38 @@
+/******************************************************************************
+ *                      rmc_procreq.h
+ *
+ * This file is part of the Castor project.
+ * See http://castor.web.cern.ch/castor
+ *
+ * Copyright (C) 2003  CERN
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *
+ * 
+ *
+ * @author Castor Dev team, castor-dev@cern.ch
+ *****************************************************************************/
+
+#ifndef _RMC_PROCREQ_H
+#define _RMC_PROCREQ_H 1
+
+int rmc_srv_export(const int rpfd, char *const req_data, const char *const clienthost);
+int rmc_srv_findcart(const int rpfd, char *const req_data, const char *const clienthost);
+int rmc_srv_getgeom(const int rpfd, char *const req_data, const char *const clienthost);
+int rmc_srv_import(const int rpfd, char *const req_data, const char *const clienthost);
+int rmc_srv_mount( const int rpfd, char *const req_data, const char *const clienthost);
+int rmc_srv_readelem(const int rpfd, char *const req_data, const char *const clienthost);
+int rmc_srv_unmount(const int rpfd, char *const req_data, const char *const clienthost);
+int rmc_srv_genericmount(const int rpfd, char *const req_data, const char *const clienthost);
+int rmc_srv_genericunmount(const int rpfd, char *const req_data, const char *const clienthost);
+#endif
diff --git a/mediachanger/castorrmc/h/rmc_server_api.h b/mediachanger/castorrmc/h/rmc_server_api.h
deleted file mode 100644
index 77a3fab1d37221291c7325befdce2a884231a5a1..0000000000000000000000000000000000000000
--- a/mediachanger/castorrmc/h/rmc_server_api.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- */
-
-#ifndef _RMC_SERVER_API_H
-#define _RMC_SERVER_API_H
-
-                        /*  function prototypes */
-
-int rmc_srv_export(const int rpfd, char *const req_data, const char *const clienthost);
-int rmc_srv_findcart(const int rpfd, char *const req_data, const char *const clienthost);
-int rmc_srv_getgeom(const int rpfd, char *const req_data, const char *const clienthost);
-int rmc_srv_import(const int rpfd, char *const req_data, const char *const clienthost);
-int rmc_srv_mount( const int rpfd, char *const req_data, const char *const clienthost);
-int rmc_srv_readelem(const int rpfd, char *const req_data, const char *const clienthost);
-int rmc_srv_unmount(const int rpfd, char *const req_data, const char *const clienthost);
-int rmc_srv_genericmount(const int rpfd, char *const req_data, const char *const clienthost);
-int rmc_srv_genericunmount(const int rpfd, char *const req_data, const char *const clienthost);
-#endif
diff --git a/mediachanger/castorrmc/rmc/rmc_procreq.c b/mediachanger/castorrmc/rmc/rmc_procreq.c
index a32b3f3345778828d5ff578322e419d79e7ec3ca..80bf2d42bbbabb67d7ec51e2aed38aa5006fdbe0 100644
--- a/mediachanger/castorrmc/rmc/rmc_procreq.c
+++ b/mediachanger/castorrmc/rmc/rmc_procreq.c
@@ -19,10 +19,10 @@
 #include "h/rmc_logit.h"
 #include "h/rmc_logreq.h"
 #include "h/rmc_marshall_element.h"
+#include "h/rmc_procreq.h"
 #include "h/rmc_smcsubr.h"
 #include "h/rmc_smcsubr2.h"
 #include "h/rmc_sendrep.h"
-#include "h/rmc_server_api.h"
 #include "h/tplogger_api.h"
 #include <string.h>
 #include <Ctape_api.h>
diff --git a/mediachanger/castorrmc/rmc/rmc_serv.c b/mediachanger/castorrmc/rmc/rmc_serv.c
index 8baf119cfe630dd313e2efbc7dc925c6b3dc0f06..9be188f1cbc53ffd98300ba7c73c88abb2facb9a 100644
--- a/mediachanger/castorrmc/rmc/rmc_serv.c
+++ b/mediachanger/castorrmc/rmc/rmc_serv.c
@@ -22,8 +22,8 @@
 #include "h/net.h"
 #include "h/rmc_constants.h"
 #include "h/rmc_logit.h"
+#include "h/rmc_procreq.h"
 #include "h/rmc_sendrep.h"
-#include "h/rmc_server_api.h"
 #include "h/rmc_smcsubr.h"
 #include "h/scsictl.h"
 #include "h/serrno.h"