diff --git a/taglib/asf/asfattribute.cpp b/taglib/asf/asfattribute.cpp
index f9bae658..a4a4c178 100644
--- a/taglib/asf/asfattribute.cpp
+++ b/taglib/asf/asfattribute.cpp
@@ -27,7 +27,7 @@
 #include <config.h>
 #endif
 
-#ifdef TAGLIB_WITH_ASF
+#ifdef WITH_ASF
 
 #include <taglib.h>
 #include "asfattribute.h"
diff --git a/taglib/asf/asffile.cpp b/taglib/asf/asffile.cpp
index da50056d..e403934b 100644
--- a/taglib/asf/asffile.cpp
+++ b/taglib/asf/asffile.cpp
@@ -27,7 +27,7 @@
 #include <config.h>
 #endif
 
-#ifdef TAGLIB_WITH_ASF
+#ifdef WITH_ASF
 
 #include <tdebug.h>
 #include <tbytevectorlist.h>
diff --git a/taglib/asf/asfproperties.cpp b/taglib/asf/asfproperties.cpp
index f7b7be48..68e2d4ca 100644
--- a/taglib/asf/asfproperties.cpp
+++ b/taglib/asf/asfproperties.cpp
@@ -27,7 +27,7 @@
 #include <config.h>
 #endif
 
-#ifdef TAGLIB_WITH_ASF
+#ifdef WITH_ASF
 
 #include <tdebug.h>
 #include <tstring.h>
diff --git a/taglib/asf/asftag.cpp b/taglib/asf/asftag.cpp
index 6ec64aa0..6bea247f 100644
--- a/taglib/asf/asftag.cpp
+++ b/taglib/asf/asftag.cpp
@@ -27,7 +27,7 @@
 #include <config.h>
 #endif
 
-#ifdef TAGLIB_WITH_ASF
+#ifdef WITH_ASF
 
 #include "asftag.h"
 
diff --git a/taglib/mp4/mp4atom.cpp b/taglib/mp4/mp4atom.cpp
index 7ef16317..ba07409a 100644
--- a/taglib/mp4/mp4atom.cpp
+++ b/taglib/mp4/mp4atom.cpp
@@ -27,7 +27,7 @@
 #include <config.h>
 #endif
 
-#ifdef TAGLIB_WITH_MP4
+#ifdef WITH_MP4
 
 #include <tdebug.h>
 #include <tstring.h>
diff --git a/taglib/mp4/mp4file.cpp b/taglib/mp4/mp4file.cpp
index bbf58b05..3165256c 100644
--- a/taglib/mp4/mp4file.cpp
+++ b/taglib/mp4/mp4file.cpp
@@ -27,7 +27,7 @@
 #include <config.h>
 #endif
 
-#ifdef TAGLIB_WITH_MP4
+#ifdef WITH_MP4
 
 #include <tdebug.h>
 #include <tstring.h>
diff --git a/taglib/mp4/mp4item.cpp b/taglib/mp4/mp4item.cpp
index f0cb9ebf..2b5613ad 100644
--- a/taglib/mp4/mp4item.cpp
+++ b/taglib/mp4/mp4item.cpp
@@ -27,7 +27,7 @@
 #include <config.h>
 #endif
 
-#ifdef TAGLIB_WITH_MP4
+#ifdef WITH_MP4
 
 #include <taglib.h>
 #include <tdebug.h>
diff --git a/taglib/mp4/mp4properties.cpp b/taglib/mp4/mp4properties.cpp
index 2ae762bb..c973d3a2 100644
--- a/taglib/mp4/mp4properties.cpp
+++ b/taglib/mp4/mp4properties.cpp
@@ -27,7 +27,7 @@
 #include <config.h>
 #endif
 
-#ifdef TAGLIB_WITH_MP4
+#ifdef WITH_MP4
 
 #include <tdebug.h>
 #include <tstring.h>
diff --git a/taglib/mp4/mp4tag.cpp b/taglib/mp4/mp4tag.cpp
index 77f1a317..e73952d7 100644
--- a/taglib/mp4/mp4tag.cpp
+++ b/taglib/mp4/mp4tag.cpp
@@ -27,7 +27,7 @@
 #include <config.h>
 #endif
 
-#ifdef TAGLIB_WITH_MP4
+#ifdef WITH_MP4
 
 #include <tdebug.h>
 #include <tstring.h>