6 files changed, 5 insertions, 82 deletions
diff --git a/source4/include/clitar.h b/source4/include/clitar.h
deleted file mode 100644
index b7731172d6..0000000000
--- a/source4/include/clitar.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Unix SMB/CIFS implementation. 
- * clitar file format
- * Copyright (C) Andrew Tridgell              2000
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 675
- * Mass Ave, Cambridge, MA 02139, USA.  
- */
-
-#ifndef _CLITAR_H
-#define _CLITAR_H
-
-#define TBLOCK 512
-#define NAMSIZ 100
-union hblock {
-  char dummy[TBLOCK];
-  struct header {
-    char name[NAMSIZ];
-    char mode[8];
-    char uid[8];
-    char gid[8];
-    char size[12];
-    char mtime[12];
-    char chksum[8];
-    char linkflag;
-    char linkname[NAMSIZ];
-  } dbuf;
-};
-
-#endif /* _CLITAR_H */
diff --git a/source4/include/includes.h b/source4/include/includes.h
index ee1ac6d96e..b7acae9019 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -102,7 +102,6 @@ struct ipv4_addr {
 #include "smb_macros.h"
 #include "smb.h"
 #include "byteorder.h"
-#include "module.h"
 #include "lib/tdr/tdr.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/misc.h"
@@ -116,10 +115,6 @@ struct ipv4_addr {
 #include "lib/com/com.h"
 #include "credentials.h"
 
-#define malloc_p(type) (type *)malloc(sizeof(type))
-#define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), count)
-#define realloc_p(p, type, count) (type *)realloc_array(p, sizeof(type), count)
-
 /***** automatically generated prototypes *****/
 #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
 #include "include/proto.h"
@@ -170,9 +165,4 @@ extern int DEBUGLEVEL;
 #define UINT16_MAX 65535
 #endif
 
-/*
-  type safe varient of smb_xmalloc()
-*/
-#define smb_xmalloc_p(type) (type *)smb_xmalloc(sizeof(type))
-
 #endif /* _INCLUDES_H */
diff --git a/source4/include/interfaces.h b/source4/include/interfaces.h
deleted file mode 100644
index e69de29bb2..0000000000
--- a/source4/include/interfaces.h
+++ /dev/null
diff --git a/source4/include/module.h b/source4/include/module.h
deleted file mode 100644
index 5994b85f8e..0000000000
--- a/source4/include/module.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   Handling of idle/exit events
-   Copyright (C) Jelmer Vernooij 2003
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#ifndef _MODULE_H
-#define _MODULE_H
-
-/* Module support */
-typedef NTSTATUS (*init_module_function) (void);
-
-/* Module that registers a backend for a certain subsystem */
-typedef NTSTATUS (*register_backend_function) (const void *data);
-
-#endif /* _MODULE_H */
diff --git a/source4/include/mutex.h b/source4/include/mutex.h
index c0b7d26744..bb26c84f5d 100644
--- a/source4/include/mutex.h
+++ b/source4/include/mutex.h
@@ -66,4 +66,4 @@ struct mutex_ops {
 	int (*rwlock_destroy)(smb_rwlock_t *rwlock, const char *name);
 };
 
-#endif /* ndef _MUTEX_H_ */
+#endif /* endif _MUTEX_H_ */
diff --git a/source4/include/smb_macros.h b/source4/include/smb_macros.h
index f5ac3ac96d..f1c62ab024 100644
--- a/source4/include/smb_macros.h
+++ b/source4/include/smb_macros.h
@@ -70,4 +70,8 @@
 #define SAFE_FREE(x) do { if ((x) != NULL) {free(discard_const_p(void *, (x))); (x)=NULL;} } while(0)
 #endif
 
+#define malloc_p(type) (type *)malloc(sizeof(type))
+#define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), count)
+#define realloc_p(p, type, count) (type *)realloc_array(p, sizeof(type), count)
+
 #endif /* _SMB_MACROS_H */