Index: src/spectral/fft.h
===================================================================
--- src/spectral/fft.h	(revision 5958d1ee363b72e34ef712b8408afe7f345e1ad3)
+++ src/spectral/fft.h	(revision b235c0ebcf217209b267bf95f3ed90a788b6b919)
@@ -1,4 +1,4 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
@@ -27,6 +27,6 @@
 */
 
-#ifndef FFT_H_
-#define FFT_H_
+#ifndef _AUBIO_FFT_H
+#define _AUBIO_FFT_H
 
 #ifdef __cplusplus
@@ -140,3 +140,3 @@
 #endif
 
-#endif // FFT_H_
+#endif /* _AUBIO_FFT_H */
Index: src/spectral/filterbank.h
===================================================================
--- src/spectral/filterbank.h	(revision 5958d1ee363b72e34ef712b8408afe7f345e1ad3)
+++ src/spectral/filterbank.h	(revision b235c0ebcf217209b267bf95f3ed90a788b6b919)
@@ -1,4 +1,4 @@
 /*
-  Copyright (C) 2007-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2007-2013 Paul Brossier <piem@aubio.org>
                       and Amaury Hazan <ahazan@iua.upf.edu>
 
@@ -30,6 +30,6 @@
 */
 
-#ifndef FILTERBANK_H
-#define FILTERBANK_H
+#ifndef _AUBIO_FILTERBANK_H
+#define _AUBIO_FILTERBANK_H
 
 #ifdef __cplusplus
@@ -88,3 +88,3 @@
 #endif
 
-#endif                          // FILTERBANK_H
+#endif /* _AUBIO_FILTERBANK_H */
Index: src/spectral/filterbank_mel.h
===================================================================
--- src/spectral/filterbank_mel.h	(revision 5958d1ee363b72e34ef712b8408afe7f345e1ad3)
+++ src/spectral/filterbank_mel.h	(revision b235c0ebcf217209b267bf95f3ed90a788b6b919)
@@ -1,4 +1,4 @@
 /*
-  Copyright (C) 2007-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2007-2013 Paul Brossier <piem@aubio.org>
                       and Amaury Hazan <ahazan@iua.upf.edu>
 
@@ -32,6 +32,6 @@
 */
 
-#ifndef FILTERBANK_MEL_H
-#define FILTERBANK_MEL_H
+#ifndef _AUBIO_FILTERBANK_MEL_H
+#define _AUBIO_FILTERBANK_MEL_H
 
 #ifdef __cplusplus
@@ -70,3 +70,3 @@
 #endif
 
-#endif // FILTERBANK_MEL_H
+#endif /* _AUBIO_FILTERBANK_MEL_H */
Index: src/spectral/mfcc.h
===================================================================
--- src/spectral/mfcc.h	(revision 5958d1ee363b72e34ef712b8408afe7f345e1ad3)
+++ src/spectral/mfcc.h	(revision b235c0ebcf217209b267bf95f3ed90a788b6b919)
@@ -1,4 +1,4 @@
 /*
-  Copyright (C) 2007-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2007-2013 Paul Brossier <piem@aubio.org>
                       and Amaury Hazan <ahazan@iua.upf.edu>
 
@@ -28,6 +28,6 @@
 */
 
-#ifndef MFCC_H
-#define MFCC_H
+#ifndef _AUBIO_MFCC_H
+#define _AUBIO_MFCC_H
 
 #ifdef __cplusplus
@@ -70,3 +70,3 @@
 #endif
 
-#endif                          // MFCC_H
+#endif /* _AUBIO_MFCC_H */
Index: src/spectral/phasevoc.h
===================================================================
--- src/spectral/phasevoc.h	(revision 5958d1ee363b72e34ef712b8408afe7f345e1ad3)
+++ src/spectral/phasevoc.h	(revision b235c0ebcf217209b267bf95f3ed90a788b6b919)
@@ -1,4 +1,4 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
@@ -32,6 +32,6 @@
 */
 
-#ifndef _PHASEVOC_H
-#define _PHASEVOC_H
+#ifndef _AUBIO_PHASEVOC_H
+#define _AUBIO_PHASEVOC_H
 
 #ifdef __cplusplus
@@ -100,3 +100,3 @@
 #endif 
 
-#endif
+#endif /* _AUBIO_PHASEVOC_H */
Index: src/spectral/specdesc.h
===================================================================
--- src/spectral/specdesc.h	(revision 5958d1ee363b72e34ef712b8408afe7f345e1ad3)
+++ src/spectral/specdesc.h	(revision b235c0ebcf217209b267bf95f3ed90a788b6b919)
@@ -1,4 +1,4 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
@@ -20,11 +20,11 @@
 
 /** \file
- 
+
   Spectral description functions
- 
+
   All of the following spectral description functions take as arguments the FFT
   of a windowed signal (as created with aubio_pvoc). They output one smpl_t per
   buffer (stored in a vector of size [1]).
- 
+
   \section specdesc Spectral description functions
 
@@ -35,10 +35,10 @@
   These functions are designed to raise at notes attacks in music signals.
 
-  \b \p energy : Energy based onset detection function 
- 
+  \b \p energy : Energy based onset detection function
+
   This function calculates the local energy of the input spectral frame.
-  
+
   \b \p hfc : High Frequency Content onset detection function
- 
+
   This method computes the High Frequency Content (HFC) of the input spectral
   frame. The resulting function is efficient at detecting percussive onsets.
@@ -47,11 +47,11 @@
   Musical Signal. PhD dissertation, University of Bristol, UK, 1996.
 
-  \b \p complex : Complex Domain Method onset detection function 
- 
+  \b \p complex : Complex Domain Method onset detection function
+
   Christopher Duxbury, Mike E. Davies, and Mark B. Sandler. Complex domain
   onset detection for musical signals. In Proceedings of the Digital Audio
   Effects Conference, DAFx-03, pages 90-93, London, UK, 2003.
 
-  \b \p phase : Phase Based Method onset detection function 
+  \b \p phase : Phase Based Method onset detection function
 
   Juan-Pablo Bello, Mike P. Davies, and Mark B. Sandler. Phase-based note onset
@@ -60,5 +60,5 @@
   Hong-Kong, 2003.
 
-  \b \p specdiff : Spectral difference method onset detection function 
+  \b \p specdiff : Spectral difference method onset detection function
 
   Jonhatan Foote and Shingo Uchihashi. The beat spectrum: a new approach to
@@ -66,11 +66,11 @@
   (ICME 2001), pages 881­884, Tokyo, Japan, August 2001.
 
-  \b \p kl : Kullback-Liebler onset detection function 
-  
+  \b \p kl : Kullback-Liebler onset detection function
+
   Stephen Hainsworth and Malcom Macleod. Onset detection in music audio
   signals. In Proceedings of the International Computer Music Conference
   (ICMC), Singapore, 2003.
 
-  \b \p mkl : Modified Kullback-Liebler onset detection function 
+  \b \p mkl : Modified Kullback-Liebler onset detection function
 
   Paul Brossier, ``Automatic annotation of musical audio for interactive
@@ -78,9 +78,9 @@
   music, Queen Mary University of London, London, UK, 2006.
 
-  \b \p specflux : Spectral Flux 
+  \b \p specflux : Spectral Flux
 
   Simon Dixon, Onset Detection Revisited, in ``Proceedings of the 9th
   International Conference on Digital Audio Effects'' (DAFx-06), Montreal,
-  Canada, 2006. 
+  Canada, 2006.
 
   \subsection shapedesc Spectral shape descriptors
@@ -93,12 +93,12 @@
   href="http://www.ircam.fr/anasyn/peeters/ARTICLES/Peeters_2003_cuidadoaudiofeatures.pdf">pdf</a>)
 
-  \b \p centroid : Spectral centroid 
+  \b \p centroid : Spectral centroid
 
   The spectral centroid represents the barycenter of the spectrum.
 
   \e Note: This function returns the result in bin. To get the spectral
-  centroid in Hz, aubio_bintofreq() should be used. 
+  centroid in Hz, aubio_bintofreq() should be used.
 
-  \b \p spread : Spectral spread 
+  \b \p spread : Spectral spread
 
   The spectral spread is the variance of the spectral distribution around its
@@ -126,5 +126,5 @@
   Wikipedia.
 
-  \b \p slope : Spectral slope 
+  \b \p slope : Spectral slope
 
   The spectral slope represents decreasing rate of the spectral amplitude,
@@ -133,5 +133,5 @@
   \b \p decrease : Spectral decrease
 
-  The spectral decrease is another representation of the decreasing rate,  
+  The spectral decrease is another representation of the decreasing rate,
   based on perceptual criteria.
 
@@ -146,6 +146,6 @@
 
 
-#ifndef ONSETDETECTION_H
-#define ONSETDETECTION_H
+#ifndef _AUBIO_SPECDESC_H
+#define _AUBIO_SPECDESC_H
 
 #ifdef __cplusplus
@@ -156,8 +156,8 @@
 typedef struct _aubio_specdesc_t aubio_specdesc_t;
 
-/** execute spectral description function on a spectral frame 
+/** execute spectral description function on a spectral frame
 
   Generic function to compute spectral detescription.
- 
+
   \param o spectral description object as returned by new_aubio_specdesc()
   \param fftgrain input signal spectrum as computed by aubio_pvoc_do
@@ -168,5 +168,5 @@
     fvec_t * desc);
 
-/** creation of a spectral description object 
+/** creation of a spectral description object
 
   \param method spectral description method
@@ -181,5 +181,5 @@
 aubio_specdesc_t *new_aubio_specdesc (char_t * method, uint_t buf_size);
 
-/** deletion of a spectral descriptor 
+/** deletion of a spectral descriptor
 
   \param o spectral descriptor object as returned by new_aubio_specdesc()
@@ -192,3 +192,3 @@
 #endif
 
-#endif /* ONSETDETECTION_H */
+#endif /* _AUBIO_SPECDESC_H */
Index: src/spectral/tss.h
===================================================================
--- src/spectral/tss.h	(revision 5958d1ee363b72e34ef712b8408afe7f345e1ad3)
+++ src/spectral/tss.h	(revision b235c0ebcf217209b267bf95f3ed90a788b6b919)
@@ -1,4 +1,4 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
@@ -37,6 +37,6 @@
 */
 
-#ifndef TSS_H
-#define TSS_H
+#ifndef _AUBIO_TSS_H
+#define _AUBIO_TSS_H
 
 #ifdef __cplusplus
@@ -101,3 +101,3 @@
 #endif
 
-#endif /*TSS_H*/
+#endif /* _AUBIO_TSS_H */
