--- MITgcm/pkg/exch2/exch2_recv_rx1.template	2005/07/22 18:21:55	1.3
+++ MITgcm/pkg/exch2/exch2_recv_rx1.template	2005/07/24 01:21:36	1.4
@@ -1,7 +1,8 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/exch2/exch2_recv_rx1.template,v 1.3 2005/07/22 18:21:55 jmc Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/exch2/exch2_recv_rx1.template,v 1.4 2005/07/24 01:21:36 jmc Exp $
 C $Name:  $
 
-#include "CPP_OPTIONS.h"
+#include "CPP_EEOPTIONS.h"
+#include "W2_OPTIONS.h"
 
       SUBROUTINE EXCH2_RECV_RX1(
      I       tIlo, tIhi, tiStride,
@@ -18,12 +19,11 @@
 
       IMPLICIT NONE
 
-C
-#include "W2_OPTIONS.h"
+#include "SIZE.h"
+#include "EEPARAMS.h"
+#include "EESUPPORT.h"
 #include "W2_EXCH2_TOPOLOGY.h"
 
-#include "EEPARAMS.h"
-C
 C     === Routine arguments ===
 C     tIlo, tIhi, tIstride :: index range in I that will be filled in target "array"
 C     tJlo, tJhi, tJstride :: index range in J that will be filled in target "array"
@@ -94,8 +94,6 @@
       INTEGER I
 
 C     MPI setup
-#include "SIZE.h"
-#include "EESUPPORT.h"
 #ifdef ALLOW_USE_MPI
 c     INTEGER theTag, theSize, theType
       INTEGER theTag, theType