--- parser3/src/classes/amqp.C	2026/09/20 16:00:58	1.24
+++ parser3/src/classes/amqp.C	2026/10/09 18:32:15	1.27
@@ -5,33 +5,17 @@
 	Authors: Konstantin Morshnev <moko@design.ru>
 */
 
+
+#include "classes.h"
 #include "pa_vmethod_frame.h"
 
+#include "pa_vamqp.h"
 #include "pa_request.h"
-#include "pa_int.h"
-#include "pa_vstring.h"
-#include "pa_vhash.h"
 #include "pa_varray.h"
 #include "pa_vbool.h"
-#include "pa_vvoid.h"
-#include "pa_vdouble.h"
-#include "pa_vamqp.h"
 #include "pa_os.h"
-#include "pa_globals.h"
-
-#ifdef WITH_AMQP
-
-#include <amqp.h>
-#include <amqp_tcp_socket.h>
-#include <amqp_framing.h>
-
-#ifndef WITHOUT_AMQP_SSL
-#include <amqp_ssl_socket.h>
-#endif
-
-#endif
 
-volatile const char * IDENT_AMQP_C="$Id: amqp.C,v 1.24 2026/09/20 16:00:58 moko Exp $" IDENT_PA_VAMQP_H;
+volatile const char * IDENT_AMQP_C="$Id: amqp.C,v 1.27 2026/10/09 18:32:15 moko Exp $" IDENT_PA_VAMQP_H;
 
 class MAmqp: public Methoded {
 public: // VStateless_class
@@ -102,7 +86,7 @@ static void amqp_connect(VAmqp& self, Re
 	int heartbeat_sec = 30;
 	int reconnect_interval_sec = 0;
 	bool tls_specified = false;
-#ifndef WITHOUT_AMQP_SSL
+#ifdef WITH_AMQP_SSL
 	const char* tls_ca = 0;
 	const char* tls_cert = 0;
 	const char* tls_key = 0;
@@ -130,7 +114,7 @@ static void amqp_connect(VAmqp& self, Re
 			} else if(key=="auto_reconnect"){
 				reconnect_interval_sec=r.process(*value).as_int();
 			} else if(key=="tls"){
-#ifndef WITHOUT_AMQP_SSL
+#ifdef WITH_AMQP_SSL
 				tls_specified = true;
 				if(HashStringValue* tls_options=value->get_hash()){
 					for(HashStringValue::Iterator t(*tls_options); t; t.next()){
@@ -159,7 +143,7 @@ static void amqp_connect(VAmqp& self, Re
 	amqp_connection_state_t conn = amqp_new_connection();
 	amqp_socket_t* socket = 0;
 
-#ifndef WITHOUT_AMQP_SSL
+#ifdef WITH_AMQP_SSL
 	if(tls_specified) {
 		socket = amqp_ssl_socket_new(conn);
 		if(!socket)