diff --git a/src/dstarparse/nra2nba.cc b/src/dstarparse/nra2nba.cc
index 89e9e936c..25703cdc3 100644
--- a/src/dstarparse/nra2nba.cc
+++ b/src/dstarparse/nra2nba.cc
@@ -1,6 +1,6 @@
 // -*- coding: utf-8 -*-
-// Copyright (C) 2013, 2014 Laboratoire de Recherche et Développement de
-// l'Epita (LRDE).
+// Copyright (C) 2013, 2014, 2015 Laboratoire de Recherche et
+// Développement de l'Epita (LRDE).
 //
 // This file is part of Spot, a model checking library.
 //
@@ -123,7 +123,6 @@ namespace spot
     return scc_filter_states(w.result());
   }
 
-  SPOT_API
   tgba_digraph_ptr nra_to_nba(const const_dstar_aut_ptr& nra)
   {
     return nra_to_nba(nra, nra->aut);
diff --git a/src/dstarparse/nsa2tgba.cc b/src/dstarparse/nsa2tgba.cc
index da98b98d3..565f3c647 100644
--- a/src/dstarparse/nsa2tgba.cc
+++ b/src/dstarparse/nsa2tgba.cc
@@ -1,6 +1,6 @@
 // -*- coding: utf-8 -*-
-// Copyright (C) 2013, 2014 Laboratoire de Recherche et Développement
-// de l'Epita (LRDE).
+// Copyright (C) 2013, 2014, 2015 Laboratoire de Recherche et
+// Développement de l'Epita (LRDE).
 //
 // This file is part of Spot, a model checking library.
 //
@@ -98,7 +98,6 @@ namespace spot
 
   }
 
-  SPOT_API
   tgba_digraph_ptr nsa_to_tgba(const const_dstar_aut_ptr& nsa)
   {
     assert(nsa->type == Streett);
diff --git a/src/sanity/style.test b/src/sanity/style.test
index 5aa9253ac..bbcdfd20f 100755
--- a/src/sanity/style.test
+++ b/src/sanity/style.test
@@ -107,6 +107,13 @@ for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do
     perl -ne '/(.*\\brief.*\n.*\\ingroup.*)/ && print("$1\n") && exit(1)' \
       -0777 $file || diag "always put 'ingroup' before 'brief'"
 
+    # Check this before we remove SPOT_API from the input.
+    case $file in
+	*.cc)
+	    $GREP 'SPOT_API' $file &&
+		diag 'use SPOT_API only in header files';;
+    esac
+
     # Strip comments and strings.
     #
     # Multi-line comments of the form
@@ -119,7 +126,7 @@ for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do
     # //
     # to keep the line numbers correct in the diagnostics.
     #
-    # Also get read of the SPOT_API tags.
+    # Also get rid of the SPOT_API tags.
     perl -pe 'sub f {my $a = shift; $a =~ s:[^\n]*://:g; return "$a"}
               s,/\*(.*?)\*/,f($1),sge;
               s,//.*?\n,//\n,g;
diff --git a/src/tgbaalgos/randomize.cc b/src/tgbaalgos/randomize.cc
index a5a6d8a8a..acf3c1a0e 100644
--- a/src/tgbaalgos/randomize.cc
+++ b/src/tgbaalgos/randomize.cc
@@ -1,6 +1,6 @@
 // -*- coding: utf-8 -*-
-// Copyright (C) 2014 Laboratoire de Recherche et Développement de
-// l'Epita (LRDE).
+// Copyright (C) 2014, 2015 Laboratoire de Recherche et Développement
+// de l'Epita (LRDE).
 //
 // This file is part of Spot, a model checking library.
 //
@@ -24,7 +24,7 @@
 
 namespace spot
 {
-  SPOT_API void
+  void
   randomize(tgba_digraph_ptr& aut, bool randomize_states,
 	    bool randomize_transitions)
   {
diff --git a/src/tgbaalgos/stutter.cc b/src/tgbaalgos/stutter.cc
index 57b66d8cb..0ba0593fb 100644
--- a/src/tgbaalgos/stutter.cc
+++ b/src/tgbaalgos/stutter.cc
@@ -201,7 +201,7 @@ namespace spot
     };
 
 
-    class SPOT_API tgbasl final : public tgba
+    class tgbasl final : public tgba
     {
     public:
       tgbasl(const const_tgba_ptr& a, bdd atomic_propositions)