diff -ur xrootd-3.0.3.orig/src/XrdCms/Makefile.am xrootd-3.0.3/src/XrdCms/Makefile.am
--- xrootd-3.0.3.orig/src/XrdCms/Makefile.am	2011-04-22 12:40:49.906967849 +0200
+++ xrootd-3.0.3/src/XrdCms/Makefile.am	2011-04-22 13:15:57.854180302 +0200
@@ -25,9 +25,12 @@
         XrdCmsClient.hh        \
         XrdCmsClientConfig.hh  \
         XrdCmsFinder.hh        \
+        XrdCmsReq.hh           \
         XrdCmsSecurity.hh      \
         XrdCmsTrace.hh         \
-        XrdCmsTypes.hh
+        XrdCmsTypes.hh         \
+        XrdCmsXmi.hh           \
+        XrdCmsXmiReq.hh
 
 
 
@@ -50,7 +53,10 @@
         XrdCmsClientMan.cc           XrdCmsClientMan.hh  \
         XrdCmsClientMsg.cc           XrdCmsClientMsg.hh  \
         XrdCmsFinder.cc                                  \
-        XrdCmsResp.cc                XrdCmsResp.hh
+        XrdCmsReq.cc                                     \
+        XrdCmsResp.cc                XrdCmsResp.hh       \
+        XrdCmsRTable.cc              XrdCmsRTable.hh     \
+        XrdCmsXmiReq.cc
 
 
 libXrdCms_la_LIBADD = libXrdCmsConv.la \
@@ -79,15 +85,11 @@
         XrdCmsPrepArgs.cc    XrdCmsPrepArgs.hh   \
         XrdCmsPrepare.cc     XrdCmsPrepare.hh    \
         XrdCmsProtocol.cc    XrdCmsProtocol.hh   \
-        XrdCmsReq.cc         XrdCmsReq.hh        \
         XrdCmsRouting.cc     XrdCmsRouting.hh    \
         XrdCmsRRQ.cc         XrdCmsRRQ.hh        \
-        XrdCmsRTable.cc      XrdCmsRTable.hh     \
                              XrdCmsSelect.hh     \
         XrdCmsState.cc       XrdCmsState.hh      \
-        XrdCmsSupervisor.cc  XrdCmsSupervisor.hh \
-                             XrdCmsXmi.hh        \
-        XrdCmsXmiReq.cc      XrdCmsXmiReq.hh
+        XrdCmsSupervisor.cc  XrdCmsSupervisor.hh
 
 
 cmsd_LDADD = libXrdCms.la \