Index: trunk/psModules/src/config/pmConfigMask.c
===================================================================
--- trunk/psModules/src/config/pmConfigMask.c	(revision 28271)
+++ trunk/psModules/src/config/pmConfigMask.c	(revision 28272)
@@ -8,4 +8,12 @@
 
 #include "pmConfigMask.h"
+
+// Structure to hold the properties of a mask value
+typedef struct {
+    char *badMaskName;                  // name for "bad" (i.e., mask me please) pixels
+    char *fallbackName;                 // Fallback name in case a bad mask name is not defined
+    psImageMaskType defaultMaskValue;   // Default value in case a bad mask name and its fallback are not defined
+    bool isBad; // include this value as part of the MASK.VALUE entry (generically bad)
+} pmConfigMaskInfo;
 
 static pmConfigMaskInfo masks[] = {
Index: trunk/psModules/src/config/pmConfigMask.h
===================================================================
--- trunk/psModules/src/config/pmConfigMask.h	(revision 28271)
+++ trunk/psModules/src/config/pmConfigMask.h	(revision 28272)
@@ -20,12 +20,4 @@
 /// @{
 
-// structure to hold the properties of a mask value
-typedef struct {
-    char *badMaskName;			// name for "bad" (i.e., mask me please) pixels
-    char *fallbackName;			// Fallback name in case a bad mask name is not defined
-    psImageMaskType defaultMaskValue;	// Default value in case a bad mask name and its fallback are not defined
-    bool isBad;	// include this value as part of the MASK.VALUE entry (generically bad)
-} pmConfigMaskInfo;
-
 // pmConfigMaskSetInMetadata examines named mask values and set the bits for maskValue and
 // markValue.  Ensures that the below-named mask values are set, and calculates the mask value
@@ -33,6 +25,6 @@
 // name is not found, or the default values if the fallback name is not found.
 bool pmConfigMaskSetInMetadata(psImageMaskType *outMaskValue, // Value of MASK.VALUE, returned
-			       psImageMaskType *outMarkValue, // Value of MARK.VALUE, returned
-			       psMetadata *source  // Source of mask bits
+                               psImageMaskType *outMarkValue, // Value of MARK.VALUE, returned
+                               psMetadata *source  // Source of mask bits
   );
 
@@ -40,9 +32,9 @@
 // Get a mask value by name(s)
 psImageMaskType pmConfigMaskGetFromMetadata(psMetadata *source, // Source of masks
-					    const char *masks // Mask values to get
+                                            const char *masks // Mask values to get
   );
 
 
-// lookup an image mask value by name from a psMetadata, without requiring the entry to 
+// lookup an image mask value by name from a psMetadata, without requiring the entry to
 // be of type psImageMaskType, but verifying that it will fit in psImageMaskType
 psImageMaskType psMetadataLookupImageMaskFromGeneric (bool *status, const psMetadata *md, const char *name);
@@ -50,5 +42,5 @@
 // Remove from the header keywords starting with the provided string
 int pmConfigMaskRemoveHeaderKeywords(psMetadata *header, // Header from which to remove keywords
-				     const char *start // Remove keywords that start with this string
+                                     const char *start // Remove keywords that start with this string
   );