diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h
index 8b05d04501b1e3de1d495ea069ab500a8e16bb78..ca6bd168af34ca8d01d9290fb969c94f1a6097d5 100644
--- a/src/conf/nwfilter_conf.h
+++ b/src/conf/nwfilter_conf.h
@@ -2,7 +2,7 @@
  * nwfilter_conf.h: network filter XML processing
  *                  (derived from storage_conf.h)
  *
- * Copyright (C) 2006-2010 Red Hat, Inc.
+ * Copyright (C) 2006-2010, 2012 Red Hat, Inc.
  * Copyright (C) 2006-2008 Daniel P. Berrange
  *
  * Copyright (C) 2010 IBM Corporation
@@ -26,9 +26,6 @@
 #ifndef NWFILTER_CONF_H
 # define NWFILTER_CONF_H
 
-# include <stdint.h>
-# include <stddef.h>
-
 # include "internal.h"
 
 # include "util.h"
diff --git a/src/internal.h b/src/internal.h
index fd8d1902298b1abbb884e93c14ad2bde7738ad1b..300de3ac5c7765d263f9c95a92709631fd6b0a4a 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -9,6 +9,7 @@
 # include <limits.h>
 # include <verify.h>
 # include <stdbool.h>
+# include <stdint.h>
 
 # if STATIC_ANALYSIS
 #  undef NDEBUG /* Don't let a prior NDEBUG definition cause trouble.  */
diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index 4a2109e80945b89a5c20a2b77ec755bd233d5de5..df3833a342f4b673a2ed5791166f1014ab1b1f8d 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -32,7 +32,6 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <stdint.h>
 #include <sys/stat.h>
 #include <sys/param.h>
 #include <dirent.h>
diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h
index bafd6b6c6dda1424de2baeda9bf0d0adc980fd68..5352f5d2577f901e9bbbfb2b1b43ec0dd14022db 100644
--- a/src/storage/storage_backend.h
+++ b/src/storage/storage_backend.h
@@ -1,7 +1,7 @@
 /*
  * storage_backend.h: internal storage driver backend contract
  *
- * Copyright (C) 2007-2010 Red Hat, Inc.
+ * Copyright (C) 2007-2010, 2012 Red Hat, Inc.
  * Copyright (C) 2007-2008 Daniel P. Berrange
  *
  * This library is free software; you can redistribute it and/or
@@ -24,7 +24,6 @@
 #ifndef __VIR_STORAGE_BACKEND_H__
 # define __VIR_STORAGE_BACKEND_H__
 
-# include <stdint.h>
 # include "internal.h"
 # include "storage_conf.h"
 # include "command.h"
diff --git a/src/util/cgroup.c b/src/util/cgroup.c
index 6c29c874bfdc5c8baa38a4138789e5df30ba8d00..2256c23af4a28c2410d1e28017d43c1eb350e038 100644
--- a/src/util/cgroup.c
+++ b/src/util/cgroup.c
@@ -24,7 +24,6 @@
 #include <config.h>
 
 #include <stdio.h>
-#include <stdint.h>
 #if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R
 # include <mntent.h>
 #endif
diff --git a/src/util/sexpr.h b/src/util/sexpr.h
index 8dfd89a1d81bb5c94f136fc55a0d8e09b331ad2c..b4b41edb6433b0e086716be00b55987739d0804e 100644
--- a/src/util/sexpr.h
+++ b/src/util/sexpr.h
@@ -1,9 +1,8 @@
 /*
  * sexpr.h : S-Expression interfaces needed to communicate with the Xen Daemon
  *
- * Copyright (C) 2005
- *
- *      Anthony Liguori <aliguori@us.ibm.com>
+ * Copyright (C) 2012 Red Hat, Inc.
+ * Copyright (C) 2005 Anthony Liguori <aliguori@us.ibm.com>
  *
  *  This file is subject to the terms and conditions of the GNU Lesser General
  *  Public License. See the file COPYING.LIB in the main directory of this
@@ -16,9 +15,6 @@
 # include "internal.h"
 # include "buf.h"
 
-# include <sys/types.h>
-# include <stdint.h>
-
 enum sexpr_type {
     SEXPR_NIL,
     SEXPR_CONS,
diff --git a/src/util/virhashcode.h b/src/util/virhashcode.h
index 2fb7a95bd4ddf496990181d17eb8d53d60c87832..34254b6cf62e5127bd38bd7d64999c2324e7b7ba 100644
--- a/src/util/virhashcode.h
+++ b/src/util/virhashcode.h
@@ -29,7 +29,6 @@
 # define __VIR_HASH_CODE_H__
 
 # include "internal.h"
-# include <stdint.h>
 
 extern uint32_t virHashCodeGen(const void *key, size_t len, uint32_t seed);
 
diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprofile.h
index 6cce1bb457a5b6064b36c6d1eef30c653d86ff8b..f33da1878d0b56712ae9738f72cbf03e9b0c1d9b 100644
--- a/src/util/virnetdevvportprofile.h
+++ b/src/util/virnetdevvportprofile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2011 Red Hat, Inc.
+ * Copyright (C) 2009-2012 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,8 +23,6 @@
 #ifndef __VIR_NETDEV_VPORT_PROFILE_H__
 # define __VIR_NETDEV_VPORT_PROFILE_H__
 
-# include <stdint.h>
-
 # include "internal.h"
 # include "uuid.h"
 # include "util.h"
diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h
index 1997c8d0e7eb37ad619af28709a720f13d78babb..5d8337dda21fab04cd5f3b21e2c17a26042d4c32 100644
--- a/src/util/virnetlink.h
+++ b/src/util/virnetlink.h
@@ -24,8 +24,6 @@
 # include "internal.h"
 # include "virmacaddr.h"
 
-# include <stdint.h>
-
 # if defined(__linux__) && defined(HAVE_LIBNL)
 
 #  include <netlink/msg.h>
diff --git a/src/util/virrandom.h b/src/util/virrandom.h
index 8d3cad722513521f4dabde72867fc1aff6086c50..29a055dcedb0eb78558d8e8c876e80f6be18e8de 100644
--- a/src/util/virrandom.h
+++ b/src/util/virrandom.h
@@ -23,7 +23,6 @@
 # define __VIR_RANDOM_H__
 
 # include "internal.h"
-# include <stdint.h>
 
 uint64_t virRandomBits(int nbits);
 int virRandomGenerateWWN(char **wwn, const char *virt_type);
diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c
index b340b7c0610c7a247843f4ff2479c20ad8865369..c4037f8ec158f408dd300e38178f563e34aff5f8 100644
--- a/src/vbox/vbox_driver.c
+++ b/src/vbox/vbox_driver.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Red Hat, Inc.
+ * Copyright (C) 2010-2012 Red Hat, Inc.
  * Copyright (C) 2008-2009 Sun Microsystems, Inc.
  *
  * This file is part of a free software library; you can redistribute
@@ -29,9 +29,7 @@
 
 #include <config.h>
 
-#include <stdint.h>
 #include <unistd.h>
-#include <sys/types.h>
 
 #include "internal.h"
 
diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 5608de8893c8c3d87d05332d1cf971c489f009fd..f57449e34de283ddf62439971b1dfe3fdaf0f0ce 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -23,7 +23,6 @@
 #include <config.h>
 
 #include <limits.h>
-#include <stdint.h>
 #include <string.h>
 #include <curl/curl.h>
 #include <xen/api/xen_all.h>
diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c
index 3031a17a5b66ccd5eb2c20134408882239a25e32..d62192a200b04f5653f9f6286b842d62042f3b0c 100644
--- a/src/xenapi/xenapi_utils.c
+++ b/src/xenapi/xenapi_utils.c
@@ -24,7 +24,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <stdint.h>
 #include <xen/api/xen_all.h>
 #include "internal.h"
 #include "domain_conf.h"
diff --git a/src/xenapi/xenapi_utils.h b/src/xenapi/xenapi_utils.h
index 59124464a6fbc6b54db042b96c60dea2d8df7ed3..86af07c347786b0b5356a3c1dc6e64c124a74be1 100644
--- a/src/xenapi/xenapi_utils.h
+++ b/src/xenapi/xenapi_utils.h
@@ -1,5 +1,6 @@
 /*
  * xenapi_utils.h: Xen API driver -- utils header
+ * Copyright (C) 2012, Red Hat, Inc.
  * Copyright (C) 2009, 2010 Citrix Ltd.
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +23,6 @@
 #ifndef __VIR_XENAPI_UTILS__
 # define __VIR_XENAPI_UTILS__
 
-# include <stdint.h>
 # include <xen/api/xen_all.h>
 # include "internal.h"
 # include "viruri.h"
diff --git a/src/xenxs/xenxs_private.h b/src/xenxs/xenxs_private.h
index d0ba59a65be471afd9c76103ed9ae2aa6cf5e1c0..17b481b83c4e01947a7ddfeb73dbff102ae89b53 100644
--- a/src/xenxs/xenxs_private.h
+++ b/src/xenxs/xenxs_private.h
@@ -1,8 +1,8 @@
 /*
  * xenxs_private.h: Private definitions for Xen parsing
  *
+ * Copyright (C) 2007, 2010, 2012 Red Hat, Inc.
  * Copyright (C) 2011 Univention GmbH
- * Copyright (C) 2007, 2010 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -27,7 +27,6 @@
 
 # include "internal.h"
 
-# include <stdint.h>
 # include <xen/xen.h>
 # include "xen_sxpr.h"
 
diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c
index b7b3b35d097d6df051914df7f9258cc10df9aeb7..ba5bc36beb7903337c649ba64325ecc43f24777a 100644
--- a/tests/storagebackendsheepdogtest.c
+++ b/tests/storagebackendsheepdogtest.c
@@ -25,10 +25,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <stdint.h>
 #include <string.h>
 
-#include <sys/types.h>
 #include <fcntl.h>
 
 #include "internal.h"