diff -r 730c025d4b77 -r f378acbc9cfb src/hbcommon.pri
--- a/src/hbcommon.pri	Thu Jul 15 14:03:49 2010 +0100
+++ b/src/hbcommon.pri	Thu Jul 22 16:36:53 2010 +0100
@@ -54,14 +54,21 @@
 # integrity check for public/private headers
 contains(TEMPLATE, .*lib$) {
     for(pubheader, $$list($$lower($$unique(PUBLIC_HEADERS)))) {
-        contains(pubheader, .*_p.h$):warning($$basename(pubheader) is listed in PUBLIC_HEADERS but has a \"_p.h\" suffix.)
+        contains(pubheader, .*_[pr].h$):warning($$basename(pubheader) is listed in PUBLIC_HEADERS but has a \"_[pr].h\" suffix.)
+    }
+    for(restheader, $$list($$lower($$unique(RESTRICTED_HEADERS)))) {
+        !contains(restheader, .*_r.h$):warning($$basename(restheader) is listed in RESTRICTED_HEADERS but has no \"_r.h\" suffix.)
     }
     for(privheader, $$list($$lower($$unique(PRIVATE_HEADERS)))) {
         !contains(privheader, .*_p.h$):warning($$basename(privheader) is listed in PRIVATE_HEADERS but has no \"_p.h\" suffix.)
     }
+    !isEmpty(INTERNAL_HEADERS) {
+        warning(INTERNAL_HEADERS is obsolete. Use PUBLIC|RESTRICTED|PRIVATE_HEADERS for the following headers:)
+        for(intheader, $$list($$unique(INTERNAL_HEADERS))) {
+            warning($$intheader)
+        }
+    }
 }
 
 # common extra targets
-include(flint.pri)
-include(astyle.pri)
 include(coverage.pri)