Megacommit of dozens of files.

Cleanup of redundant/useless header file inclusion.

ISC style lint, primarily for function declarations and standalone
comments -- ie, those that appear on a line without any code, which
should be written as follows:
   /*
    * This is a comment.
    */

lib/omapi/include/omapi/compatibility.h

@@ -15,6 +15,11 @@
  * SOFTWARE.
  */
 
+#ifndef OMAPI_COMPATIBILITY_H
+#define OMAPI_COMPATIBILITY_H 1
+
+#include <isc/result.h>
+
 /*****
  ***** Macro definitions for partial compatability with Ted Lemon's original
  ***** design of OMAPI for DCHP.  The intent is that with by using this header
@@ -82,3 +87,5 @@
 #define omapi_connection_put_string	omapi_connection_putstring
 #define omapi_connection_put_handle	omapi_connection_puthandle
 #define omapi_connection_write_typed_data	omapi_connection_putdata
+
+#endif /* OMAPI_COMPATIBILITY_H */

lib/omapi/include/omapi/omapi.h

@@ -19,18 +19,14 @@
  * Definitions for the object management API and protocol.
  */
 
-#ifndef _OMAPI_OMAPI_H_
-#define _OMAPI_OMAPI_H_
+#ifndef OMAPI_OMAPI_H
+#define OMAPI_OMAPI_H 1
 
 #include <stdarg.h>
 
 #include <isc/boolean.h>
+#include <isc/eventclass.h>
 #include <isc/lang.h>
-#include <isc/time.h>
-#include <isc/region.h>
-#include <isc/result.h>
-#include <isc/sockaddr.h>
-#include <isc/task.h>
 
 #include <dns/acl.h>
 
@@ -367,4 +363,4 @@ omapi_value_getregion(omapi_value_t *value, isc_region_t *region);
 
 ISC_LANG_ENDDECLS
 
-#endif /* _OMAPI_OMAPI_H_ */
+#endif /* OMAPI_OMAPI_H */

lib/omapi/include/omapi/private.h

@@ -20,24 +20,15 @@
  *****/
 
 #ifndef OMAPI_PRIVATE_H
-#define OMAPI_PRIVATE_H
+#define OMAPI_PRIVATE_H 1
 
 #include <isc/condition.h>
 #include <isc/lang.h>
-#include <isc/mem.h>
-#include <isc/mutex.h>
-#include <isc/net.h>
 #include <isc/socket.h>
-#include <isc/task.h>
-#include <isc/timer.h>
-#include <isc/util.h>
 
 #include <dst/dst.h>
 
 #include <omapi/omapi.h>
-#include <omapi/result.h>
-
-ISC_LANG_BEGINDECLS
 
 #define OMAPI_BUFFER_SIZE 4096
 
@@ -294,7 +285,7 @@ extern isc_socketmgr_t *omapi_socketmgr;
 #define PASS_CHECK(object, function) \
 	(object->inner != NULL && object->inner->type->function != NULL)
 
-
+ISC_LANG_BEGINDECLS
 
 /*
  * Private library functions defined in auth.c.
@@ -414,4 +405,4 @@ send_update(omapi_object_t *protocol, unsigned int response_id,
 
 ISC_LANG_ENDDECLS
 
-#endif /* OMAPIP_PRIVATE_H */
+#endif /* OMAPI_PRIVATE_H */

lib/omapi/include/omapi/result.h

@@ -16,10 +16,10 @@
  */
 
 #ifndef OMAPI_RESULT_H
-#define DNS_RESULT_H 1
+#define OMAPI_RESULT_H 1
 
 #include <isc/lang.h>
-#include <isc/result.h>
+#include <isc/result.h>		/* Contractual promise. */
 #include <isc/resultclass.h>
 
 ISC_LANG_BEGINDECLS
@@ -33,9 +33,12 @@ ISC_LANG_BEGINDECLS
 
 #define OMAPI_R_NRESULTS		6	/* Number of results */
 
-char *				omapi_result_totext(isc_result_t);
-void				omapi_result_register(void);
+char *
+omapi_result_totext(isc_result_t);
+
+void
+omapi_result_register(void);
 
 ISC_LANG_ENDDECLS
 
-#endif /* DNS_RESULT_H */
+#endif /* OMAPI_RESULT_H */

lib/omapi/include/omapi/types.h

@@ -15,12 +15,8 @@
  * SOFTWARE.
  */
 
-#ifndef _OMAPI_TYPES_H_
-#define _OMAPI_TYPES_H_
-
-#include <isc/lang.h>
-
-ISC_LANG_BEGINDECLS
+#ifndef OMAPI_TYPES_H
+#define OMAPI_TYPES_H 1
 
 /*****
  ***** Type definitions.
@@ -45,6 +41,4 @@ typedef enum {
 	omapi_datatype_object
 } omapi_datatype_t;
 
-ISC_LANG_ENDDECLS
-
-#endif /* _OMAPI_OMAPIP_H_ */
+#endif /* OMAPI_TYPES_H */