From d269c91a5b973b9d34c30bf252fffa6b5fcd98ef Mon Sep 17 00:00:00 2001
From: giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>
Date: Sat, 29 Sep 2007 06:16:08 +0000
Subject: cleanup

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@418 9d0c8265-081b-0410-96cb-a4ca84ce46f8
---
 lib/libpam.h     | 2 +-
 lib/libpbm1.c    | 1 -
 lib/libpbm3.c    | 1 -
 lib/libpgm2.c    | 1 -
 lib/libpnm2.c    | 3 ---
 lib/libpnm3.c    | 3 ---
 lib/libppm2.c    | 1 -
 lib/libppmcmap.c | 1 -
 lib/pgm.h        | 1 +
 lib/pnm.h        | 1 +
 lib/ppm.h        | 1 +
 11 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/lib/libpam.h b/lib/libpam.h
index 4b8e6693..9f8a34d0 100644
--- a/lib/libpam.h
+++ b/lib/libpam.h
@@ -4,7 +4,7 @@
 #ifndef LIBPAM_H_INCLUDED
 #define LIBPAM_H_INCLUDED
 
-#include "pam.h"
+#include "pgm.h"
 
 void
 pnm_readpaminitrestaspnm(FILE * const fileP, 
diff --git a/lib/libpbm1.c b/lib/libpbm1.c
index 8dd491a7..6c43587e 100644
--- a/lib/libpbm1.c
+++ b/lib/libpbm1.c
@@ -18,7 +18,6 @@
 
 #include <stdio.h>
 #include "pbm.h"
-#include "libpbm.h"
 #include "shhopt.h"
 
 void
diff --git a/lib/libpbm3.c b/lib/libpbm3.c
index 2a811748..5759e65d 100644
--- a/lib/libpbm3.c
+++ b/lib/libpbm3.c
@@ -11,7 +11,6 @@
 */
 
 #include "pbm.h"
-#include "libpbm.h"
 #include "bitreverse.h"
 
 #if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 301) && defined (__SSE__)
diff --git a/lib/libpgm2.c b/lib/libpgm2.c
index 9f607d73..650d2cb5 100644
--- a/lib/libpgm2.c
+++ b/lib/libpgm2.c
@@ -16,7 +16,6 @@
 #include "pm_c_util.h"
 #include "mallocvar.h"
 #include "pgm.h"
-#include "libpgm.h"
 
 
 
diff --git a/lib/libpnm2.c b/lib/libpnm2.c
index 7e4f7e2a..fdfe0dc0 100644
--- a/lib/libpnm2.c
+++ b/lib/libpnm2.c
@@ -15,13 +15,10 @@
 #include "pnm.h"
 
 #include "ppm.h"
-#include "libppm.h"
 
 #include "pgm.h"
-#include "libpgm.h"
 
 #include "pbm.h"
-#include "libpbm.h"
 
 void
 pnm_writepnminit(FILE * const fileP, 
diff --git a/lib/libpnm3.c b/lib/libpnm3.c
index 4df8041c..71df0cbf 100644
--- a/lib/libpnm3.c
+++ b/lib/libpnm3.c
@@ -13,13 +13,10 @@
 #include "pnm.h"
 
 #include "ppm.h"
-#include "libppm.h"
 
 #include "pgm.h"
-#include "libpgm.h"
 
 #include "pbm.h"
-#include "libpbm.h"
 
 xel
 pnm_backgroundxel( xel** xels, int cols, int rows, xelval maxval, int format )
diff --git a/lib/libppm2.c b/lib/libppm2.c
index 52c4ab16..78898910 100644
--- a/lib/libppm2.c
+++ b/lib/libppm2.c
@@ -17,7 +17,6 @@
 #include "pm_c_util.h"
 #include "mallocvar.h"
 #include "ppm.h"
-#include "libppm.h"
 
 void
 ppm_writeppminit(FILE*  const fileP, 
diff --git a/lib/libppmcmap.c b/lib/libppmcmap.c
index 954488d7..055bfc8b 100644
--- a/lib/libppmcmap.c
+++ b/lib/libppmcmap.c
@@ -15,7 +15,6 @@
 #include "pm_c_util.h"
 #include "nstring.h"
 #include "mallocvar.h"
-#include "libppm.h"
 #include "ppm.h"
 #include "ppmcmap.h"
 
diff --git a/lib/pgm.h b/lib/pgm.h
index 86935307..a3fd8565 100644
--- a/lib/pgm.h
+++ b/lib/pgm.h
@@ -4,6 +4,7 @@
 #ifndef _PGM_H_
 #define _PGM_H_
 
+#include "pm.h"
 #include "pbm.h"
 
 #ifdef __cplusplus
diff --git a/lib/pnm.h b/lib/pnm.h
index 94d4ff85..90c03507 100644
--- a/lib/pnm.h
+++ b/lib/pnm.h
@@ -4,6 +4,7 @@
 #ifndef _PNM_H_
 #define _PNM_H_
 
+#include "pm.h"
 #include "ppm.h"
 
 #ifdef __cplusplus
diff --git a/lib/ppm.h b/lib/ppm.h
index 7f7d6446..c2667983 100644
--- a/lib/ppm.h
+++ b/lib/ppm.h
@@ -3,6 +3,7 @@
 #ifndef _PPM_H_
 #define _PPM_H_
 
+#include "pm.h"
 #include "pgm.h"
 
 #ifdef __cplusplus
-- 
cgit 1.4.1