Fix header related problems

3 files changed, 20 insertions, 17 deletions

diff --git a/Makefile.am b/Makefile.am
index 49e3061..2929e04 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +17,8 @@ endif
 if IOS
 libicclient_la_LDFLAGS += -static
 endif
+include_HEADERS = icclient.h
 pkginclude_HEADERS = \
-		  icclient.h \
 		  icclient/typedefs.h \
 		  icclient/ord.h \
 		  icclient/member.h \
diff --git a/icclient.h b/icclient.h
index bcf8170..fb13ef7 100644
--- a/icclient.h
+++ b/icclient.h
@@ -1,25 +1,29 @@
 #ifndef ICCLIENT_CLIENT_H
 #define ICCLIENT_CLIENT_H
 
+#include <icclient/typedefs.h>
+
 #define	icclient_allproducts(callback, handler) icclient_results("All-Products", callback, handler)
 
+struct icclient_product {
+	char *sku;
+	char *description;
+	char *comment;
+	char *thumb;
+	char *image;
+	double price;
+	char *prod_group;
+	double weight;
+	char *author;
+	struct icclient_product_crosssell {
+		size_t length;
+		char *skus[];
+	} *crosssell;
+};
+
 struct icclient_catalog {
 	size_t length;
-	struct icclient_product {
-		char *sku;
-		char *description;
-		char *comment;
-		char *thumb;
-		char *image;
-		double price;
-		char *prod_group;
-		double weight;
-		char *author;
-		struct icclient_product_crosssell {
-			size_t length;
-			char *skus[];
-		} *crosssell;
-	} *products[];
+	struct icclient_product *products[];
 };
 
 #ifdef __cplusplus
diff --git a/main.c b/main.c
index b0dea89..fb2e13b 100644
--- a/main.c
+++ b/main.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "icclient/typedefs.h"
 #include "icclient.h"
 #include "icclient/member.h"