utils/local_buard,resource_manager: IWYU

src/utils/lock_guard.h

@@ -5,12 +5,6 @@
 #ifndef LOCK_GUARD_H_
 #define LOCK_GUARD_H_
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#include "config_unix.h"
-#include "config_win32.h"
-#endif // HAVE_CONFIG_H
-
 #include <pthread.h>
 
 namespace ultragrid {

src/utils/resource_manager.cpp

@@ -40,23 +40,17 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#include "config_unix.h"
-#include "config_win32.h"
-#endif // HAVE_CONFIG_H
-
 #include "resource_manager.h"
 
-#include "utils/lock_guard.h"
-
 #include <algorithm>
+#include <cstdlib>            // for NULL, calloc, free
 #include <map>
 #include <stdexcept>
 #include <string>
-#include <typeinfo>
 #include <utility>
 
+#include "utils/lock_guard.h"
+
 #define TYPE_LOCK 0
 #define TYPE_SHM 1
 #define TYPE_SINGLETON 2

src/utils/resource_manager.h

@@ -35,15 +35,11 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#include "config_unix.h"
-#include "config_win32.h"
-#endif // HAVE_CONFIG_H
- 
 #ifndef RESOURCE_MANAGER_H_
 #define RESOURCE_MANAGER_H_
 
+#include <pthread.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif